From d7b94d06161b4016df4c999b08792075b86c4b90 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8F=B2=E5=85=B8=E5=8D=93?=
 <shidianzhuo@shidianzhuodeMacBook-Pro.local>
Date: Tue, 5 Nov 2024 14:59:56 +0800
Subject: [PATCH] flat: update

---
 .../tenant/main/serve/Dialog/addGroup.vue     |  2 +-
 .../talents/LocalWarningDisposal/index.vue    | 25 ++++++++++++++++---
 .../main/talents/serverRecords/index.vue      | 13 +++++++---
 3 files changed, 31 insertions(+), 9 deletions(-)

diff --git a/src/views/tenant/main/serve/Dialog/addGroup.vue b/src/views/tenant/main/serve/Dialog/addGroup.vue
index 9866866..187df17 100644
--- a/src/views/tenant/main/serve/Dialog/addGroup.vue
+++ b/src/views/tenant/main/serve/Dialog/addGroup.vue
@@ -120,7 +120,7 @@ const initFormValue = {
 }
 const checkAtturbute = {
   name: '',
-  serveLabels: [],
+  // serveLabels: [],
   policyIds: [],
   talentsGroupId: [],
 }
diff --git a/src/views/tenant/main/talents/LocalWarningDisposal/index.vue b/src/views/tenant/main/talents/LocalWarningDisposal/index.vue
index bf1a9d8..9f0933f 100644
--- a/src/views/tenant/main/talents/LocalWarningDisposal/index.vue
+++ b/src/views/tenant/main/talents/LocalWarningDisposal/index.vue
@@ -17,6 +17,9 @@
         class="customPage"
         :row-style="rowStyle"
       >
+        <template slot="statusCop" slot-scope="{row}">
+          <span>{{ statusLs.find((item) => item.value === row.status).label }}</span>
+        </template>
       </avue-crud>
     </basic-container>
   </el-row>
@@ -35,6 +38,11 @@ const page = {
   currentPage: 1,
   total: 0,
 }
+const statusLs = [
+  {label: "未处理", value: '0'},
+  {label: "确认", value: '1'},
+  {label: "忽略", value: '2'}
+]
 const baseOptions = {
   size: 'medium',
   dateBtn: false,
@@ -78,7 +86,8 @@ export default {
       loadingLog: false,
       innerDrawerLog: false,
       innerDrawerAddLog: false,
-      logValues: {}
+      logValues: {},
+      statusLs
     }
   },
   computed: {
@@ -136,17 +145,25 @@ export default {
             prop: 'remark',
             display: false
           },
+          {
+            label: '状态',
+            prop: 'statusCop',
+            type: 'radio',
+            slot: true,
+            display: false,
+            dicData: statusLs
+          },
           {
             label: '状态',
             prop: 'status',
             type: 'radio',
+            showColumn: false,
             dicData: [
-              {label: "未处理", value: '0'},
               {label: "确认", value: '1'},
               {label: "忽略", value: '2'}
             ]
-          }
-        ]
+          },
+        ],
       }
     },
   },
diff --git a/src/views/tenant/main/talents/serverRecords/index.vue b/src/views/tenant/main/talents/serverRecords/index.vue
index f0b08e9..4520f31 100644
--- a/src/views/tenant/main/talents/serverRecords/index.vue
+++ b/src/views/tenant/main/talents/serverRecords/index.vue
@@ -78,7 +78,8 @@ export default {
       loadingLog: false,
       innerDrawerLog: false,
       innerDrawerAddLog: false,
-      logValues: {}
+      logValues: {},
+      query: {}
     }
   },
   computed: {
@@ -183,7 +184,9 @@ export default {
   },
   created() {
     this.getDept()
-    this.onLoad(this.page, {...this.query, stime: this.getdate()})
+    this.query = {...this.query, stime: this.getdate()}
+    this.onLoad(this.page, this.query)
+
   },
   activated() {
     this.$nextTick(() => {
@@ -222,16 +225,18 @@ export default {
       this.onLoad(this.page, this.query);
     },
     sizeChange(size) {
-      this.page.size = size;
+      this.page.pageSize = size;
       this.onLoad(this.page, this.query);
     },
     onLoad(page, params = {}) {
       const {releaseTimeRange} = params;
       let paramsed = {
         current: page.currentPage,
-        size: page.size,
+        size: page.pageSize,
         ...params
       };
+      console.log(this.query, paramsed)
+
       this.loading = true;
       getServeLogList(paramsed).then((res) => {
         const {total, size, current, records, page} = res.data.data