From 0c0fa2483fd431104f6498e40fffd983d913dce2 Mon Sep 17 00:00:00 2001
From: 马宇豪 <978517621@qq.com>
Date: 星期二, 25 四月 2023 17:11:09 +0800
Subject: [PATCH] 修改
---
src/views/experiment/project/components/projectDialog.vue | 158 +++++++++++++++++++++++++++-------------------------
1 files changed, 82 insertions(+), 76 deletions(-)
diff --git a/src/views/experiment/project/components/projectDialog.vue b/src/views/experiment/project/components/projectDialog.vue
index 9e234fc..e9fa759 100644
--- a/src/views/experiment/project/components/projectDialog.vue
+++ b/src/views/experiment/project/components/projectDialog.vue
@@ -133,8 +133,8 @@
</el-radio-group>
</el-form-item>
</td>
- <td class="w-25 m-color required">过夜、老化保障措施</td>
- <td class="w-25 m-color">
+ <td class="w-25 m-color required" v-if="projectDialogState.projectForm.timeout === 1">过夜、老化保障措施</td>
+ <td class="w-25 m-color" v-if="projectDialogState.projectForm.timeout === 1">
<el-form-item prop="timeoutManager">
<el-input :disabled="projectDialogState.disabled" v-model="projectDialogState.projectForm.timeoutManager" />
</el-form-item>
@@ -150,10 +150,10 @@
</el-radio-group>
</el-form-item>
</td>
- <td class="w-25 m-color required">封闭条件保障措施</td>
- <td class="w-25 m-color">
+ <td class="w-25 m-color required" v-if="projectDialogState.projectForm.closed === 1">封闭条件保障措施</td>
+ <td class="w-25 m-color" v-if="projectDialogState.projectForm.closed === 1">
<el-form-item prop="unclosedManager">
- <el-input :disabled="projectDialogState.disabled" v-model="projectDialogState.projectForm.unclosedManager" />
+ <el-input :disabled="projectDialogState.disabled" v-model="projectDialogState.projectForm.unclosedManager"/>
</el-form-item>
</td>
</tr>
@@ -200,49 +200,54 @@
<!-- <el-input v-model="projectDialogState.projectForm.systemName" placeholder="请输入" />-->
<!-- </td>-->
<!-- </tr>-->
+<!-- <tr class="m-color b-font" style="text-align: center">应急预案/应急演练</tr>-->
+<!-- <tr>-->
+<!-- <td class="w-25 m-color required">有无预案</td>-->
+<!-- <td class="w-25 m-color required">预案名称</td>-->
+<!-- <td class="w-25 m-color required">是否演练</td>-->
+<!-- <td class="w-25 m-color required">演练情况</td>-->
+<!-- </tr>-->
+<!-- <tr>-->
+<!-- <td class="w-25 m-color">-->
+<!-- <el-form-item prop="emergencyPlan">-->
+<!-- <el-input :disabled="projectDialogState.disabled" v-model="projectDialogState.projectForm.emergencyPlan" />-->
+<!-- </el-form-item>-->
+<!-- </td>-->
+<!-- <td class="w-25 m-color">-->
+<!-- <el-form-item prop="emergencyPlanName">-->
+<!-- <el-input :disabled="projectDialogState.disabled" v-model="projectDialogState.projectForm.emergencyPlanName" />-->
+<!-- </el-form-item>-->
+<!-- </td>-->
+<!-- <td class="w-25 m-color">-->
+<!-- <el-form-item prop="emergencyDrillStatus">-->
+<!-- <el-input :disabled="projectDialogState.disabled" v-model="projectDialogState.projectForm.emergencyDrillStatus" />-->
+<!-- </el-form-item>-->
+<!-- </td>-->
+<!-- <td class="w-25 m-color">-->
+<!-- <el-form-item prop="emergencyDrill">-->
+<!-- <el-input :disabled="projectDialogState.disabled" v-model="projectDialogState.projectForm.emergencyDrill" />-->
+<!-- </el-form-item>-->
+<!-- </td>-->
+<!-- </tr>-->
+ <select-emergency ref="selectEmergencyRef" v-model:disabled="projectDialogState.disabled" v-model:data="projectDialogState.projectForm.emergencyList"></select-emergency>
<tr>
- <td class="w-25 m-color required">安全管理制度</td>
- <td class="w-75 m-color">
- <el-form-item prop="safeManagerMethod">
- <el-input :disabled="projectDialogState.disabled" v-model="projectDialogState.projectForm.safeManagerMethod" placeholder="请输入" />
- </el-form-item>
- </td>
- </tr>
- <tr class="m-color b-font" style="text-align: center">应急预案/应急演练</tr>
- <tr>
- <td class="w-25 m-color required">有无预案</td>
- <td class="w-25 m-color required">预案名称</td>
- <td class="w-25 m-color required">是否演练</td>
- <td class="w-25 m-color required">演练情况</td>
- </tr>
- <tr>
- <td class="w-25 m-color">
- <el-form-item prop="emergencyPlan">
- <el-input :disabled="projectDialogState.disabled" v-model="projectDialogState.projectForm.emergencyPlan" />
- </el-form-item>
- </td>
- <td class="w-25 m-color">
- <el-form-item prop="emergencyPlanName">
- <el-input :disabled="projectDialogState.disabled" v-model="projectDialogState.projectForm.emergencyPlanName" />
- </el-form-item>
- </td>
- <td class="w-25 m-color">
- <el-form-item prop="emergencyDrillStatus">
- <el-input :disabled="projectDialogState.disabled" v-model="projectDialogState.projectForm.emergencyDrillStatus" />
- </el-form-item>
- </td>
- <td class="w-25 m-color">
- <el-form-item prop="emergencyDrill">
- <el-input :disabled="projectDialogState.disabled" v-model="projectDialogState.projectForm.emergencyDrill" />
- </el-form-item>
- </td>
+ <td class="w-25 m-color required">安全管理制度</td>
+ <td class="w-75 m-color">
+ <el-form-item prop="safeManagerMethod">
+ <el-input :disabled="projectDialogState.disabled" v-model="projectDialogState.projectForm.safeManagerMethod" placeholder="请输入" />
+ </el-form-item>
+ </td>
</tr>
<tr class="m-color b-font" style=" text-align: center">其他信息</tr>
<tr>
<td class="w-25 m-color required">实验场所是否需要分区隔断</td>
<td class="w-75 m-color">
<el-form-item prop="partitionCondition">
- <el-input :disabled="projectDialogState.disabled" v-model="projectDialogState.projectForm.partitionCondition" placeholder="请输入" />
+<!-- <el-input :disabled="projectDialogState.disabled" v-model="projectDialogState.projectForm.partitionCondition" placeholder="请输入" />-->
+ <el-radio-group :disabled="projectDialogState.disabled" v-model="projectDialogState.projectForm.partitionCondition">
+ <el-radio :label="0">是</el-radio>
+ <el-radio :label="1">否</el-radio>
+ </el-radio-group>
</el-form-item>
</td>
</tr>
@@ -278,6 +283,7 @@
const SelectEquipment = defineAsyncComponent(() => import('./selectEquipment.vue'))
const SelectMaterial = defineAsyncComponent(() => import('./selectMaterial.vue'))
+const SelectEmergency = defineAsyncComponent(() => import('./selectEmergency.vue'))
const SelectDanger = defineAsyncComponent(() => import('./selectDanger.vue'))
const SelectPerson = defineAsyncComponent(() => import('./selectPerson.vue'))
const SelectRoom = defineAsyncComponent(() => import('./selectRoom.vue'))
@@ -286,6 +292,7 @@
const selectEquipmentRef = ref()
const selectRoomRef = ref()
const selectMaterialRef = ref()
+const selectEmergencyRef = ref()
const selectDangerRef = ref()
const userInfo = useUserInfo();
@@ -316,24 +323,16 @@
explosionProof: "",
fireProof: "",
poisonProof: "",
- hazardousWaste: null,
safeManagerMethod: "",
- emergencyPlan: "",
- emergencyDrill: "",
- emergencyPlanName: "",
- emergencyDrillStatus: "",
- partitionCondition: "",
+ emergencyList: [],
+ partitionCondition: null,
note: "",
createExperimentTime: '',
- persons: [
- ],
+ persons: [],
siteList: [],
- deviceList: [
- ],
- stuffList: [
- ],
- hazardousWasteList: [
- ]
+ deviceList: [],
+ stuffList: [],
+ hazardousWasteList: []
},
projectFormRules: {
experimentName: [{ required: true, message: '', trigger: 'blur' }],
@@ -355,12 +354,8 @@
explosionProof: [{ required: true, message: '', trigger: 'blur' }],
fireProof: [{ required: true, message: '', trigger: 'blur' }],
poisonProof: [{ required: true, message: '', trigger: 'blur' }],
- hazardousWaste: [{ required: true, message: '', trigger: 'blur' }],
safeManagerMethod: [{ required: true, message: '', trigger: 'blur' }],
- emergencyPlan: [{ required: true, message: '', trigger: 'blur' }],
- emergencyDrill: [{ required: true, message: '', trigger: 'blur' }],
- emergencyPlanName: [{ required: true, message: '', trigger: 'blur' }],
- emergencyDrillStatus: [{ required: true, message: '', trigger: 'blur' }],
+ emergencyList: [{ required: true, message: '', trigger: 'blur' }],
partitionCondition: [{ required: true, message: '', trigger: 'blur' }],
createExperimentTime: [{ required: true, message: '', trigger: 'blur' }]
},
@@ -409,13 +404,9 @@
explosionProof: "",
fireProof: "",
poisonProof: "",
- hazardousWaste: 1,
safeManagerMethod: "",
- emergencyPlan: "",
- emergencyDrill: "",
- emergencyPlanName: "",
- emergencyDrillStatus: "",
- partitionCondition: "",
+ emergencyList: [],
+ partitionCondition: null,
note: "",
createExperimentTime: '',
persons: [],
@@ -450,6 +441,30 @@
const onSubmitProject = () => {
ProjectFormRef.value.validate(async(valid: boolean) => {
if(valid){
+ if(projectDialogState.projectForm.timeout === 2){
+ projectDialogState.projectForm.timeoutManager = ''
+ }else{
+ if(projectDialogState.projectForm.timeoutManager == ''){
+ ElMessage({
+ type: 'warning',
+ message: '请填写过夜、老化保障措施',
+ duration: 1000
+ });
+ return
+ }
+ }
+ if(projectDialogState.projectForm.closed === 2){
+ projectDialogState.projectForm.unclosedManager = ""
+ }else{
+ if(projectDialogState.projectForm.unclosedManager == ''){
+ ElMessage({
+ type: 'warning',
+ message: '请填写封闭条件保障措施',
+ duration: 1000
+ });
+ return
+ }
+ }
if(projectDialogState.title === '新增'){
if(checkChineseName(projectDialogState.projectForm.safeLiabilityUser) == false){
ElMessage({
@@ -491,14 +506,6 @@
});
return
}
- if(projectDialogState.projectForm.hazardousWasteList.length === 0){
- ElMessage({
- type: 'warning',
- message: '请选择添加危废数据',
- duration: 1000
- });
- return
- }
if(projectDialogState.projectForm.persons.length === 0){
ElMessage({
type: 'warning',
@@ -507,6 +514,7 @@
});
return
}
+ projectDialogState.projectForm.emergencyList = selectEmergencyRef.value.dataList
projectDialogState.projectForm.persons = selectPersonRef.value.dataList
projectDialogState.projectForm.hazardousWasteList = selectDangerRef.value.dataList
// projectDialogState.projectForm.siteList = selectRoomRef.value.dataList.map(({siteId}) => ({siteId}))
@@ -529,8 +537,6 @@
});
}
}else{
- console.log(selectRoomRef.value.dataList,'selectRoomRef.value.dataList',selectMaterialRef.value.dataList)
- // projectDialogState.projectForm.siteList = selectRoomRef.value.dataList.map(({siteId}) => ({siteId}))
projectDialogState.projectForm.siteList = selectRoomRef.value.dataList.map(obj => ({siteId:obj.siteId}))
projectDialogState.projectForm.hazardousWasteList = selectDangerRef.value.dataList.map(obj => ({classify:obj.classify,wasteStorage:obj.wasteStorage,handAmount:obj.handAmount}))
let res = await projectApi().modProject(projectDialogState.projectForm)
--
Gitblit v1.9.2