From ca151ff4c1cdc4a029f13ac6da7d42e4f8147287 Mon Sep 17 00:00:00 2001 From: Your Name <123456> Date: 星期六, 06 八月 2022 16:18:50 +0800 Subject: [PATCH] 重构双重预防 --- src/views/doublePreventAction/riskLevelManage/controlAction/index.vue | 275 ++++++++++++++++++++++++++---------------------------- 1 files changed, 133 insertions(+), 142 deletions(-) diff --git a/src/views/doublePreventAction/riskLevelManage/controlAction/index.vue b/src/views/doublePreventAction/riskLevelManage/controlAction/index.vue index 5f6e594..036fb74 100644 --- a/src/views/doublePreventAction/riskLevelManage/controlAction/index.vue +++ b/src/views/doublePreventAction/riskLevelManage/controlAction/index.vue @@ -3,17 +3,18 @@ <div class="filter-container"> <div class="basic_search"> <span>事件名称:</span> - <el-input v-model="listQuery.filter.riskEventName" style="width:200px"> - </el-input> + <el-select clearable style="width:200px" v-model="listQuery.riskEventId" placeholder="安全风险事件" clearable> + <el-option v-for="item in riskEventList" :key="item.id" :label="item.riskEventName" :value="item.id"></el-option> + </el-select> </div> <div class="basic_search"> <span>管控方式:</span> - <el-select v-model="listQuery.filter.dataSrc" clearable style="width:200px"> + <el-select v-model="listQuery.controlType" clearable style="width:200px"> <el-option - v-for="item in DataSrcList" + v-for="item in controlTypeList" :key="item.id" - :value="item.text" - :label="item.text" + :value="item.id" + :label="item.name" ></el-option> </el-select> </div> @@ -31,46 +32,36 @@ border fit ref="table" - :row-key="getRowKey" highlight-current-row style="width: 100%;" > - <el-table-column type="selection" :reserve-selection="true" width="55"></el-table-column> - <el-table-column label="安全风险事件名称" prop="riskEventId" align="center" show-overflow-tooltip> +<!-- <el-table-column type="selection" :reserve-selection="true" width="55"></el-table-column>--> + <el-table-column type="selection" width="55"></el-table-column> + <el-table-column type="index" label="序号" width="60" /> + <el-table-column prop="riskEventName" label="安全风险事件名称" show-overflow-tooltip></el-table-column> + <el-table-column prop="controlMeasureCode" label="风控措施编码" show-overflow-tooltip></el-table-column> + <el-table-column prop="controlType" label="管控方式" show-overflow-tooltip> <template slot-scope="scope"> - <div v-for="item in riskEventList"> - <div v-if="item.id === scope.row.riskEventId"> - {{item.riskEventName}} - </div> - </div> + {{ parseNumber(scope.row.controlType, '管控方式') }} </template> </el-table-column> - <el-table-column label="管控方式" prop="dataSrc" align="center"> + <el-table-column prop="checkContent" label="管控内容" show-overflow-tooltip></el-table-column> + <el-table-column prop="classify1" label="管控措施分类1" show-overflow-tooltip> + <template slot-scope="scope"> + {{ parseNumber(scope.row.classify1, '管控措施分类1') }} + </template> </el-table-column> - <el-table-column label="管控方式描述" prop="riskMeasureDesc" align="center" show-overflow-tooltip> + <el-table-column prop="classify2" label="管控措施分类2" show-overflow-tooltip> + <template slot-scope="scope"> + {{ parseNumber(scope.row.classify2, '管控措施分类2') }} + </template> </el-table-column> - <el-table-column label="管控措施分类1" prop="classify1" align="center"> - </el-table-column> - <el-table-column label="管控措施分类2" prop="classify2" align="center"> - </el-table-column> - <el-table-column label="管控措施分类3" prop="classify3" align="center"> - </el-table-column> - <el-table-column label="隐患排查内容" prop="troubleshootContent" align="center" show-overflow-tooltip> - </el-table-column> - <el-table-column label="检查类型" prop="hazardLiablePerson" align="center"> - </el-table-column> - <el-table-column label="周期" prop="timeEffect" align="center"> - </el-table-column> - <el-table-column label="单位" prop="timeUnit" align="center"> - </el-table-column> - <el-table-column label="创建人" prop="createBy" align="center"> - </el-table-column> - <el-table-column label="创建时间" prop="createTime" align="center"> - </el-table-column> - <el-table-column label="最后修改人" prop="updateBy" align="center"> - </el-table-column> - <el-table-column label="最后修改时间" prop="updateTime" align="center"> - </el-table-column> + <el-table-column prop="classify3" label="管控措施分类3" show-overflow-tooltip></el-table-column> + <el-table-column prop="measureDesc" label="措施说明" show-overflow-tooltip></el-table-column> + <el-table-column prop="createByUserName" label="创建人" show-overflow-tooltip></el-table-column> + <el-table-column prop="gmtCreate" label="创建时间" show-overflow-tooltip></el-table-column> + <el-table-column prop="lastEditUserName" label="最后修改人" show-overflow-tooltip></el-table-column> + <el-table-column prop="gmtModitify" label="最后修改时间" show-overflow-tooltip></el-table-column> <el-table-column label="操作" align="center" width="280" class-name="small-padding fixed-width"> <template slot-scope="scope"> <el-button type="text" @click="giveValue(scope.row,)" v-show="showOther">选择</el-button> @@ -82,9 +73,9 @@ <br> <el-pagination v-show="recordTotal>0" - :current-page="currentPage" + :current-page="listQuery.pageIndex" :page-sizes="[10, 20, 30, 50]" - :page-size="pageSize" + :page-size="listQuery.pageSize" :total="recordTotal" layout="total, sizes, prev, pager, next, jumper" background @@ -97,67 +88,51 @@ <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"> + <el-select v-model="riskControlMeasureForm.riskEventId" class="analyseUnit_box" placeholder="请选择安全风险事件名称"> <el-option v-for="item in riskEventList" - :key="item.id" + :key="item.riskEventName" :value="item.id" :label="item.riskEventName" ></el-option> </el-select> </el-form-item> - <el-form-item label="管控方式" prop="dataSrc"> - <el-select v-model="riskControlMeasureForm.dataSrc" class="analyseUnit_input"> - <el-option - v-for="item in DataSrcList" - :key="item.id" - :value="item.text" - :label="item.text" - ></el-option> + <el-form-item label="风险措施编码" prop="controlMeasureCode"> + <el-input class="analyseUnit_box" v-model.trim="riskControlMeasureForm.controlMeasureCode" placeholder="请输入风险措施编码"></el-input> + </el-form-item> + <el-form-item label="管控方式" prop="controlType"> + <el-select class="analyseUnit_box" v-model="riskControlMeasureForm.controlType" placeholder="请选择管控方式" clearable> + <el-option v-for="item in controlTypeList" :key="item.id" :label="item.name" :value="item.id"></el-option> </el-select> </el-form-item> - <el-form-item label="管控方式描述" prop="riskMeasureDesc"> - <el-input type="textarea" :rows="4" v-model="riskControlMeasureForm.riskMeasureDesc" class="analyseUnit_input"></el-input> - </el-form-item> + <el-form-item label="管控内容" prop="checkContent"> + <el-input class="analyseUnit_box" type="textarea" :rows="3" v-model.trim="riskControlMeasureForm.checkContent" placeholder="请输入管控内容" clearable> </el-input> + </el-form-item> <el-form-item label="管控措施分类1" prop="classify1"> - <el-select v-model="riskControlMeasureForm.classify1" class="analyseUnit_input" @change="changeClassifyTwoList()"> + <el-select v-model="riskControlMeasureForm.classify1" class="analyseUnit_box" filterable clearable placeholder="请选择管控措施分类1" @change="changeClassifyTwoList()"> <el-option v-for="item in classifyOneList" :key="item.id" - :value="item.name" + :value="item.id" :label="item.name" ></el-option> </el-select> </el-form-item> <el-form-item label="管控措施分类2" prop="classify2"> - <el-select v-model="riskControlMeasureForm.classify2" class="analyseUnit_input"> + <el-select v-model="riskControlMeasureForm.classify2" class="analyseUnit_box" filterable clearable placeholder="请选择管控措施分类2"> <el-option v-for="item in classifyTwoList" :key="item.id" - :value="item.name" + :value="item.id" :label="item.name" ></el-option> </el-select> </el-form-item> <el-form-item label="管控措施分类3" prop="classify3"> - <el-input v-model="riskControlMeasureForm.classify3" class="analyseUnit_input"></el-input> + <el-input v-model="riskControlMeasureForm.classify3" class="analyseUnit_box" placeholder="请填写管控措施分类3"></el-input> </el-form-item> - <el-form-item label="隐患排查内容" prop="troubleshootContent"> - <el-input type="textarea" :rows="4" v-model="riskControlMeasureForm.troubleshootContent" class="analyseUnit_input"></el-input> - </el-form-item> - <el-form-item label="周期" prop="timeEffect"> - <el-input v-model="riskControlMeasureForm.timeEffect" type="number" class="analyseUnit_input"></el-input> - </el-form-item> - <el-form-item label="单位" prop="timeUnit"> - <el-select v-model="riskControlMeasureForm.timeUnit" class="analyseUnit_input"> - <el-option - v-for="item in timeUnitList" - :key="item.id" - :value="item.name" - :label="item.name" - > - </el-option> - </el-select> + <el-form-item label="措施说明" prop="measureDesc"> + <el-input class="analyseUnit_box" type="textarea" :rows="3" placeholder="请填写措施说明" v-model.trim="riskControlMeasureForm.measureDesc" clearable> </el-input> </el-form-item> </el-form> <div align="right"> @@ -199,7 +174,7 @@ import { computePageCount } from '@/utils' import { addRiskControlMeasure, deleteRiskControlMeasure, getRiskControlMeasureList, updateRiskControlMeasure } from '@/api/riskLevelManage' import { - exportRiskControlMeasure, + exportRiskControlMeasure, getAllSafetyRiskEventList, getClassify, getRiskEventList, importAnalyseUnit, importRiskControlMeasure } from "../../../../api/riskLevelManage"; @@ -220,9 +195,13 @@ tableKey: 0, riskControlMeasureData: [], riskEventList:[], - DataSrcList:[], + controlTypeList: [ + { id: 1, name: '自动化监控' }, + { id: 2, name: '隐患排查' } + ], classifyOneList:[], classifyTwoList:[], + list:[], riskControlMeasureIdList:[], timeUnitList:[{id:1,name:'小时'},{id:2,name:'天'},{id:3,name:'周'},{id:4,name:'月'},], listLoading: false, @@ -239,47 +218,36 @@ importDialogFormVisible:false, riskControlMeasureVisible:false, riskControlMeasureFormRules:{ - riskEventId: [{ required: true, message: '安全风险事件名称不能为空', trigger: 'change' }], - dataSrc: [{ required: true, message: '管控方式不能为空', trigger: 'change' }], - riskMeasureDesc: [{ required: true, message: '管控方式描述不能为空', trigger: 'blur' }], - classify1: [{ required: true, message: '管控措施分类1不能为空', trigger: 'change' }], - classify2: [{ required: true, message: '管控措施分类2不能为空', trigger: 'change' }], - troubleshootContent: [{ required: true, message: '隐患排查内容不能为空', trigger: 'change' }], - timeEffect: [{ required: true, message: '周期不能为空', trigger: 'blur' }], - timeUnit: [{ required: true, message: '单位不能为空', trigger: 'change' }], + riskEventId: [{ required: true, message: '请选择风险事件', trigger: 'change' }], + controlMeasureCode: [{ required: true, message: '请填写风险措施编码', trigger: 'blur' }], + controlType: [{ required: true, message: '请选择管控方式', trigger: 'change' }], + checkContent: [{ required: true, message: '请填写管控内容', trigger: 'blur' }], + classify1: [{ required: true, message: '请选择管控措施分类1', trigger: 'change' }], + classify2: [{ required: true, message: '请选择管控措施分类2', trigger: 'change' }], + classify3: [{ required: true, message: '请填写管控措施分类3', trigger: 'blur' }], + measureDesc: [{ required: true, message: '请填写措施说明', trigger: 'blur' }] }, riskControlMeasureForm:{ - id: null, riskEventId: null, - dataSrc: "", - riskMeasureDesc: "", - classify1: "", - classify2: "", - classify3: "", - troubleshootContent: "", - validFlag: true, - createTime: "", - updateTime: "", - createBy: "", - updateBy: "", - riskEvent: { - }, - timeEffect:"", - timeUnit:"", + controlMeasureCode: null, + controlType: null, + checkContent: null, + classify1: null, + classify2: null, + classify3: null, + measureDesc: null }, listQuery:{ pageIndex:1, pageSize:10, - filter:{ - riskEventName:'', - } + controlType: null, + riskEventId: null }, } }, created() { this.getRiskControlMeasureData() this.getRiskEvent() - this.getDataSrcList() this.getClassify() }, methods: { @@ -287,11 +255,30 @@ this.listLoading = true let res = await getRiskControlMeasureList(this.listQuery) if(res.data.code === '200'){ - this.recordTotal = res.data.result.total - this.pageSize = res.data.result.size - this.pageTotal = computePageCount(res.data.result.total, res.data.result.size) - this.currentPage = res.data.result.current - this.riskControlMeasureData = res.data.result.records + if(res.data.data.length === 0 && res.data.count > 0){ + this.listQuery.pageIndex = 1 + await this.getData() + }else{ + this.recordTotal = res.data.count + this.riskControlMeasureData = res.data.data + } + }else{ + this.$message({ + message:res.data.message, + type:'warning' + }) + } + this.listLoading = false + + + }, + + async getData(){ + this.listLoading = true + let res = await getRiskControlMeasureList(this.listQuery) + if(res.data.code === '200'){ + this.recordTotal = res.data.count + this.riskControlMeasureData = res.data.data }else{ this.$message({ message:res.data.message, @@ -300,10 +287,11 @@ } this.listLoading = false }, + async getRiskEvent(){ - let res = await getRiskEventList({pageSize:1000,pageIndex:1,filter:{riskEventName:''}}) + let res = await getAllSafetyRiskEventList() if(res.data.code === '200'){ - this.riskEventList = res.data.result.records + this.riskEventList = JSON.parse(JSON.stringify(res.data.data)) }else{ this.$message({ message:res.data.message, @@ -315,6 +303,12 @@ let res = await getClassify({pageSize:1000,pageIndex:1,filter:{riskEventName:''}}) if(res.data.code === '200'){ this.classifyOneList = res.data.result + this.list = [] + this.classifyOneList.forEach(item =>{ + for(let i in item.subClassify){ + this.list.push(item.subClassify[i]) + } + }) }else{ this.$message({ message:res.data.message, @@ -322,19 +316,7 @@ }) } }, - async getDataSrcList(){ - const params = {} - params['dictionaryType'] = '管控方式' - let res = await dictionaryAllItems(params) - if (res.data.code === '200') { - this.DataSrcList = res.data.result - } else { - this.$message({ - type:'warning', - message:res.data.message - }) - } - }, + changeClassifyTwoList(){ if(this.riskControlMeasureForm.classify1 === '工程技术'){ this.classifyTwoList = this.classifyOneList[0].subClassify @@ -354,6 +336,17 @@ this.riskControlMeasureForm.classify3 = '' } }, + + parseNumber(value, type) { + if (type === '管控方式') { + return this.controlTypeList.find((item) => item.id === value).name; + }else if(type === '管控措施分类1'){ + return this.classifyOneList.find((item) => item.id === value).name + }else{ + return this.list.find((item) => item.id === value).name + } + }, + showRiskControlMeasureForm(value,type){ this.riskControlMeasureVisible = true this.$nextTick(() =>{ @@ -362,27 +355,21 @@ if(type === '新增'){ this.title = '新增' this.riskControlMeasureForm = { - id: null, riskEventId: null, - dataSrc: "", - riskMeasureDesc: "", - classify1: "", - classify2: "", - classify3: "", - troubleshootContent: "", - validFlag: true, - createTime: "", - updateTime: "", - createBy: "", - updateBy: "", - riskEvent: { - }, - timeEffect:"", - timeUnit:"", + controlMeasureCode: null, + controlType: null, + checkContent: null, + classify1: null, + classify2: null, + classify3: null, + measureDesc: null } }else{ this.title = '修改' - this.riskControlMeasureForm = value + for( let key in this.riskControlMeasureForm){ + this.riskControlMeasureForm[key] = JSON.parse(JSON.stringify(value))[key] + } + this.riskControlMeasureForm.id = JSON.parse(JSON.stringify(value)).id } }, submitAnalyseUnit(){ @@ -564,6 +551,7 @@ }, giveValue(value){ + debugger this.$emit('giveRiskControlId',this.riskControlMeasureIdList) // this.$emit('giveRiskControlId',value) }, @@ -584,6 +572,9 @@ padding-bottom: 10px; } .analyseUnit_input{ - width:320px; + width:200px; + } + .analyseUnit_box{ + width:90%; } </style> -- Gitblit v1.9.2