From b25286eaee9e15a48533ab869dd0144182472bb8 Mon Sep 17 00:00:00 2001 From: liujun Date: Fri, 19 Jul 2024 16:32:36 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=BA=94=E6=80=A5=E6=8C=87=E6=8C=A5?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../emergency_map/components/mapAssembly.vue | 30 +++++++++++++++---- .../emergency_map_icon/components/add.vue | 2 +- .../emergency_map_icon/components/list.vue | 4 +-- 3 files changed, 27 insertions(+), 9 deletions(-) diff --git a/src/views/emergen_cyrescue/emergency_map/components/mapAssembly.vue b/src/views/emergen_cyrescue/emergency_map/components/mapAssembly.vue index 88acb29..111b76b 100644 --- a/src/views/emergen_cyrescue/emergency_map/components/mapAssembly.vue +++ b/src/views/emergen_cyrescue/emergency_map/components/mapAssembly.vue @@ -3,8 +3,8 @@
- + diff --git a/src/views/emergen_cyrescue/emergency_plan/company_plan-check/components/list.vue b/src/views/emergen_cyrescue/emergency_plan/company_plan-check/components/list.vue new file mode 100644 index 0000000..c98b453 --- /dev/null +++ b/src/views/emergen_cyrescue/emergency_plan/company_plan-check/components/list.vue @@ -0,0 +1,235 @@ + + + + diff --git a/src/views/emergen_cyrescue/emergency_plan/company_plan-check/components/yingjizhuangjia.vue b/src/views/emergen_cyrescue/emergency_plan/company_plan-check/components/yingjizhuangjia.vue new file mode 100644 index 0000000..0d0605a --- /dev/null +++ b/src/views/emergen_cyrescue/emergency_plan/company_plan-check/components/yingjizhuangjia.vue @@ -0,0 +1,154 @@ + + + + + + diff --git a/src/views/emergen_cyrescue/emergency_plan/company_plan-check/components/yjshenherenyuan.vue b/src/views/emergen_cyrescue/emergency_plan/company_plan-check/components/yjshenherenyuan.vue new file mode 100644 index 0000000..23d3995 --- /dev/null +++ b/src/views/emergen_cyrescue/emergency_plan/company_plan-check/components/yjshenherenyuan.vue @@ -0,0 +1,194 @@ + + + + + + diff --git a/src/views/emergen_cyrescue/emergency_plan/company_plan-check/components/yvanfujian.vue b/src/views/emergen_cyrescue/emergency_plan/company_plan-check/components/yvanfujian.vue new file mode 100644 index 0000000..a777e0d --- /dev/null +++ b/src/views/emergen_cyrescue/emergency_plan/company_plan-check/components/yvanfujian.vue @@ -0,0 +1,252 @@ + + + + + + diff --git a/src/views/emergen_cyrescue/emergency_plan/company_plan-check/components/yvanwenben.vue b/src/views/emergen_cyrescue/emergency_plan/company_plan-check/components/yvanwenben.vue new file mode 100644 index 0000000..fbae549 --- /dev/null +++ b/src/views/emergen_cyrescue/emergency_plan/company_plan-check/components/yvanwenben.vue @@ -0,0 +1,111 @@ + + + + + + diff --git a/src/views/emergen_cyrescue/emergency_plan/company_plan-check/components/yvanziling.vue b/src/views/emergen_cyrescue/emergency_plan/company_plan-check/components/yvanziling.vue new file mode 100644 index 0000000..0ae4fbe --- /dev/null +++ b/src/views/emergen_cyrescue/emergency_plan/company_plan-check/components/yvanziling.vue @@ -0,0 +1,328 @@ + + + + + + diff --git a/src/views/emergen_cyrescue/emergency_plan/company_plan-check/components/yvanziyuan.vue b/src/views/emergen_cyrescue/emergency_plan/company_plan-check/components/yvanziyuan.vue new file mode 100644 index 0000000..75c9409 --- /dev/null +++ b/src/views/emergen_cyrescue/emergency_plan/company_plan-check/components/yvanziyuan.vue @@ -0,0 +1,376 @@ + + + + + + diff --git a/src/views/emergen_cyrescue/emergency_plan/company_plan-check/components/zuzhijiagou.vue b/src/views/emergen_cyrescue/emergency_plan/company_plan-check/components/zuzhijiagou.vue new file mode 100644 index 0000000..9f5b5af --- /dev/null +++ b/src/views/emergen_cyrescue/emergency_plan/company_plan-check/components/zuzhijiagou.vue @@ -0,0 +1,306 @@ + + + + + + diff --git a/src/views/emergen_cyrescue/emergency_plan/company_plan-check/index.vue b/src/views/emergen_cyrescue/emergency_plan/company_plan-check/index.vue new file mode 100644 index 0000000..9859403 --- /dev/null +++ b/src/views/emergen_cyrescue/emergency_plan/company_plan-check/index.vue @@ -0,0 +1,26 @@ + + diff --git a/src/views/emergen_cyrescue/emergency_plan/company_plan/components/addfrom.vue b/src/views/emergen_cyrescue/emergency_plan/company_plan/components/addfrom.vue index 40e4133..8b94285 100644 --- a/src/views/emergen_cyrescue/emergency_plan/company_plan/components/addfrom.vue +++ b/src/views/emergen_cyrescue/emergency_plan/company_plan/components/addfrom.vue @@ -7,10 +7,10 @@
- + - + @@ -40,7 +40,7 @@ :options="yhPLANGRADEthree" v-model="form.PLANGRADE" - placeholder="请选择预案类型" + placeholder="请选择预案等级" no-options-text="暂无数据" no-children-text="暂无数据" /> @@ -100,17 +100,17 @@ - - + + - + - + @@ -129,6 +129,8 @@ 上一步 下一步 + + 提交审核
@@ -164,6 +166,10 @@ + + + + @@ -177,10 +183,26 @@ import yvanziyuan from './yvanziyuan.vue' import yvanziling from './yvanziling.vue' import yvanwenben from './yvanwenben.vue' import yvanfujian from './yvanfujian.vue' +import yjshenherenyuan from './yjshenherenyuan.vue' export default { - components: { Treeselect, yingjizhuangjia, zuzhijiagou, yvanziyuan, yvanziling, yvanwenben, yvanfujian }, + components: { Treeselect, yingjizhuangjia, zuzhijiagou, yvanziyuan, yvanziling, yvanwenben, yvanfujian, yjshenherenyuan }, data() { return { + rules: { + PLANNAME: [ + { required: true, message: '预案名称不能为空', trigger: 'blur' }, + { min: 2, max: 30, message: '长度在 2 到 30 个字符', trigger: 'blur' }], + PLANTYPE: [ + { required: true, message: '预案类型不能为空', trigger: 'blur' }], + PLANCODE: [ + { required: true, message: '预案编码不能为空', trigger: 'blur' }], + PLANGRADE: [ + { required: true, message: '预案等级不能为空', trigger: 'blur' }], + PLANDES: [ + { required: true, message: '预案概述不能为空', trigger: 'blur' }] + + }, + dialogFormshenhe: false, // 地图相关 CORPINFO_ID: this.$parent.CORPINFO_ID, clientHeight: 600, @@ -231,6 +253,45 @@ export default { this.getYaTypeDataList() }, methods: { + fenjihuidiao() { + this.zhilingreset() + }, + zuzhihuidiao() { + this.zhilingreset() + }, + // 指令初始化刷新 + zhilingreset() { + this.$refs.zhiling.getForFractModule() + this.$refs.zhiling.getTreeList() + }, + + yjwenancheck(id) { + console.log(id) + const params = { + FIRERESERVEPLAN_ID: this.PLAN_ID, + CHECKSTATUS: '1', + AUDIT_UESRID: id + } + requestFN('/major/emergencyplan/submitCheck', params).then((data) => { + this.$message({ + message: '提交成功', + type: 'success' + }) + setTimeout(() => { + this.dialogFormshenhe = false + this.$parent.activeName = 'list' + this.$parent.huidiao() + }, 500) + }).catch((e) => { + + }) + }, + closeDialog() { + this.dialogFormshenhe = false + }, + tijiaoshenhe() { + this.dialogFormshenhe = true + }, //* **************地图相关***************** // 地图相关 mapOpen() { @@ -437,6 +498,13 @@ export default { }, confirm(type) { + /* if (this.form.PLANNAME === undefined) { + this.$message({ + message: '预案名称不能为空', + type: 'warning' + }) + return + }*/ this.$refs.form.validate(valid => { if (valid) { this.saveData(type) diff --git a/src/views/emergen_cyrescue/emergency_plan/company_plan/components/list.vue b/src/views/emergen_cyrescue/emergency_plan/company_plan/components/list.vue index 06e8011..c2d6237 100644 --- a/src/views/emergen_cyrescue/emergency_plan/company_plan/components/list.vue +++ b/src/views/emergen_cyrescue/emergency_plan/company_plan/components/list.vue @@ -10,9 +10,13 @@ - - - + + + + +