From 070e6ce56f585eb26eabbb2ed17fef1e3e4026c5 Mon Sep 17 00:00:00 2001
From: zhoucong <123456>
Date: 星期一, 16 五月 2022 16:27:20 +0800
Subject: [PATCH] fix
---
src/views/doublePreventAction/riskLevelManage/controlAction/index.vue | 45 ++++++++++++++++++++++++++++++++++++++-------
1 files changed, 38 insertions(+), 7 deletions(-)
diff --git a/src/views/doublePreventAction/riskLevelManage/controlAction/index.vue b/src/views/doublePreventAction/riskLevelManage/controlAction/index.vue
index 42ad0d6..6edc6a2 100644
--- a/src/views/doublePreventAction/riskLevelManage/controlAction/index.vue
+++ b/src/views/doublePreventAction/riskLevelManage/controlAction/index.vue
@@ -2,9 +2,20 @@
<div class="app-container">
<div class="filter-container">
<div class="basic_search">
- <span>单位名称：</span>
- <el-input v-model="listQuery.filter.riskUnitName" style="width:200px">
+ <span>事件名称：</span>
+ <el-input v-model="listQuery.filter.riskEventName" style="width:200px">
</el-input>
+ </div>
+ <div class="basic_search">
+ <span>事件名称：</span>
+ <el-select v-model="listQuery.filter.dataSrc" clearable style="width:200px">
+ <el-option
+ v-for="item in DataSrcList"
+ :key="item.id"
+ :value="item.text"
+ :label="item.text"
+ ></el-option>
+ </el-select>
</div>
<el-button class="filter-item" style="margin-left: 10px;margin-top: 10px" type="primary" icon="el-icon-refresh" @click="refreshHandle">搜索</el-button>
<el-button class="filter-item" style="margin-left: 10px;margin-top: 10px" type="primary" icon="el-icon-plus" @click="showRiskControlMeasureForm('','新增')" v-show="showCurrent">新增</el-button>
@@ -13,12 +24,14 @@
<el-table
v-loading="listLoading"
:key="tableKey"
+ @selection-change="handleSelectionChange"
:data="riskControlMeasureData"
border
fit
highlight-current-row
style="width: 100%;"
>
+ <!-- <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">
@@ -66,7 +79,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">
@@ -119,8 +132,8 @@
</el-form-item>
</el-form>
<div align="right">
- <el-button @click="unitFormVisible = false">取消</el-button>
- <el-button type="primary" @click="submitAnalyseUnit()">确认</el-button>
+ <el-button @click="riskControlMeasureVisible = false">取消</el-button>
+ <el-button type="primary" @click="submitAnalyseUnit()" v-show="ifShowSelf">确认</el-button>
</div>
</el-dialog>
</div>
@@ -156,9 +169,11 @@
DataSrcList:[],
classifyOneList:[],
classifyTwoList:[],
+ riskCcntrolMeasureIdList:[],
listLoading: false,
showCurrent:true,
showOther:false,
+ ifShowSelf:true,
pageSize: 10,
recordTotal: 0,
currentPage: 1,
@@ -197,7 +212,7 @@
pageIndex:1,
pageSize:10,
filter:{
- riskUnitName:'',
+ riskEventName:'',
}
},
}
@@ -391,7 +406,23 @@
this.showCurrent = false
this.showOther = true
},
- giveValue(){
+
+ handleSelectionChange(val){
+ this.riskControlMeasureIdList = val
+ },
+
+ 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