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/analyseUnit/index.vue | 185 +++++++++++++++++++++++++++------------------- 1 files changed, 109 insertions(+), 76 deletions(-) diff --git a/src/views/doublePreventAction/riskLevelManage/analyseUnit/index.vue b/src/views/doublePreventAction/riskLevelManage/analyseUnit/index.vue index e446d95..4a01cb4 100644 --- a/src/views/doublePreventAction/riskLevelManage/analyseUnit/index.vue +++ b/src/views/doublePreventAction/riskLevelManage/analyseUnit/index.vue @@ -3,29 +3,29 @@ <div class="filter-container"> <div class="basic_search"> <span>责任部门:</span> - <el-select v-model="listQuery.filter.hazardDep" clearable filterable style="width:200px"> + <el-select v-model="listQuery.liableDepId" clearable filterable style="width:200px"> <el-option v-for="item in departmentList" :key="item.id" :label="item.department" - :value="item.department" + :value="item.id" ></el-option> </el-select> </div> <div class="basic_search"> <span>责任人:</span> - <el-select v-model="listQuery.filter.hazardLiablePerson" clearable filterable style="width:200px"> + <el-select v-model="listQuery.liablePersonId" clearable filterable style="width:200px"> <el-option v-for="item in userList" :key="item.id" :label="item.realname" - :value="item.realname" + :value="item.id" ></el-option> </el-select> </div> <div class="basic_search"> <span>单元名称:</span> - <el-input v-model="listQuery.filter.riskUnitName" style="width:200px"> + <el-input v-model="listQuery.riskUnitName" style="width:200px"> </el-input> </div> <el-button class="filter-item" style="margin-left: 10px;margin-top: 10px" type="primary" icon="el-icon-refresh" @click="refreshHandle">搜索</el-button> @@ -44,22 +44,15 @@ highlight-current-row style="width: 100%;" > - <el-table-column label="安全风险分析对象编码" prop="hazardCode" align="center"> - </el-table-column> - <el-table-column label="责任部门" prop="hazardDep" align="center"> - </el-table-column> - <el-table-column label="责任人" prop="hazardLiablePerson" align="center"> - </el-table-column> - <el-table-column label="安全风险分析单元名称" prop="riskUnitName" 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="produceDeviceName" label="生产装置名称" show-overflow-tooltip></el-table-column> + <el-table-column prop="riskUnitName" label="安全风险分析单元名称" width="180" show-overflow-tooltip></el-table-column> + <el-table-column prop="riskCode" label="安全风险分析对象编码" width="180" show-overflow-tooltip></el-table-column> + <el-table-column prop="liableDep" label="责任部门" show-overflow-tooltip></el-table-column> + <el-table-column prop="liablePerson" 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="showAnalyseUnitForm(scope.row,'编辑')">编辑</el-button> @@ -70,9 +63,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 @@ -84,8 +77,19 @@ </div> <el-dialog :title="title" :visible.sync="analyseUnitVisible" :modal-append-to-body="false" :close-on-click-modal="false" width="600px"> <el-form ref="analyseUnitForm" :rules="analyseUnitFormRules" :model="analyseUnitForm" label-position="right" label-width="165px"> - <el-form-item label="责任部门" prop="hazardDepId"> - <el-select v-model="analyseUnitForm.hazardDepId" class="analyseUnit_input" @change="departmentChange" clearable filterable> + <el-form-item label="安全风险分析对象编码" prop="riskCode"> + <el-input class="analyseUnit_input" v-model.trim="analyseUnitForm.riskCode" placeholder="请输入安全风险分析对象编码"></el-input> + </el-form-item> + <el-form-item label="安全风险分析单元名称" prop="riskUnitName"> + <el-input class="analyseUnit_input" v-model.trim="analyseUnitForm.riskUnitName" placeholder="请输入安全风险分析单元名称"></el-input> + </el-form-item> + <el-form-item label="生产装置名称" prop="produceDeviceId"> + <el-select class="analyseUnit_input" v-model="analyseUnitForm.produceDeviceId" placeholder="请输入生产装置名称" clearable filterable> + <el-option v-for="item in allProduceDeviceData" :key="item.produceDeviceName" :label="item.produceDeviceName" :value="item.id"></el-option> + </el-select> + </el-form-item> + <el-form-item label="责任部门" prop="liableDepId"> + <el-select v-model="analyseUnitForm.liableDepId" class="analyseUnit_input" @change="changeExec" clearable filterable> <el-option v-for="item in departmentList" :key="item.id" @@ -94,21 +98,10 @@ ></el-option> </el-select> </el-form-item> - <el-form-item label="责任人" prop="hazardLiablePersonId"> - <el-select v-model="analyseUnitForm.hazardLiablePersonId" class="analyseUnit_input" clearable filterable> - <el-option - v-for="item in departmentUserList" - :key="item.id" - :label="item.realname" - :value="item.id" - ></el-option> + <el-form-item label="责任人" prop="liablePersonId"> + <el-select class="analyseUnit_input" v-model="analyseUnitForm.liablePersonId" placeholder="请选择责任人" clearable filterable> + <el-option v-for="item in execUidList" :key="item.id" :label="item.realname" :value="item.id"></el-option> </el-select> - </el-form-item> - <el-form-item label="安全风险分析对象编码" prop="hazardCode"> - <el-input v-model="analyseUnitForm.hazardCode" class="analyseUnit_input"></el-input> - </el-form-item> - <el-form-item label="安全风险分析单元名称" prop="riskUnitName"> - <el-input v-model="analyseUnitForm.riskUnitName" class="analyseUnit_input"></el-input> </el-form-item> </el-form> <div align="right"> @@ -156,6 +149,7 @@ import {safetyInspectionItemName} from "../../../../api/safetySelfInspection"; import {exportAnalyseUnit, getDepartmentChart, importAnalyseUnit} from "../../../../api/riskLevelManage"; import {parseError} from "../../../../utils/messageDialog"; + import {getAllProductionDeviceList} from "../../../../api/riskSource"; const exampleFile = require('@/assets/example/riskAnaUnit.xlsx') export default { name: 'index', @@ -182,7 +176,9 @@ analyseUnitData: [], departmentList:[], userList:[], + execUidList:[], departmentUserList:[], + allProduceDeviceData:[], listLoading: false, pageSize: 10, recordTotal: 0, @@ -194,35 +190,30 @@ importDialogFormVisible:false, analyseUnitVisible:false, analyseUnitFormRules:{ - hazardDepId: [{ required: true, message: '责任部门不能为空', trigger: 'change' }], - hazardLiablePersonId: [{ required: true, message: '责任人不能为空', trigger: 'blur' }], - hazardCode: [{ required: true, message: '安全风险分析对象编码不能为空', trigger: 'blur' }], - riskUnitName: [{ required: true, message: '安全风险分析单元名称不能为空', trigger: 'blur' }], + riskCode: [{ required: true, message: '请填写安全风险分析对象编码', trigger: 'blur' }], + riskUnitName: [{ required: true, message: '请填写安全风险分析单元名称', trigger: 'blur' }], + liableDepId: [{ required: true, message: '请选择责任部门', trigger: 'change' }], + liablePersonId: [{ required: true, message: '请选择责任人', trigger: 'change' }], + produceDeviceId: [{ required: true, message: '请选择生产装置', trigger: 'change' }] }, analyseUnitForm:{ - id: null, - hazardCode: "", - riskUnitName: "", - createTime: "", - updateTime: "", - createBy: "", - updateBy: "", - validFlag: null, - hazardLiablePersonId: null, - hazardDepId: null + riskCode: null, + riskUnitName: null, + liablePersonId: null, + liableDepId: null, + produceDeviceId: null }, listQuery:{ pageIndex:1, pageSize:10, - filter:{ - hazardLiablePerson:'', - hazardDep:'', - riskUnitName:'' - } + riskUnitName: null, + liableDepId: null, + liablePersonId: null }, } }, created() { + this.getAllProduceDeviceData() this.getAnalyseUnitData() this.getDepartment() this.getUser() @@ -232,11 +223,27 @@ this.listLoading = true let res = await getAnalyseUnitList(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.analyseUnitData = 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.analyseUnitData = res.data.data + } + }else{ + this.$message({ + message:res.data.message, + type:'warning' + }) + } + this.listLoading = false + }, + async getData(){ + this.listLoading = true + let res = await getAnalyseUnitList(this.listQuery) + if(res.data.code === '200'){ + this.recordTotal = res.data.count + this.analyseUnitData = res.data.data }else{ this.$message({ message:res.data.message, @@ -256,6 +263,19 @@ }) } }, + + async getAllProduceDeviceData(){ + let res = await getAllProductionDeviceList(); + if (res.data.code === '200') { + this.allProduceDeviceData = JSON.parse(JSON.stringify(res.data.data)); + } else { + this.$message({ + message:res.data.msg, + type:'warning' + }) + } + }, + async getUser(){ let res = await safetyInspectionItemName() if(res.data.code === '200'){ @@ -267,6 +287,15 @@ }) } }, + + changeExec(){ + if(this.liableDepId === '') { + this.execUidList = [] + } + this.analyseUnitForm.liablePersonId = '' + this.execUidList = this.userList.filter ( item => item.department === this.analyseUnitForm.liableDepId) + }, + showDepartmentChart() { this.$refs.chart.show() }, @@ -278,22 +307,20 @@ if(type === '新增'){ this.title = '新增' this.analyseUnitForm = { - id: null, - hazardCode: "", - riskUnitName: "", - createTime: "", - updateTime: "", - createBy: "", - updateBy: "", - validFlag: null, - hazardLiablePersonId: null, - hazardDepId: null + riskCode: null, + riskUnitName: null, + liablePersonId: null, + liableDepId: null, + produceDeviceId: null } }else{ this.title = '修改' - this.analyseUnitForm.hazardDepId = value.hazardDepId - this.departmentChange() - this.analyseUnitForm = JSON.parse(JSON.stringify(value)) + this.analyseUnitForm.liableDepId = value.liableDepId + this.changeExec() + for( let key in this.analyseUnitForm){ + this.analyseUnitForm[key] = JSON.parse(JSON.stringify(value))[key] + } + this.analyseUnitForm.id = JSON.parse(JSON.stringify(value)).id } }, submitAnalyseUnit(){ @@ -460,6 +487,12 @@ padding-bottom: 10px; } .analyseUnit_input{ + width:90%; + } + .analyseUnit_box{ + width:200px; + } + .analyseUnit_input{ width:320px; } .image{ -- Gitblit v1.9.2