From e77d8a24d84ddee103c4d166be1732a04d0c5868 Mon Sep 17 00:00:00 2001 From: hxh <762326930@qq.com> Date: Fri, 22 Mar 2024 11:28:20 +0800 Subject: [PATCH 1/5] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=B7=A1=E8=A7=86?= =?UTF-8?q?=E6=A3=80=E6=9F=A5=E6=96=B0=E5=A2=9E=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/dike/index.js | 9 ++++++++ src/api/sluice/index.js | 9 +++++++- .../inspectionItems/inspectionItemDetails.vue | 19 ++++++++++++---- .../inspectionItems/inspectionItemDetails.vue | 22 ++++++++++++++----- 4 files changed, 49 insertions(+), 10 deletions(-) diff --git a/src/api/dike/index.js b/src/api/dike/index.js index 2d7b014..0326b69 100644 --- a/src/api/dike/index.js +++ b/src/api/dike/index.js @@ -19,6 +19,15 @@ export function getInspectionProjectDetails(id) { }) } +// 巡查项目管理-新增巡视检查 +export function postInspectionProjectData(data) { + return request({ + url: '/run/df/checking', + method: 'post', + data + }) +} + // 巡查项目管理-修改巡视检查 export function putInspectionProjectData(data) { return request({ diff --git a/src/api/sluice/index.js b/src/api/sluice/index.js index fce7e73..fb4c9d3 100644 --- a/src/api/sluice/index.js +++ b/src/api/sluice/index.js @@ -18,7 +18,14 @@ export function getInspectionProjectDetails(id) { method: 'get', }) } - +// 巡查项目管理-新增巡视检查 +export function postInspectionProjectData(data) { + return request({ + url: '/run/sz/checking', + method: 'post', + data + }) +} // 巡查项目管理-修改巡视检查 export function putInspectionProjectData(data) { return request({ diff --git a/src/views/dike/runManage/enginerring/inspectionItems/inspectionItemDetails.vue b/src/views/dike/runManage/enginerring/inspectionItems/inspectionItemDetails.vue index 5d0af07..b45c07a 100644 --- a/src/views/dike/runManage/enginerring/inspectionItems/inspectionItemDetails.vue +++ b/src/views/dike/runManage/enginerring/inspectionItems/inspectionItemDetails.vue @@ -177,6 +177,7 @@ import { intersection } from "lodash"; import { putInspectionProjectData, + postInspectionProjectData, getCheckingDictTree, getInspectionProjectDetails, } from "@/api/dike"; @@ -288,14 +289,24 @@ export default { this.$message.error("请选择巡检类型"); return; } + this.formData.items = this.getCheckData(this.xcTreeData); + if (this.$route.query.id) { this.formData.id = this.$route.query.id; } - this.formData.items = this.getCheckData(this.xcTreeData); - putInspectionProjectData(this.formData).then(() => { + + if(this.formData.id){ + putInspectionProjectData(this.formData).then((res) => { this.$message.success("保存成功"); - // this.$router.go(-1); - }); + }); + } else{ + postInspectionProjectData(this.formData).then((res) => { + if (res.data?.id) { + this.formData.id = res.data.id; + } + this.$message.success("保存成功"); + }); + } }, }, mounted() { diff --git a/src/views/sluice/runManage/enginerring/inspectionItems/inspectionItemDetails.vue b/src/views/sluice/runManage/enginerring/inspectionItems/inspectionItemDetails.vue index 9047b7b..086abe0 100644 --- a/src/views/sluice/runManage/enginerring/inspectionItems/inspectionItemDetails.vue +++ b/src/views/sluice/runManage/enginerring/inspectionItems/inspectionItemDetails.vue @@ -177,6 +177,7 @@ import { intersection } from "lodash"; import { putInspectionProjectData, + postInspectionProjectData, getCheckingDictTree, getInspectionProjectDetails, } from "@/api/sluice"; @@ -290,14 +291,25 @@ export default { this.$message.error("请选择巡检类型"); return; } + this.formData.items = this.getCheckData(this.xcTreeData); + if (this.$route.query.id) { this.formData.id = this.$route.query.id; - } - this.formData.items = this.getCheckData(this.xcTreeData); - putInspectionProjectData(this.formData).then(() => { + } + + if (this.formData.id){ + putInspectionProjectData(this.formData).then(() => { this.$message.success("保存成功"); - // this.$router.go(-1); - }); + }); + }else { + postInspectionProjectData(this.formData).then((res) => { + if (res.data?.id) { + this.formData.id = res.data.id; + } + this.$message.success("保存成功"); + }); + } + }, }, mounted() { From b34c6cae6c7b68b234e4204c239f45f6a21c5e73 Mon Sep 17 00:00:00 2001 From: hxh <762326930@qq.com> Date: Fri, 22 Mar 2024 11:37:21 +0800 Subject: [PATCH 2/5] =?UTF-8?q?fix:=20=E5=B7=A1=E6=A3=80=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=80=BC=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dike/runManage/enginerring/inspectionPlan/index.vue | 8 ++++---- .../sluice/runManage/enginerring/inspectionPlan/index.vue | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/views/dike/runManage/enginerring/inspectionPlan/index.vue b/src/views/dike/runManage/enginerring/inspectionPlan/index.vue index 3afd165..d360dec 100644 --- a/src/views/dike/runManage/enginerring/inspectionPlan/index.vue +++ b/src/views/dike/runManage/enginerring/inspectionPlan/index.vue @@ -35,8 +35,8 @@ export default { type: "", xcId: "", frequency: "", - cycleType: "", - isReminder: false, + cycleType: "0", + isReminder: true, reminderTime: "", operators: [], files: [], //依据 @@ -222,8 +222,8 @@ export default { type: "", xcId: "", frequency: "", - cycleType: "", - isReminder: false, + cycleType: "0", + isReminder: true, reminderTime: "", operators: [], otherConfig: { diff --git a/src/views/sluice/runManage/enginerring/inspectionPlan/index.vue b/src/views/sluice/runManage/enginerring/inspectionPlan/index.vue index a10e5a5..40a2f96 100644 --- a/src/views/sluice/runManage/enginerring/inspectionPlan/index.vue +++ b/src/views/sluice/runManage/enginerring/inspectionPlan/index.vue @@ -35,8 +35,8 @@ export default { type: "", xcId: "", frequency: "", - cycleType: "", - isReminder: false, + cycleType: "0", + isReminder: true, reminderTime: "", operators: [], files: [], //依据 @@ -224,8 +224,8 @@ export default { type: "", xcId: "", frequency: "", - cycleType: "", - isReminder: false, + cycleType: "0", + isReminder: true, reminderTime: "", operators: [], otherConfig: { From 6b22256b992b5ff1897c8756993e31f4e359280a Mon Sep 17 00:00:00 2001 From: chenhaojie Date: Fri, 22 Mar 2024 11:42:41 +0800 Subject: [PATCH 3/5] =?UTF-8?q?feat:=20=E6=8B=93=E5=B1=95=E5=9B=BE?= =?UTF-8?q?=E5=B1=82=E8=B5=84=E6=BA=90=E9=85=8D=E7=BD=AE=E7=9A=84=E6=89=A9?= =?UTF-8?q?=E5=B1=95=E5=AD=97=E6=AE=B5=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../layerManage/resource/LayerDetails.vue | 304 +++++++++++++----- 1 file changed, 224 insertions(+), 80 deletions(-) diff --git a/src/views/aiSupervision/layerManage/resource/LayerDetails.vue b/src/views/aiSupervision/layerManage/resource/LayerDetails.vue index d5f7fdb..72c2ceb 100644 --- a/src/views/aiSupervision/layerManage/resource/LayerDetails.vue +++ b/src/views/aiSupervision/layerManage/resource/LayerDetails.vue @@ -19,70 +19,134 @@
添加图层 - - - - - - + + + + + + + + - - - - - - - - - - - - - -
- + + + + + + + + + - {{ editDataInfoForm.relationStyleName ? editDataInfoForm.relationStyleName : '点击选择样式' }} - - 取消选择样式 + + +
+ + {{ editDataInfoForm.relationStyleName ? editDataInfoForm.relationStyleName : '点击选择样式' }} + + 取消选择样式 +
+ + + + + +
+ 添加 + 删除
- - - + + + + + + + + + + + + + + + + +
取 消 @@ -188,9 +252,32 @@ export default { }, dialogFormVisible: false, //是否显示对话框 keyword: '', - styleDialogVisible: false //是否显示样式选择对话框 + styleDialogVisible: false, //是否显示样式选择对话框 + activeName: '1', + extendTable: [], + multipleSelection: [] }; }, + watch: { + keyword() { + this.debouncedGetLayerList(); + }, + dialogFormVisible(val) { + if (val === false) { + this.initData(); + } + } + }, + created() { + // 使用 lodash 的 debounce 函数创建防抖版本 + this.debouncedGetLayerList = debounce(this.getLayerList, 500); + + getDirectoryByIdApi(this.$route.query.id).then((res) => { + this.directoryInfo = res.data.children[0]; + this.initData(); + this.getLayerList(); + }); + }, methods: { goBack() { this.$router.go(-1); @@ -204,6 +291,7 @@ export default { this.editDataInfoForm.serviceIndex = row.serviceIndex; this.editDataInfoForm.relationStyleId = row.relationStyleId; this.editDataInfoForm.relationStyleName = row.relationStyleName; + this.extendTable = (row.extendData && JSON.parse(row.extendData)) || []; this.dialogTitle = '编辑图层'; this.dialogFormVisible = true; }, @@ -259,7 +347,11 @@ export default { }); return; } - await saveOrUpdateLayerApi(this.editDataInfoForm); + const params = { + ...this.editDataInfoForm, + extendData: JSON.stringify(this.extendTable) + }; + await saveOrUpdateLayerApi(params); this.getLayerList(); this.dialogFormVisible = false; }, @@ -284,26 +376,73 @@ export default { this.editDataInfoForm.dirNames = this.directoryInfo.name; this.editDataInfoForm.tileSize = '256'; this.dialogTitle = '添加图层'; - } - }, - created() { - // 使用 lodash 的 debounce 函数创建防抖版本 - this.debouncedGetLayerList = debounce(this.getLayerList, 500); - - getDirectoryByIdApi(this.$route.query.id).then((res) => { - this.directoryInfo = res.data.children[0]; - this.initData(); - this.getLayerList(); - }); - }, - watch: { - keyword() { - this.debouncedGetLayerList(); }, - dialogFormVisible(val) { - if (val === false) { - this.initData(); + addRow() { + const editRow = this.extendTable.find((item) => item.isEdit); + if (editRow) { + this.$message({ + type: 'info', + message: '请先保存当前编辑行' + }); + return; + } + this.extendTable.push({ + id: '', + field: '', + alias: '', + value: '', + isEdit: true + }); + }, + deleteRow(index) { + this.$messageBox + .confirm('是否删除该行数据?', '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }) + .then(() => { + if (index !== undefined) { + this.extendTable.splice(index, 1); + } else { + this.extendTable = this.extendTable.filter((item) => !this.multipleSelection.includes(item)); + } + }) + .catch(() => { + this.$message({ + type: 'info', + message: '已取消删除' + }); + }); + }, + editRow(index) { + this.extendTable[index].isEdit = true; + }, + cancelRow(index) { + if (!this.extendTable[index].id) { + this.extendTable.splice(index, 1); + } else { + this.extendTable[index].isEdit = false; + } + }, + saveRow(index) { + if (!this.extendTable[index].id) { + this.extendTable[index].id = sycim.Cesium.createGuid(); } + // 表格名字校验不重复 + const name = this.extendTable[index].field; + const isRepeat = this.extendTable.some((item, i) => item.field === name && i !== index); + if (isRepeat) { + this.$message({ + type: 'info', + message: '字段名称重复，请重新输入' + }); + return; + } + this.extendTable[index].isEdit = false; + }, + handleSelectionChange(val) { + this.multipleSelection = val; } } }; @@ -402,4 +541,9 @@ header { } } } +.el-dialog { + .fn-btns { + margin-bottom: 10px; + } +} From 83e988aad14a296487e6550418c67e90c47ba33c Mon Sep 17 00:00:00 2001 From: hxh <762326930@qq.com> Date: Fri, 22 Mar 2024 13:57:57 +0800 Subject: [PATCH 4/5] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E9=80=80=E5=87=BA?= =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/layout/components/Navbar.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue index d71f8c5..750c495 100644 --- a/src/layout/components/Navbar.vue +++ b/src/layout/components/Navbar.vue @@ -149,7 +149,7 @@ export default { type: "warning", }).then(() => { this.$store.dispatch("LogOut").then(() => { - location.href = "/index"; + location.href = "/"; }); }); }, From 3cc7008f16d72db5053babb21bba9f5df5d0f562 Mon Sep 17 00:00:00 2001 From: yantingyu <1904823781@qq.com> Date: Fri, 22 Mar 2024 14:12:45 +0800 Subject: [PATCH 5/5] =?UTF-8?q?fix:=20=E3=80=90=E6=B0=B4=E9=97=B8=E3=80=81?= =?UTF-8?q?=E5=A0=A4=E9=98=B2-=E6=B0=B4=E9=9B=A8=E6=83=85=E6=99=BA?= =?UTF-8?q?=E8=83=BD=E5=88=86=E6=9E=90=E3=80=91=E6=8A=98=E7=BA=BF=E5=9B=BE?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=83=A8=E5=88=86=EF=BC=8C=E9=BC=A0=E6=A0=87?= =?UTF-8?q?=E7=A7=BB=E5=85=A5=E5=90=8E=E5=87=BA=E7=8E=B0=E7=82=B9=E4=BD=8D?= =?UTF-8?q?=E5=81=8F=E7=A7=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../waterRainReport/smartAnalyse/index.vue | 32 ++++++++++++--- .../waterRainReport/smartAnalyse/index.vue | 39 +++++++++++++++---- 2 files changed, 58 insertions(+), 13 deletions(-) diff --git a/src/views/dike/runManage/waterRainReport/smartAnalyse/index.vue b/src/views/dike/runManage/waterRainReport/smartAnalyse/index.vue index b889514..f4982b2 100644 --- a/src/views/dike/runManage/waterRainReport/smartAnalyse/index.vue +++ b/src/views/dike/runManage/waterRainReport/smartAnalyse/index.vue @@ -76,8 +76,8 @@ {{ analysisData.exceedGateFlowCount }}
-
-
+
+
@@ -114,7 +114,11 @@ export default { exceedWarningCount: 0, // 高于警戒水位次数 exceedRainfallCount: 0, // 降雨量超过50mm/h次数 exceedGateFlowCount: 0 // 当天总过闸流量高于100m³次数 - } + }, + currentDike: null, + zoom: 1, + levelChart:null, + flowChart:null }; }, @@ -163,6 +167,7 @@ export default { }, // 选择一个堤坝数据行 handleRowChange(row) { + this.currentDike = row; getDikeExceedApi(row.dikeCode).then((res) => { if (!res.success) return; const data = res.data; @@ -176,7 +181,9 @@ export default { getRainfallAndGateFlowApi(row.dikeCode).then((res) => { if (!res.success) return; const data = res.data.rainfallAndGateFlowMap; //{2024-03-04:{rainfall: '0.0', gateFlow: '0.0'}......} - this.$echarts.init(this.$refs['water-flow']).setOption({ + if(this.flowChart) this.flowChart.dispose(); + this.flowChart = this.$echarts.init(document.getElementById('water-flow')) + this.flowChart.setOption({ title: { text: '流量监测', textStyle: { @@ -255,12 +262,17 @@ export default { } ] }); + this.$nextTick(() => { + this.flowChart.resize(); + }); }); getWaterLevelInfoApi(row.dikeCode).then((res) => { if (!res.success) return; let data = res.data.waterLevelMap; // {2024-03-04:{waterLevel: '0.0', floodLevel: '12', warningLevel: '38'}.....} - this.$echarts.init(this.$refs['water-level']).setOption({ + if(this.levelChart) this.levelChart.dispose(); + this.levelChart = this.$echarts.init(document.getElementById('water-level')) + this.levelChart.setOption({ title: { text: '水位监测', textStyle: { @@ -333,14 +345,24 @@ export default { } ] }); + this.$nextTick(() => { + this.levelChart.resize(); + }); }); } }, async mounted() { + this.zoom = 1 / document.body.style.zoom; await this.getDikeStatisticalList(); this.getAreasOptions(); this.$refs.table.setCurrentRow(this.tableData[0]); //隐式触发了handleRowChange + + window.onresize = ()=> { + this.zoom = 1 / document.body.style.zoom; + this.handleRowChange(this.currentDike) + }; + } }; diff --git a/src/views/sluice/runManage/waterRainReport/smartAnalyse/index.vue b/src/views/sluice/runManage/waterRainReport/smartAnalyse/index.vue index 6da8619..114f2cc 100644 --- a/src/views/sluice/runManage/waterRainReport/smartAnalyse/index.vue +++ b/src/views/sluice/runManage/waterRainReport/smartAnalyse/index.vue @@ -76,8 +76,8 @@ {{ analysisData.exceedGateFlowCount }} -
-
+
+
@@ -114,7 +114,11 @@ export default { exceedWarningCount: 0, // 高于警戒水位次数 exceedRainfallCount: 0, // 降雨量超过50mm/h次数 exceedGateFlowCount: 0 // 当天总过闸流量高于100m³次数 - } + }, + currentSluice:null, //当前水闸 + zoom: 1, + flowChart: null, + levelChart: null, }; }, @@ -126,7 +130,7 @@ export default { pageNum: this.pageConfig.pageNum, data: { basin: this.basin, - adcd: this.region //区域筛选 + adcd: this.region, //区域筛选 } }; const res = await getSluiceStatisticalListApi(params); @@ -163,6 +167,7 @@ export default { }, // 选择一个水闸数据行 handleRowChange(row) { + this.currentSluice = row; getSluiceExceedApi(row.wagaCode).then((res) => { if (!res.success) return; const data = res.data; @@ -176,7 +181,9 @@ export default { getRainfallAndGateFlowApi(row.wagaCode).then((res) => { if (!res.success) return; const data = res.data.rainfallAndGateFlowMap; //{2024-03-04:{rainfall: '0.0', gateFlow: '0.0'}......} - this.$echarts.init(this.$refs['water-flow']).setOption({ + if(this.flowChart) this.flowChart.dispose(); + this.flowChart = this.$echarts.init(document.getElementById('water-flow')); + this.flowChart.setOption({ title: { text: '流量监测', textStyle: { @@ -186,7 +193,8 @@ export default { } }, tooltip: { - trigger: 'axis' + trigger: 'axis', + // show:false }, legend: { right: 'center', @@ -255,12 +263,17 @@ export default { } ] }); + this.$nextTick(() => { + this.flowChart.resize(); + }); }); getWaterLevelInfoApi(row.wagaCode).then((res) => { if (!res.success) return; let data = res.data.waterLevelMap; // {2024-03-04:{waterLevel: '0.0', floodLevel: '12', warningLevel: '38'}.....} - this.$echarts.init(this.$refs['water-level']).setOption({ + if(this.levelChart) this.flowChart.dispose(); + this.levelChart = this.$echarts.init(document.getElementById('water-level')); + this.levelChart.setOption({ title: { text: '水位监测', textStyle: { @@ -270,7 +283,8 @@ export default { } }, tooltip: { - trigger: 'axis' + trigger: 'axis', + // show:false }, legend: { right: 'center', @@ -333,14 +347,23 @@ export default { } ] }); + this.$nextTick(() => { + this.levelChart.resize(); + }); }); } }, async mounted() { + this.zoom = 1 / document.body.style.zoom; await this.getSluiceStatisticalList(); this.getAreasOptions(); this.$refs.table.setCurrentRow(this.tableData[0]); //隐式触发了handleRowChange + + window.onresize = ()=> { + this.zoom = 1 / document.body.style.zoom; + this.handleRowChange(this.currentSluice) + }; } };