From cb38e05a028842de6aec68d392c1623ad14b458f Mon Sep 17 00:00:00 2001
From: xuechunyuan <17853500702@163.com>
Date: Mon, 7 Aug 2023 17:05:30 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1=E5=92=8C?=
 =?UTF-8?q?=E8=AE=BE=E5=A4=87=E8=81=94=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wirelessintrusion/deployment/list.vue     | 30 ++++++++++---------
 src/views/wirelessintrusion/device/list.vue   | 13 ++++----
 2 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/src/views/wirelessintrusion/deployment/list.vue b/src/views/wirelessintrusion/deployment/list.vue
index 16c35c5..06d3dc1 100644
--- a/src/views/wirelessintrusion/deployment/list.vue
+++ b/src/views/wirelessintrusion/deployment/list.vue
@@ -198,14 +198,13 @@ export default {
         editBtn: this.vaildData(this.permission.notice_edit, false)
       };
     },
-
     ids() {
       let ids = [];
       this.selectionList.forEach(ele => {
         ids.push(ele.id);
       });
       return ids.join(",");
-    }
+    },
   },
   mounted() {
     this.loadDict();
@@ -273,8 +272,7 @@ export default {
     },
     // 弹窗表格多选
     handleSelectionChange(val) {
-      this.multipleSelection = val.map(item => item.id);
-      console.log(this.multipleSelection)
+      this.multipleSelection = val;
     },
     // 弹窗确认按钮
     submitForm() {
@@ -287,11 +285,15 @@ export default {
             })
             return;
           }
-          let ids = this.multipleSelection.join(",");
-          console.log(ids)
+          let ids = [], deviceId = [];
+          this.multipleSelection.forEach(ele => {
+            let tags = JSON.parse(ele.tags)
+            ids.push(ele.id);
+            deviceId.push(tags.sectorNo);
+          });
           this.submitLoading = true;
           if (this.addForm.id > 0) {
-            cornJobUpdate({ ...this.addForm, deviceId: ids }).then((res) => {
+            cornJobUpdate({ ...this.addForm, deviceId: deviceId.join(","), ids: ids.join(",") }).then((res) => {
               this.submitLoading = false;
               this.dialogVisible = false;
               this.onLoad(this.page);
@@ -303,7 +305,7 @@ export default {
               this.submitLoading = false;
             })
           } else {
-            cornJobSave({ ...this.addForm, deviceId: ids }).then(res => {
+            cornJobSave({ ...this.addForm, deviceId: deviceId.join(","), ids: ids.join(",") }).then(res => {
               this.submitLoading = false;
               this.dialogVisible = false;
               this.onLoad(this.page);
@@ -444,11 +446,11 @@ export default {
             })
             this.tableData = data.records;
             this.$refs.multipleTable.clearSelection();
-            this.multipleSelection = this.addForm.deviceId ? this.addForm.deviceId.split(",") : [];
-            if (this.multipleSelection.length > 0) { // 判断是否存在勾选过的数据
+            let multipleSelection = this.addForm.ids ? this.addForm.ids.split(",") : [];
+            if (multipleSelection.length > 0) { // 判断是否存在勾选过的数据
               this.$nextTick(() => {
                 this.tableData.forEach(row => {  // 获取数据列表接口请求到的数据
-                  this.multipleSelection.forEach(item => {  // 勾选到的数据
+                  multipleSelection.forEach(item => {  // 勾选到的数据
                     if (row.id === parseInt(item)) {
                       this.$refs.multipleTable.toggleRowSelection(row, true); // 若有重合，则回显该条数据
                     }
@@ -476,11 +478,11 @@ export default {
             })
             this.tableData = data.rows;
             this.$refs.multipleTable.clearSelection();
-            this.multipleSelection = this.addForm.deviceId ? this.addForm.deviceId.split(",") : [];
-            if (this.multipleSelection.length > 0) { // 判断是否存在勾选过的数据
+            let multipleSelection = this.addForm.ids ? this.addForm.ids.split(",") : [];
+            if (multipleSelection.length > 0) { // 判断是否存在勾选过的数据
               this.$nextTick(() => {
                 this.tableData.forEach(row => {  // 获取数据列表接口请求到的数据
-                  this.multipleSelection.forEach(item => {  // 勾选到的数据
+                  multipleSelection.forEach(item => {  // 勾选到的数据
                     if (row.id === parseInt(item)) {
                       this.$refs.multipleTable.toggleRowSelection(row, true); // 若有重合，则回显该条数据
                     }
diff --git a/src/views/wirelessintrusion/device/list.vue b/src/views/wirelessintrusion/device/list.vue
index 0bc0767..b1ed0b5 100644
--- a/src/views/wirelessintrusion/device/list.vue
+++ b/src/views/wirelessintrusion/device/list.vue
@@ -143,12 +143,13 @@ export default {
             span: 12,
             labelWidth: 120,
             hide: true,
-          }, {
-            label: "最后上线时间",
-            span: 24,
-            prop: "lastOnline",
-            labelWidth: 120
-          },
+          }, 
+          // {
+          //   label: "最后上线时间",
+          //   span: 24,
+          //   prop: "lastOnline",
+          //   labelWidth: 120
+          // },
         ]
       },
       data: [],