From 6ddb76dc2980cb64835e0644bf5de406ce6670c8 Mon Sep 17 00:00:00 2001
From: lct123456 <lucht>
Date: 星期三, 20 四月 2022 21:03:24 +0800
Subject: [PATCH] Merge branch 'master' of https://sinanoaq.cn:8888/r/ztqt
---
src/views/doublePreventAction/riskLevelManage/controlAction/index.vue | 21 ++++++++++++++++-----
1 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/src/views/doublePreventAction/riskLevelManage/controlAction/index.vue b/src/views/doublePreventAction/riskLevelManage/controlAction/index.vue
index e846537..fe0a8b4 100644
--- a/src/views/doublePreventAction/riskLevelManage/controlAction/index.vue
+++ b/src/views/doublePreventAction/riskLevelManage/controlAction/index.vue
@@ -20,7 +20,7 @@
highlight-current-row
style="width: 100%;"
>
- <el-table-column type="selection" width="55"></el-table-column>
+ <!-- <el-table-column type="selection" width="55"></el-table-column> -->
<el-table-column label="安全风险事件名称" prop="riskEventId" align="center">
</el-table-column>
<el-table-column label="管控方式" prop="dataSrc" align="center">
@@ -68,7 +68,7 @@
/>
<br>
</div>
- <el-dialog :title="title" :visible.sync="riskControlMeasureVisible" :modal-append-to-body="false" :close-on-click-modal="false" width="600px">
+ <el-dialog :title="title" :visible.sync="riskControlMeasureVisible" append-to-body :close-on-click-modal="false" width="600px">
<el-form ref="riskControlMeasureForm" :rules="riskControlMeasureFormRules" :model="riskControlMeasureForm" label-position="right" label-width="160px">
<el-form-item label="安全风险事件名称" prop="riskEventId">
<el-select v-model="riskControlMeasureForm.riskEventId" class="analyseUnit_input">
@@ -121,7 +121,7 @@
</el-form-item>
</el-form>
<div align="right">
- <el-button @click="unitFormVisible = false">取消</el-button>
+ <el-button @click="riskControlMeasureVisible = false">取消</el-button>
<el-button type="primary" @click="submitAnalyseUnit()">确认</el-button>
</div>
</el-dialog>
@@ -399,8 +399,19 @@
this.riskControlMeasureIdList = val
},
- giveValue(){
- this.$emit('giveRiskControlId',this.riskControlMeasureIdList)
+ giveValue(value){
+ // this.$emit('giveRiskControlId',this.riskControlMeasureIdList)
+ this.$emit('giveRiskControlId',value)
+ },
+ showMeasureDetail(value){
+ this.riskControlMeasureVisible = true
+ this.getRiskControlMeasureData().then( ()=>{
+ let riskControlMeasureForm = this.riskControlMeasureData.find(item => item.id === value.measureId)
+ this.riskControlMeasureForm = riskControlMeasureForm
+ this.$emit('closeDialog')
+ })
+
+
}
}
}
--
Gitblit v1.9.2