From a0da13fa9d90a7b3f8091d5759ba630f95c35528 Mon Sep 17 00:00:00 2001 From: Your Name <123456> Date: 星期二, 19 七月 2022 16:06:09 +0800 Subject: [PATCH] 更新 --- src/views/doublePreventAction/riskLevelManage/controlAction/index.vue | 8 ++-- config/dev.env.js | 2 src/views/doublePreventAction/hiddenDanger/inspectionTask/components/inpectionPoint.vue | 1 src/views/doublePreventAction/hiddenDanger/inspectionTask/index.vue | 4 +- src/views/doublePreventAction/riskLevelManage/analyseUnit/index.vue | 48 +++++++++--------------- 5 files changed, 25 insertions(+), 38 deletions(-) diff --git a/config/dev.env.js b/config/dev.env.js index aa7a368..88072b5 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -21,7 +21,7 @@ // BASE_API: '"http://192.168.0.8:8006"', // IMG_API: '"http://192.168.0.8:8006/upload/"', - + // BASE_API: '"http://192.168.0.35:8006"', IMG_API: '"http://192.168.0.35:8006/upload/"', // BASE_API: '"http://192.168.0.62:8006"', diff --git a/src/views/doublePreventAction/hiddenDanger/inspectionTask/components/inpectionPoint.vue b/src/views/doublePreventAction/hiddenDanger/inspectionTask/components/inpectionPoint.vue index 2ac04f1..d892430 100644 --- a/src/views/doublePreventAction/hiddenDanger/inspectionTask/components/inpectionPoint.vue +++ b/src/views/doublePreventAction/hiddenDanger/inspectionTask/components/inpectionPoint.vue @@ -120,7 +120,6 @@ cancelButtonText:'取消', type:'warning', }).then(()=> { - debugger deleteInspectionControlAction({workId:scope.workId,measureId:scope.measureId}).then( (res)=>{ if(res.data.code === '200'){ this.getControlActionList() diff --git a/src/views/doublePreventAction/hiddenDanger/inspectionTask/index.vue b/src/views/doublePreventAction/hiddenDanger/inspectionTask/index.vue index 3bbd25f..60e93a7 100644 --- a/src/views/doublePreventAction/hiddenDanger/inspectionTask/index.vue +++ b/src/views/doublePreventAction/hiddenDanger/inspectionTask/index.vue @@ -440,7 +440,7 @@ this.execUidList = [] this.inspectionTaskForm.execUid = '' } - this.execUidList = this.userList.filter ( item => item.department === this.execDepartment) + this.execUidList = this.userList.filter ( item => item.departmentname === this.execDepartment) }, async getUser(){ let res = await safetyInspectionItemName() @@ -500,7 +500,7 @@ let department = '' for(let i in this.userList){ if(this.userList[i].id === value){ - department = this.userList[i].department + department = this.userList[i].departmentname } } department = this.departmentList.find(item => item.department === department) diff --git a/src/views/doublePreventAction/riskLevelManage/analyseUnit/index.vue b/src/views/doublePreventAction/riskLevelManage/analyseUnit/index.vue index efdb8e4..e446d95 100644 --- a/src/views/doublePreventAction/riskLevelManage/analyseUnit/index.vue +++ b/src/views/doublePreventAction/riskLevelManage/analyseUnit/index.vue @@ -84,23 +84,23 @@ </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="hazardDep"> - <el-select v-model="analyseUnitForm.hazardDep" value-key="item" class="analyseUnit_input" @change="departmentChange" @clear="departmentClear" clearable filterable> + <el-form-item label="责任部门" prop="hazardDepId"> + <el-select v-model="analyseUnitForm.hazardDepId" class="analyseUnit_input" @change="departmentChange" clearable filterable> <el-option v-for="item in departmentList" :key="item.id" - :value="item" + :value="item.id" :label="item.department" ></el-option> </el-select> </el-form-item> - <el-form-item label="责任人" prop="hazardLiablePerson"> - <el-select v-model="analyseUnitForm.hazardLiablePerson" value-key="item" class="analyseUnit_input"@change="personChange" @clear="personClear" clearable filterable> + <el-form-item label="责任人" prop="hazardLiablePersonId"> + <el-select v-model="analyseUnitForm.hazardLiablePersonId" class="analyseUnit_input" clearable filterable> <el-option - v-for="item in userList" + v-for="item in departmentUserList" :key="item.id" :label="item.realname" - :value="item" + :value="item.id" ></el-option> </el-select> </el-form-item> @@ -182,6 +182,7 @@ analyseUnitData: [], departmentList:[], userList:[], + departmentUserList:[], listLoading: false, pageSize: 10, recordTotal: 0, @@ -193,16 +194,14 @@ importDialogFormVisible:false, analyseUnitVisible:false, analyseUnitFormRules:{ - hazardDep: [{ required: true, message: '责任部门不能为空', trigger: 'change' }], - hazardLiablePerson: [{ required: true, message: '责任人不能为空', trigger: 'blur' }], + hazardDepId: [{ required: true, message: '责任部门不能为空', trigger: 'change' }], + hazardLiablePersonId: [{ required: true, message: '责任人不能为空', trigger: 'blur' }], hazardCode: [{ required: true, message: '安全风险分析对象编码不能为空', trigger: 'blur' }], riskUnitName: [{ required: true, message: '安全风险分析单元名称不能为空', trigger: 'blur' }], }, analyseUnitForm:{ id: null, hazardCode: "", - hazardDep: "", - hazardLiablePerson: "", riskUnitName: "", createTime: "", updateTime: "", @@ -210,7 +209,7 @@ updateBy: "", validFlag: null, hazardLiablePersonId: null, - hazardDepId: 1 + hazardDepId: null }, listQuery:{ pageIndex:1, @@ -281,8 +280,6 @@ this.analyseUnitForm = { id: null, hazardCode: "", - hazardDep: "", - hazardLiablePerson: "", riskUnitName: "", createTime: "", updateTime: "", @@ -290,11 +287,13 @@ updateBy: "", validFlag: null, hazardLiablePersonId: null, - hazardDepId: 1 + hazardDepId: null } }else{ this.title = '修改' - this.analyseUnitForm = value + this.analyseUnitForm.hazardDepId = value.hazardDepId + this.departmentChange() + this.analyseUnitForm = JSON.parse(JSON.stringify(value)) } }, submitAnalyseUnit(){ @@ -436,21 +435,10 @@ return jsonData.map(v => filterVal.map(j => v[j])) }, - personChange(val){ - this.analyseUnitForm.hazardLiablePerson = val.realname - this.analyseUnitForm.hazardLiablePersonId = val.id - }, - departmentChange(val){ - this.analyseUnitForm.hazardDep = val.department - this.analyseUnitForm.hazardDepId = val.id - }, - personClear(){ - this.analyseUnitForm.hazardLiablePerson = null + departmentChange(){ this.analyseUnitForm.hazardLiablePersonId = null - }, - departmentClear(){ - this.analyseUnitForm.hazardDep = null - this.analyseUnitForm.hazardDepId = null + this.departmentUserList = this.userList.filter( item => item.department === this.analyseUnitForm.hazardDepId) + console.log(this.departmentUserList) }, refreshHandle(){ this.getAnalyseUnitData() diff --git a/src/views/doublePreventAction/riskLevelManage/controlAction/index.vue b/src/views/doublePreventAction/riskLevelManage/controlAction/index.vue index 92f2af4..5f6e594 100644 --- a/src/views/doublePreventAction/riskLevelManage/controlAction/index.vue +++ b/src/views/doublePreventAction/riskLevelManage/controlAction/index.vue @@ -36,7 +36,7 @@ style="width: 100%;" > <el-table-column type="selection" :reserve-selection="true" width="55"></el-table-column> - <el-table-column label="安全风险事件名称" prop="riskEventId" align="center"> + <el-table-column label="安全风险事件名称" prop="riskEventId" align="center" show-overflow-tooltip> <template slot-scope="scope"> <div v-for="item in riskEventList"> <div v-if="item.id === scope.row.riskEventId"> @@ -47,7 +47,7 @@ </el-table-column> <el-table-column label="管控方式" prop="dataSrc" align="center"> </el-table-column> - <el-table-column label="管控方式描述" prop="riskMeasureDesc" align="center"> + <el-table-column label="管控方式描述" prop="riskMeasureDesc" align="center" show-overflow-tooltip> </el-table-column> <el-table-column label="管控措施分类1" prop="classify1" align="center"> </el-table-column> @@ -55,7 +55,7 @@ </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 label="隐患排查内容" prop="troubleshootContent" align="center" show-overflow-tooltip> </el-table-column> <el-table-column label="检查类型" prop="hazardLiablePerson" align="center"> </el-table-column> @@ -224,7 +224,7 @@ classifyOneList:[], classifyTwoList:[], riskControlMeasureIdList:[], - timeUnitList:[{id:1,name:'小时'},{id:1,name:'天'},{id:1,name:'周'},{id:1,name:'月'},], + timeUnitList:[{id:1,name:'小时'},{id:2,name:'天'},{id:3,name:'周'},{id:4,name:'月'},], listLoading: false, showCurrent:true, showOther:false, -- Gitblit v1.9.2