From 277b37a794c0c32816ef10a62f3736e0665aa523 Mon Sep 17 00:00:00 2001 From: panyuyi Date: Thu, 9 May 2024 11:33:27 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dikeBaseInfo/options/basePage.vue | 5 +- .../components/DikeBaseInfo/index.vue | 82 ++++ .../components/DikeBaseInfoDialog/index.vue | 44 +++ .../maintenancePlan/DetailsDialog.vue | 358 ------------------ .../maintenancePlan/DetailsMap.vue | 16 - .../maintenance/maintenancePlan/index.vue | 40 +- .../maintenance/maintenanceRecords/index.vue | 36 +- .../dike/runManage/monitoring/dike/index.vue | 21 +- .../planManagement/index.vue | 8 +- .../sluiceBaseInfo/options/basePage.vue | 5 +- .../components/SluiceBaseInfo/index.vue | 65 ++++ .../components/SluiceBaseInfoDialog/index.vue | 44 +++ .../dispatch/record/components/edit.vue | 189 +++++---- .../runManage/dispatch/record/index.vue | 189 ++++++--- .../maintenance/maintenancePlan/index.vue | 43 ++- .../maintenance/maintenanceRecords/index.vue | 47 ++- 16 files changed, 630 insertions(+), 562 deletions(-) create mode 100644 src/views/dike/runManage/components/DikeBaseInfo/index.vue create mode 100644 src/views/dike/runManage/components/DikeBaseInfoDialog/index.vue delete mode 100644 src/views/dike/runManage/maintenance/maintenancePlan/DetailsDialog.vue delete mode 100644 src/views/dike/runManage/maintenance/maintenancePlan/DetailsMap.vue create mode 100644 src/views/sluice/runManage/components/SluiceBaseInfo/index.vue create mode 100644 src/views/sluice/runManage/components/SluiceBaseInfoDialog/index.vue diff --git a/src/views/dike/engineeringCondition/dikeBaseInfo/options/basePage.vue b/src/views/dike/engineeringCondition/dikeBaseInfo/options/basePage.vue index 4427269..7d588a4 100644 --- a/src/views/dike/engineeringCondition/dikeBaseInfo/options/basePage.vue +++ b/src/views/dike/engineeringCondition/dikeBaseInfo/options/basePage.vue @@ -262,6 +262,9 @@ import { regionData, codeToText, TextToCode } from "element-china-area-data"; export default { name: "Jbxx", + props: { + baseDataId: String, + }, data() { return { areasOptionProps: { @@ -495,7 +498,7 @@ export default { /** 查询堤防安全管理基本信息列表 */ getList() { this.loading = true; - const id = this.$route.query.baseDataId; + const id = this.$route.query.baseDataId || this.baseDataId; getJbxx(id).then((response) => { console.log(1111, response); this.form = response.data; diff --git a/src/views/dike/runManage/components/DikeBaseInfo/index.vue b/src/views/dike/runManage/components/DikeBaseInfo/index.vue new file mode 100644 index 0000000..bed738e --- /dev/null +++ b/src/views/dike/runManage/components/DikeBaseInfo/index.vue @@ -0,0 +1,82 @@ + + + diff --git a/src/views/dike/runManage/components/DikeBaseInfoDialog/index.vue b/src/views/dike/runManage/components/DikeBaseInfoDialog/index.vue new file mode 100644 index 0000000..9dab309 --- /dev/null +++ b/src/views/dike/runManage/components/DikeBaseInfoDialog/index.vue @@ -0,0 +1,44 @@ + + + diff --git a/src/views/dike/runManage/maintenance/maintenancePlan/DetailsDialog.vue b/src/views/dike/runManage/maintenance/maintenancePlan/DetailsDialog.vue deleted file mode 100644 index 8a82202..0000000 --- a/src/views/dike/runManage/maintenance/maintenancePlan/DetailsDialog.vue +++ /dev/null @@ -1,358 +0,0 @@ - - - diff --git a/src/views/dike/runManage/maintenance/maintenancePlan/DetailsMap.vue b/src/views/dike/runManage/maintenance/maintenancePlan/DetailsMap.vue deleted file mode 100644 index 4734ff0..0000000 --- a/src/views/dike/runManage/maintenance/maintenancePlan/DetailsMap.vue +++ /dev/null @@ -1,16 +0,0 @@ - - - diff --git a/src/views/dike/runManage/maintenance/maintenancePlan/index.vue b/src/views/dike/runManage/maintenance/maintenancePlan/index.vue index c1a731e..068b262 100644 --- a/src/views/dike/runManage/maintenance/maintenancePlan/index.vue +++ b/src/views/dike/runManage/maintenance/maintenancePlan/index.vue @@ -9,20 +9,22 @@ import { } from "@/api/management"; import { listJbxx } from "@/api/yg/dike/jbxx"; import { getDikeYhPlanList } from "@/api/dike"; -import DetailsDialog from "./DetailsDialog.vue"; +import DikeBaseInfoDialog from "@/views/dike/runManage/components/DikeBaseInfoDialog/index.vue"; export default { name: "InspectionItems", - components: { DetailsDialog }, + components: { DikeBaseInfoDialog }, data() { return { - searchInput: "", - dialogVisible: false, - prohibitEditing: false, - dikeDetailsDialog: { + // 堤防详情弹窗 + baseInfoDialog: { show: false, id: "", + code: "", }, + searchInput: "", + dialogVisible: false, + prohibitEditing: false, dikeLevel: [ { id: 1, @@ -126,7 +128,7 @@ export default { }); }, addPlan() { - this.ruleForm.dikeCode = this.$route.query.dikeCode; + // this.ruleForm.dikeCode = this.$route.query.dikeCode; this.dialogVisible = true; }, // 查看或编辑计划详情 @@ -261,14 +263,14 @@ export default { }); }, handleChangeDike(value) { - // this.ruleForm.name = this.ruleForm.dikeCode; let res = this.embankmentList.find((v) => v.dikeCode === value); - this.dikeDetailsDialog.id = res?.id || ""; + this.baseInfoDialog.id = res?.id || ""; + this.baseInfoDialog.code = this.ruleForm.dikeCode; }, // 打开堤防详情 handleOpenDetails() { - if (this.dikeDetailsDialog.id) { - this.dikeDetailsDialog.show = true; + if (this.baseInfoDialog.id) { + this.baseInfoDialog.show = true; } else { this.$message.warning("缺少id"); } @@ -443,12 +445,7 @@ export default { @click="handleOpenDetails" >详情 - 打开地图 @@ -549,10 +546,11 @@ export default { - + diff --git a/src/views/dike/runManage/maintenance/maintenanceRecords/index.vue b/src/views/dike/runManage/maintenance/maintenanceRecords/index.vue index e858943..fe5a8a8 100644 --- a/src/views/dike/runManage/maintenance/maintenanceRecords/index.vue +++ b/src/views/dike/runManage/maintenance/maintenanceRecords/index.vue @@ -12,10 +12,19 @@ import { } from "@/api/management"; import { getDikeYhRecordList, updateYhRecordStatus } from "@/api/dike"; +import DikeBaseInfoDialog from "@/views/dike/runManage/components/DikeBaseInfoDialog/index.vue"; + export default { name: "InspectionItems", + components: { DikeBaseInfoDialog }, data() { return { + // 堤防详情弹窗 + baseInfoDialog: { + show: false, + id: "", + code: "", + }, tableHeight: null, createTimeArr: [], updateTimeArr: [], @@ -27,6 +36,7 @@ export default { statusList: [], // 状态列表 personnelList: [], // 用户列表 planData: { + dikeName: "", dikeCode: "", planTime: "", nationalSupplement: "", @@ -95,6 +105,14 @@ export default { this.$message.success("删除成功"); }); }, + // 打开详情 + handleOpenDetails() { + if (this.baseInfoDialog.id) { + this.baseInfoDialog.show = true; + } else { + this.$message.warning("缺少id"); + } + }, // 查看或编辑记录详情 viewOrEditPlanDetails(row, edit = false) { if (!edit) { @@ -238,6 +256,9 @@ export default { }, // 改变选中计划 changeSelectPlan() { + let p = this.planList.find((item) => item.id === this.ruleForm.planId); + this.baseInfoDialog.id = p?.dikeId; + this.baseInfoDialog.code = p?.dikeCode; getDFMaintenancePlan(this.ruleForm.planId).then((res) => { if (res.data) { this.ruleForm.name = res.data.name; @@ -541,10 +562,15 @@ export default { > - 详情 - 打开地图 @@ -721,6 +747,12 @@ export default { > + + diff --git a/src/views/dike/runManage/monitoring/dike/index.vue b/src/views/dike/runManage/monitoring/dike/index.vue index a211963..2316616 100644 --- a/src/views/dike/runManage/monitoring/dike/index.vue +++ b/src/views/dike/runManage/monitoring/dike/index.vue @@ -9,8 +9,7 @@ export default { data() { return { searchForm: { - adcdStart: "", - adcdEnd: "", + adcd: "", dikeGrad: -1, dikeName: "", }, @@ -84,8 +83,7 @@ export default { timeView: { timeField: "create_time", }, - adcdStart: this.searchForm.adcdStart, - adcdEnd: this.searchForm.adcdEnd, + adcd: this.searchForm.adcd, dikeGrad: this.searchForm.dikeGrad == -1 ? "" : this.searchForm.dikeGrad, dikeName: this.searchForm.dikeName, @@ -157,17 +155,7 @@ export default { - - - - + > + + { console.log(1111, response); this.form = response.data; diff --git a/src/views/sluice/runManage/components/SluiceBaseInfo/index.vue b/src/views/sluice/runManage/components/SluiceBaseInfo/index.vue new file mode 100644 index 0000000..46ab48f --- /dev/null +++ b/src/views/sluice/runManage/components/SluiceBaseInfo/index.vue @@ -0,0 +1,65 @@ + + + diff --git a/src/views/sluice/runManage/components/SluiceBaseInfoDialog/index.vue b/src/views/sluice/runManage/components/SluiceBaseInfoDialog/index.vue new file mode 100644 index 0000000..1abab97 --- /dev/null +++ b/src/views/sluice/runManage/components/SluiceBaseInfoDialog/index.vue @@ -0,0 +1,44 @@ + + + diff --git a/src/views/sluice/runManage/dispatch/record/components/edit.vue b/src/views/sluice/runManage/dispatch/record/components/edit.vue index ce83172..eeb5f1c 100644 --- a/src/views/sluice/runManage/dispatch/record/components/edit.vue +++ b/src/views/sluice/runManage/dispatch/record/components/edit.vue @@ -1,80 +1,83 @@ - + diff --git a/src/views/sluice/runManage/dispatch/record/index.vue b/src/views/sluice/runManage/dispatch/record/index.vue index efd257d..2f6626f 100644 --- a/src/views/sluice/runManage/dispatch/record/index.vue +++ b/src/views/sluice/runManage/dispatch/record/index.vue @@ -1,29 +1,29 @@