| src/views/analyse/assessApply/components/reportDialog.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/analyse/assessApply/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/analyse/evaluate/components/evaluateDialog.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/analyse/evaluate/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/analyse/identify/components/identifyQuery.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/views/analyse/assessApply/components/reportDialog.vue
@@ -128,7 +128,7 @@ <!-- <el-radio :label="7">激光安全</el-radio>--> <!-- <el-radio :label="8">其他安全</el-radio>--> <!-- </el-radio-group>--> <el-checkbox-group disabled> <el-checkbox-group disabled class="checkTip"> <el-checkbox v-for="item in reportDialogState.reportForm.riskSourceType" :label="item.riskSourceType" :checked="item.status==1?true:false"/> </el-checkbox-group> </td> @@ -152,7 +152,7 @@ <tr class="m-color b-font required" style="text-align: center">实验和实验项目综合风险等级评定</tr> <tr> <td class="m-color" style="width: 100%;height: 65px"> <el-radio-group :disabled="reportDialogState.disabled" v-model="reportDialogState.reportForm.assessLevel"> <el-radio-group :disabled="reportDialogState.disabled" v-model="reportDialogState.reportForm.assessLevel" class="checkTip"> <div style="display: flex;justify-content: center"> <div style="display: flex;flex-direction: column"> <el-radio :label="1">重大风险（一级）</el-radio> @@ -196,7 +196,8 @@ <!-- </td>--> </tr> <tr v-if="reportDialogState.reportForm.person?.length>0" class="m-color b-font" style="text-align: center">审批内容</tr> <template v-if="reportDialogState.reportForm.person?.length>0" v-for="item in reportDialogState.reportForm.person"> <template v-if="reportDialogState.reportForm.person?.length > 0"> <template v-for="item in reportDialogState.reportForm.person"> <tr> <td class="w-25 m-color">{{item.approveStage}}</td> <td class="w-25">{{item.approvePerson}}</td> @@ -209,6 +210,7 @@ {{ item.approveDesc }} </td> </tr> </template> </template> </table> </el-form> @@ -758,3 +760,35 @@ </style> <style> .checkTip{ .is-disabled{ .el-checkbox__label{ color: #606266 !important } .el-radio__label{ color: #606266 !important } &.is-checked{ .el-checkbox__label{ color: #409eff !important } .el-radio__label{ color: #409eff !important } .el-checkbox__inner{ background-color: #409eff; &::after{ border-color: #fff !important } } .el-radio__inner{ background-color: #409eff !important; &::after{ background-color: #fff !important } } } } } </style> src/views/analyse/assessApply/index.vue
@@ -69,7 +69,8 @@ </el-table-column> <el-table-column label="操作" width="250" fixed="right"> <template #default="scope"> <el-button size="small" v-if="scope.row.stage == 3" text type="primary" :icon="Edit" @click="toReport(scope.row)">生成评估报告</el-button> <el-button size="small" v-if="scope.row.stage == 3" text type="primary" :icon="Edit" @click="toReport(scope.row,0)">生成评估报告</el-button> <el-button size="small" v-if="scope.row.stage == 4" text type="primary" :icon="Edit" @click="toReport(scope.row,1)">重新生成报告</el-button> <el-button size="small" text type="primary" :icon="Edit" @click="openRiskDialog(scope.row)">管理实验风险单元</el-button> <el-button size="small" v-if="scope.row.stage == 4 && !scope.row.assessPerson" text type="primary" :icon="View" @click="openReportDialog('提交', scope.row)">提交审批</el-button> <el-button size="small" v-if="scope.row.stage == 4 && scope.row.assessPerson" text type="primary" :icon="View" @click="openReportDialog('修改', scope.row)">修改</el-button> @@ -137,7 +138,8 @@ } }; const toReport = (val: ProjectType)=>{ const toReport = (val: ProjectType,type: number)=>{ if(type == 0){ ElMessageBox.confirm(`此操作将对该实验生成风险评估报告：“${val.experimentName}”，是否继续?`, '提示', { confirmButtonText: '确认', cancelButtonText: '取消', @@ -161,6 +163,31 @@ }) .catch((error) => { }); }else{ ElMessageBox.confirm(`此操作将对该实验重新生成风险评估报告：“${val.experimentName}”，是否继续?`, '提示', { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning' }) .then(async () => { let res = await assessApplyApi().toRiskReport({ id: val.id, reSubmit: 1}); if (res.data.code === 100) { ElMessage({ type: 'success', duration: 2000, message: '重新生成报告成功' }); await getAssessData(); } else { ElMessage({ type: 'warning', message: res.data.msg }); } }) .catch((error) => { }); } } const getAllRoom = async () => { src/views/analyse/evaluate/components/evaluateDialog.vue
@@ -766,7 +766,7 @@ {id:1, name: 'LEC'}, {id:2, name: 'LS'}, {id:3, name: 'MES'}, {id:4, name: 'RS'}, // {id:4, name: 'RS'}, ] }) @@ -914,7 +914,9 @@ }) } evaluateDialogState.evaluateMethodVisible = false evaluateDialogState.evaluateDialogVisible = false evaluateDialogState.evaluateMethod = evaluateDialogState.evaluateForm.evaluateMethod evaluateFormRef.value.resetFields(); evaluateFormRef.value.clearValidate(); }) .catch((error) => { }); @@ -1086,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 } } } @@ -1105,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 } } } src/views/analyse/evaluate/index.vue
@@ -257,7 +257,7 @@ experimentName: '', experimentType: null, assessLevel: null, id: value.experimentId experimentId: value.experimentId } },); if(res.data.code === 100){ src/views/analyse/identify/components/identifyQuery.vue
@@ -38,7 +38,7 @@ <div class="checkUnit-point"> <el-tabs class="active" v-model="identifyQueryState.activeName"> <el-tab-pane label="辨识信息" name="identify"> <div style="padding-bottom: 10px" v-if="identifyQueryState.identifyForm.planExecStatus === 2"> <div style="padding-bottom: 10px"> <el-button size="default" type="primary" @click="openIdentifyDialog('新增', '')"> <el-icon> <ele-FolderAdd /> @@ -75,6 +75,11 @@ <span>{{scope.row.result == 1?'有风险':scope.row.result == 2?'无风险':'--'}}</span> </template> </el-table-column> <el-table-column label="辨识人" show-overflow-tooltip align="center"> <template #default="scope"> <span>{{scope.row.updateByUser?scope.row.updateByUser:scope.row.createByUser}}</span> </template> </el-table-column> <el-table-column label="操作" width="150" align="center"> <template #default="scope"> <el-button size="default" text type="primary" @click="openIdentifyDialog('查看', scope.row)">查看</el-button>
