From cd9dae5c7db49c3dba61609e7188a6b29a635c08 Mon Sep 17 00:00:00 2001 From: 马宇豪 <978517621@qq.com> Date: 星期一, 12 十二月 2022 10:01:43 +0800 Subject: [PATCH] 修改绑定参数 --- src/views/doublePreventAction/riskLevelManage/controlAction/index.vue | 450 +++++++++++++++++++++++++++++++++++++++---------------- 1 files changed, 316 insertions(+), 134 deletions(-) diff --git a/src/views/doublePreventAction/riskLevelManage/controlAction/index.vue b/src/views/doublePreventAction/riskLevelManage/controlAction/index.vue index 42ad0d6..23439bc 100644 --- a/src/views/doublePreventAction/riskLevelManage/controlAction/index.vue +++ b/src/views/doublePreventAction/riskLevelManage/controlAction/index.vue @@ -2,47 +2,66 @@ <div class="app-container"> <div class="filter-container"> <div class="basic_search"> - <span>单位名称:</span> - <el-input v-model="listQuery.filter.riskUnitName" style="width:200px"> - </el-input> + <span>事件名称:</span> + <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.controlType" clearable style="width:200px"> + <el-option + v-for="item in controlTypeList" + :key="item.id" + :value="item.id" + :label="item.name" + ></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> + <el-button class="filter-item" style="margin-left: 10px;margin-top: 10px" type="primary" @click="showImportDialog()">导入</el-button> +<!-- <el-button class="filter-item" style="margin-left: 10px;margin-top: 10px" type="primary" @click="exportToExcel">导出</el-button>--> </div> <div class="table_content"> <el-table v-loading="listLoading" :key="tableKey" + @selection-change="handleSelectionChange" :data="riskControlMeasureData" border fit + ref="table" highlight-current-row style="width: 100%;" > - <el-table-column label="安全风险事件名称" prop="riskEventId" align="center"> +<!-- <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"> + {{ 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"> + <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"> - </el-table-column> - <el-table-column label="检查类型" prop="hazardLiablePerson" 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> @@ -54,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 @@ -66,61 +85,85 @@ /> <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"> + <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 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(val)"> + <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 v-model="riskControlMeasureForm.troubleshootContent" class="analyseUnit_input"></el-input> + <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"> - <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> + <el-dialog + :visible.sync="importDialogFormVisible" + :modal-append-to-body="false" + :close-on-click-modal="false" + title="用户导入" + width="700px" + > + <el-form + ref="importForm" + label-position="right" + label-width="120px" + style="margin-left:50px;width:500px;" + element-loading-text="导入中..." + > + <el-form-item label="导入文件:"> + <input ref="importLabInput" type="file" accept=".xls, .xlsx" > + </el-form-item> + <el-form-item label="excel参考模板:"> + <el-button type="text" @click="viewHandle">下载模板</el-button> + </el-form-item> + </el-form> + <div slot="footer" class="dialog-footer"> + <el-button @click="importDialogFormVisible = false">取消</el-button> + <el-button type="primary" @click="importToTable()">导入</el-button> </div> </el-dialog> </div> @@ -130,18 +173,17 @@ import { mapGetters } from 'vuex' import { computePageCount } from '@/utils' import { addRiskControlMeasure, deleteRiskControlMeasure, getRiskControlMeasureList, updateRiskControlMeasure } from '@/api/riskLevelManage' - import {getClassify, getRiskEventList} from "../../../../api/riskLevelManage"; + import { + exportRiskControlMeasure, getAllSafetyRiskEventList, + getClassify, + getRiskEventList, importAnalyseUnit, importRiskControlMeasure + } from "../../../../api/riskLevelManage"; import {dictionaryAllItems} from "../../../../api/dictionary"; + import {parseError} from "../../../../utils/messageDialog"; + const exampleFile = require('@/assets/example/riskControlMeasure.xlsx') export default { name: 'index', filters: { - parseMain(type){ - if(type === 1){ - return "是" - }else if(type === 0){ - return "否" - } - }, }, computed: { ...mapGetters([ @@ -153,12 +195,19 @@ 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, showCurrent:true, showOther:false, + ifShowSelf:true, pageSize: 10, recordTotal: 0, currentPage: 1, @@ -166,46 +215,39 @@ title:'', company:'', code:'', + 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' }], - classify3: [{ required: true, message: '管控措施分类3不能为空', trigger: 'blur' }], - troubleshootContent: [{ 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: { - } + controlMeasureCode: null, + controlType: null, + checkContent: null, + classify1: null, + classify2: null, + classify3: null, + measureDesc: null }, listQuery:{ pageIndex:1, pageSize:10, - filter:{ - riskUnitName:'', - } + controlType: null, + riskEventId: null }, } }, created() { this.getRiskControlMeasureData() this.getRiskEvent() - this.getDataSrcList() this.getClassify() }, methods: { @@ -213,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, @@ -226,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, @@ -241,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, @@ -248,29 +316,17 @@ }) } }, - 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 === '工程技术'){ + if(this.riskControlMeasureForm.classify1 === 1){ this.classifyTwoList = this.classifyOneList[0].subClassify this.riskControlMeasureForm.classify2 = '' this.riskControlMeasureForm.classify3 = '' - }else if(this.riskControlMeasureForm.classify1 === '维护保养') { + }else if(this.riskControlMeasureForm.classify1 === 2) { this.classifyTwoList = this.classifyOneList[1].subClassify this.riskControlMeasureForm.classify2 = '' this.riskControlMeasureForm.classify3 = '' - }else if(this.riskControlMeasureForm.classify1 === '操作行为') { + }else if(this.riskControlMeasureForm.classify1 === 3) { this.classifyTwoList = this.classifyOneList[2].subClassify this.riskControlMeasureForm.classify2 = '' this.riskControlMeasureForm.classify3 = '' @@ -280,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(() =>{ @@ -288,25 +355,24 @@ if(type === '新增'){ this.title = '新增' this.riskControlMeasureForm = { - id: null, riskEventId: null, - dataSrc: "", - riskMeasureDesc: "", - classify1: "", - classify2: "", - classify3: "", - troubleshootContent: "", - validFlag: true, - createTime: "", - updateTime: "", - createBy: "", - updateBy: "", - riskEvent: { - } + controlMeasureCode: null, + controlType: null, + checkContent: null, + classify1: null, + classify2: null, + classify3: null, + measureDesc: null } }else{ this.title = '修改' - this.riskControlMeasureForm = value + debugger + this.riskControlMeasureForm.classify1 = JSON.parse(JSON.stringify(value)).classify1 + this.changeClassifyTwoList() + 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(){ @@ -356,7 +422,6 @@ }) } }) - }, deleteById(val){ this.$confirm('删除此条信息,是否继续','提示',{ @@ -364,17 +429,104 @@ cancelButtonText:'取消', type:'warning', }).then(()=> { - deleteRiskControlMeasure({id:val.id}).then( ()=>{ - this.getRiskControlMeasureData() - this.$notify({ - title:'成功', - message:'删除成功', - type:'success', - duration:2000, - }) + deleteRiskControlMeasure({id:val.id}).then( (res)=>{ + if(res.data.code === '200'){ + this.getRiskControlMeasureData() + this.$notify({ + title:'成功', + message:'删除成功', + type:'success', + duration:2000, + }) + }else{ + this.$message({ + type:'warning', + message:res.data.message + }) + } + }) }) }, + + viewHandle() { + window.open(exampleFile, '_blank') + }, + + showImportDialog(){ + this.importDialogFormVisible = true + }, + + importToTable(){ + const formData = new FormData() + const files = this.$refs['importLabInput'].files + if (files && files.length > 0) { + formData.append('file', files[0]) + } + importRiskControlMeasure(formData).then((response) => { + const res = response.data + if (res.code == 200) { + this.importDialogFormVisible = false + this.$message({ + message: '导入成功', + type: 'success' + }) + this.getRiskControlMeasureData() + } else { + parseError({ error: res.message, vm: this }) + } + }).catch((error) => { + parseError({ error: error, vm: this }) + }) + }, + + exportToExcel() { + exportRiskControlMeasure(this.listQuery.filter).then(res=>{ + if (res.data.code === '200') { + if(res.data.result === null ||res.data.result === [] || res.data.result.length === 0){ + this.$message({ + type:'warning', + message:'无数据可导出' + }) + } + else{ + let allData = res.data.result + import('@/vendor/Export2Excel').then((excel) => { + const tHeader = [ + '安全风险事件名称', + '管控方式', + '管控方式描述', + '管控措施分类1', + '管控措施分类2', + '管控措施分类3', + '隐患排查内容', + ] + const filterVal = [ + 'riskEventName', + 'dataSrc', + 'riskMeasureDesc', + 'classify1', + 'classify2', + 'classify3', + 'troubleshootContent', + ] + const data = this.formatJson(filterVal, allData) + excel.export_json_to_excel({ + header: tHeader, + data, + filename: '安全风险管控措施数据' + }) + }) + + } + } + }) + }, + + formatJson(filterVal, jsonData) { + return jsonData.map(v => filterVal.map(j => v[j])) + }, + refreshHandle(){ this.getRiskControlMeasureData() }, @@ -387,12 +539,39 @@ this.getRiskControlMeasureData() }, - ifShowButton (){ + ifShowButton (value){ this.showCurrent = false this.showOther = true - }, - giveValue(){ + 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){ + this.riskControlMeasureIdList = val + }, + + getRowKey(value){ + return value.id + }, + + 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') + }) } } } @@ -403,6 +582,9 @@ padding-bottom: 10px; } .analyseUnit_input{ - width:320px; + width:200px; + } + .analyseUnit_box{ + width:90%; } </style> -- Gitblit v1.9.2