src/views/contingencyManagement/emergencyDrill/drillImplementationEvaluation/component/approvalProgress.vue
@@ -6,6 +6,7 @@ width="900px" draggable :fullscreen="full" @close="resetForm(ruleFormRef)" > <el-button @click="toggleFullscreen" size="small" class="pot" :icon="FullScreen"></el-button> <el-form @@ -433,7 +434,7 @@ const ruleFormRef = ref<FormInstance>() //定义表单 const ruleForm = ref ({ drillPlanId: '', drillExecuteId: '', suitable: '', sufficient: '', arrival: '', @@ -450,10 +451,29 @@ questionAndImprove: '', modifyContent: '', fileList: [ { fileName: 'name', fileUrl: 'url', } ], userList: [ ] }); //定义表单 const realRuleForm = ref ({ drillExecuteId: '', suitable: '', sufficient: '', arrival: '', supplies: '', protection: '', whole: '', division: '', effect: '', report: '', safety: '', rescue: '', evacuate: '', needModify: '', questionAndImprove: '', modifyContent: '', fileList: [ ], userList: [ ] @@ -504,18 +524,28 @@ ruleForm.value.chargeUserListString='' ruleForm.value.executeUserListString='' ruleForm.value.evaluationUserListString='' for(var a = 0;a<res.data.data.planUserList.length;a++){ ruleForm.value.planUserListString += res.data.data.planUserList[a].userName+';' if(res.data.data.planUserList){ for(var a = 0;a<res.data.data.planUserList.length;a++){ ruleForm.value.planUserListString += res.data.data.planUserList[a].userName+';' } } for(var a = 0;a<res.data.data.planChargeUserList.length;a++){ ruleForm.value.chargeUserListString += res.data.data.planChargeUserList[a].userName+';' if(res.data.data.planChargeUserList){ for(var a = 0;a<res.data.data.planChargeUserList.length;a++){ ruleForm.value.chargeUserListString += res.data.data.planChargeUserList[a].userName+';' } } for(var a = 0;a<res.data.data.executeUserList.length;a++){ ruleForm.value.executeUserListString += res.data.data.executeUserList[a].userName+';' if(res.data.data.executeUserList){ for(var a = 0;a<res.data.data.executeUserList.length;a++){ ruleForm.value.executeUserListString += res.data.data.executeUserList[a].userName+';' } } //演练负责人(评价) for(var a = 0;a<res.data.data.evaluationUserList.length;a++){ ruleForm.value.evaluationUserListString += res.data.data.evaluationUserList[a].userName+';' if(res.data.data.evaluationUserList){ for(var a = 0;a<res.data.data.evaluationUserList.length;a++){ ruleForm.value.evaluationUserListString += res.data.data.evaluationUserList[a].userName+';' } } } }); @@ -530,19 +560,31 @@ ruleForm.value.chargeUserListString='' ruleForm.value.executeUserListString='' ruleForm.value.evaluationUserListString='' for(var a = 0;a<res.data.data.planUserList.length;a++){ ruleForm.value.planUserListString += res.data.data.planUserList[a].userName+';' if(res.data.data.planUserList){ for(var a = 0;a<res.data.data.planUserList.length;a++){ ruleForm.value.planUserListString += res.data.data.planUserList[a].userName+';' } } for(var a = 0;a<res.data.data.planChargeUserList.length;a++){ ruleForm.value.chargeUserListString += res.data.data.planChargeUserList[a].userName+';' if(res.data.data.planChargeUserList){ for(var a = 0;a<res.data.data.planChargeUserList.length;a++){ ruleForm.value.chargeUserListString += res.data.data.planChargeUserList[a].userName+';' } } for(var a = 0;a<res.data.data.executeUserList.length;a++){ ruleForm.value.executeUserListString += res.data.data.executeUserList[a].userName+';' if(res.data.data.executeUserList){ for(var a = 0;a<res.data.data.executeUserList.length;a++){ ruleForm.value.executeUserListString += res.data.data.executeUserList[a].userName+';' } } //演练负责人(评价) for(var a = 0;a<res.data.data.evaluationUserList.length;a++){ ruleForm.value.evaluationUserListString += res.data.data.evaluationUserList[a].userName+';' if(res.data.data.evaluationUserList){ for(var a = 0;a<res.data.data.evaluationUserList.length;a++){ ruleForm.value.evaluationUserListString += res.data.data.evaluationUserList[a].userName+';' } } } }); } @@ -623,6 +665,34 @@ const submitForm = async (title: string, formEl: FormInstance | undefined) => { //演练负责人(评价) ruleForm.value.userList = ruleForm.value.evaluationUserList realRuleForm.value.drillExecuteId=ruleForm.value.drillExecuteId realRuleForm.value.suitable=ruleForm.value.suitable realRuleForm.value.sufficient=ruleForm.value.sufficient realRuleForm.value.arrival=ruleForm.value.arrival realRuleForm.value.supplies=ruleForm.value.supplies realRuleForm.value.protection=ruleForm.value.protection realRuleForm.value.whole=ruleForm.value.whole realRuleForm.value.division=ruleForm.value.division realRuleForm.value.effect=ruleForm.value.effect realRuleForm.value.report=ruleForm.value.report realRuleForm.value.safety=ruleForm.value.safety realRuleForm.value.rescue=ruleForm.value.rescue realRuleForm.value.evacuate=ruleForm.value.evacuate realRuleForm.value.needModify=ruleForm.value.needModify realRuleForm.value.questionAndImprove=ruleForm.value.questionAndImprove realRuleForm.value.modifyContent=ruleForm.value.modifyContent realRuleForm.value.fileList=ruleForm.value.fileList if(ruleForm.value.userList){ for(var a = 0;a<ruleForm.value.userList.length;a++){ realRuleForm.value.userList.push({ userUid:ruleForm.value.userList[a].userUid, userName:ruleForm.value.userList[a].userName }) } } // console.log(ruleForm.value.evaluationUserList) // ruleForm.value.userList=[] // for(var a = 0;a<ruleForm.value.evaluationUserList.length;a++){ @@ -634,7 +704,7 @@ if (valid) { // console.log(ruleForm.value) emergencyDrillEvaluationApi() .editEmergencyDrillEvaluation(ruleForm.value) .editEmergencyDrillEvaluation(realRuleForm.value) // emergencyDrillExecuteApi() // .editEmergencyDrillExecute(ruleForm.value) .then((res) => { @@ -709,6 +779,7 @@ ) ruleForm.value.evaluationUserListString+=e[a].realName+';' } console.log(ruleForm.value.evaluationUserList) } //el-tree-select回显 const propse = { @@ -789,7 +860,8 @@ department, newTreeList, selectUser, submitForm submitForm, realRuleForm }; }, }); src/views/contingencyManagement/emergencyDrill/implementationOfEmergencyDrill/component/openAdd.vue
@@ -205,7 +205,7 @@ <el-form-item label="演练过程描述" prop="processDesc"> <el-input v-model="ruleForm.processDesc" placeholder="请填写演练目的" placeholder="请填写演练过程描述" class="textarea" type="textarea" /> @@ -412,6 +412,8 @@ const drillRecordDate = ref('') // 表单提交验证必填项 const submitForm = async (title: string, formEl: FormInstance | undefined) => { delete ruleForm.value.drillName delete ruleForm.value.autualUserListString if (title == '新建应急演练实施') { if (!formEl) return; await formEl.validate((valid, fields) => { src/views/contingencyManagement/emergencyDrill/releaseOfDrillPlan/component/openAdd.vue
@@ -80,11 +80,11 @@ <el-date-picker v-model="ruleForm.drillPlanDate" value-format="YYYY-MM-DD HH:mm:ss" type="datetime" placeholder="选择日期时间" style="width: 100%" /> </el-form-item> </el-col> <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20"> <el-form-item label="修改时间" prop="gmtModitify"> <el-date-picker v-model="ruleForm.gmtModitify" value-format="YYYY-MM-DD HH:mm:ss" type="datetime" placeholder="选择日期时间" style="width: 100%" /> </el-form-item> </el-col> <!--<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">--> <!--<el-form-item label="修改时间" prop="gmtModitify">--> <!--<el-date-picker v-model="ruleForm.gmtModitify" value-format="YYYY-MM-DD HH:mm:ss" type="datetime" placeholder="选择日期时间" style="width: 100%" />--> <!--</el-form-item>--> <!--</el-col>--> <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20"> <el-form-item label="计划定制人" prop="makingUserName"> <el-input v-model="ruleForm.makingUserName" placeholder="请填写计划定制人" disabled></el-input> src/views/contingencyManagement/emergencyPlanStartRecord/component/selectEmergencyPlan.vue
@@ -1,5 +1,5 @@ <template> <el-dialog v-model="dialogVisible" title="选择应急预案" width="900px" draggable :fullscreen="full"> <el-dialog v-model="dialogVisible" title="选择应急预案" width="900px" draggable :fullscreen="full" @close="closeDialog"> <el-button @click="toggleFullscreen" size="small" class="pot" :icon="FullScreen"></el-button> <el-row> <el-col :span="18"> @@ -154,6 +154,9 @@ dynamicTags.value.splice(dynamicTags.value.indexOf(tag), 1); radio1.value = ''; }; const closeDialog = () => { handleClose('') } const radio1 = ref(''); const radio = (event: any) => { dynamicTags.value[0] = event; @@ -198,6 +201,7 @@ onSubmit, submitForm, total, closeDialog }; }, }); src/views/contingencyManagement/emergencyPlanStartRecord/index.vue
@@ -157,12 +157,15 @@ // 请求列表数据 const onSubmit = async () => { var planName = listQuery.searchParams.planName delete listQuery.searchParams.planName let res = await emergencyPlanLogApi().getEmergencyPlanLogList(listQuery); if (res.data.code == 200) { tableData.value = res.data.data; pageIndex.value = res.data.pageIndex; pageSize.value = res.data.pageSize; total.value = res.data.total; listQuery.searchParams.planName = planName } else { ElMessage.error(res.data.msg); } src/views/contingencyManagement/panManagement/component/abolishLibrary.vue
@@ -12,8 +12,15 @@ :header-cell-style="{ background: '#f6f7fa', color: '#909399' }" > <el-table-column prop="name" label="预案名称" show-overflow-tooltip sortable></el-table-column> <el-table-column prop="type" label="预案类型" show-overflow-tooltip sortable></el-table-column> <el-table-column prop="authorUid" label="编写人" show-overflow-tooltip sortable></el-table-column> <el-table-column prop="type" label="预案类型" show-overflow-tooltip sortable> <template #default="scope"> <div v-if="scope.row.type==1">综合应急预案</div> <div v-if="scope.row.type==2">现场处置方案</div> <div v-if="scope.row.type==3">专项应急预案</div> <div v-if="scope.row.type==4">其他预案</div> </template> </el-table-column> <el-table-column prop="authorName" label="编写人" show-overflow-tooltip sortable></el-table-column> <el-table-column prop="releaseDate" label="发布实施日期" show-overflow-tooltip sortable></el-table-column> <el-table-column label="操作" width="200" align="center"> <template #default="scope"> src/views/contingencyManagement/panManagement/component/approval.vue
@@ -132,15 +132,24 @@ }; const submitForm = async () => { console.log(ruleForm.value); ruleForm.value.workName = ruleForm.value.twoWorkName; ruleForm.value.title = ruleForm.value.twoTitle; ruleForm.value.approvePersonId = ruleForm.value.twoApprovePersonId; ruleForm.value.approvePersonName = ruleForm.value.twoApprovePersonName; ruleForm.value.relateType = 1; isShowDialog.value = false; if(ruleForm.value.complete == false) { ruleForm.value.approveStatus=3 } if(ruleForm.value.complete == false) { ruleForm.value.approveStatus=3 } delete ruleForm.value.gmtCreate delete ruleForm.value.complete delete ruleForm.value.submitPersonName delete ruleForm.value.twoApprovePersonId delete ruleForm.value.twoApprovePersonName delete ruleForm.value.twoTitle delete ruleForm.value.twoWorkName emergencyPlanApi() .editApprovalEmergencyPlan(ruleForm.value) .then((res) => { src/views/contingencyManagement/panManagement/component/openAdd.vue
@@ -198,6 +198,20 @@ .then((res) => { if (res.data.code == 200) { ruleForm.value = res.data.data; ruleForm.value.teamName = '' responsibleDepartment.value = [] if(res.data.data.teamList){ for(var a = 0;a<res.data.data.teamList.length;a++){ ruleForm.value.teamName+=res.data.data.teamList[a].teamName+';' } } if(res.data.data.deptList){ for(var a = 0;a<res.data.data.deptList.length;a++){ responsibleDepartment.value.push(res.data.data.deptList[a].departmentId) } } } }); } @@ -254,7 +268,7 @@ console.log(ruleForm); }; //定义树形下拉框 const responsibleDepartment = ref(); const responsibleDepartment = ref([]); const data = ref(); const submitForm = async (title: string, formEl: FormInstance | undefined) => { @@ -263,7 +277,7 @@ await formEl.validate((valid, fields) => { if (valid) { isShowDialog.value = false; delete ruleForm.value.teamName delete ruleForm.value.teamName emergencyPlanApi() .addEmergencyPlan(ruleForm.value) .then((res) => { src/views/contingencyManagement/panManagement/index.vue
@@ -8,10 +8,10 @@ </el-form-item> <el-form-item> <el-select size="default" v-model="listQuery.searchParams.type" placeholder="请选择预案类型" class="ml10" style="max-width: 215px"> <el-option label="综合应急预案" value="admin"></el-option> <el-option label="现场处置方案" value="common"></el-option> <el-option label="专项应急预案" value="common"></el-option> <el-option label="其他预案" value="common"></el-option> <el-option label="综合应急预案" value="1"></el-option> <el-option label="现场处置方案" value="2"></el-option> <el-option label="专项应急预案" value="3"></el-option> <el-option label="其他预案" value="4"></el-option> </el-select> </el-form-item> <el-form-item>
