diff --git a/src/views/alarm/dangerAssessment/manage/editChemistryDialog.vue b/src/views/alarm/dangerAssessment/manage/editChemistryDialog.vue new file mode 100644 index 0000000..62b4a0b --- /dev/null +++ b/src/views/alarm/dangerAssessment/manage/editChemistryDialog.vue @@ -0,0 +1,239 @@ + + + + + + diff --git a/src/views/alarm/dangerAssessment/manage/editChemistryDialog.vue b/src/views/alarm/dangerAssessment/manage/editChemistryDialog.vue new file mode 100644 index 0000000..62b4a0b --- /dev/null +++ b/src/views/alarm/dangerAssessment/manage/editChemistryDialog.vue @@ -0,0 +1,239 @@ + + + + + + diff --git a/src/views/alarm/dangerAssessment/manage/editPointDialog.vue b/src/views/alarm/dangerAssessment/manage/editPointDialog.vue index a86a3a2..5e8d989 100644 --- a/src/views/alarm/dangerAssessment/manage/editPointDialog.vue +++ b/src/views/alarm/dangerAssessment/manage/editPointDialog.vue @@ -128,6 +128,9 @@ function closeRefresh() { dialogVisible.value = false resetForm() + if (formDataRef.value) { + formDataRef.value?.clearValidate() + } emits('closeRefresh') } diff --git a/src/views/alarm/dangerAssessment/manage/editChemistryDialog.vue b/src/views/alarm/dangerAssessment/manage/editChemistryDialog.vue new file mode 100644 index 0000000..62b4a0b --- /dev/null +++ b/src/views/alarm/dangerAssessment/manage/editChemistryDialog.vue @@ -0,0 +1,239 @@ + + + + + + diff --git a/src/views/alarm/dangerAssessment/manage/editPointDialog.vue b/src/views/alarm/dangerAssessment/manage/editPointDialog.vue index a86a3a2..5e8d989 100644 --- a/src/views/alarm/dangerAssessment/manage/editPointDialog.vue +++ b/src/views/alarm/dangerAssessment/manage/editPointDialog.vue @@ -128,6 +128,9 @@ function closeRefresh() { dialogVisible.value = false resetForm() + if (formDataRef.value) { + formDataRef.value?.clearValidate() + } emits('closeRefresh') } diff --git a/src/views/alarm/dangerAssessment/manage/editSourceDialog.vue b/src/views/alarm/dangerAssessment/manage/editSourceDialog.vue index bf5fcd5..8b69e15 100644 --- a/src/views/alarm/dangerAssessment/manage/editSourceDialog.vue +++ b/src/views/alarm/dangerAssessment/manage/editSourceDialog.vue @@ -24,8 +24,8 @@ csjb: '', // 场所级别 wxhxpmc: '', // 危险化学品名称 nature: '', // 危险性质 - cl: '', // 存量 - ljl: '', // 临界量 + cl: 0, // 存量 + ljl: 0, // 临界量 fjzs: '', // 分级指数 substancesQuantities: '', // 危险物质及定量 grade: '', // 危险源等级 @@ -36,20 +36,21 @@ // 校验规则 const rules = reactive({ deptId: [{ required: true, message: '所属单位必选', trigger: ['blur', 'change'] }], - riskName: [{ required: true, message: '危险点名称必填', trigger: ['blur', 'change'] }], - address: [{ required: true, message: '详细地址必填', trigger: ['blur', 'change'] }], - content: [{ required: true, message: '作业活动概述必填', trigger: ['blur', 'change'] }], + riskName: [{ required: true, message: '重大危险源名称必填', trigger: ['blur', 'change'] }], + csjb: [{ required: true, message: '场所级别必填', trigger: ['blur', 'change'] }], + wxhxpmc: [{ required: true, message: '危险化学品名称必填', trigger: ['blur', 'change'] }], nature: [{ required: true, message: '危险性质必填', trigger: ['blur', 'change'] }], - grade: [{ required: true, message: '等级必填', trigger: ['blur', 'change'] }], - assignPost: [{ required: true, message: '定岗必填', trigger: ['blur', 'change'] }], - staffQuota: [{ required: true, message: '定员必填', trigger: ['blur', 'change'] }], + cl: [{ required: true, message: '存量必填', trigger: ['blur', 'change'] }], + ljl: [{ required: true, message: '临界量必填', trigger: ['blur', 'change'] }], + fjzs: [{ required: true, message: '分级指数必填', trigger: ['blur', 'change'] }], substancesQuantities: [{ required: true, message: '危险物质及定量必填', trigger: ['blur', 'change'] }], + grade: [{ required: true, message: '危险源等级必填', trigger: ['blur', 'change'] }], }) // -----------------------------------------字典-------------------------------------------------------------- -const deviceStatusList = ref([]) // 危险点等级 +const deviceStatusList = ref([]) // 重大危险源等级 const getDict = async () => { - // 危险点等级 + // 重大危险源等级 getDictByCode('dangerPointGrade').then((response) => { deviceStatusList.value = response.data }) @@ -58,27 +59,28 @@ // ------------------------------------------------------------------------------------------- // 表单提交 function submitForm() { - if (formDataRef.value) { - formDataRef.value?.validate((valid: boolean) => { - if (valid) { - const params = { - ...formData.value, - } - if (dialogStatus.value === 'add') { // 新建 - addDangerAssessmentManage(params).then((res) => { - ElMessage.success('新增危险点成功') - closeRefresh() - }) - } - else if (dialogStatus.value === 'edit') { // 编辑 - updateDangerAssessmentManage(params).then((res) => { - ElMessage.success('编辑危险点成功') - closeRefresh() - }) - } - } - }) - } + return ElMessage.info('敬请期待') + // if (formDataRef.value) { + // formDataRef.value?.validate((valid: boolean) => { + // if (valid) { + // const params = { + // ...formData.value, + // } + // if (dialogStatus.value === 'add') { // 新建 + // addDangerAssessmentManage(params).then((res) => { + // ElMessage.success('新增重大危险源成功') + // closeRefresh() + // }) + // } + // else if (dialogStatus.value === 'edit') { // 编辑 + // updateDangerAssessmentManage(params).then((res) => { + // ElMessage.success('编辑重大危险源成功') + // closeRefresh() + // }) + // } + // } + // }) + // } } // 重置表单 @@ -87,14 +89,15 @@ id: '', deptId: '', // 所属单位id deptName: '', // 所属单位 - riskName: '', // 危险点名称 - address: '', // 详细地址 - content: '', // 作业活动概述 + riskName: '', // 危险源名称 + csjb: '', // 场所级别 + wxhxpmc: '', // 危险化学品名称 nature: '', // 危险性质 - grade: '', // 等级 - assignPost: '', // 定岗 - staffQuota: 1, // 定员 + cl: 0, // 存量 + ljl: 0, // 临界量 + fjzs: '', // 分级指数 substancesQuantities: '', // 危险物质及定量 + grade: '', // 危险源等级 riskType: '', // 类型 } } @@ -107,14 +110,15 @@ formData.value.id = row.id formData.value.deptId = row.deptId // 所属单位id formData.value.deptName = row.deptName // 所属单位 - formData.value.riskName = row.riskName // 危险点名称 - formData.value.address = row.address // 详细地址 - formData.value.content = row.content // 作业活动概述 + formData.value.riskName = row.riskName // 重大危险源名称 + formData.value.csjb = row.csjb // 场所级别 + formData.value.wxhxpmc = row.wxhxpmc // 危险化学品名称 formData.value.nature = row.nature // 危险性质 - formData.value.grade = row.grade // 等级 - formData.value.assignPost = row.assignPost // 定岗 - formData.value.staffQuota = Number(row.staffQuota) // 定员 + formData.value.cl = row.cl // 存量 + formData.value.ljl = row.ljl // 临界量 + formData.value.fjzs = row.fjzs // 分级指数 formData.value.substancesQuantities = row.substancesQuantities // 危险物质及定量 + formData.value.grade = row.grade // 危险源等级 } // 详情隐藏表单校验 @@ -129,6 +133,9 @@ function closeRefresh() { dialogVisible.value = false resetForm() + if (formDataRef.value) { + formDataRef.value?.clearValidate() + } emits('closeRefresh') } @@ -156,23 +163,51 @@ - - - + + + - - + + - + - + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - -