diff --git a/src/assets/styles/publicXG.scss b/src/assets/styles/publicXG.scss index a1bb068..1cd628d 100644 --- a/src/assets/styles/publicXG.scss +++ b/src/assets/styles/publicXG.scss @@ -480,25 +480,6 @@ color: #e4f5ff; padding-left: 30px; position: relative; - &::after { - content: ''; - position: absolute; - top: 3px; - width: 71px; - height: 35px; - background: url('@/assets/newImgs/HMScreen/partLight.png') no-repeat; - background-size: 100% 100%; - animation: partDXL 3s infinite ease-in-out; - pointer-events: none; - @keyframes partDXL { - 0% { - left: 0px; - } - 100% { - left: 390px; - } - } - } } .partContHM { background: #004565; diff --git a/src/assets/styles/publicXG.scss b/src/assets/styles/publicXG.scss index a1bb068..1cd628d 100644 --- a/src/assets/styles/publicXG.scss +++ b/src/assets/styles/publicXG.scss @@ -480,25 +480,6 @@ color: #e4f5ff; padding-left: 30px; position: relative; - &::after { - content: ''; - position: absolute; - top: 3px; - width: 71px; - height: 35px; - background: url('@/assets/newImgs/HMScreen/partLight.png') no-repeat; - background-size: 100% 100%; - animation: partDXL 3s infinite ease-in-out; - pointer-events: none; - @keyframes partDXL { - 0% { - left: 0px; - } - 100% { - left: 390px; - } - } - } } .partContHM { background: #004565; diff --git a/src/views/sponeScreen/Echarts/RainfallLegend.vue b/src/views/sponeScreen/Echarts/RainfallLegend.vue index 7c03214..62292a6 100644 --- a/src/views/sponeScreen/Echarts/RainfallLegend.vue +++ b/src/views/sponeScreen/Echarts/RainfallLegend.vue @@ -12,8 +12,6 @@ refresh: Number, }, setup(props) { - console.log(props.data); - const allData = reactive({ series: [], legend: [], @@ -40,20 +38,6 @@ }, tooltip: { trigger: 'axis', - // formatter: "{b}:{c}㎡", - // feature: { - // mark: { show: true }, - // dataView: { show: true, readOnly: false }, - // magicType: { show: true, type: ['line', 'bar'] }, - // restore: { show: true }, - // saveAsImage: { show: true } - // }, - // axisPointer: { - // type: "cross", - // textStyle: { - // color: "#fff" - // } - // }, formatter: params => { // console.log(params); var relVal = '' + params[0].name; @@ -68,7 +52,7 @@ }, legend: { // type: 'scroll', - data: '降雨量', + data: [], itemWidth: 18, itemHeight: 12, textStyle: { diff --git a/src/assets/styles/publicXG.scss b/src/assets/styles/publicXG.scss index a1bb068..1cd628d 100644 --- a/src/assets/styles/publicXG.scss +++ b/src/assets/styles/publicXG.scss @@ -480,25 +480,6 @@ color: #e4f5ff; padding-left: 30px; position: relative; - &::after { - content: ''; - position: absolute; - top: 3px; - width: 71px; - height: 35px; - background: url('@/assets/newImgs/HMScreen/partLight.png') no-repeat; - background-size: 100% 100%; - animation: partDXL 3s infinite ease-in-out; - pointer-events: none; - @keyframes partDXL { - 0% { - left: 0px; - } - 100% { - left: 390px; - } - } - } } .partContHM { background: #004565; diff --git a/src/views/sponeScreen/Echarts/RainfallLegend.vue b/src/views/sponeScreen/Echarts/RainfallLegend.vue index 7c03214..62292a6 100644 --- a/src/views/sponeScreen/Echarts/RainfallLegend.vue +++ b/src/views/sponeScreen/Echarts/RainfallLegend.vue @@ -12,8 +12,6 @@ refresh: Number, }, setup(props) { - console.log(props.data); - const allData = reactive({ series: [], legend: [], @@ -40,20 +38,6 @@ }, tooltip: { trigger: 'axis', - // formatter: "{b}:{c}㎡", - // feature: { - // mark: { show: true }, - // dataView: { show: true, readOnly: false }, - // magicType: { show: true, type: ['line', 'bar'] }, - // restore: { show: true }, - // saveAsImage: { show: true } - // }, - // axisPointer: { - // type: "cross", - // textStyle: { - // color: "#fff" - // } - // }, formatter: params => { // console.log(params); var relVal = '' + params[0].name; @@ -68,7 +52,7 @@ }, legend: { // type: 'scroll', - data: '降雨量', + data: [], itemWidth: 18, itemHeight: 12, textStyle: { diff --git a/src/views/sponeScreen/HaiMianScreen/index.vue b/src/views/sponeScreen/HaiMianScreen/index.vue index 5dd1c73..4a22924 100644 --- a/src/views/sponeScreen/HaiMianScreen/index.vue +++ b/src/views/sponeScreen/HaiMianScreen/index.vue @@ -121,9 +121,12 @@ - + + + + @@ -138,6 +141,7 @@ import EvaluationKH from '@/views/sponeScreen/evaluationKH/index.vue'; //考核评估 import WaterFlood from '@/views/sponeScreen/waterFlood/index.vue'; //排水防涝 import LongYW from '@/views/sponeScreen/longYW/index.vue'; //长效运维 +import CanvasRain from '@/views/sponeScreen/cityGK/canvasRain.vue'; //降雨效果 import axios from 'axios'; import NewFiberMapUtils from '@/utils/gis/NewFiberMapUtils'; import newfiberMapBoxVectorLayer from '@/views/sponeScreen/gisMF/mapboxVectorLayer.js'; @@ -149,6 +153,7 @@ const stationList = ref([]); const stationCode = ref(''); const dateNow = ref(proxy.moment(new Date()).format('YYYY-MM-DD')); +const showRainFlow = ref(false); const menuList = ref([ { name: '城市概况', id: 1 }, { name: '项目建设', id: 2 }, @@ -240,31 +245,25 @@ newfiberMapBoxVectorLayer.removeByIds(['bengzhan_Area']); //清除泵站范围 } }; -//关闭三维管网弹窗 -const closePipe = () => { - // if (newfiberMap) { - // let _originalGLContext = newfiberMap.getMap().scene?.context._originalGLContext; - // newfiberMap.getMap().imageryLayers.removeAll(); - // newfiberMap.getMap().entities.removeAll(); - // newfiberMap.getMap().scene.primitives.removeAll(); - // newfiberMap.getMap().destroy(); - // if (_originalGLContext) { - // _originalGLContext.getExtension('WEBGL_lose_context').loseContext(); - // _originalGLContext = null; - // } - // newfiberMap.baseMap.map = null; - // newfiberMap = null; - // } -}; + onMounted(() => { getWeather(); // 获取项目片区点击 bus.on('checkProjectArea', params => { areaObj.value = params; }); + // 降雨特征点击 + bus.on('checkRainL', params => { + if (params == 1) { + showRainFlow.value = false; + } else { + showRainFlow.value = true; + } + }); }); onBeforeUnmount(() => { bus.off('checkProjectArea'); + bus.off('checkRainL'); if (!newfiberMap) return; if (newfiberMap) { let _originalGLContext = newfiberMap.getMap().scene?.context._originalGLContext; diff --git a/src/assets/styles/publicXG.scss b/src/assets/styles/publicXG.scss index a1bb068..1cd628d 100644 --- a/src/assets/styles/publicXG.scss +++ b/src/assets/styles/publicXG.scss @@ -480,25 +480,6 @@ color: #e4f5ff; padding-left: 30px; position: relative; - &::after { - content: ''; - position: absolute; - top: 3px; - width: 71px; - height: 35px; - background: url('@/assets/newImgs/HMScreen/partLight.png') no-repeat; - background-size: 100% 100%; - animation: partDXL 3s infinite ease-in-out; - pointer-events: none; - @keyframes partDXL { - 0% { - left: 0px; - } - 100% { - left: 390px; - } - } - } } .partContHM { background: #004565; diff --git a/src/views/sponeScreen/Echarts/RainfallLegend.vue b/src/views/sponeScreen/Echarts/RainfallLegend.vue index 7c03214..62292a6 100644 --- a/src/views/sponeScreen/Echarts/RainfallLegend.vue +++ b/src/views/sponeScreen/Echarts/RainfallLegend.vue @@ -12,8 +12,6 @@ refresh: Number, }, setup(props) { - console.log(props.data); - const allData = reactive({ series: [], legend: [], @@ -40,20 +38,6 @@ }, tooltip: { trigger: 'axis', - // formatter: "{b}:{c}㎡", - // feature: { - // mark: { show: true }, - // dataView: { show: true, readOnly: false }, - // magicType: { show: true, type: ['line', 'bar'] }, - // restore: { show: true }, - // saveAsImage: { show: true } - // }, - // axisPointer: { - // type: "cross", - // textStyle: { - // color: "#fff" - // } - // }, formatter: params => { // console.log(params); var relVal = '' + params[0].name; @@ -68,7 +52,7 @@ }, legend: { // type: 'scroll', - data: '降雨量', + data: [], itemWidth: 18, itemHeight: 12, textStyle: { diff --git a/src/views/sponeScreen/HaiMianScreen/index.vue b/src/views/sponeScreen/HaiMianScreen/index.vue index 5dd1c73..4a22924 100644 --- a/src/views/sponeScreen/HaiMianScreen/index.vue +++ b/src/views/sponeScreen/HaiMianScreen/index.vue @@ -121,9 +121,12 @@ - + + + + @@ -138,6 +141,7 @@ import EvaluationKH from '@/views/sponeScreen/evaluationKH/index.vue'; //考核评估 import WaterFlood from '@/views/sponeScreen/waterFlood/index.vue'; //排水防涝 import LongYW from '@/views/sponeScreen/longYW/index.vue'; //长效运维 +import CanvasRain from '@/views/sponeScreen/cityGK/canvasRain.vue'; //降雨效果 import axios from 'axios'; import NewFiberMapUtils from '@/utils/gis/NewFiberMapUtils'; import newfiberMapBoxVectorLayer from '@/views/sponeScreen/gisMF/mapboxVectorLayer.js'; @@ -149,6 +153,7 @@ const stationList = ref([]); const stationCode = ref(''); const dateNow = ref(proxy.moment(new Date()).format('YYYY-MM-DD')); +const showRainFlow = ref(false); const menuList = ref([ { name: '城市概况', id: 1 }, { name: '项目建设', id: 2 }, @@ -240,31 +245,25 @@ newfiberMapBoxVectorLayer.removeByIds(['bengzhan_Area']); //清除泵站范围 } }; -//关闭三维管网弹窗 -const closePipe = () => { - // if (newfiberMap) { - // let _originalGLContext = newfiberMap.getMap().scene?.context._originalGLContext; - // newfiberMap.getMap().imageryLayers.removeAll(); - // newfiberMap.getMap().entities.removeAll(); - // newfiberMap.getMap().scene.primitives.removeAll(); - // newfiberMap.getMap().destroy(); - // if (_originalGLContext) { - // _originalGLContext.getExtension('WEBGL_lose_context').loseContext(); - // _originalGLContext = null; - // } - // newfiberMap.baseMap.map = null; - // newfiberMap = null; - // } -}; + onMounted(() => { getWeather(); // 获取项目片区点击 bus.on('checkProjectArea', params => { areaObj.value = params; }); + // 降雨特征点击 + bus.on('checkRainL', params => { + if (params == 1) { + showRainFlow.value = false; + } else { + showRainFlow.value = true; + } + }); }); onBeforeUnmount(() => { bus.off('checkProjectArea'); + bus.off('checkRainL'); if (!newfiberMap) return; if (newfiberMap) { let _originalGLContext = newfiberMap.getMap().scene?.context._originalGLContext; diff --git a/src/views/sponeScreen/cityGK/canvasRain.vue b/src/views/sponeScreen/cityGK/canvasRain.vue new file mode 100644 index 0000000..415c5f3 --- /dev/null +++ b/src/views/sponeScreen/cityGK/canvasRain.vue @@ -0,0 +1,129 @@ + + + + + diff --git a/src/assets/styles/publicXG.scss b/src/assets/styles/publicXG.scss index a1bb068..1cd628d 100644 --- a/src/assets/styles/publicXG.scss +++ b/src/assets/styles/publicXG.scss @@ -480,25 +480,6 @@ color: #e4f5ff; padding-left: 30px; position: relative; - &::after { - content: ''; - position: absolute; - top: 3px; - width: 71px; - height: 35px; - background: url('@/assets/newImgs/HMScreen/partLight.png') no-repeat; - background-size: 100% 100%; - animation: partDXL 3s infinite ease-in-out; - pointer-events: none; - @keyframes partDXL { - 0% { - left: 0px; - } - 100% { - left: 390px; - } - } - } } .partContHM { background: #004565; diff --git a/src/views/sponeScreen/Echarts/RainfallLegend.vue b/src/views/sponeScreen/Echarts/RainfallLegend.vue index 7c03214..62292a6 100644 --- a/src/views/sponeScreen/Echarts/RainfallLegend.vue +++ b/src/views/sponeScreen/Echarts/RainfallLegend.vue @@ -12,8 +12,6 @@ refresh: Number, }, setup(props) { - console.log(props.data); - const allData = reactive({ series: [], legend: [], @@ -40,20 +38,6 @@ }, tooltip: { trigger: 'axis', - // formatter: "{b}:{c}㎡", - // feature: { - // mark: { show: true }, - // dataView: { show: true, readOnly: false }, - // magicType: { show: true, type: ['line', 'bar'] }, - // restore: { show: true }, - // saveAsImage: { show: true } - // }, - // axisPointer: { - // type: "cross", - // textStyle: { - // color: "#fff" - // } - // }, formatter: params => { // console.log(params); var relVal = '' + params[0].name; @@ -68,7 +52,7 @@ }, legend: { // type: 'scroll', - data: '降雨量', + data: [], itemWidth: 18, itemHeight: 12, textStyle: { diff --git a/src/views/sponeScreen/HaiMianScreen/index.vue b/src/views/sponeScreen/HaiMianScreen/index.vue index 5dd1c73..4a22924 100644 --- a/src/views/sponeScreen/HaiMianScreen/index.vue +++ b/src/views/sponeScreen/HaiMianScreen/index.vue @@ -121,9 +121,12 @@ - + + + + @@ -138,6 +141,7 @@ import EvaluationKH from '@/views/sponeScreen/evaluationKH/index.vue'; //考核评估 import WaterFlood from '@/views/sponeScreen/waterFlood/index.vue'; //排水防涝 import LongYW from '@/views/sponeScreen/longYW/index.vue'; //长效运维 +import CanvasRain from '@/views/sponeScreen/cityGK/canvasRain.vue'; //降雨效果 import axios from 'axios'; import NewFiberMapUtils from '@/utils/gis/NewFiberMapUtils'; import newfiberMapBoxVectorLayer from '@/views/sponeScreen/gisMF/mapboxVectorLayer.js'; @@ -149,6 +153,7 @@ const stationList = ref([]); const stationCode = ref(''); const dateNow = ref(proxy.moment(new Date()).format('YYYY-MM-DD')); +const showRainFlow = ref(false); const menuList = ref([ { name: '城市概况', id: 1 }, { name: '项目建设', id: 2 }, @@ -240,31 +245,25 @@ newfiberMapBoxVectorLayer.removeByIds(['bengzhan_Area']); //清除泵站范围 } }; -//关闭三维管网弹窗 -const closePipe = () => { - // if (newfiberMap) { - // let _originalGLContext = newfiberMap.getMap().scene?.context._originalGLContext; - // newfiberMap.getMap().imageryLayers.removeAll(); - // newfiberMap.getMap().entities.removeAll(); - // newfiberMap.getMap().scene.primitives.removeAll(); - // newfiberMap.getMap().destroy(); - // if (_originalGLContext) { - // _originalGLContext.getExtension('WEBGL_lose_context').loseContext(); - // _originalGLContext = null; - // } - // newfiberMap.baseMap.map = null; - // newfiberMap = null; - // } -}; + onMounted(() => { getWeather(); // 获取项目片区点击 bus.on('checkProjectArea', params => { areaObj.value = params; }); + // 降雨特征点击 + bus.on('checkRainL', params => { + if (params == 1) { + showRainFlow.value = false; + } else { + showRainFlow.value = true; + } + }); }); onBeforeUnmount(() => { bus.off('checkProjectArea'); + bus.off('checkRainL'); if (!newfiberMap) return; if (newfiberMap) { let _originalGLContext = newfiberMap.getMap().scene?.context._originalGLContext; diff --git a/src/views/sponeScreen/cityGK/canvasRain.vue b/src/views/sponeScreen/cityGK/canvasRain.vue new file mode 100644 index 0000000..415c5f3 --- /dev/null +++ b/src/views/sponeScreen/cityGK/canvasRain.vue @@ -0,0 +1,129 @@ + + + + + diff --git a/src/views/sponeScreen/cityGK/rainfall.vue b/src/views/sponeScreen/cityGK/rainfall.vue index c6a4e74..2cb1d5d 100644 --- a/src/views/sponeScreen/cityGK/rainfall.vue +++ b/src/views/sponeScreen/cityGK/rainfall.vue @@ -28,15 +28,13 @@ diff --git a/src/views/sponeScreen/cityGK/rainfall.vue b/src/views/sponeScreen/cityGK/rainfall.vue index c6a4e74..2cb1d5d 100644 --- a/src/views/sponeScreen/cityGK/rainfall.vue +++ b/src/views/sponeScreen/cityGK/rainfall.vue @@ -28,15 +28,13 @@