From 5415dae6cbb023dcfbadb4f4864b2ae6a5892bcd Mon Sep 17 00:00:00 2001
From: zhouwx <1175765986@qq.com>
Date: Tue, 07 Jan 2025 13:55:45 +0800
Subject: [PATCH] 修改
---
src/views/analyse/assessApply/components/reportDialog.vue | 74 +++++++++++++++++++++++++++++++-----
1 files changed, 63 insertions(+), 11 deletions(-)
diff --git a/src/views/analyse/assessApply/components/reportDialog.vue b/src/views/analyse/assessApply/components/reportDialog.vue
index f8d1257..9623f1f 100644
--- a/src/views/analyse/assessApply/components/reportDialog.vue
+++ b/src/views/analyse/assessApply/components/reportDialog.vue
@@ -110,7 +110,8 @@
<tr class="m-color b-font" style="text-align: center">实验概况</tr>
<tr>
- <el-input type="textarea" :autosize="{ minRows: 3}" disabled v-model="reportDialogState.reportForm.experimentDesc" placeholder="(简要描述实验原理、实验步骤、所用试剂或材料设备等)" />
+<!-- <el-input type="textarea" :autosize="{ minRows: 3}" disabled v-model="reportDialogState.reportForm.experimentDesc" placeholder="(简要描述实验原理、实验步骤、所用试剂或材料设备等)" />-->
+ <el-input type="textarea" :autosize="{ minRows: 3}" disabled v-model="reportDialogState.reportForm.process" placeholder="(简要描述实验原理、实验步骤、所用试剂或材料设备等)" />
</tr>
<tr class="m-color b-font" style="text-align: center">实验涉及的危险源</tr>
<tr>
@@ -131,7 +132,14 @@
</el-checkbox-group>
</td>
</tr>
+
<select-danger ref="selectDangerRef" v-model:data="reportDialogState.reportForm.riskSource" v-model:disabled="reportDialogState.disabled"></select-danger>
+
+<!-- <tr class="m-color b-font required" style="text-align: center">安全风险分析(总结)</tr>-->
+<!-- <tr>-->
+<!-- <el-input type="textarea" :autosize="{ minRows: 3}" :disabled="reportDialogState.disabled" v-model="reportDialogState.reportForm.safeRiskAnalysis" placeholder="1.实验过程中是否有爆炸、火灾、腐蚀、中毒风险、产生危险废弃物等(根据危险源清单,分析实验过程中可能对人身安全、人体健康、实验室环境和周边环境等带来的负面影响)" />-->
+<!-- </tr>-->
+
<tr class="m-color b-font required" style="text-align: center">安全风险分析(总结)</tr>
<tr>
<el-input type="textarea" :autosize="{ minRows: 3}" :disabled="reportDialogState.disabled" v-model="reportDialogState.reportForm.safeRiskAnalysis" placeholder="1.实验过程中是否有爆炸、火灾、腐蚀、中毒风险、产生危险废弃物等(根据危险源清单,分析实验过程中可能对人身安全、人体健康、实验室环境和周边环境等带来的负面影响)" />
@@ -142,12 +150,26 @@
</tr>
<tr class="m-color b-font required" style="text-align: center">实验和实验项目综合风险等级评定</tr>
<tr>
- <td class="m-color" style="width: 100%">
+ <td class="m-color" style="width: 100%;height: 65px">
<el-radio-group :disabled="reportDialogState.disabled" v-model="reportDialogState.reportForm.assessLevel">
- <el-radio :label="1">重大风险(一级)</el-radio>
- <el-radio :label="2">较大风险(二级)</el-radio>
- <el-radio :label="3">一般风险(三级)</el-radio>
- <el-radio :label="4">低风险(四级)</el-radio>
+ <div style="display: flex;justify-content: center">
+ <div style="display: flex;flex-direction: column">
+ <el-radio :label="1">重大风险(一级)</el-radio>
+ <el-tag v-if="reportDialogState.reportForm.assessLevel == 1" class="tag-style tag-bg1" />
+ </div>
+ <div style="display: flex;flex-direction: column">
+ <el-radio :label="2">较大风险(二级)</el-radio>
+ <el-tag v-if="reportDialogState.reportForm.assessLevel == 2" class="tag-style tag-bg2" />
+ </div>
+ <div style="display: flex;flex-direction: column">
+ <el-radio :label="3">一般风险(三级)</el-radio>
+ <el-tag v-if="reportDialogState.reportForm.assessLevel == 3" class="tag-style tag-bg3" />
+ </div>
+ <div style="display: flex;flex-direction: column">
+ <el-radio :label="4">低风险(四级)</el-radio>
+ <el-tag v-if="reportDialogState.reportForm.assessLevel == 4" style="width: 43px;margin-left: 20px;" class="tag-bg4" />
+ </div>
+ </div>
</el-radio-group>
</td>
</tr>
@@ -235,7 +257,8 @@
riskSource: [],
riskSourceType: [],
description: '',
- person:[]
+ person:[],
+ process: ''
},
reportFormRules: {
assessPerson: [{ required: true, message: '请填写评估人员', trigger: 'blur' }],
@@ -271,6 +294,10 @@
// reportDialogState.reportForm[i] = value[i];
// }
// }
+ reportDialogState.reportForm.riskSource = []
+ setTimeout(()=>{
+ selectDangerRef.value.dangerSourceState.dangerList = []
+ },2000)
}else if(title === '修改'){
reportDialogState.title = '修改报告';
reportDialogState.disabled = false
@@ -283,6 +310,7 @@
// }
// }
}
+ console.log(reportDialogState.reportForm,'form')
};
const isValidKey = (key: string | number | symbol, object:object): key is keyof typeof object =>{
@@ -317,7 +345,8 @@
riskSource: [],
riskSourceType: [],
description: '',
- person:[]
+ person:[],
+ process: ''
}
if(res.data.data&&res.data.data.length==0){
ElMessage({
@@ -358,9 +387,14 @@
const onSubmitProject = () => {
reportFormRef.value.validate(async(valid: boolean) => {
if(valid){
- const { id,assessPerson,safeRiskAnalysis,assessLevel,description } = reportDialogState.reportForm
- const data = { id,assessPerson,safeRiskAnalysis,assessLevel,description }
+ reportDialogState.reportForm.riskSource = selectDangerRef.value.dangerSourceState.dangerList
+ const { id,assessPerson,riskSource,safeRiskAnalysis,assessLevel,description } = reportDialogState.reportForm
+ const data = { id,assessPerson,riskSource,safeRiskAnalysis,assessLevel,description }
if(reportDialogState.title === '提交报告'){
+ for(let i in data.riskSource){
+ riskSource[i].reportId = data.id
+ riskSource[i].riskSourceIndex = i + 1
+ }
let res = await assessApplyApi().updateRiskReport(data);
if(res.data.code === 100){
emit('refresh')
@@ -558,7 +592,22 @@
.m-color {
color: #0c4995;
}
-
+.tag-style{
+ width: 58px;
+ margin-left: 20px;
+}
+.tag-bg1 {
+ background: rgba(255,0,0,0.65);
+}
+.tag-bg2 {
+ background: rgba(248,82,8,0.65);
+}
+.tag-bg3 {
+ background: rgba(247,255,0,0.65);
+}
+.tag-bg4 {
+ background: rgba(0,112,192,0.65);
+}
.roomSelect{
::v-deep(.el-popper){
.el-select-dropdown__item{
@@ -604,6 +653,9 @@
display: flex;
justify-content: center;
}
+:deep(.el-tag){
+ border: none;
+}
</style>
--
Gitblit v1.9.2