diff --git a/src/components/Map/MapBox.vue b/src/components/Map/MapBox.vue index dc07d3e..0c6e293 100644 --- a/src/components/Map/MapBox.vue +++ b/src/components/Map/MapBox.vue @@ -373,7 +373,7 @@ let prevObj = null; const panelDataToMap = (obj) => { - debugger + // debugger const { setLayerVisible, setHighlight } = events_params; // if (prevObj != null) busEmit(setLayerVisible.key, { layername: prevObj.type, isCheck: false }); busEmit(setHighlight.key, []); diff --git a/src/components/Map/MapBox.vue b/src/components/Map/MapBox.vue index dc07d3e..0c6e293 100644 --- a/src/components/Map/MapBox.vue +++ b/src/components/Map/MapBox.vue @@ -373,7 +373,7 @@ let prevObj = null; const panelDataToMap = (obj) => { - debugger + // debugger const { setLayerVisible, setHighlight } = events_params; // if (prevObj != null) busEmit(setLayerVisible.key, { layername: prevObj.type, isCheck: false }); busEmit(setHighlight.key, []); diff --git a/src/views/pictureOnMap/index.vue b/src/views/pictureOnMap/index.vue index 021d994..1cde2c4 100644 --- a/src/views/pictureOnMap/index.vue +++ b/src/views/pictureOnMap/index.vue @@ -214,10 +214,10 @@ name: "dp_gwfx", //管网风险 value: "rainwater_pipeline_water_level", //雨水管网液位 }, - { - name: "dp_gwfx", //管网风险 - value: "rainwater_pipeline_quality", //雨水管网水质 - }, + // { + // name: "dp_gwfx", //管网风险 + // value: "rainwater_pipeline_quality", //雨水管网水质 + // }, { name: "dp_wsgwfx", //大屏污水管网风险分析弹框 value: "sewage_pipeline_quality", //雨水管网水质 @@ -248,7 +248,7 @@ // proxy.$modal.msgSuccess(''); return; } - debugger; + // debugger; let params = { dataCode: specificFun(type) || type, scene: "basis_monitor", @@ -483,7 +483,7 @@ }; function anotherMeht(item) { let properties = {}; - Getproperties.value.stCode = item.stCode||item.siteCode||item.lakeCode; + 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.id || item.relationId; //item.relationId监测告警的普通id @@ -491,10 +491,10 @@ Getproperties.value.stType = item.stType; Getproperties.value.geometry = item.geometry; Getproperties.value.waterRegionCode = item.waterRegionCode || item.lakeCode; //河湖水情 查询水系分区详情 - if(item.daterange){ - Getproperties.value.daterange=item.daterange + if (item.daterange) { + Getproperties.value.daterange = item.daterange; } - console.log('Getproperties', Getproperties.value); + console.log("Getproperties", Getproperties.value); if (arrstcode.value.includes(item.stType)) { properties.stCode = item.stCode; } @@ -509,11 +509,11 @@ allScreen(); useStore.getsewageData(); bus.on("DynamicBus", (item) => { - debugger; + // debugger; console.log("item", item); dialogConfig.RefName = item.RefName || ""; dialogConfig.title = item.stName || item.name; - debugger + // debugger; if (!!!item.NoPromise) { anotherMeht(item); } else { diff --git a/src/components/Map/MapBox.vue b/src/components/Map/MapBox.vue index dc07d3e..0c6e293 100644 --- a/src/components/Map/MapBox.vue +++ b/src/components/Map/MapBox.vue @@ -373,7 +373,7 @@ let prevObj = null; const panelDataToMap = (obj) => { - debugger + // debugger const { setLayerVisible, setHighlight } = events_params; // if (prevObj != null) busEmit(setLayerVisible.key, { layername: prevObj.type, isCheck: false }); busEmit(setHighlight.key, []); diff --git a/src/views/pictureOnMap/index.vue b/src/views/pictureOnMap/index.vue index 021d994..1cde2c4 100644 --- a/src/views/pictureOnMap/index.vue +++ b/src/views/pictureOnMap/index.vue @@ -214,10 +214,10 @@ name: "dp_gwfx", //管网风险 value: "rainwater_pipeline_water_level", //雨水管网液位 }, - { - name: "dp_gwfx", //管网风险 - value: "rainwater_pipeline_quality", //雨水管网水质 - }, + // { + // name: "dp_gwfx", //管网风险 + // value: "rainwater_pipeline_quality", //雨水管网水质 + // }, { name: "dp_wsgwfx", //大屏污水管网风险分析弹框 value: "sewage_pipeline_quality", //雨水管网水质 @@ -248,7 +248,7 @@ // proxy.$modal.msgSuccess(''); return; } - debugger; + // debugger; let params = { dataCode: specificFun(type) || type, scene: "basis_monitor", @@ -483,7 +483,7 @@ }; function anotherMeht(item) { let properties = {}; - Getproperties.value.stCode = item.stCode||item.siteCode||item.lakeCode; + 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.id || item.relationId; //item.relationId监测告警的普通id @@ -491,10 +491,10 @@ Getproperties.value.stType = item.stType; Getproperties.value.geometry = item.geometry; Getproperties.value.waterRegionCode = item.waterRegionCode || item.lakeCode; //河湖水情 查询水系分区详情 - if(item.daterange){ - Getproperties.value.daterange=item.daterange + if (item.daterange) { + Getproperties.value.daterange = item.daterange; } - console.log('Getproperties', Getproperties.value); + console.log("Getproperties", Getproperties.value); if (arrstcode.value.includes(item.stType)) { properties.stCode = item.stCode; } @@ -509,11 +509,11 @@ allScreen(); useStore.getsewageData(); bus.on("DynamicBus", (item) => { - debugger; + // debugger; console.log("item", item); dialogConfig.RefName = item.RefName || ""; dialogConfig.title = item.stName || item.name; - debugger + // debugger; if (!!!item.NoPromise) { anotherMeht(item); } else { diff --git a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/dxssr.vue b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/dxssr.vue index ea98dc2..a2a1cab 100644 --- a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/dxssr.vue +++ b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/dxssr.vue @@ -289,6 +289,7 @@ const rowIgnore = (item) => { item.RefName = "dxssrfxJCFX"; bus.emit("DynamicBus", item); + localStorage.setItem("JCFXDialogTimer", item.tt); }; // 打开周边全景 diff --git a/src/components/Map/MapBox.vue b/src/components/Map/MapBox.vue index dc07d3e..0c6e293 100644 --- a/src/components/Map/MapBox.vue +++ b/src/components/Map/MapBox.vue @@ -373,7 +373,7 @@ let prevObj = null; const panelDataToMap = (obj) => { - debugger + // debugger const { setLayerVisible, setHighlight } = events_params; // if (prevObj != null) busEmit(setLayerVisible.key, { layername: prevObj.type, isCheck: false }); busEmit(setHighlight.key, []); diff --git a/src/views/pictureOnMap/index.vue b/src/views/pictureOnMap/index.vue index 021d994..1cde2c4 100644 --- a/src/views/pictureOnMap/index.vue +++ b/src/views/pictureOnMap/index.vue @@ -214,10 +214,10 @@ name: "dp_gwfx", //管网风险 value: "rainwater_pipeline_water_level", //雨水管网液位 }, - { - name: "dp_gwfx", //管网风险 - value: "rainwater_pipeline_quality", //雨水管网水质 - }, + // { + // name: "dp_gwfx", //管网风险 + // value: "rainwater_pipeline_quality", //雨水管网水质 + // }, { name: "dp_wsgwfx", //大屏污水管网风险分析弹框 value: "sewage_pipeline_quality", //雨水管网水质 @@ -248,7 +248,7 @@ // proxy.$modal.msgSuccess(''); return; } - debugger; + // debugger; let params = { dataCode: specificFun(type) || type, scene: "basis_monitor", @@ -483,7 +483,7 @@ }; function anotherMeht(item) { let properties = {}; - Getproperties.value.stCode = item.stCode||item.siteCode||item.lakeCode; + 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.id || item.relationId; //item.relationId监测告警的普通id @@ -491,10 +491,10 @@ Getproperties.value.stType = item.stType; Getproperties.value.geometry = item.geometry; Getproperties.value.waterRegionCode = item.waterRegionCode || item.lakeCode; //河湖水情 查询水系分区详情 - if(item.daterange){ - Getproperties.value.daterange=item.daterange + if (item.daterange) { + Getproperties.value.daterange = item.daterange; } - console.log('Getproperties', Getproperties.value); + console.log("Getproperties", Getproperties.value); if (arrstcode.value.includes(item.stType)) { properties.stCode = item.stCode; } @@ -509,11 +509,11 @@ allScreen(); useStore.getsewageData(); bus.on("DynamicBus", (item) => { - debugger; + // debugger; console.log("item", item); dialogConfig.RefName = item.RefName || ""; dialogConfig.title = item.stName || item.name; - debugger + // debugger; if (!!!item.NoPromise) { anotherMeht(item); } else { diff --git a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/dxssr.vue b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/dxssr.vue index ea98dc2..a2a1cab 100644 --- a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/dxssr.vue +++ b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/dxssr.vue @@ -289,6 +289,7 @@ const rowIgnore = (item) => { item.RefName = "dxssrfxJCFX"; bus.emit("DynamicBus", item); + localStorage.setItem("JCFXDialogTimer", item.tt); }; // 打开周边全景 diff --git a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/gwfx.vue b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/gwfx.vue index 3e81bab..4e737d0 100644 --- a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/gwfx.vue +++ b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/gwfx.vue @@ -288,6 +288,7 @@ const rowIgnore = (item) => { item.RefName = "ylfxJCFX"; bus.emit("DynamicBus", item); + localStorage.setItem("JCFXDialogTimer", item.tt); }; // 打开周边全景 diff --git a/src/components/Map/MapBox.vue b/src/components/Map/MapBox.vue index dc07d3e..0c6e293 100644 --- a/src/components/Map/MapBox.vue +++ b/src/components/Map/MapBox.vue @@ -373,7 +373,7 @@ let prevObj = null; const panelDataToMap = (obj) => { - debugger + // debugger const { setLayerVisible, setHighlight } = events_params; // if (prevObj != null) busEmit(setLayerVisible.key, { layername: prevObj.type, isCheck: false }); busEmit(setHighlight.key, []); diff --git a/src/views/pictureOnMap/index.vue b/src/views/pictureOnMap/index.vue index 021d994..1cde2c4 100644 --- a/src/views/pictureOnMap/index.vue +++ b/src/views/pictureOnMap/index.vue @@ -214,10 +214,10 @@ name: "dp_gwfx", //管网风险 value: "rainwater_pipeline_water_level", //雨水管网液位 }, - { - name: "dp_gwfx", //管网风险 - value: "rainwater_pipeline_quality", //雨水管网水质 - }, + // { + // name: "dp_gwfx", //管网风险 + // value: "rainwater_pipeline_quality", //雨水管网水质 + // }, { name: "dp_wsgwfx", //大屏污水管网风险分析弹框 value: "sewage_pipeline_quality", //雨水管网水质 @@ -248,7 +248,7 @@ // proxy.$modal.msgSuccess(''); return; } - debugger; + // debugger; let params = { dataCode: specificFun(type) || type, scene: "basis_monitor", @@ -483,7 +483,7 @@ }; function anotherMeht(item) { let properties = {}; - Getproperties.value.stCode = item.stCode||item.siteCode||item.lakeCode; + 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.id || item.relationId; //item.relationId监测告警的普通id @@ -491,10 +491,10 @@ Getproperties.value.stType = item.stType; Getproperties.value.geometry = item.geometry; Getproperties.value.waterRegionCode = item.waterRegionCode || item.lakeCode; //河湖水情 查询水系分区详情 - if(item.daterange){ - Getproperties.value.daterange=item.daterange + if (item.daterange) { + Getproperties.value.daterange = item.daterange; } - console.log('Getproperties', Getproperties.value); + console.log("Getproperties", Getproperties.value); if (arrstcode.value.includes(item.stType)) { properties.stCode = item.stCode; } @@ -509,11 +509,11 @@ allScreen(); useStore.getsewageData(); bus.on("DynamicBus", (item) => { - debugger; + // debugger; console.log("item", item); dialogConfig.RefName = item.RefName || ""; dialogConfig.title = item.stName || item.name; - debugger + // debugger; if (!!!item.NoPromise) { anotherMeht(item); } else { diff --git a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/dxssr.vue b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/dxssr.vue index ea98dc2..a2a1cab 100644 --- a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/dxssr.vue +++ b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/dxssr.vue @@ -289,6 +289,7 @@ const rowIgnore = (item) => { item.RefName = "dxssrfxJCFX"; bus.emit("DynamicBus", item); + localStorage.setItem("JCFXDialogTimer", item.tt); }; // 打开周边全景 diff --git a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/gwfx.vue b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/gwfx.vue index 3e81bab..4e737d0 100644 --- a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/gwfx.vue +++ b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/gwfx.vue @@ -288,6 +288,7 @@ const rowIgnore = (item) => { item.RefName = "ylfxJCFX"; bus.emit("DynamicBus", item); + localStorage.setItem("JCFXDialogTimer", item.tt); }; // 打开周边全景 diff --git a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/szyc.vue b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/szyc.vue index 5392ad3..d4588e7 100644 --- a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/szyc.vue +++ b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/szyc.vue @@ -288,6 +288,7 @@ const rowIgnore = (item) => { item.RefName = "szycfxJCFX"; bus.emit("DynamicBus", item); + localStorage.setItem("JCFXDialogTimer", item.tt); }; // 打开周边全景 diff --git a/src/components/Map/MapBox.vue b/src/components/Map/MapBox.vue index dc07d3e..0c6e293 100644 --- a/src/components/Map/MapBox.vue +++ b/src/components/Map/MapBox.vue @@ -373,7 +373,7 @@ let prevObj = null; const panelDataToMap = (obj) => { - debugger + // debugger const { setLayerVisible, setHighlight } = events_params; // if (prevObj != null) busEmit(setLayerVisible.key, { layername: prevObj.type, isCheck: false }); busEmit(setHighlight.key, []); diff --git a/src/views/pictureOnMap/index.vue b/src/views/pictureOnMap/index.vue index 021d994..1cde2c4 100644 --- a/src/views/pictureOnMap/index.vue +++ b/src/views/pictureOnMap/index.vue @@ -214,10 +214,10 @@ name: "dp_gwfx", //管网风险 value: "rainwater_pipeline_water_level", //雨水管网液位 }, - { - name: "dp_gwfx", //管网风险 - value: "rainwater_pipeline_quality", //雨水管网水质 - }, + // { + // name: "dp_gwfx", //管网风险 + // value: "rainwater_pipeline_quality", //雨水管网水质 + // }, { name: "dp_wsgwfx", //大屏污水管网风险分析弹框 value: "sewage_pipeline_quality", //雨水管网水质 @@ -248,7 +248,7 @@ // proxy.$modal.msgSuccess(''); return; } - debugger; + // debugger; let params = { dataCode: specificFun(type) || type, scene: "basis_monitor", @@ -483,7 +483,7 @@ }; function anotherMeht(item) { let properties = {}; - Getproperties.value.stCode = item.stCode||item.siteCode||item.lakeCode; + 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.id || item.relationId; //item.relationId监测告警的普通id @@ -491,10 +491,10 @@ Getproperties.value.stType = item.stType; Getproperties.value.geometry = item.geometry; Getproperties.value.waterRegionCode = item.waterRegionCode || item.lakeCode; //河湖水情 查询水系分区详情 - if(item.daterange){ - Getproperties.value.daterange=item.daterange + if (item.daterange) { + Getproperties.value.daterange = item.daterange; } - console.log('Getproperties', Getproperties.value); + console.log("Getproperties", Getproperties.value); if (arrstcode.value.includes(item.stType)) { properties.stCode = item.stCode; } @@ -509,11 +509,11 @@ allScreen(); useStore.getsewageData(); bus.on("DynamicBus", (item) => { - debugger; + // debugger; console.log("item", item); dialogConfig.RefName = item.RefName || ""; dialogConfig.title = item.stName || item.name; - debugger + // debugger; if (!!!item.NoPromise) { anotherMeht(item); } else { diff --git a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/dxssr.vue b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/dxssr.vue index ea98dc2..a2a1cab 100644 --- a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/dxssr.vue +++ b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/dxssr.vue @@ -289,6 +289,7 @@ const rowIgnore = (item) => { item.RefName = "dxssrfxJCFX"; bus.emit("DynamicBus", item); + localStorage.setItem("JCFXDialogTimer", item.tt); }; // 打开周边全景 diff --git a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/gwfx.vue b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/gwfx.vue index 3e81bab..4e737d0 100644 --- a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/gwfx.vue +++ b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/gwfx.vue @@ -288,6 +288,7 @@ const rowIgnore = (item) => { item.RefName = "ylfxJCFX"; bus.emit("DynamicBus", item); + localStorage.setItem("JCFXDialogTimer", item.tt); }; // 打开周边全景 diff --git a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/szyc.vue b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/szyc.vue index 5392ad3..d4588e7 100644 --- a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/szyc.vue +++ b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/szyc.vue @@ -288,6 +288,7 @@ const rowIgnore = (item) => { item.RefName = "szycfxJCFX"; bus.emit("DynamicBus", item); + localStorage.setItem("JCFXDialogTimer", item.tt); }; // 打开周边全景 diff --git a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/wszr.vue b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/wszr.vue index 55e0ad7..3a5bca3 100644 --- a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/wszr.vue +++ b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/wszr.vue @@ -288,6 +288,7 @@ const rowIgnore = (item) => { item.RefName = "yszrfxJCFX"; bus.emit("DynamicBus", item); + localStorage.setItem("JCFXDialogTimer", item.tt); }; // 打开周边全景 const ClickZBQJ2 = (item) => { diff --git a/src/components/Map/MapBox.vue b/src/components/Map/MapBox.vue index dc07d3e..0c6e293 100644 --- a/src/components/Map/MapBox.vue +++ b/src/components/Map/MapBox.vue @@ -373,7 +373,7 @@ let prevObj = null; const panelDataToMap = (obj) => { - debugger + // debugger const { setLayerVisible, setHighlight } = events_params; // if (prevObj != null) busEmit(setLayerVisible.key, { layername: prevObj.type, isCheck: false }); busEmit(setHighlight.key, []); diff --git a/src/views/pictureOnMap/index.vue b/src/views/pictureOnMap/index.vue index 021d994..1cde2c4 100644 --- a/src/views/pictureOnMap/index.vue +++ b/src/views/pictureOnMap/index.vue @@ -214,10 +214,10 @@ name: "dp_gwfx", //管网风险 value: "rainwater_pipeline_water_level", //雨水管网液位 }, - { - name: "dp_gwfx", //管网风险 - value: "rainwater_pipeline_quality", //雨水管网水质 - }, + // { + // name: "dp_gwfx", //管网风险 + // value: "rainwater_pipeline_quality", //雨水管网水质 + // }, { name: "dp_wsgwfx", //大屏污水管网风险分析弹框 value: "sewage_pipeline_quality", //雨水管网水质 @@ -248,7 +248,7 @@ // proxy.$modal.msgSuccess(''); return; } - debugger; + // debugger; let params = { dataCode: specificFun(type) || type, scene: "basis_monitor", @@ -483,7 +483,7 @@ }; function anotherMeht(item) { let properties = {}; - Getproperties.value.stCode = item.stCode||item.siteCode||item.lakeCode; + 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.id || item.relationId; //item.relationId监测告警的普通id @@ -491,10 +491,10 @@ Getproperties.value.stType = item.stType; Getproperties.value.geometry = item.geometry; Getproperties.value.waterRegionCode = item.waterRegionCode || item.lakeCode; //河湖水情 查询水系分区详情 - if(item.daterange){ - Getproperties.value.daterange=item.daterange + if (item.daterange) { + Getproperties.value.daterange = item.daterange; } - console.log('Getproperties', Getproperties.value); + console.log("Getproperties", Getproperties.value); if (arrstcode.value.includes(item.stType)) { properties.stCode = item.stCode; } @@ -509,11 +509,11 @@ allScreen(); useStore.getsewageData(); bus.on("DynamicBus", (item) => { - debugger; + // debugger; console.log("item", item); dialogConfig.RefName = item.RefName || ""; dialogConfig.title = item.stName || item.name; - debugger + // debugger; if (!!!item.NoPromise) { anotherMeht(item); } else { diff --git a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/dxssr.vue b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/dxssr.vue index ea98dc2..a2a1cab 100644 --- a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/dxssr.vue +++ b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/dxssr.vue @@ -289,6 +289,7 @@ const rowIgnore = (item) => { item.RefName = "dxssrfxJCFX"; bus.emit("DynamicBus", item); + localStorage.setItem("JCFXDialogTimer", item.tt); }; // 打开周边全景 diff --git a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/gwfx.vue b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/gwfx.vue index 3e81bab..4e737d0 100644 --- a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/gwfx.vue +++ b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/gwfx.vue @@ -288,6 +288,7 @@ const rowIgnore = (item) => { item.RefName = "ylfxJCFX"; bus.emit("DynamicBus", item); + localStorage.setItem("JCFXDialogTimer", item.tt); }; // 打开周边全景 diff --git a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/szyc.vue b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/szyc.vue index 5392ad3..d4588e7 100644 --- a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/szyc.vue +++ b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/szyc.vue @@ -288,6 +288,7 @@ const rowIgnore = (item) => { item.RefName = "szycfxJCFX"; bus.emit("DynamicBus", item); + localStorage.setItem("JCFXDialogTimer", item.tt); }; // 打开周边全景 diff --git a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/wszr.vue b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/wszr.vue index 55e0ad7..3a5bca3 100644 --- a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/wszr.vue +++ b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/wszr.vue @@ -288,6 +288,7 @@ const rowIgnore = (item) => { item.RefName = "yszrfxJCFX"; bus.emit("DynamicBus", item); + localStorage.setItem("JCFXDialogTimer", item.tt); }; // 打开周边全景 const ClickZBQJ2 = (item) => { diff --git a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/ydfx.vue b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/ydfx.vue index 792b536..8dbcaa2 100644 --- a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/ydfx.vue +++ b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/ydfx.vue @@ -288,6 +288,7 @@ const rowIgnore = (item) => { item.RefName = props.TypeID == "sewage" ? "ydfxfxJCFX" : "wszrfxJCFX"; bus.emit("DynamicBus", item); + localStorage.setItem("JCFXDialogTimer", item.tt); }; // 打开周边全景 const ClickZBQJ2 = (item) => { diff --git a/src/components/Map/MapBox.vue b/src/components/Map/MapBox.vue index dc07d3e..0c6e293 100644 --- a/src/components/Map/MapBox.vue +++ b/src/components/Map/MapBox.vue @@ -373,7 +373,7 @@ let prevObj = null; const panelDataToMap = (obj) => { - debugger + // debugger const { setLayerVisible, setHighlight } = events_params; // if (prevObj != null) busEmit(setLayerVisible.key, { layername: prevObj.type, isCheck: false }); busEmit(setHighlight.key, []); diff --git a/src/views/pictureOnMap/index.vue b/src/views/pictureOnMap/index.vue index 021d994..1cde2c4 100644 --- a/src/views/pictureOnMap/index.vue +++ b/src/views/pictureOnMap/index.vue @@ -214,10 +214,10 @@ name: "dp_gwfx", //管网风险 value: "rainwater_pipeline_water_level", //雨水管网液位 }, - { - name: "dp_gwfx", //管网风险 - value: "rainwater_pipeline_quality", //雨水管网水质 - }, + // { + // name: "dp_gwfx", //管网风险 + // value: "rainwater_pipeline_quality", //雨水管网水质 + // }, { name: "dp_wsgwfx", //大屏污水管网风险分析弹框 value: "sewage_pipeline_quality", //雨水管网水质 @@ -248,7 +248,7 @@ // proxy.$modal.msgSuccess(''); return; } - debugger; + // debugger; let params = { dataCode: specificFun(type) || type, scene: "basis_monitor", @@ -483,7 +483,7 @@ }; function anotherMeht(item) { let properties = {}; - Getproperties.value.stCode = item.stCode||item.siteCode||item.lakeCode; + 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.id || item.relationId; //item.relationId监测告警的普通id @@ -491,10 +491,10 @@ Getproperties.value.stType = item.stType; Getproperties.value.geometry = item.geometry; Getproperties.value.waterRegionCode = item.waterRegionCode || item.lakeCode; //河湖水情 查询水系分区详情 - if(item.daterange){ - Getproperties.value.daterange=item.daterange + if (item.daterange) { + Getproperties.value.daterange = item.daterange; } - console.log('Getproperties', Getproperties.value); + console.log("Getproperties", Getproperties.value); if (arrstcode.value.includes(item.stType)) { properties.stCode = item.stCode; } @@ -509,11 +509,11 @@ allScreen(); useStore.getsewageData(); bus.on("DynamicBus", (item) => { - debugger; + // debugger; console.log("item", item); dialogConfig.RefName = item.RefName || ""; dialogConfig.title = item.stName || item.name; - debugger + // debugger; if (!!!item.NoPromise) { anotherMeht(item); } else { diff --git a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/dxssr.vue b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/dxssr.vue index ea98dc2..a2a1cab 100644 --- a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/dxssr.vue +++ b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/dxssr.vue @@ -289,6 +289,7 @@ const rowIgnore = (item) => { item.RefName = "dxssrfxJCFX"; bus.emit("DynamicBus", item); + localStorage.setItem("JCFXDialogTimer", item.tt); }; // 打开周边全景 diff --git a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/gwfx.vue b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/gwfx.vue index 3e81bab..4e737d0 100644 --- a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/gwfx.vue +++ b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/gwfx.vue @@ -288,6 +288,7 @@ const rowIgnore = (item) => { item.RefName = "ylfxJCFX"; bus.emit("DynamicBus", item); + localStorage.setItem("JCFXDialogTimer", item.tt); }; // 打开周边全景 diff --git a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/szyc.vue b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/szyc.vue index 5392ad3..d4588e7 100644 --- a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/szyc.vue +++ b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/szyc.vue @@ -288,6 +288,7 @@ const rowIgnore = (item) => { item.RefName = "szycfxJCFX"; bus.emit("DynamicBus", item); + localStorage.setItem("JCFXDialogTimer", item.tt); }; // 打开周边全景 diff --git a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/wszr.vue b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/wszr.vue index 55e0ad7..3a5bca3 100644 --- a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/wszr.vue +++ b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/wszr.vue @@ -288,6 +288,7 @@ const rowIgnore = (item) => { item.RefName = "yszrfxJCFX"; bus.emit("DynamicBus", item); + localStorage.setItem("JCFXDialogTimer", item.tt); }; // 打开周边全景 const ClickZBQJ2 = (item) => { diff --git a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/ydfx.vue b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/ydfx.vue index 792b536..8dbcaa2 100644 --- a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/ydfx.vue +++ b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/ydfx.vue @@ -288,6 +288,7 @@ const rowIgnore = (item) => { item.RefName = props.TypeID == "sewage" ? "ydfxfxJCFX" : "wszrfxJCFX"; bus.emit("DynamicBus", item); + localStorage.setItem("JCFXDialogTimer", item.tt); }; // 打开周边全景 const ClickZBQJ2 = (item) => { diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/dxssrfxJCFX.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/dxssrfxJCFX.vue index 93c149a..c1ea044 100644 --- a/src/views/pictureOnMap/page/components/DialogTabs/component/dxssrfxJCFX.vue +++ b/src/views/pictureOnMap/page/components/DialogTabs/component/dxssrfxJCFX.vue @@ -30,7 +30,25 @@ import * as echarts from "echarts"; import { getEchart } from "@/api/MonitorAssetsOnMap"; import { riskAnalysisReason } from "@/api/MonitoringAnalysis"; - +import moment from "moment"; +const props = defineProps({ + // 数据id + dataID: { + type: String, + }, + dataCode: { + type: String, + }, + arrstcode: { + type: Array, + }, + arrid: { + type: Array, + }, + Getproperties: { + type: Object, + }, +}); const AllData = reactive({ chart: null, yAxis: [], @@ -124,7 +142,7 @@ { name: AllData.yAxis_Name, type: "value", - minInterval: 1, + // minInterval: 1, axisLabel: { color: "#AAC1CF", show: true, @@ -147,7 +165,7 @@ { name: AllData.yAxis2_Name, type: "value", - minInterval: 1, + // minInterval: 1, axisLabel: { color: "#AAC1CF", show: true, @@ -168,7 +186,7 @@ { name: AllData.yAxis3_Name, type: "value", - minInterval: 1, + // minInterval: 1, axisLabel: { color: "#AAC1CF", show: true, @@ -189,7 +207,7 @@ { name: AllData.yAxis4_Name, type: "value", - minInterval: 1, + // minInterval: 1, axisLabel: { color: "#AAC1CF", show: true, @@ -283,16 +301,13 @@ }; const getChartsData = () => { getEchart({ - // stType: props.Getproperties.stType, - // stCode: props.Getproperties.stCode, - // dataCode: props.Getproperties.dataCode, - // start: "2024-07-01 00:00:00", - // end: "2024-07-01 23:59:59", - stType: "rainwater_pipeline_quality", - stCode: "0201460323", - dataCode: "pipePoint", - start: "2024-11-26 11:10:03", - end: "2024-11-27 11:10:03", + stType: props.Getproperties.stType, + stCode: props.Getproperties.stCode, + dataCode: props.Getproperties.dataCode, + start: + moment(localStorage.getItem("JCFXDialogTimer")).format("YYYY-MM-DD") + " 00:00:00", + end: + moment(localStorage.getItem("JCFXDialogTimer")).format("YYYY-MM-DD") + " 23:59:59", }).then((res) => { if (res && res.code == 200) { AllData.xAxis = res.data.times; @@ -316,9 +331,23 @@ } }); }; +const getFenXiData = () => { + console.log(props); + riskAnalysisReason({ + startTime: + moment(localStorage.getItem("JCFXDialogTimer")).format("YYYY-MM-DD") + " 00:00:00", + endTime: + moment(localStorage.getItem("JCFXDialogTimer")).format("YYYY-MM-DD") + " 23:59:59", + + stCode: props.Getproperties.stCode, + dataCode: props.Getproperties.dataCode, + menuType: "dxssrfxJCFX", + }).then((res) => {}); +}; onMounted(() => { nextTick(() => { getChartsData(); + getFenXiData(); window.addEventListener("resize", resizeTheChart); }); }); diff --git a/src/components/Map/MapBox.vue b/src/components/Map/MapBox.vue index dc07d3e..0c6e293 100644 --- a/src/components/Map/MapBox.vue +++ b/src/components/Map/MapBox.vue @@ -373,7 +373,7 @@ let prevObj = null; const panelDataToMap = (obj) => { - debugger + // debugger const { setLayerVisible, setHighlight } = events_params; // if (prevObj != null) busEmit(setLayerVisible.key, { layername: prevObj.type, isCheck: false }); busEmit(setHighlight.key, []); diff --git a/src/views/pictureOnMap/index.vue b/src/views/pictureOnMap/index.vue index 021d994..1cde2c4 100644 --- a/src/views/pictureOnMap/index.vue +++ b/src/views/pictureOnMap/index.vue @@ -214,10 +214,10 @@ name: "dp_gwfx", //管网风险 value: "rainwater_pipeline_water_level", //雨水管网液位 }, - { - name: "dp_gwfx", //管网风险 - value: "rainwater_pipeline_quality", //雨水管网水质 - }, + // { + // name: "dp_gwfx", //管网风险 + // value: "rainwater_pipeline_quality", //雨水管网水质 + // }, { name: "dp_wsgwfx", //大屏污水管网风险分析弹框 value: "sewage_pipeline_quality", //雨水管网水质 @@ -248,7 +248,7 @@ // proxy.$modal.msgSuccess(''); return; } - debugger; + // debugger; let params = { dataCode: specificFun(type) || type, scene: "basis_monitor", @@ -483,7 +483,7 @@ }; function anotherMeht(item) { let properties = {}; - Getproperties.value.stCode = item.stCode||item.siteCode||item.lakeCode; + 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.id || item.relationId; //item.relationId监测告警的普通id @@ -491,10 +491,10 @@ Getproperties.value.stType = item.stType; Getproperties.value.geometry = item.geometry; Getproperties.value.waterRegionCode = item.waterRegionCode || item.lakeCode; //河湖水情 查询水系分区详情 - if(item.daterange){ - Getproperties.value.daterange=item.daterange + if (item.daterange) { + Getproperties.value.daterange = item.daterange; } - console.log('Getproperties', Getproperties.value); + console.log("Getproperties", Getproperties.value); if (arrstcode.value.includes(item.stType)) { properties.stCode = item.stCode; } @@ -509,11 +509,11 @@ allScreen(); useStore.getsewageData(); bus.on("DynamicBus", (item) => { - debugger; + // debugger; console.log("item", item); dialogConfig.RefName = item.RefName || ""; dialogConfig.title = item.stName || item.name; - debugger + // debugger; if (!!!item.NoPromise) { anotherMeht(item); } else { diff --git a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/dxssr.vue b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/dxssr.vue index ea98dc2..a2a1cab 100644 --- a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/dxssr.vue +++ b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/dxssr.vue @@ -289,6 +289,7 @@ const rowIgnore = (item) => { item.RefName = "dxssrfxJCFX"; bus.emit("DynamicBus", item); + localStorage.setItem("JCFXDialogTimer", item.tt); }; // 打开周边全景 diff --git a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/gwfx.vue b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/gwfx.vue index 3e81bab..4e737d0 100644 --- a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/gwfx.vue +++ b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/gwfx.vue @@ -288,6 +288,7 @@ const rowIgnore = (item) => { item.RefName = "ylfxJCFX"; bus.emit("DynamicBus", item); + localStorage.setItem("JCFXDialogTimer", item.tt); }; // 打开周边全景 diff --git a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/szyc.vue b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/szyc.vue index 5392ad3..d4588e7 100644 --- a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/szyc.vue +++ b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/szyc.vue @@ -288,6 +288,7 @@ const rowIgnore = (item) => { item.RefName = "szycfxJCFX"; bus.emit("DynamicBus", item); + localStorage.setItem("JCFXDialogTimer", item.tt); }; // 打开周边全景 diff --git a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/wszr.vue b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/wszr.vue index 55e0ad7..3a5bca3 100644 --- a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/wszr.vue +++ b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/wszr.vue @@ -288,6 +288,7 @@ const rowIgnore = (item) => { item.RefName = "yszrfxJCFX"; bus.emit("DynamicBus", item); + localStorage.setItem("JCFXDialogTimer", item.tt); }; // 打开周边全景 const ClickZBQJ2 = (item) => { diff --git a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/ydfx.vue b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/ydfx.vue index 792b536..8dbcaa2 100644 --- a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/ydfx.vue +++ b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/ydfx.vue @@ -288,6 +288,7 @@ const rowIgnore = (item) => { item.RefName = props.TypeID == "sewage" ? "ydfxfxJCFX" : "wszrfxJCFX"; bus.emit("DynamicBus", item); + localStorage.setItem("JCFXDialogTimer", item.tt); }; // 打开周边全景 const ClickZBQJ2 = (item) => { diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/dxssrfxJCFX.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/dxssrfxJCFX.vue index 93c149a..c1ea044 100644 --- a/src/views/pictureOnMap/page/components/DialogTabs/component/dxssrfxJCFX.vue +++ b/src/views/pictureOnMap/page/components/DialogTabs/component/dxssrfxJCFX.vue @@ -30,7 +30,25 @@ import * as echarts from "echarts"; import { getEchart } from "@/api/MonitorAssetsOnMap"; import { riskAnalysisReason } from "@/api/MonitoringAnalysis"; - +import moment from "moment"; +const props = defineProps({ + // 数据id + dataID: { + type: String, + }, + dataCode: { + type: String, + }, + arrstcode: { + type: Array, + }, + arrid: { + type: Array, + }, + Getproperties: { + type: Object, + }, +}); const AllData = reactive({ chart: null, yAxis: [], @@ -124,7 +142,7 @@ { name: AllData.yAxis_Name, type: "value", - minInterval: 1, + // minInterval: 1, axisLabel: { color: "#AAC1CF", show: true, @@ -147,7 +165,7 @@ { name: AllData.yAxis2_Name, type: "value", - minInterval: 1, + // minInterval: 1, axisLabel: { color: "#AAC1CF", show: true, @@ -168,7 +186,7 @@ { name: AllData.yAxis3_Name, type: "value", - minInterval: 1, + // minInterval: 1, axisLabel: { color: "#AAC1CF", show: true, @@ -189,7 +207,7 @@ { name: AllData.yAxis4_Name, type: "value", - minInterval: 1, + // minInterval: 1, axisLabel: { color: "#AAC1CF", show: true, @@ -283,16 +301,13 @@ }; const getChartsData = () => { getEchart({ - // stType: props.Getproperties.stType, - // stCode: props.Getproperties.stCode, - // dataCode: props.Getproperties.dataCode, - // start: "2024-07-01 00:00:00", - // end: "2024-07-01 23:59:59", - stType: "rainwater_pipeline_quality", - stCode: "0201460323", - dataCode: "pipePoint", - start: "2024-11-26 11:10:03", - end: "2024-11-27 11:10:03", + stType: props.Getproperties.stType, + stCode: props.Getproperties.stCode, + dataCode: props.Getproperties.dataCode, + start: + moment(localStorage.getItem("JCFXDialogTimer")).format("YYYY-MM-DD") + " 00:00:00", + end: + moment(localStorage.getItem("JCFXDialogTimer")).format("YYYY-MM-DD") + " 23:59:59", }).then((res) => { if (res && res.code == 200) { AllData.xAxis = res.data.times; @@ -316,9 +331,23 @@ } }); }; +const getFenXiData = () => { + console.log(props); + riskAnalysisReason({ + startTime: + moment(localStorage.getItem("JCFXDialogTimer")).format("YYYY-MM-DD") + " 00:00:00", + endTime: + moment(localStorage.getItem("JCFXDialogTimer")).format("YYYY-MM-DD") + " 23:59:59", + + stCode: props.Getproperties.stCode, + dataCode: props.Getproperties.dataCode, + menuType: "dxssrfxJCFX", + }).then((res) => {}); +}; onMounted(() => { nextTick(() => { getChartsData(); + getFenXiData(); window.addEventListener("resize", resizeTheChart); }); }); diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/wszrfxJCFX.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/wszrfxJCFX.vue index b717a28..778fcc8 100644 --- a/src/views/pictureOnMap/page/components/DialogTabs/component/wszrfxJCFX.vue +++ b/src/views/pictureOnMap/page/components/DialogTabs/component/wszrfxJCFX.vue @@ -30,6 +30,25 @@ import * as echarts from "echarts"; import { getEchart } from "@/api/MonitorAssetsOnMap"; import { riskAnalysisReason } from "@/api/MonitoringAnalysis"; +import moment from "moment"; +const props = defineProps({ + // 数据id + dataID: { + type: String, + }, + dataCode: { + type: String, + }, + arrstcode: { + type: Array, + }, + arrid: { + type: Array, + }, + Getproperties: { + type: Object, + }, +}); const AllData = reactive({ chart: null, @@ -124,7 +143,7 @@ { name: AllData.yAxis_Name, type: "value", - minInterval: 1, + // minInterval: 1, axisLabel: { color: "#AAC1CF", show: true, @@ -147,7 +166,7 @@ { name: AllData.yAxis2_Name, type: "value", - minInterval: 1, + // minInterval: 1, axisLabel: { color: "#AAC1CF", show: true, @@ -168,7 +187,7 @@ { name: AllData.yAxis3_Name, type: "value", - minInterval: 1, + // minInterval: 1, axisLabel: { color: "#AAC1CF", show: true, @@ -189,7 +208,7 @@ { name: AllData.yAxis4_Name, type: "value", - minInterval: 1, + // minInterval: 1, axisLabel: { color: "#AAC1CF", show: true, @@ -283,16 +302,13 @@ }; const getChartsData = () => { getEchart({ - // stType: props.Getproperties.stType, - // stCode: props.Getproperties.stCode, - // dataCode: props.Getproperties.dataCode, - // start: "2024-07-01 00:00:00", - // end: "2024-07-01 23:59:59", - stType: "rainwater_pipeline_quality", - stCode: "0201460323", - dataCode: "pipePoint", - start: "2024-11-26 11:10:03", - end: "2024-11-27 11:10:03", + stType: props.Getproperties.stType, + stCode: props.Getproperties.stCode, + dataCode: props.Getproperties.dataCode, + start: + moment(localStorage.getItem("JCFXDialogTimer")).format("YYYY-MM-DD") + " 00:00:00", + end: + moment(localStorage.getItem("JCFXDialogTimer")).format("YYYY-MM-DD") + " 23:59:59", }).then((res) => { if (res && res.code == 200) { AllData.xAxis = res.data.times; @@ -316,9 +332,23 @@ } }); }; +const getFenXiData = () => { + console.log(props); + riskAnalysisReason({ + startTime: + moment(localStorage.getItem("JCFXDialogTimer")).format("YYYY-MM-DD") + " 00:00:00", + endTime: + moment(localStorage.getItem("JCFXDialogTimer")).format("YYYY-MM-DD") + " 23:59:59", + + stCode: props.Getproperties.stCode, + dataCode: props.Getproperties.dataCode, + menuType: "wszrfxJCFX", + }).then((res) => {}); +}; onMounted(() => { nextTick(() => { getChartsData(); + getFenXiData(); window.addEventListener("resize", resizeTheChart); }); }); diff --git a/src/components/Map/MapBox.vue b/src/components/Map/MapBox.vue index dc07d3e..0c6e293 100644 --- a/src/components/Map/MapBox.vue +++ b/src/components/Map/MapBox.vue @@ -373,7 +373,7 @@ let prevObj = null; const panelDataToMap = (obj) => { - debugger + // debugger const { setLayerVisible, setHighlight } = events_params; // if (prevObj != null) busEmit(setLayerVisible.key, { layername: prevObj.type, isCheck: false }); busEmit(setHighlight.key, []); diff --git a/src/views/pictureOnMap/index.vue b/src/views/pictureOnMap/index.vue index 021d994..1cde2c4 100644 --- a/src/views/pictureOnMap/index.vue +++ b/src/views/pictureOnMap/index.vue @@ -214,10 +214,10 @@ name: "dp_gwfx", //管网风险 value: "rainwater_pipeline_water_level", //雨水管网液位 }, - { - name: "dp_gwfx", //管网风险 - value: "rainwater_pipeline_quality", //雨水管网水质 - }, + // { + // name: "dp_gwfx", //管网风险 + // value: "rainwater_pipeline_quality", //雨水管网水质 + // }, { name: "dp_wsgwfx", //大屏污水管网风险分析弹框 value: "sewage_pipeline_quality", //雨水管网水质 @@ -248,7 +248,7 @@ // proxy.$modal.msgSuccess(''); return; } - debugger; + // debugger; let params = { dataCode: specificFun(type) || type, scene: "basis_monitor", @@ -483,7 +483,7 @@ }; function anotherMeht(item) { let properties = {}; - Getproperties.value.stCode = item.stCode||item.siteCode||item.lakeCode; + 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.id || item.relationId; //item.relationId监测告警的普通id @@ -491,10 +491,10 @@ Getproperties.value.stType = item.stType; Getproperties.value.geometry = item.geometry; Getproperties.value.waterRegionCode = item.waterRegionCode || item.lakeCode; //河湖水情 查询水系分区详情 - if(item.daterange){ - Getproperties.value.daterange=item.daterange + if (item.daterange) { + Getproperties.value.daterange = item.daterange; } - console.log('Getproperties', Getproperties.value); + console.log("Getproperties", Getproperties.value); if (arrstcode.value.includes(item.stType)) { properties.stCode = item.stCode; } @@ -509,11 +509,11 @@ allScreen(); useStore.getsewageData(); bus.on("DynamicBus", (item) => { - debugger; + // debugger; console.log("item", item); dialogConfig.RefName = item.RefName || ""; dialogConfig.title = item.stName || item.name; - debugger + // debugger; if (!!!item.NoPromise) { anotherMeht(item); } else { diff --git a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/dxssr.vue b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/dxssr.vue index ea98dc2..a2a1cab 100644 --- a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/dxssr.vue +++ b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/dxssr.vue @@ -289,6 +289,7 @@ const rowIgnore = (item) => { item.RefName = "dxssrfxJCFX"; bus.emit("DynamicBus", item); + localStorage.setItem("JCFXDialogTimer", item.tt); }; // 打开周边全景 diff --git a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/gwfx.vue b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/gwfx.vue index 3e81bab..4e737d0 100644 --- a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/gwfx.vue +++ b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/gwfx.vue @@ -288,6 +288,7 @@ const rowIgnore = (item) => { item.RefName = "ylfxJCFX"; bus.emit("DynamicBus", item); + localStorage.setItem("JCFXDialogTimer", item.tt); }; // 打开周边全景 diff --git a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/szyc.vue b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/szyc.vue index 5392ad3..d4588e7 100644 --- a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/szyc.vue +++ b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/szyc.vue @@ -288,6 +288,7 @@ const rowIgnore = (item) => { item.RefName = "szycfxJCFX"; bus.emit("DynamicBus", item); + localStorage.setItem("JCFXDialogTimer", item.tt); }; // 打开周边全景 diff --git a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/wszr.vue b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/wszr.vue index 55e0ad7..3a5bca3 100644 --- a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/wszr.vue +++ b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/wszr.vue @@ -288,6 +288,7 @@ const rowIgnore = (item) => { item.RefName = "yszrfxJCFX"; bus.emit("DynamicBus", item); + localStorage.setItem("JCFXDialogTimer", item.tt); }; // 打开周边全景 const ClickZBQJ2 = (item) => { diff --git a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/ydfx.vue b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/ydfx.vue index 792b536..8dbcaa2 100644 --- a/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/ydfx.vue +++ b/src/views/pictureOnMap/page/MonitoringAnalysis/tab_components/ydfx.vue @@ -288,6 +288,7 @@ const rowIgnore = (item) => { item.RefName = props.TypeID == "sewage" ? "ydfxfxJCFX" : "wszrfxJCFX"; bus.emit("DynamicBus", item); + localStorage.setItem("JCFXDialogTimer", item.tt); }; // 打开周边全景 const ClickZBQJ2 = (item) => { diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/dxssrfxJCFX.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/dxssrfxJCFX.vue index 93c149a..c1ea044 100644 --- a/src/views/pictureOnMap/page/components/DialogTabs/component/dxssrfxJCFX.vue +++ b/src/views/pictureOnMap/page/components/DialogTabs/component/dxssrfxJCFX.vue @@ -30,7 +30,25 @@ import * as echarts from "echarts"; import { getEchart } from "@/api/MonitorAssetsOnMap"; import { riskAnalysisReason } from "@/api/MonitoringAnalysis"; - +import moment from "moment"; +const props = defineProps({ + // 数据id + dataID: { + type: String, + }, + dataCode: { + type: String, + }, + arrstcode: { + type: Array, + }, + arrid: { + type: Array, + }, + Getproperties: { + type: Object, + }, +}); const AllData = reactive({ chart: null, yAxis: [], @@ -124,7 +142,7 @@ { name: AllData.yAxis_Name, type: "value", - minInterval: 1, + // minInterval: 1, axisLabel: { color: "#AAC1CF", show: true, @@ -147,7 +165,7 @@ { name: AllData.yAxis2_Name, type: "value", - minInterval: 1, + // minInterval: 1, axisLabel: { color: "#AAC1CF", show: true, @@ -168,7 +186,7 @@ { name: AllData.yAxis3_Name, type: "value", - minInterval: 1, + // minInterval: 1, axisLabel: { color: "#AAC1CF", show: true, @@ -189,7 +207,7 @@ { name: AllData.yAxis4_Name, type: "value", - minInterval: 1, + // minInterval: 1, axisLabel: { color: "#AAC1CF", show: true, @@ -283,16 +301,13 @@ }; const getChartsData = () => { getEchart({ - // stType: props.Getproperties.stType, - // stCode: props.Getproperties.stCode, - // dataCode: props.Getproperties.dataCode, - // start: "2024-07-01 00:00:00", - // end: "2024-07-01 23:59:59", - stType: "rainwater_pipeline_quality", - stCode: "0201460323", - dataCode: "pipePoint", - start: "2024-11-26 11:10:03", - end: "2024-11-27 11:10:03", + stType: props.Getproperties.stType, + stCode: props.Getproperties.stCode, + dataCode: props.Getproperties.dataCode, + start: + moment(localStorage.getItem("JCFXDialogTimer")).format("YYYY-MM-DD") + " 00:00:00", + end: + moment(localStorage.getItem("JCFXDialogTimer")).format("YYYY-MM-DD") + " 23:59:59", }).then((res) => { if (res && res.code == 200) { AllData.xAxis = res.data.times; @@ -316,9 +331,23 @@ } }); }; +const getFenXiData = () => { + console.log(props); + riskAnalysisReason({ + startTime: + moment(localStorage.getItem("JCFXDialogTimer")).format("YYYY-MM-DD") + " 00:00:00", + endTime: + moment(localStorage.getItem("JCFXDialogTimer")).format("YYYY-MM-DD") + " 23:59:59", + + stCode: props.Getproperties.stCode, + dataCode: props.Getproperties.dataCode, + menuType: "dxssrfxJCFX", + }).then((res) => {}); +}; onMounted(() => { nextTick(() => { getChartsData(); + getFenXiData(); window.addEventListener("resize", resizeTheChart); }); }); diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/wszrfxJCFX.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/wszrfxJCFX.vue index b717a28..778fcc8 100644 --- a/src/views/pictureOnMap/page/components/DialogTabs/component/wszrfxJCFX.vue +++ b/src/views/pictureOnMap/page/components/DialogTabs/component/wszrfxJCFX.vue @@ -30,6 +30,25 @@ import * as echarts from "echarts"; import { getEchart } from "@/api/MonitorAssetsOnMap"; import { riskAnalysisReason } from "@/api/MonitoringAnalysis"; +import moment from "moment"; +const props = defineProps({ + // 数据id + dataID: { + type: String, + }, + dataCode: { + type: String, + }, + arrstcode: { + type: Array, + }, + arrid: { + type: Array, + }, + Getproperties: { + type: Object, + }, +}); const AllData = reactive({ chart: null, @@ -124,7 +143,7 @@ { name: AllData.yAxis_Name, type: "value", - minInterval: 1, + // minInterval: 1, axisLabel: { color: "#AAC1CF", show: true, @@ -147,7 +166,7 @@ { name: AllData.yAxis2_Name, type: "value", - minInterval: 1, + // minInterval: 1, axisLabel: { color: "#AAC1CF", show: true, @@ -168,7 +187,7 @@ { name: AllData.yAxis3_Name, type: "value", - minInterval: 1, + // minInterval: 1, axisLabel: { color: "#AAC1CF", show: true, @@ -189,7 +208,7 @@ { name: AllData.yAxis4_Name, type: "value", - minInterval: 1, + // minInterval: 1, axisLabel: { color: "#AAC1CF", show: true, @@ -283,16 +302,13 @@ }; const getChartsData = () => { getEchart({ - // stType: props.Getproperties.stType, - // stCode: props.Getproperties.stCode, - // dataCode: props.Getproperties.dataCode, - // start: "2024-07-01 00:00:00", - // end: "2024-07-01 23:59:59", - stType: "rainwater_pipeline_quality", - stCode: "0201460323", - dataCode: "pipePoint", - start: "2024-11-26 11:10:03", - end: "2024-11-27 11:10:03", + stType: props.Getproperties.stType, + stCode: props.Getproperties.stCode, + dataCode: props.Getproperties.dataCode, + start: + moment(localStorage.getItem("JCFXDialogTimer")).format("YYYY-MM-DD") + " 00:00:00", + end: + moment(localStorage.getItem("JCFXDialogTimer")).format("YYYY-MM-DD") + " 23:59:59", }).then((res) => { if (res && res.code == 200) { AllData.xAxis = res.data.times; @@ -316,9 +332,23 @@ } }); }; +const getFenXiData = () => { + console.log(props); + riskAnalysisReason({ + startTime: + moment(localStorage.getItem("JCFXDialogTimer")).format("YYYY-MM-DD") + " 00:00:00", + endTime: + moment(localStorage.getItem("JCFXDialogTimer")).format("YYYY-MM-DD") + " 23:59:59", + + stCode: props.Getproperties.stCode, + dataCode: props.Getproperties.dataCode, + menuType: "wszrfxJCFX", + }).then((res) => {}); +}; onMounted(() => { nextTick(() => { getChartsData(); + getFenXiData(); window.addEventListener("resize", resizeTheChart); }); }); diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/ylfxJCFX.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/ylfxJCFX.vue index 91404b1..c670786 100644 --- a/src/views/pictureOnMap/page/components/DialogTabs/component/ylfxJCFX.vue +++ b/src/views/pictureOnMap/page/components/DialogTabs/component/ylfxJCFX.vue @@ -47,6 +47,26 @@ import { ref, reactive, toRefs, onMounted, nextTick } from "vue"; import * as echarts from "echarts"; import { drainageDispatchRainAnalysisByGwjcd, getEchart } from "@/api/MonitorAssetsOnMap"; +import moment from "moment"; + +const props = defineProps({ + // 数据id + dataID: { + type: String, + }, + dataCode: { + type: String, + }, + arrstcode: { + type: Array, + }, + arrid: { + type: Array, + }, + Getproperties: { + type: Object, + }, +}); const AllData = reactive({ chart: null, @@ -216,16 +236,13 @@ }; const getChartsData = () => { getEchart({ - // stType: props.Getproperties.stType, - // stCode: props.Getproperties.stCode, - // dataCode: props.Getproperties.dataCode, - // start: "2024-07-01 00:00:00", - // end: "2024-07-01 23:59:59", - stType: "rainwater_pipeline_quality", - stCode: "0201460323", - dataCode: "pipePoint", - start: "2024-11-26 11:10:03", - end: "2024-11-27 11:10:03", + stType: props.Getproperties.stType, + stCode: props.Getproperties.stCode, + dataCode: props.Getproperties.dataCode, + start: + moment(localStorage.getItem("JCFXDialogTimer")).format("YYYY-MM-DD") + " 00:00:00", + end: + moment(localStorage.getItem("JCFXDialogTimer")).format("YYYY-MM-DD") + " 23:59:59", }).then((res) => { if (res && res.code == 200) { AllData.xAxis = res.data.times; @@ -247,22 +264,17 @@ const listData = ref({}); function gitDataFun() { - // loading.value = true; let params = { - // id: props.Getproperties.id, - id: "1855860534121910516", + id: props.Getproperties.id, }; drainageDispatchRainAnalysisByGwjcd(params).then( (res) => { console.log("监测分析渍水风险降雨历史", res); - // loading.value = false; if (res && res.code == 200) { listData.value = res.data; } }, - (error) => { - // loading.value = false; - } + (error) => {} ); } function RainfallLevelFun(rain) { @@ -353,7 +365,7 @@ width: calc(100% - 100px); } :deep(.el-scrollbar__wrap) { - max-height: 160px; + max-height: 120px; overflow-y: auto; } }