From 78828cc127b7849a22e42a0e5f3ecafa9baa36d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=B4=E5=BB=B6=E7=A6=8F?= <>
Date: Tue, 4 Jul 2023 14:48:15 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E6=96=B0=E5=A2=9E=E5=8F=AA=E6=9C=89?=
 =?UTF-8?q?=E5=B7=B2=E6=95=B4=E6=94=B9=E5=8F=AF=E4=BB=A5=E9=80=89=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/hiddenDanger/clap.component.vue         |  2 +-
 src/views/hiddenDanger/common.component.html      |  2 +-
 src/views/hiddenDanger/files.component.vue        | 15 ++++++++-------
 src/views/hiddenDanger/manager.component.vue      |  2 +-
 src/views/hiddenDanger/rules/rules.component.vue  |  2 +-
 .../hiddenDanger/rules/rulesManager.component.vue |  2 +-
 src/views/hiddenDanger/safe/action.component.vue  |  2 +-
 src/views/hiddenDanger/safe/plan.component.vue    |  2 +-
 src/views/risk/area/area.component.vue            |  2 +-
 src/views/risk/unit/unit.component.vue            |  2 +-
 10 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/src/views/hiddenDanger/clap.component.vue b/src/views/hiddenDanger/clap.component.vue
index 3027df0..f3746b3 100644
--- a/src/views/hiddenDanger/clap.component.vue
+++ b/src/views/hiddenDanger/clap.component.vue
@@ -679,7 +679,7 @@ export default class HiddenDangerClapComponent extends BaseRecordComponent<any>
             this.toggleAll()
         }else{
             this.tableData.datas.forEach((item,index)=>{
-                const find = this.selectData.find((data:any)=>data.userId === item.userId);
+                const find = this.selectData.find((data:any)=>data.id === item.id);
                 if(!find){
                     (this.$refs.multipleTable as any).toggleRowSelection(item);
                 }
diff --git a/src/views/hiddenDanger/common.component.html b/src/views/hiddenDanger/common.component.html
index cfdc527..4255acc 100644
--- a/src/views/hiddenDanger/common.component.html
+++ b/src/views/hiddenDanger/common.component.html
@@ -16,7 +16,7 @@
     
                 <el-table ref="multipleTable" :data="tableData.datas" height="100%" border row-key="checked"
                     @selection-change="handleSelectionChange" style="width: 100%">
-                    <el-table-column v-if="!isAction && !(isManager && params.type>1)" type="selection" fixed label="全选" width="40">
+                    <el-table-column v-if="!isAction && !(isManager && params.type>1)" type="selection" :selectable="selectable"  fixed label="全选" width="40">
                     </el-table-column>
                     <el-table-column  label="序号" width="60">
                         <div slot-scope="scope">{{scope.$index+1}}</div>
diff --git a/src/views/hiddenDanger/files.component.vue b/src/views/hiddenDanger/files.component.vue
index 4fe99c9..0cd38e7 100644
--- a/src/views/hiddenDanger/files.component.vue
+++ b/src/views/hiddenDanger/files.component.vue
@@ -620,11 +620,7 @@ export default class HiddenDangerFilesComponent extends BaseRecordComponent<any>
         }else if(data.value === "selectAll"){
             this.selectAll()
         }else if(data.value === "delete"){
-            this.deleteData(this.selectData.map((item:any)=>{
-                if(item.status ===5){
-                    return item.id
-                }
-            }))
+            this.deleteData(this.selectData.map((item:any)=>item.id))
         }else if(data.value ==="cancel"){
             this.handleClose()
 
@@ -739,6 +735,11 @@ export default class HiddenDangerFilesComponent extends BaseRecordComponent<any>
     }
 
 
+    public selectable(row){
+        return row.status===5
+    }
+
+
     public toggleAll() {
         (this.$refs.multipleTable as any).toggleAllSelection();
     }
@@ -747,8 +748,8 @@ export default class HiddenDangerFilesComponent extends BaseRecordComponent<any>
             this.toggleAll()
         }else{
             this.tableData.datas.forEach((item,index)=>{
-                const find = this.selectData.find((data:any)=>data.userId === item.userId);
-                if(!find){
+                const find = this.selectData.find((data:any)=>data.id === item.id);
+                if(!find && item.status == 5){
                     (this.$refs.multipleTable as any).toggleRowSelection(item);
                 }
             })
diff --git a/src/views/hiddenDanger/manager.component.vue b/src/views/hiddenDanger/manager.component.vue
index d41bd66..9118780 100644
--- a/src/views/hiddenDanger/manager.component.vue
+++ b/src/views/hiddenDanger/manager.component.vue
@@ -1154,7 +1154,7 @@ export default class HiddenDangerManagerComponent extends BaseRecordComponent<an
             this.toggleAll()
         }else{
             this.tableData.datas.forEach((item,index)=>{
-                const find = this.selectData.find((data:any)=>data.userId === item.userId);
+                const find = this.selectData.find((data:any)=>data.id === item.id);
                 if(!find){
                     (this.$refs.multipleTable as any).toggleRowSelection(item);
                 }
diff --git a/src/views/hiddenDanger/rules/rules.component.vue b/src/views/hiddenDanger/rules/rules.component.vue
index 1e7c390..0c3e610 100644
--- a/src/views/hiddenDanger/rules/rules.component.vue
+++ b/src/views/hiddenDanger/rules/rules.component.vue
@@ -240,7 +240,7 @@ export default class RulesComponent extends BaseRecordComponent<any> {
             this.toggleAll()
         }else{
             this.tableData.datas.forEach((item,index)=>{
-                const find = this.selectData.find((data:any)=>data.userId === item.userId);
+                const find = this.selectData.find((data:any)=>data.id === item.id);
                 if(!find){
                     (this.$refs.multipleTable as any).toggleRowSelection(item);
                 }
diff --git a/src/views/hiddenDanger/rules/rulesManager.component.vue b/src/views/hiddenDanger/rules/rulesManager.component.vue
index 7b65f4f..77917da 100644
--- a/src/views/hiddenDanger/rules/rulesManager.component.vue
+++ b/src/views/hiddenDanger/rules/rulesManager.component.vue
@@ -523,7 +523,7 @@ export default class RulesManagerComponent extends BaseRecordComponent<any> {
             this.toggleAll()
         }else{
             this.tableData.datas.forEach((item,index)=>{
-                const find = this.selectData.find((data:any)=>data.userId === item.userId);
+                const find = this.selectData.find((data:any)=>data.id === item.id);
                 if(!find){
                     (this.$refs.multipleTable as any).toggleRowSelection(item);
                 }
diff --git a/src/views/hiddenDanger/safe/action.component.vue b/src/views/hiddenDanger/safe/action.component.vue
index 17c2c20..25c1908 100644
--- a/src/views/hiddenDanger/safe/action.component.vue
+++ b/src/views/hiddenDanger/safe/action.component.vue
@@ -652,7 +652,7 @@ export default class RulesManagerComponent extends BaseRecordComponent<any> {
             this.toggleAll()
         }else{
             this.tableData.datas.forEach((item,index)=>{
-                const find = this.selectData.find((data:any)=>data.userId === item.userId);
+                const find = this.selectData.find((data:any)=>data.id === item.id);
                 if(!find){
                     (this.$refs.multipleTable as any).toggleRowSelection(item);
                 }
diff --git a/src/views/hiddenDanger/safe/plan.component.vue b/src/views/hiddenDanger/safe/plan.component.vue
index 4a17610..c3634f1 100644
--- a/src/views/hiddenDanger/safe/plan.component.vue
+++ b/src/views/hiddenDanger/safe/plan.component.vue
@@ -621,7 +621,7 @@ export default class PlanComponent extends BaseRecordComponent<any> {
             this.toggleAll()
         }else{
             this.tableData.datas.forEach((item,index)=>{
-                const find = this.selectData.find((data:any)=>data.userId === item.userId);
+                const find = this.selectData.find((data:any)=>data.id === item.id);
                 if(!find){
                     (this.$refs.multipleTable as any).toggleRowSelection(item);
                 }
diff --git a/src/views/risk/area/area.component.vue b/src/views/risk/area/area.component.vue
index 15ced2c..e3c5021 100644
--- a/src/views/risk/area/area.component.vue
+++ b/src/views/risk/area/area.component.vue
@@ -415,7 +415,7 @@ export default class AreaManagerComponent extends BaseRecordComponent<any> {
             this.toggleAll()
         }else{
             this.tableData.datas.forEach((item,index)=>{
-                const find = this.selectData.find((data:any)=>data.userId === item.userId);
+                const find = this.selectData.find((data:any)=>data.id === item.id);
                 if(!find){
                     (this.$refs.multipleTable as any).toggleRowSelection(item);
                 }
diff --git a/src/views/risk/unit/unit.component.vue b/src/views/risk/unit/unit.component.vue
index f7ae1ca..16604b3 100644
--- a/src/views/risk/unit/unit.component.vue
+++ b/src/views/risk/unit/unit.component.vue
@@ -510,7 +510,7 @@ export default class UnitManagerComponent extends BaseRecordComponent<any> {
             this.toggleAll()
         }else{
             this.tableData.datas.forEach((item,index)=>{
-                const find = this.selectData.find((data:any)=>data.userId === item.userId);
+                const find = this.selectData.find((data:any)=>data.id === item.id);
                 if(!find){
                     (this.$refs.multipleTable as any).toggleRowSelection(item);
                 }