From d0d78b9fbe144326f136ee048bb59d314413032e Mon Sep 17 00:00:00 2001 From: 马宇豪 <978517621@qq.com> Date: 星期二, 27 五月 2025 08:45:29 +0800 Subject: [PATCH] 修改导出 --- src/views/analyse/evaluate/components/evaluateDialog.vue | 136 ++++++++++++++++++++++++++++---------------- 1 files changed, 86 insertions(+), 50 deletions(-) diff --git a/src/views/analyse/evaluate/components/evaluateDialog.vue b/src/views/analyse/evaluate/components/evaluateDialog.vue index 966aac5..68ec8ff 100644 --- a/src/views/analyse/evaluate/components/evaluateDialog.vue +++ b/src/views/analyse/evaluate/components/evaluateDialog.vue @@ -148,7 +148,7 @@ <el-option v-for="item in evaluateDialogState.evaluateMethodList" :key="item.id" :label="item.name" :value="item.id"></el-option> </el-select> </el-form-item> - <el-button size="default" type="primary" @click="openChangeMethod()">修改评价方法</el-button> + <el-button :disabled="evaluateDialogState.disabled" size="default" type="primary" @click="openChangeMethod()">修改评价方法</el-button> </el-col> <div class="evaluateCard"> @@ -588,6 +588,11 @@ <el-input type="textarea" class="input-length" :autosize="{ minRows:2 }" :disabled="evaluateDialogState.disabled" v-model="evaluateDialogState.evaluateForm.evaluateDesc" placeholder="评价专家意见" clearable></el-input> </el-form-item> </el-col> + <el-col style="display: flex;align-items: center" :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20"> + <el-form-item label="安全风险分析" prop="evaluateDesc" style="width: 100% !important;"> + <el-input type="textarea" class="input-length" :autosize="{ minRows:2 }" :disabled="evaluateDialogState.disabled" v-model="evaluateDialogState.evaluateForm.safeRiskAnalysis" placeholder="安全风险分析" clearable></el-input> + </el-form-item> + </el-col> </el-row> </el-form> <el-dialog title="修改评价方法" v-model="evaluateDialogState.evaluateMethodVisible" width="30%"> @@ -618,6 +623,7 @@ import {isValidKey, numFloat} from "/@/utils/methods"; import { BigNumber } from 'bignumber.js'; import {identifyApi} from "/@/api/analyse/identify"; +import {ElMessageBox} from "element-plus/es"; const evaluateFormRef = ref() @@ -709,7 +715,8 @@ adviseEducationMeasure: '', advisePersonalProtectionMeasure: '', adviseEmergencyMeasure: '', - evaluateDesc: '' + evaluateDesc: '', + safeRiskAnalysis: '' }, evaluateFormRules: { @@ -759,7 +766,7 @@ {id:1, name: 'LEC'}, {id:2, name: 'LS'}, {id:3, name: 'MES'}, - {id:4, name: 'RS'}, + // {id:4, name: 'RS'}, ] }) @@ -801,21 +808,15 @@ setTimeout(() => { evaluateFormRef.value.clearValidate(); }); - if( value.riskValue){ + if( title === '评价'){ + if(value.riskValue){ evaluateDialogState.title = '编辑评价'; for(let i in evaluateDialogState.evaluateForm){ - if(isValidKey(i, evaluateDialogState.evaluateForm)){ - evaluateDialogState.evaluateForm[i] = value[i] - } + if(isValidKey(i, evaluateDialogState.evaluateForm)){ + evaluateDialogState.evaluateForm[i] = value[i] + } } - }else if(title === '查看'){ - evaluateDialogState.disabled = true - for(let i in evaluateDialogState.evaluateForm){ - if(isValidKey(i, evaluateDialogState.evaluateForm)){ - evaluateDialogState.evaluateForm[i] = value[i] - } - } - }else{ + }else{ evaluateDialogState.title = '评价' evaluateDialogState.evaluateForm = { id: null, @@ -866,8 +867,18 @@ adviseEducationMeasure: '', advisePersonalProtectionMeasure: '', adviseEmergencyMeasure: '', - evaluateDesc: '' + evaluateDesc: '', + safeRiskAnalysis: '' }; + } + }else { + evaluateDialogState.title = '查看' + evaluateDialogState.disabled = true + for(let i in evaluateDialogState.evaluateForm){ + if(isValidKey(i, evaluateDialogState.evaluateForm)){ + evaluateDialogState.evaluateForm[i] = value[i] + } + } } evaluateDialogState.evaluateForm.id = value.id as number evaluateDialogState.evaluateForm.evaluateMethod = value.evaluateMethod as number @@ -880,24 +891,35 @@ } const conFirmChange = async () =>{ - let res = await evaluateApi().modEvaluateMethod({ - id: evaluateDialogState.evaluateForm.id, - evaluateMethodId: evaluateDialogState.evaluateForm.evaluateMethod - }); - if(res.data.code === 100){ - ElMessage({ - type: 'success', - message: '评价方法修改成功' - }) - emit('refresh') - }else{ - ElMessage({ - type: 'warning', - message: res.data.msg - }) - } - evaluateDialogState.evaluateMethodVisible = false - evaluateDialogState.evaluateDialogVisible = false + ElMessageBox.confirm(`此操作将修改该评价计划的评价方法并清除之前的所有评价信息,是否继续?`, '提示', { + confirmButtonText: '确认', + cancelButtonText: '取消', + type: 'warning' + }) + .then(async () => { + let res = await evaluateApi().modEvaluateMethod({ + id: evaluateDialogState.evaluateForm.id, + evaluateMethodId: evaluateDialogState.evaluateForm.evaluateMethod + }); + if(res.data.code === 100){ + ElMessage({ + type: 'success', + message: '评价方法修改成功' + }) + emit('refresh') + }else{ + ElMessage({ + type: 'warning', + message: res.data.msg + }) + } + evaluateDialogState.evaluateMethodVisible = false + evaluateDialogState.evaluateMethod = evaluateDialogState.evaluateForm.evaluateMethod + evaluateFormRef.value.resetFields(); + evaluateFormRef.value.clearValidate(); + }) + .catch((error) => { + }); } const onSubmitEvaluate = () => { @@ -906,14 +928,13 @@ // evaluateDialogState.evaluateForm.riskValue = Number(numOriginValue.value) if(evaluateDialogState.title === '评价'){ let { lecId, lsId, mesId, rsId, ...data} = evaluateDialogState.evaluateForm - console.log(data,'要评价') let res = await evaluateApi().addEvaluate(data); if(res.data.code === 100){ emit('refresh') evaluateDialogState.evaluateDialogVisible = false; ElMessage({ type: 'success', - message: '新增成功' + message: '评价成功' }) }else{ ElMessage({ @@ -922,7 +943,6 @@ }); } }else{ - console.log(evaluateDialogState.evaluateForm,'要编辑') let res = await evaluateApi().modEvaluate(evaluateDialogState.evaluateForm) if(res.data.code === 100){ emit('refresh') @@ -1068,18 +1088,26 @@ const calcOriginScore=(i:string)=>{ if((i == 'lec' && (evaluateDialogState.evaluateForm.originalLecL && evaluateDialogState.evaluateForm.originalLecE && evaluateDialogState.evaluateForm.originalLecC))||(i == 'ls' && (evaluateDialogState.evaluateForm.originalLsL && evaluateDialogState.evaluateForm.originalLsS))||(i == 'mes' &&(evaluateDialogState.evaluateForm.originalMesM && evaluateDialogState.evaluateForm.originalMesE && evaluateDialogState.evaluateForm.originalMesS))||(i == 'rs' && (evaluateDialogState.evaluateForm.originalRsR && evaluateDialogState.evaluateForm.originalRsS))){ evaluateDialogState.evaluateForm.originalRiskValue = Number(numOriginValue.value) - if(evaluateDialogState.evaluateForm.originalRiskValue<=0.5){ - evaluateDialogState.evaluateForm.originalRiskLevelValue = 1 + if(evaluateDialogState.evaluateForm.originalRiskValue>0 && evaluateDialogState.evaluateForm.originalRiskValue<=70){ evaluateDialogState.evaluateForm.originalRiskLevel = 1 evaluateDialogState.evaluateForm.originalRiskColor = 1 - }else if(evaluateDialogState.evaluateForm.originalRiskValue>0.5&&evaluateDialogState.evaluateForm.originalRiskValue<1){ - evaluateDialogState.evaluateForm.originalRiskLevelValue = 2 + if(evaluateDialogState.evaluateForm.originalRiskValue<=19){ + evaluateDialogState.evaluateForm.originalRiskLevelValue = 5 + }else{ + evaluateDialogState.evaluateForm.originalRiskLevelValue = 4 + } + }else if(evaluateDialogState.evaluateForm.originalRiskValue>70&&evaluateDialogState.evaluateForm.originalRiskValue<=160){ + evaluateDialogState.evaluateForm.originalRiskLevelValue = 3 evaluateDialogState.evaluateForm.originalRiskLevel = 2 evaluateDialogState.evaluateForm.originalRiskColor = 2 - }else{ - evaluateDialogState.evaluateForm.originalRiskLevelValue = 3 + }else if(evaluateDialogState.evaluateForm.originalRiskValue>160&&evaluateDialogState.evaluateForm.originalRiskValue<=320){ + evaluateDialogState.evaluateForm.originalRiskLevelValue = 2 evaluateDialogState.evaluateForm.originalRiskLevel = 3 evaluateDialogState.evaluateForm.originalRiskColor = 3 + }else{ + evaluateDialogState.evaluateForm.originalRiskLevelValue = 1 + evaluateDialogState.evaluateForm.originalRiskLevel = 4 + evaluateDialogState.evaluateForm.originalRiskColor = 4 } } } @@ -1087,18 +1115,26 @@ const calcScore=(i:string)=>{ if((i == 'lec' && (evaluateDialogState.evaluateForm.lecL && evaluateDialogState.evaluateForm.lecE && evaluateDialogState.evaluateForm.lecC))||(i == 'ls' && (evaluateDialogState.evaluateForm.lsL && evaluateDialogState.evaluateForm.lsS))||(i == 'mes' &&(evaluateDialogState.evaluateForm.mesM && evaluateDialogState.evaluateForm.mesE && evaluateDialogState.evaluateForm.mesS))||(i == 'rs' && (evaluateDialogState.evaluateForm.rsR && evaluateDialogState.evaluateForm.rsS))){ evaluateDialogState.evaluateForm.riskValue = Number(numValue.value) - if(evaluateDialogState.evaluateForm.riskValue<=0.5){ - evaluateDialogState.evaluateForm.riskLevelValue = 1 + if(evaluateDialogState.evaluateForm.riskValue>0 && evaluateDialogState.evaluateForm.riskValue<=70){ evaluateDialogState.evaluateForm.riskLevel = 1 evaluateDialogState.evaluateForm.riskColor = 1 - }else if(evaluateDialogState.evaluateForm.riskValue>0.5&&evaluateDialogState.evaluateForm.riskValue<1){ - evaluateDialogState.evaluateForm.riskLevelValue = 2 + if(evaluateDialogState.evaluateForm.riskValue<=19){ + evaluateDialogState.evaluateForm.riskLevelValue = 5 + }else{ + evaluateDialogState.evaluateForm.riskLevelValue = 4 + } + }else if(evaluateDialogState.evaluateForm.riskValue>70&&evaluateDialogState.evaluateForm.riskValue<=160){ + evaluateDialogState.evaluateForm.riskLevelValue = 3 evaluateDialogState.evaluateForm.riskLevel = 2 evaluateDialogState.evaluateForm.riskColor = 2 + }else if(evaluateDialogState.evaluateForm.riskValue>160&&evaluateDialogState.evaluateForm.riskValue<=320){ + evaluateDialogState.evaluateForm.originalRiskLevelValue = 2 + evaluateDialogState.evaluateForm.originalRiskLevel = 3 + evaluateDialogState.evaluateForm.originalRiskColor = 3 }else{ - evaluateDialogState.evaluateForm.riskLevelValue = 3 - evaluateDialogState.evaluateForm.riskLevel = 3 - evaluateDialogState.evaluateForm.riskColor = 3 + evaluateDialogState.evaluateForm.riskLevelValue = 1 + evaluateDialogState.evaluateForm.riskLevel = 4 + evaluateDialogState.evaluateForm.riskColor = 4 } } } -- Gitblit v1.9.2