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 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 @@ - +
{{scope.$index+1}}
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 }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 } + 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 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{ - 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 { 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 { 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 { 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 { 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 { 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 { 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); }