From cf812d84e5041516510dee3f1b795eb56ae7388f Mon Sep 17 00:00:00 2001
From: kongyeqing <2697454777@qq.com>
Date: Fri, 7 Jul 2023 17:58:54 +0800
Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E4=BC=98=E5=8C=96=E5=88=86?=
 =?UTF-8?q?=E9=A1=B5=EF=BC=8C=E4=BF=AE=E5=A4=8D=E5=AE=89=E5=85=A8=E6=A3=80?=
 =?UTF-8?q?=E6=9F=A5=E8=A1=A8bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/service/device.service.ts                           | 5 +++++
 src/views/hiddenDanger/rules/rulesManager.component.vue | 4 +++-
 src/views/risk/assessment/device/device.component.html  | 1 -
 src/views/risk/assessment/device/device.component.vue   | 2 +-
 src/views/risk/assessment/work/work.component.vue       | 7 +++----
 src/views/risk/duty/duty.component.vue                  | 4 ++--
 src/views/risk/duty/dutyRecords.component.vue           | 2 +-
 7 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/src/service/device.service.ts b/src/service/device.service.ts
index adc7811..b60eba4 100644
--- a/src/service/device.service.ts
+++ b/src/service/device.service.ts
@@ -30,4 +30,9 @@ export default class DeviceService extends BaseService<any>{
         const url = this.prefix.prevention +'/device/inventory/delete';
         return this.deleteBatch(url,params,{},true)
     }
+
+    public selectByPage2(params: any):Promise<AxiosResponse<ActionResult<any>>>{
+        const url = this.prefix.prevention+'/device/inventory/getList';
+        return this.post(url,params)
+    }
 }
\ No newline at end of file
diff --git a/src/views/hiddenDanger/rules/rulesManager.component.vue b/src/views/hiddenDanger/rules/rulesManager.component.vue
index 7de17f7..aa419fe 100644
--- a/src/views/hiddenDanger/rules/rulesManager.component.vue
+++ b/src/views/hiddenDanger/rules/rulesManager.component.vue
@@ -372,7 +372,9 @@ export default class RulesManagerComponent extends BaseRecordComponent<any> {
     public doMutilAdd(){
         this.selectData.forEach((item:any)=>{
             if(!this.updateParams.tableItems.find(itm=>itm.id===item.id)){
-                this.updateParams.tableItems.push(item)
+                const data = JSON.parse(JSON.stringify(item))
+                delete data.id;
+                this.updateParams.tableItems.push(data)
             }
         })
 
diff --git a/src/views/risk/assessment/device/device.component.html b/src/views/risk/assessment/device/device.component.html
index fa8f1da..a7b84da 100644
--- a/src/views/risk/assessment/device/device.component.html
+++ b/src/views/risk/assessment/device/device.component.html
@@ -37,7 +37,6 @@
                         </template>
                     </el-table-column>
                 </el-table>
-
             </TableComponent>
         </div>
     </div>
diff --git a/src/views/risk/assessment/device/device.component.vue b/src/views/risk/assessment/device/device.component.vue
index 96f055b..f714f5c 100644
--- a/src/views/risk/assessment/device/device.component.vue
+++ b/src/views/risk/assessment/device/device.component.vue
@@ -405,7 +405,7 @@ export default class DeviceManagerComponent extends BaseRecordComponent<any> {
 
     // 分页数据
     public getTableData() {
-        this.tableService.selectByPage(this.params).then(res => {
+        this.tableService.selectByPage2(this.params).then(res => {
             this.tableData = res.data as any;
         })
     }
diff --git a/src/views/risk/assessment/work/work.component.vue b/src/views/risk/assessment/work/work.component.vue
index 2ca4a17..c3688c1 100644
--- a/src/views/risk/assessment/work/work.component.vue
+++ b/src/views/risk/assessment/work/work.component.vue
@@ -324,8 +324,7 @@ export default class WorkManagerComponent extends BaseRecordComponent<any> {
     }
 
     public buildTable() {
-        console.log(template);
-        
+
         this.tableColumn.push({ name: '区域名称', key: "areaName", width: "200px" });
         this.tableColumn.push({ name: '风险分析单元', key: "unitName", width: "200px" });
         this.tableColumn.push({ name: '作业活动', key: "name", showTip: true });
@@ -549,8 +548,8 @@ export default class WorkManagerComponent extends BaseRecordComponent<any> {
 
 
     public toggleAll() {
-        
-        this.tableData.datas.forEach((item,index)=>{
+
+        this.tableData.datas.forEach((item, index) => {
             (this.$refs.multipleTable as any).toggleRowSelection(item);
         })
     }
diff --git a/src/views/risk/duty/duty.component.vue b/src/views/risk/duty/duty.component.vue
index 66316ab..2d25ae3 100644
--- a/src/views/risk/duty/duty.component.vue
+++ b/src/views/risk/duty/duty.component.vue
@@ -359,8 +359,8 @@ export default class DutyManagerComponent extends BaseRecordComponent<any> {
 
 
     public toggleAll() {
-        
-        this.tableData.datas.forEach((item,index)=>{
+
+        this.tableData.datas.forEach((item, index) => {
             (this.$refs.multipleTable as any).toggleRowSelection(item);
         })
     }
diff --git a/src/views/risk/duty/dutyRecords.component.vue b/src/views/risk/duty/dutyRecords.component.vue
index 54a78de..836f259 100644
--- a/src/views/risk/duty/dutyRecords.component.vue
+++ b/src/views/risk/duty/dutyRecords.component.vue
@@ -264,7 +264,7 @@ export default class DutyRecordsManagerComponent extends BaseRecordComponent<any
     // 分页数据
     public getTableData() {
         this.tableService.selectByPage2(this.params).then(res => {
-            this.tableData.datas = res.data as any;
+            this.tableData = res.data as any;
         })
     }