From 4d482d7ce36f1e779677cdaef0475b5a2030e31b Mon Sep 17 00:00:00 2001
From: lyfO_o <764716047@qq.com>
Date: 星期四, 02 六月 2022 13:13:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master
---
src/views/doublePreventAction/riskLevelManage/controlAction/index.vue | 30 ++++++++++++++++--------------
1 files changed, 16 insertions(+), 14 deletions(-)
diff --git a/src/views/doublePreventAction/riskLevelManage/controlAction/index.vue b/src/views/doublePreventAction/riskLevelManage/controlAction/index.vue
index 8a03eab..5ab5ee9 100644
--- a/src/views/doublePreventAction/riskLevelManage/controlAction/index.vue
+++ b/src/views/doublePreventAction/riskLevelManage/controlAction/index.vue
@@ -35,6 +35,13 @@
>
<el-table-column type="selection" :reserve-selection="true" width="55"></el-table-column>
<el-table-column label="安全风险事件名称" prop="riskEventId" align="center">
+ <template slot-scope="scope">
+ <div v-for="item in riskEventList">
+ <div v-if="item.id === scope.row.riskEventId">
+ {{item.riskEventName}}
+ </div>
+ </div>
+ </template>
</el-table-column>
<el-table-column label="管控方式" prop="dataSrc" align="center">
</el-table-column>
@@ -150,13 +157,6 @@
export default {
name: 'index',
filters: {
- parseMain(type){
- if(type === 1){
- return "是"
- }else if(type === 0){
- return "否"
- }
- },
},
computed: {
...mapGetters([
@@ -406,16 +406,18 @@
ifShowButton (value){
this.showCurrent = false
this.showOther = true
- // this.$refs.table.clearSelection()
- // value.forEach(row => {
- // this.$refs.table.toggleRowSelection(this.riskControlMeasureData.find(item => {
- // return row.id === item.id
- // }) , this.riskControlMeasureData.find(item => {return row.id === item.id}) === undefined ? false :true)
- // })
+ this.listQuery.pageSize = 1000
+ this.getRiskControlMeasureData()
+ this.$refs.table.clearSelection()
+ value.forEach(row => {
+ this.$refs.table.toggleRowSelection(this.riskControlMeasureData.find(item => {
+ return row.id === item.id
+ }) , this.riskControlMeasureData.find(item => {return row.id === item.id}) === undefined ? false :true)
+ })
+
},
handleSelectionChange(val){
- debugger
this.riskControlMeasureIdList = val
},
--
Gitblit v1.9.2