diff --git a/src/api/FloodControlAndDrainage.js b/src/api/FloodControlAndDrainage.js index b09c9df..52091a4 100644 --- a/src/api/FloodControlAndDrainage.js +++ b/src/api/FloodControlAndDrainage.js @@ -364,6 +364,14 @@ method: 'get', }); } +// 查询基础数据-水系汇水分区详情 +export function lakeInfoGetWaterRegion(query) { + return request({ + url: `/business/lakeInfo/getWaterRegion`, + method: 'get', + params: query, + }); +} // 查询河湖水情 有哪些泵站 export function rainWaterPumpStationInfoList(query) { return request({ diff --git a/src/api/FloodControlAndDrainage.js b/src/api/FloodControlAndDrainage.js index b09c9df..52091a4 100644 --- a/src/api/FloodControlAndDrainage.js +++ b/src/api/FloodControlAndDrainage.js @@ -364,6 +364,14 @@ method: 'get', }); } +// 查询基础数据-水系汇水分区详情 +export function lakeInfoGetWaterRegion(query) { + return request({ + url: `/business/lakeInfo/getWaterRegion`, + method: 'get', + params: query, + }); +} // 查询河湖水情 有哪些泵站 export function rainWaterPumpStationInfoList(query) { return request({ diff --git a/src/views/pictureOnMap/index.vue b/src/views/pictureOnMap/index.vue index 919a6e1..86ae337 100644 --- a/src/views/pictureOnMap/index.vue +++ b/src/views/pictureOnMap/index.vue @@ -487,14 +487,15 @@ Getproperties.value.stCode = item.stCode || item.siteCode || item.lakeCode; Getproperties.value.dataCode = item.dataCode; Getproperties.value.wellcode = item.wellCode || item.dataName || item.pipeLine; - Getproperties.value.id = item.relationId||item.id; //item.relationId监测告警的普通id + Getproperties.value.id =item.id; + Getproperties.value.gwMonitorId =item.gwMonitorId||item.id; //管网坡面 Getproperties.value.dataId = item.dataId || ""; Getproperties.value.stType = item.stType; Getproperties.value.geometry = item.geometry || item.geometrys||''; // Terraformer.WKT.convert(turf.point(item.lonLat.split(",").map(Number)).geometry); - Getproperties.value.waterRegionCode = item.waterRegionCode || item.lakeCode; //河湖水情 查询水系分区详情 + Getproperties.value.waterRegionCode =item.lakeCode ||item.waterRegionCode ; //河湖水情 查询水系分区详情 Getproperties.value.GWDADataNow = item.GWDADataNow ? item.GWDADataNow : false; if (item.daterange) { Getproperties.value.daterange = item.daterange; diff --git a/src/api/FloodControlAndDrainage.js b/src/api/FloodControlAndDrainage.js index b09c9df..52091a4 100644 --- a/src/api/FloodControlAndDrainage.js +++ b/src/api/FloodControlAndDrainage.js @@ -364,6 +364,14 @@ method: 'get', }); } +// 查询基础数据-水系汇水分区详情 +export function lakeInfoGetWaterRegion(query) { + return request({ + url: `/business/lakeInfo/getWaterRegion`, + method: 'get', + params: query, + }); +} // 查询河湖水情 有哪些泵站 export function rainWaterPumpStationInfoList(query) { return request({ diff --git a/src/views/pictureOnMap/index.vue b/src/views/pictureOnMap/index.vue index 919a6e1..86ae337 100644 --- a/src/views/pictureOnMap/index.vue +++ b/src/views/pictureOnMap/index.vue @@ -487,14 +487,15 @@ Getproperties.value.stCode = item.stCode || item.siteCode || item.lakeCode; Getproperties.value.dataCode = item.dataCode; Getproperties.value.wellcode = item.wellCode || item.dataName || item.pipeLine; - Getproperties.value.id = item.relationId||item.id; //item.relationId监测告警的普通id + Getproperties.value.id =item.id; + Getproperties.value.gwMonitorId =item.gwMonitorId||item.id; //管网坡面 Getproperties.value.dataId = item.dataId || ""; Getproperties.value.stType = item.stType; Getproperties.value.geometry = item.geometry || item.geometrys||''; // Terraformer.WKT.convert(turf.point(item.lonLat.split(",").map(Number)).geometry); - Getproperties.value.waterRegionCode = item.waterRegionCode || item.lakeCode; //河湖水情 查询水系分区详情 + Getproperties.value.waterRegionCode =item.lakeCode ||item.waterRegionCode ; //河湖水情 查询水系分区详情 Getproperties.value.GWDADataNow = item.GWDADataNow ? item.GWDADataNow : false; if (item.daterange) { Getproperties.value.daterange = item.daterange; diff --git a/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaohuigu/MonitoringWarningRigh/components/shuiqing.vue b/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaohuigu/MonitoringWarningRigh/components/shuiqing.vue index 2b9dcc6..8d74108 100644 --- a/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaohuigu/MonitoringWarningRigh/components/shuiqing.vue +++ b/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaohuigu/MonitoringWarningRigh/components/shuiqing.vue @@ -219,6 +219,8 @@ if(num==2){ item.stType="rainwater_pipeline_quality" item.dataCode="pipePoint" + item.gwMonitorId=item.id + item.daterange=[`${props.day} 08:00:00`,`${proxy.moment(props.day).add(1, "days").format("YYYY-MM-DD")} 08:00:00`] _bus.emit("DynamicBus", item); } diff --git a/src/api/FloodControlAndDrainage.js b/src/api/FloodControlAndDrainage.js index b09c9df..52091a4 100644 --- a/src/api/FloodControlAndDrainage.js +++ b/src/api/FloodControlAndDrainage.js @@ -364,6 +364,14 @@ method: 'get', }); } +// 查询基础数据-水系汇水分区详情 +export function lakeInfoGetWaterRegion(query) { + return request({ + url: `/business/lakeInfo/getWaterRegion`, + method: 'get', + params: query, + }); +} // 查询河湖水情 有哪些泵站 export function rainWaterPumpStationInfoList(query) { return request({ diff --git a/src/views/pictureOnMap/index.vue b/src/views/pictureOnMap/index.vue index 919a6e1..86ae337 100644 --- a/src/views/pictureOnMap/index.vue +++ b/src/views/pictureOnMap/index.vue @@ -487,14 +487,15 @@ Getproperties.value.stCode = item.stCode || item.siteCode || item.lakeCode; Getproperties.value.dataCode = item.dataCode; Getproperties.value.wellcode = item.wellCode || item.dataName || item.pipeLine; - Getproperties.value.id = item.relationId||item.id; //item.relationId监测告警的普通id + Getproperties.value.id =item.id; + Getproperties.value.gwMonitorId =item.gwMonitorId||item.id; //管网坡面 Getproperties.value.dataId = item.dataId || ""; Getproperties.value.stType = item.stType; Getproperties.value.geometry = item.geometry || item.geometrys||''; // Terraformer.WKT.convert(turf.point(item.lonLat.split(",").map(Number)).geometry); - Getproperties.value.waterRegionCode = item.waterRegionCode || item.lakeCode; //河湖水情 查询水系分区详情 + Getproperties.value.waterRegionCode =item.lakeCode ||item.waterRegionCode ; //河湖水情 查询水系分区详情 Getproperties.value.GWDADataNow = item.GWDADataNow ? item.GWDADataNow : false; if (item.daterange) { Getproperties.value.daterange = item.daterange; diff --git a/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaohuigu/MonitoringWarningRigh/components/shuiqing.vue b/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaohuigu/MonitoringWarningRigh/components/shuiqing.vue index 2b9dcc6..8d74108 100644 --- a/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaohuigu/MonitoringWarningRigh/components/shuiqing.vue +++ b/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaohuigu/MonitoringWarningRigh/components/shuiqing.vue @@ -219,6 +219,8 @@ if(num==2){ item.stType="rainwater_pipeline_quality" item.dataCode="pipePoint" + item.gwMonitorId=item.id + item.daterange=[`${props.day} 08:00:00`,`${proxy.moment(props.day).add(1, "days").format("YYYY-MM-DD")} 08:00:00`] _bus.emit("DynamicBus", item); } diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/MonitoringAnalysisChart.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/MonitoringAnalysisChart.vue index 45e2825..4adccc8 100644 --- a/src/views/pictureOnMap/page/components/DialogTabs/component/MonitoringAnalysisChart.vue +++ b/src/views/pictureOnMap/page/components/DialogTabs/component/MonitoringAnalysisChart.vue @@ -192,7 +192,7 @@ top: nowSize(50, 1920), bottom: nowSize(40, 1920), //也可设置left和right设置距离来控制图表的大小 left: nowSize(40, 1920), - right: nowSize(10, 1920), + right: nowSize(20, 1920), containLabel: true, }, xAxis: [ diff --git a/src/api/FloodControlAndDrainage.js b/src/api/FloodControlAndDrainage.js index b09c9df..52091a4 100644 --- a/src/api/FloodControlAndDrainage.js +++ b/src/api/FloodControlAndDrainage.js @@ -364,6 +364,14 @@ method: 'get', }); } +// 查询基础数据-水系汇水分区详情 +export function lakeInfoGetWaterRegion(query) { + return request({ + url: `/business/lakeInfo/getWaterRegion`, + method: 'get', + params: query, + }); +} // 查询河湖水情 有哪些泵站 export function rainWaterPumpStationInfoList(query) { return request({ diff --git a/src/views/pictureOnMap/index.vue b/src/views/pictureOnMap/index.vue index 919a6e1..86ae337 100644 --- a/src/views/pictureOnMap/index.vue +++ b/src/views/pictureOnMap/index.vue @@ -487,14 +487,15 @@ Getproperties.value.stCode = item.stCode || item.siteCode || item.lakeCode; Getproperties.value.dataCode = item.dataCode; Getproperties.value.wellcode = item.wellCode || item.dataName || item.pipeLine; - Getproperties.value.id = item.relationId||item.id; //item.relationId监测告警的普通id + Getproperties.value.id =item.id; + Getproperties.value.gwMonitorId =item.gwMonitorId||item.id; //管网坡面 Getproperties.value.dataId = item.dataId || ""; Getproperties.value.stType = item.stType; Getproperties.value.geometry = item.geometry || item.geometrys||''; // Terraformer.WKT.convert(turf.point(item.lonLat.split(",").map(Number)).geometry); - Getproperties.value.waterRegionCode = item.waterRegionCode || item.lakeCode; //河湖水情 查询水系分区详情 + Getproperties.value.waterRegionCode =item.lakeCode ||item.waterRegionCode ; //河湖水情 查询水系分区详情 Getproperties.value.GWDADataNow = item.GWDADataNow ? item.GWDADataNow : false; if (item.daterange) { Getproperties.value.daterange = item.daterange; diff --git a/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaohuigu/MonitoringWarningRigh/components/shuiqing.vue b/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaohuigu/MonitoringWarningRigh/components/shuiqing.vue index 2b9dcc6..8d74108 100644 --- a/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaohuigu/MonitoringWarningRigh/components/shuiqing.vue +++ b/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaohuigu/MonitoringWarningRigh/components/shuiqing.vue @@ -219,6 +219,8 @@ if(num==2){ item.stType="rainwater_pipeline_quality" item.dataCode="pipePoint" + item.gwMonitorId=item.id + item.daterange=[`${props.day} 08:00:00`,`${proxy.moment(props.day).add(1, "days").format("YYYY-MM-DD")} 08:00:00`] _bus.emit("DynamicBus", item); } diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/MonitoringAnalysisChart.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/MonitoringAnalysisChart.vue index 45e2825..4adccc8 100644 --- a/src/views/pictureOnMap/page/components/DialogTabs/component/MonitoringAnalysisChart.vue +++ b/src/views/pictureOnMap/page/components/DialogTabs/component/MonitoringAnalysisChart.vue @@ -192,7 +192,7 @@ top: nowSize(50, 1920), bottom: nowSize(40, 1920), //也可设置left和right设置距离来控制图表的大小 left: nowSize(40, 1920), - right: nowSize(10, 1920), + right: nowSize(20, 1920), containLabel: true, }, xAxis: [ diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/guanlianjianceHeHu.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/guanlianjianceHeHu.vue index 124fbb9..4b7aa4a 100644 --- a/src/views/pictureOnMap/page/components/DialogTabs/component/guanlianjianceHeHu.vue +++ b/src/views/pictureOnMap/page/components/DialogTabs/component/guanlianjianceHeHu.vue @@ -65,7 +65,7 @@ :YAxis2="chartInfo2.YAxis2" :marklineJYL="chartInfo2.marklineJYL" :marklineSS="chartInfo2.marklineSS" - XnameTop="-480" + XnameTop="-490" /> diff --git a/src/api/FloodControlAndDrainage.js b/src/api/FloodControlAndDrainage.js index b09c9df..52091a4 100644 --- a/src/api/FloodControlAndDrainage.js +++ b/src/api/FloodControlAndDrainage.js @@ -364,6 +364,14 @@ method: 'get', }); } +// 查询基础数据-水系汇水分区详情 +export function lakeInfoGetWaterRegion(query) { + return request({ + url: `/business/lakeInfo/getWaterRegion`, + method: 'get', + params: query, + }); +} // 查询河湖水情 有哪些泵站 export function rainWaterPumpStationInfoList(query) { return request({ diff --git a/src/views/pictureOnMap/index.vue b/src/views/pictureOnMap/index.vue index 919a6e1..86ae337 100644 --- a/src/views/pictureOnMap/index.vue +++ b/src/views/pictureOnMap/index.vue @@ -487,14 +487,15 @@ Getproperties.value.stCode = item.stCode || item.siteCode || item.lakeCode; Getproperties.value.dataCode = item.dataCode; Getproperties.value.wellcode = item.wellCode || item.dataName || item.pipeLine; - Getproperties.value.id = item.relationId||item.id; //item.relationId监测告警的普通id + Getproperties.value.id =item.id; + Getproperties.value.gwMonitorId =item.gwMonitorId||item.id; //管网坡面 Getproperties.value.dataId = item.dataId || ""; Getproperties.value.stType = item.stType; Getproperties.value.geometry = item.geometry || item.geometrys||''; // Terraformer.WKT.convert(turf.point(item.lonLat.split(",").map(Number)).geometry); - Getproperties.value.waterRegionCode = item.waterRegionCode || item.lakeCode; //河湖水情 查询水系分区详情 + Getproperties.value.waterRegionCode =item.lakeCode ||item.waterRegionCode ; //河湖水情 查询水系分区详情 Getproperties.value.GWDADataNow = item.GWDADataNow ? item.GWDADataNow : false; if (item.daterange) { Getproperties.value.daterange = item.daterange; diff --git a/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaohuigu/MonitoringWarningRigh/components/shuiqing.vue b/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaohuigu/MonitoringWarningRigh/components/shuiqing.vue index 2b9dcc6..8d74108 100644 --- a/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaohuigu/MonitoringWarningRigh/components/shuiqing.vue +++ b/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaohuigu/MonitoringWarningRigh/components/shuiqing.vue @@ -219,6 +219,8 @@ if(num==2){ item.stType="rainwater_pipeline_quality" item.dataCode="pipePoint" + item.gwMonitorId=item.id + item.daterange=[`${props.day} 08:00:00`,`${proxy.moment(props.day).add(1, "days").format("YYYY-MM-DD")} 08:00:00`] _bus.emit("DynamicBus", item); } diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/MonitoringAnalysisChart.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/MonitoringAnalysisChart.vue index 45e2825..4adccc8 100644 --- a/src/views/pictureOnMap/page/components/DialogTabs/component/MonitoringAnalysisChart.vue +++ b/src/views/pictureOnMap/page/components/DialogTabs/component/MonitoringAnalysisChart.vue @@ -192,7 +192,7 @@ top: nowSize(50, 1920), bottom: nowSize(40, 1920), //也可设置left和right设置距离来控制图表的大小 left: nowSize(40, 1920), - right: nowSize(10, 1920), + right: nowSize(20, 1920), containLabel: true, }, xAxis: [ diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/guanlianjianceHeHu.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/guanlianjianceHeHu.vue index 124fbb9..4b7aa4a 100644 --- a/src/views/pictureOnMap/page/components/DialogTabs/component/guanlianjianceHeHu.vue +++ b/src/views/pictureOnMap/page/components/DialogTabs/component/guanlianjianceHeHu.vue @@ -65,7 +65,7 @@ :YAxis2="chartInfo2.YAxis2" :marklineJYL="chartInfo2.marklineJYL" :marklineSS="chartInfo2.marklineSS" - XnameTop="-480" + XnameTop="-490" /> diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/guanwangpoumian.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/guanwangpoumian.vue index cea2095..18afcf5 100644 --- a/src/views/pictureOnMap/page/components/DialogTabs/component/guanwangpoumian.vue +++ b/src/views/pictureOnMap/page/components/DialogTabs/component/guanwangpoumian.vue @@ -29,7 +29,7 @@ let params = { wellcode, // time:moment(props.Getproperties.daterange[0]).format("YYYY-MM-DD") - id: props.Getproperties.id, + id: props.Getproperties.gwMonitorId, }; getSectionByWellCodeDetail(params).then((res) => { if (res && res.code == 200) { diff --git a/src/api/FloodControlAndDrainage.js b/src/api/FloodControlAndDrainage.js index b09c9df..52091a4 100644 --- a/src/api/FloodControlAndDrainage.js +++ b/src/api/FloodControlAndDrainage.js @@ -364,6 +364,14 @@ method: 'get', }); } +// 查询基础数据-水系汇水分区详情 +export function lakeInfoGetWaterRegion(query) { + return request({ + url: `/business/lakeInfo/getWaterRegion`, + method: 'get', + params: query, + }); +} // 查询河湖水情 有哪些泵站 export function rainWaterPumpStationInfoList(query) { return request({ diff --git a/src/views/pictureOnMap/index.vue b/src/views/pictureOnMap/index.vue index 919a6e1..86ae337 100644 --- a/src/views/pictureOnMap/index.vue +++ b/src/views/pictureOnMap/index.vue @@ -487,14 +487,15 @@ Getproperties.value.stCode = item.stCode || item.siteCode || item.lakeCode; Getproperties.value.dataCode = item.dataCode; Getproperties.value.wellcode = item.wellCode || item.dataName || item.pipeLine; - Getproperties.value.id = item.relationId||item.id; //item.relationId监测告警的普通id + Getproperties.value.id =item.id; + Getproperties.value.gwMonitorId =item.gwMonitorId||item.id; //管网坡面 Getproperties.value.dataId = item.dataId || ""; Getproperties.value.stType = item.stType; Getproperties.value.geometry = item.geometry || item.geometrys||''; // Terraformer.WKT.convert(turf.point(item.lonLat.split(",").map(Number)).geometry); - Getproperties.value.waterRegionCode = item.waterRegionCode || item.lakeCode; //河湖水情 查询水系分区详情 + Getproperties.value.waterRegionCode =item.lakeCode ||item.waterRegionCode ; //河湖水情 查询水系分区详情 Getproperties.value.GWDADataNow = item.GWDADataNow ? item.GWDADataNow : false; if (item.daterange) { Getproperties.value.daterange = item.daterange; diff --git a/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaohuigu/MonitoringWarningRigh/components/shuiqing.vue b/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaohuigu/MonitoringWarningRigh/components/shuiqing.vue index 2b9dcc6..8d74108 100644 --- a/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaohuigu/MonitoringWarningRigh/components/shuiqing.vue +++ b/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaohuigu/MonitoringWarningRigh/components/shuiqing.vue @@ -219,6 +219,8 @@ if(num==2){ item.stType="rainwater_pipeline_quality" item.dataCode="pipePoint" + item.gwMonitorId=item.id + item.daterange=[`${props.day} 08:00:00`,`${proxy.moment(props.day).add(1, "days").format("YYYY-MM-DD")} 08:00:00`] _bus.emit("DynamicBus", item); } diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/MonitoringAnalysisChart.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/MonitoringAnalysisChart.vue index 45e2825..4adccc8 100644 --- a/src/views/pictureOnMap/page/components/DialogTabs/component/MonitoringAnalysisChart.vue +++ b/src/views/pictureOnMap/page/components/DialogTabs/component/MonitoringAnalysisChart.vue @@ -192,7 +192,7 @@ top: nowSize(50, 1920), bottom: nowSize(40, 1920), //也可设置left和right设置距离来控制图表的大小 left: nowSize(40, 1920), - right: nowSize(10, 1920), + right: nowSize(20, 1920), containLabel: true, }, xAxis: [ diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/guanlianjianceHeHu.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/guanlianjianceHeHu.vue index 124fbb9..4b7aa4a 100644 --- a/src/views/pictureOnMap/page/components/DialogTabs/component/guanlianjianceHeHu.vue +++ b/src/views/pictureOnMap/page/components/DialogTabs/component/guanlianjianceHeHu.vue @@ -65,7 +65,7 @@ :YAxis2="chartInfo2.YAxis2" :marklineJYL="chartInfo2.marklineJYL" :marklineSS="chartInfo2.marklineSS" - XnameTop="-480" + XnameTop="-490" /> diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/guanwangpoumian.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/guanwangpoumian.vue index cea2095..18afcf5 100644 --- a/src/views/pictureOnMap/page/components/DialogTabs/component/guanwangpoumian.vue +++ b/src/views/pictureOnMap/page/components/DialogTabs/component/guanwangpoumian.vue @@ -29,7 +29,7 @@ let params = { wellcode, // time:moment(props.Getproperties.daterange[0]).format("YYYY-MM-DD") - id: props.Getproperties.id, + id: props.Getproperties.gwMonitorId, }; getSectionByWellCodeDetail(params).then((res) => { if (res && res.code == 200) { diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/liuyujieshaoHeHu.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/liuyujieshaoHeHu.vue index eb989bc..b480c61 100644 --- a/src/views/pictureOnMap/page/components/DialogTabs/component/liuyujieshaoHeHu.vue +++ b/src/views/pictureOnMap/page/components/DialogTabs/component/liuyujieshaoHeHu.vue @@ -34,6 +34,7 @@ const { proxy } = getCurrentInstance(); import { waterRegionInfo, + lakeInfoGetWaterRegion } from '@/api/FloodControlAndDrainage.js'; const props = defineProps({ // 数据id