Merge remote-tracking branch 'origin/master'

portal-manager-ui/admin/src/assets/css/common.less

@@ -316,6 +316,22 @@ img {
   background-color: rgba(5, 149, 253, 1);
 }
 
+.ant-table-fixed-header .ant-table-scroll .ant-table-header {
+  overflow: hidden !important;
+  margin-bottom: 0 !important;
+  padding-right: 6px;
+  tr:only-child > th:last-child {
+    border-right-color: #f0f0f0 !important;
+  }
+}
+.ant-table-placeholder {
+  width: calc(100% - 6px);
+}
+// .ant-table-header {
+//   background: #fff;
+// }
+
+
 ::-webkit-scrollbar {
   width: 6px;
   height: 6px;

portal-manager-ui/admin/src/views/thePlatformIsSet/components/logService/Service.vue

@@ -11,7 +11,9 @@
           v-model="BegindAndEndTime"
         >
         </a-range-picker>
-        <a-button type="primary" class="addclass"  @click="handleSearch">搜索</a-button>
+        <a-button type="primary" class="addclass" @click="handleSearch"
+          >搜索</a-button
+        >
         <a-button @click="resetSearch">重置</a-button>
       </a-space>
     </div>
@@ -110,7 +112,10 @@ export default {
       tableHeaders,
       searchName: "",
       tableLoading: false,
-      BegindAndEndTime: [],
+      BegindAndEndTime: [
+        this.$moment().format("YYYY-MM-DD"),
+        this.$moment().format("YYYY-MM-DD"),
+      ],
       tableSourceData: [],
       pageSizeOptions: ["10", "30", "50", "100"],
       current: 1,
@@ -127,17 +132,19 @@ export default {
     // 获取日志列表
     async getOperLogList() {
       this.tableLoading = true;
+      let query = {
+        logDateStart: this.BegindAndEndTime[0],
+        logDateEnd: this.BegindAndEndTime[1],
+      };
+      if (this.searchName != "") {
+        query.content = `%${this.searchName}%`;
+      }
       let res = await getOperLogList({
         pageInfo: {
           prePageResult: this.size,
-          currPage: this.size,
-        },
-        query: {
-          logDateStart: this.BegindAndEndTime[0],
-          logDateEnd: this.BegindAndEndTime[1],
-          // siteId: this.siteId,
-          content: `%${this.searchName}%`,
+          currPage: this.current,
         },
+        query,
       });
       this.tableLoading = false;
       this.dict = res.data.dict;
@@ -162,7 +169,10 @@ export default {
     },
     resetSearch() {
       this.current = 1;
-      this.BegindAndEndTime = [];
+      this.BegindAndEndTime = [
+        this.$moment().format("YYYY-MM-DD"),
+        this.$moment().format("YYYY-MM-DD"),
+      ];
       this.searchName = "";
       this.getOperLogList();
     },

portal-manager-ui/admin/src/views/thePlatformIsSet/index.css

@@ -8,7 +8,7 @@
   }
 }
 
-html{
+html {
   font-size: var(--base-font-size);
 }
 
@@ -25,8 +25,8 @@ html{
 .effect-box {
   position: sticky;
   top: 0;
-  /* height: 100vh; */
-  min-height: 930rem;
+  height: 100vh;
+  /* min-height: 930rem; */
   background-color: #031233;
   perspective: 800px;
   overflow: hidden;