From ce8855d3c22da4463589c289d2370ab0ea2ca7de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=89=88=E5=85=86=E5=A2=9E?= <你的邮箱@example.com> Date: Tue, 16 Jun 2026 11:36:17 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B0=B4=E6=B8=A9=E5=9E=82?= =?UTF-8?q?=E5=90=91=E5=8F=B3=E4=BE=A7=E7=82=B9=E5=87=BB,=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E5=BD=95=E5=83=8F=E8=A7=86=E9=A2=91=E5=92=8C=E5=BB=BA?= =?UTF-8?q?=E8=AE=BE=E7=8A=B6=E6=80=81=EF=BC=8Cbug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/api/mapModal/index.ts | 18 + .../components/MapModal/components/DZGJ.vue | 12 +- .../MapModal/components/EcologicalFlow.vue | 5 + .../MapModal/components/Ecology.vue | 6 +- .../components/FishFacilityBuildState.vue | 355 +++ .../MapModal/components/FlowMeasure.vue | 7 + .../MapModal/components/NoLiveVideo.vue | 396 +++ .../components/NormalDataMonitoring2.vue | 24 +- .../components/VerticalWaterTemperature.vue | 6 + .../MapModal/components/WaterTemperature.vue | 8 + .../components/WaterTemperatureRep.vue | 13 +- frontend/src/components/MapModal/index.vue | 43 +- .../src/components/SidePanelItem/index.vue | 1455 ++++++----- frontend/src/components/gis/map.class.ts | 1 + frontend/src/components/gis/map.ol.ts | 88 +- .../components/gis/ol/point-layer-manager.ts | 29 + .../src/components/gis/ol/popup-manager.ts | 208 ++ .../chuixiangshuiwenChangeMod/index.vue | 271 ++- .../src/modules/churukushuiwenMod/index.vue | 1067 ++++---- .../map/application/map-orchestrator.ts | 23 +- .../monthlyAverage.vue | 99 +- .../modules/qixidiliuliangbianhua/index.vue | 1397 +++++------ .../modules/qixidishuiwenbianhua/index.vue | 1098 +++++---- .../TwoLayers/yaerAverage.vue | 6 +- .../src/modules/shuiWenNianNeiFenBu/index.vue | 961 ++++---- frontend/src/modules/waterQuality/index.vue | 2161 +++++++++-------- .../yanchengshuiwenChangeMod/index.vue | 350 +-- 27 files changed, 5926 insertions(+), 4181 deletions(-) create mode 100644 frontend/src/components/MapModal/components/FishFacilityBuildState.vue create mode 100644 frontend/src/components/MapModal/components/NoLiveVideo.vue diff --git a/frontend/src/api/mapModal/index.ts b/frontend/src/api/mapModal/index.ts index 3d57ef3b..1cb7afb2 100644 --- a/frontend/src/api/mapModal/index.ts +++ b/frontend/src/api/mapModal/index.ts @@ -91,6 +91,24 @@ export function getVideoList(data: any) { data }); } +// 录像视频 - 时间查询 没接 +export function getNoLiveVideoYear(data: any) { + return request({ + url: '/wmp-env-server/env/vd/GetKendoListCust', + method: 'post', + data + }); +} + +// 录像视频 +export function getNoLiveVideoList(data: any) { + return request({ + url: '/wmp-env-server/env/vd/runData/GetKendoListCust', + method: 'post', + data + }); +} + // 实时视频单个查询 export function getVideoDetail(data: any) { return request({ diff --git a/frontend/src/components/MapModal/components/DZGJ.vue b/frontend/src/components/MapModal/components/DZGJ.vue index 0cd90d1d..d31327e3 100644 --- a/frontend/src/components/MapModal/components/DZGJ.vue +++ b/frontend/src/components/MapModal/components/DZGJ.vue @@ -74,11 +74,6 @@ const baseColumns = [ dataIndex: 'rowId', width: 60 }, - { - title: '告警设施', - dataIndex: 'stnm', - width: 220 - }, { title: '告警时间', dataIndex: 'tms', @@ -91,12 +86,7 @@ const baseColumns = [ width: 120 }, { - title: '监测要素', - dataIndex: 'ysName', - width: 120 - }, - { - title: '判断标准', + title: '限值(m³/s)', dataIndex: 'bzz', width: 120 }, diff --git a/frontend/src/components/MapModal/components/EcologicalFlow.vue b/frontend/src/components/MapModal/components/EcologicalFlow.vue index a1f94f26..3393e6b1 100644 --- a/frontend/src/components/MapModal/components/EcologicalFlow.vue +++ b/frontend/src/components/MapModal/components/EcologicalFlow.vue @@ -21,6 +21,11 @@
+ = { }, { title: '性腺发育期', - dataIndex: 'fwgh', + dataIndex: 'st', width: 140 }, { title: '早期资源量和种类', - dataIndex: 'fwgh', + dataIndex: 'ps', width: 220 }, { @@ -203,7 +203,7 @@ const columnsMap: Record = { }, { title: '电导率(μS/cm)', - dataIndex: 'tm', + dataIndex: 'cond', width: 180 } ], diff --git a/frontend/src/components/MapModal/components/FishFacilityBuildState.vue b/frontend/src/components/MapModal/components/FishFacilityBuildState.vue new file mode 100644 index 00000000..df4c92f1 --- /dev/null +++ b/frontend/src/components/MapModal/components/FishFacilityBuildState.vue @@ -0,0 +1,355 @@ + + + + + diff --git a/frontend/src/components/MapModal/components/FlowMeasure.vue b/frontend/src/components/MapModal/components/FlowMeasure.vue index ad36ad53..b3908191 100644 --- a/frontend/src/components/MapModal/components/FlowMeasure.vue +++ b/frontend/src/components/MapModal/components/FlowMeasure.vue @@ -472,6 +472,13 @@ const handleSearch = () => fetchData(); const initData = () => { if (hasLoaded.value) return; + console.log(modelStore.filter.rangeTm); + if (modelStore.filter.rangeTm.length > 0) { + dateRange.value = [ + dayjs(modelStore.filter.rangeTm[0]), + dayjs(modelStore.filter.rangeTm[1]) + ]; + } nextTick(() => initChart()); fetchData(); hasLoaded.value = true; diff --git a/frontend/src/components/MapModal/components/NoLiveVideo.vue b/frontend/src/components/MapModal/components/NoLiveVideo.vue new file mode 100644 index 00000000..17b5eb60 --- /dev/null +++ b/frontend/src/components/MapModal/components/NoLiveVideo.vue @@ -0,0 +1,396 @@ + + + + + diff --git a/frontend/src/components/MapModal/components/NormalDataMonitoring2.vue b/frontend/src/components/MapModal/components/NormalDataMonitoring2.vue index a2d276e5..d7304cb6 100644 --- a/frontend/src/components/MapModal/components/NormalDataMonitoring2.vue +++ b/frontend/src/components/MapModal/components/NormalDataMonitoring2.vue @@ -103,13 +103,13 @@ const tableColumns = ref([ String(record.tecnt).trim() !== '' ? record.tecnt : '-'; - const transplant = - record?.transplant !== undefined && - record?.transplant !== null && - String(record.transplant).trim() !== '' - ? record.transplant + const plantask = + record?.plantask !== undefined && + record?.plantask !== null && + String(record.plplantask).trim() !== '' + ? record.plplantask : '-'; - return `${tecnt}/${transplant}`; + return `${tecnt}/${plantask}`; } }, { @@ -123,13 +123,13 @@ const tableColumns = ref([ String(record.surnum).trim() !== '' ? record.surnum : '-'; - const plantask = - record?.plantask !== undefined && - record?.plantask !== null && - String(record.plantask).trim() !== '' - ? record.plantask + const transplant = + record?.transplant !== undefined && + record?.transplant !== null && + String(record.transplant).trim() !== '' + ? record.transplant : '-'; - return `${surnum}/${plantask}`; + return `${surnum}/${transplant}`; } }, { diff --git a/frontend/src/components/MapModal/components/VerticalWaterTemperature.vue b/frontend/src/components/MapModal/components/VerticalWaterTemperature.vue index 7c9b25fe..2d3c665e 100644 --- a/frontend/src/components/MapModal/components/VerticalWaterTemperature.vue +++ b/frontend/src/components/MapModal/components/VerticalWaterTemperature.vue @@ -479,6 +479,12 @@ const handleSearch = () => fetchData(); const initData = () => { if (hasLoaded.value) return; nextTick(() => { + if (modelStore.filter.rangeTm.length > 0) { + dateRange.value = [ + dayjs(modelStore.filter.rangeTm[0]), + dayjs(modelStore.filter.rangeTm[1]) + ]; + } if (chartRef.value && !chartInstance) chartInstance = echarts.init(chartRef.value); }); diff --git a/frontend/src/components/MapModal/components/WaterTemperature.vue b/frontend/src/components/MapModal/components/WaterTemperature.vue index 497c806f..15c238e0 100644 --- a/frontend/src/components/MapModal/components/WaterTemperature.vue +++ b/frontend/src/components/MapModal/components/WaterTemperature.vue @@ -903,7 +903,15 @@ const handleExport = () => { const initData = () => { if (hasLoaded.value) return; + console.log('modelStore.filter.rangeTm:', modelStore.filter.rangeTm); + nextTick(() => { + if (modelStore.filter.rangeTm.length > 0) { + dateRange.value = [ + dayjs(modelStore.filter.rangeTm[0]), + dayjs(modelStore.filter.rangeTm[1]) + ]; + } if (chartRef.value && !chartInstance) chartInstance = echarts.init(chartRef.value); }); diff --git a/frontend/src/components/MapModal/components/WaterTemperatureRep.vue b/frontend/src/components/MapModal/components/WaterTemperatureRep.vue index 63fca633..a7334bb2 100644 --- a/frontend/src/components/MapModal/components/WaterTemperatureRep.vue +++ b/frontend/src/components/MapModal/components/WaterTemperatureRep.vue @@ -37,7 +37,12 @@