diff --git a/src/views/floodSys/floodOneMap/commonPopupJCGJ.vue b/src/views/floodSys/floodOneMap/commonPopupJCGJ.vue index ddcb3e9..c6f2d6b 100644 --- a/src/views/floodSys/floodOneMap/commonPopupJCGJ.vue +++ b/src/views/floodSys/floodOneMap/commonPopupJCGJ.vue @@ -233,8 +233,8 @@ allData.dataTime1 = proxy.moment(new Date()).subtract(3, 'days').format('YYYY-MM-DD'); allData.dataTime2 = proxy.moment(new Date()).format('YYYY-MM-DD'); newfiberMapbox.map.easeTo({ - center: [113.953, 30.906], - zoom: 13.6, + center: [114.312, 34.802], + zoom: 12.9, pitch: 55, }); let clearSelectedFeature = []; diff --git a/src/views/floodSys/floodOneMap/commonPopupJCGJ.vue b/src/views/floodSys/floodOneMap/commonPopupJCGJ.vue index ddcb3e9..c6f2d6b 100644 --- a/src/views/floodSys/floodOneMap/commonPopupJCGJ.vue +++ b/src/views/floodSys/floodOneMap/commonPopupJCGJ.vue @@ -233,8 +233,8 @@ allData.dataTime1 = proxy.moment(new Date()).subtract(3, 'days').format('YYYY-MM-DD'); allData.dataTime2 = proxy.moment(new Date()).format('YYYY-MM-DD'); newfiberMapbox.map.easeTo({ - center: [113.953, 30.906], - zoom: 13.6, + center: [114.312, 34.802], + zoom: 12.9, pitch: 55, }); let clearSelectedFeature = []; diff --git a/src/views/floodSys/floodOneMap/commonPopupPK.vue b/src/views/floodSys/floodOneMap/commonPopupPK.vue index c6828f0..d914c05 100644 --- a/src/views/floodSys/floodOneMap/commonPopupPK.vue +++ b/src/views/floodSys/floodOneMap/commonPopupPK.vue @@ -107,8 +107,8 @@ allData.dataTime1 = proxy.moment(new Date()).subtract(3, 'days').format('YYYY-MM-DD'); allData.dataTime2 = proxy.moment(new Date()).format('YYYY-MM-DD'); newfiberMapbox.map.easeTo({ - center: [113.953, 30.906], - zoom: 13.6, + center: [114.312, 34.802], + zoom: 12.9, pitch: 55, }); let clearSelectedFeature = []; @@ -248,35 +248,35 @@ if (!!chartPK) chartPK.dispose(); chartPK = echarts.init(document.getElementById('chartSupervisePK')); chartOption.floodOneMapPipewater.legend.data = [seleceName.value]; - chartOption.floodOneMapPipewater.yAxis[0] = { - name: 'SS(mg/l)', - type: 'value', - textStyle: { - color: '#00D1FF', - }, - axisLine: { - show: false, - lineStyle: { - color: '#00D1FF', //刻度线的颜色 - }, - }, - splitLine: { - //x网格样式 - show: true, - lineStyle: { - color: '#00D1FF', - type: 'dashed', - }, + (chartOption.floodOneMapPipewater.yAxis[0] = { + name: 'SS(mg/l)', + type: 'value', + textStyle: { + color: '#00D1FF', + }, + axisLine: { + show: false, + lineStyle: { + color: '#00D1FF', //刻度线的颜色 }, }, - chartOption.floodOneMapPipewater.yAxis[0].name = unitName.value; + splitLine: { + //x网格样式 + show: true, + lineStyle: { + color: '#00D1FF', + type: 'dashed', + }, + }, + }), + (chartOption.floodOneMapPipewater.yAxis[0].name = unitName.value); chartOption.floodOneMapPipewater.yAxis[1].name = ''; chartOption.floodOneMapPipewater.xAxis[0].data = propertyMonitorXList.value; chartOption.floodOneMapPipewater.series[0].name = seleceName.value; chartOption.floodOneMapPipewater.series[0].data = selectData.value; chartOption.floodOneMapPipewater.series[1].data = []; chartOption.floodOneMapPipewater.series[0].markLine = {}; - + // 设置鼠标滚轮放大缩小展示数据区间 chartOption.floodOneMapPipewater.dataZoom = [ { type: 'inside', startValue: propertyMonitorXList.value[propertyMonitorXList.value.length / 2] }, @@ -351,8 +351,6 @@ } else { chartOption.floodOneMapPipewater.series[1].data = []; chartOption.floodOneMapPipewater.series[1].markLine = ''; - - } if (propertyMonitorXList.value.length > 0) { diff --git a/src/views/floodSys/floodOneMap/commonPopupJCGJ.vue b/src/views/floodSys/floodOneMap/commonPopupJCGJ.vue index ddcb3e9..c6f2d6b 100644 --- a/src/views/floodSys/floodOneMap/commonPopupJCGJ.vue +++ b/src/views/floodSys/floodOneMap/commonPopupJCGJ.vue @@ -233,8 +233,8 @@ allData.dataTime1 = proxy.moment(new Date()).subtract(3, 'days').format('YYYY-MM-DD'); allData.dataTime2 = proxy.moment(new Date()).format('YYYY-MM-DD'); newfiberMapbox.map.easeTo({ - center: [113.953, 30.906], - zoom: 13.6, + center: [114.312, 34.802], + zoom: 12.9, pitch: 55, }); let clearSelectedFeature = []; diff --git a/src/views/floodSys/floodOneMap/commonPopupPK.vue b/src/views/floodSys/floodOneMap/commonPopupPK.vue index c6828f0..d914c05 100644 --- a/src/views/floodSys/floodOneMap/commonPopupPK.vue +++ b/src/views/floodSys/floodOneMap/commonPopupPK.vue @@ -107,8 +107,8 @@ allData.dataTime1 = proxy.moment(new Date()).subtract(3, 'days').format('YYYY-MM-DD'); allData.dataTime2 = proxy.moment(new Date()).format('YYYY-MM-DD'); newfiberMapbox.map.easeTo({ - center: [113.953, 30.906], - zoom: 13.6, + center: [114.312, 34.802], + zoom: 12.9, pitch: 55, }); let clearSelectedFeature = []; @@ -248,35 +248,35 @@ if (!!chartPK) chartPK.dispose(); chartPK = echarts.init(document.getElementById('chartSupervisePK')); chartOption.floodOneMapPipewater.legend.data = [seleceName.value]; - chartOption.floodOneMapPipewater.yAxis[0] = { - name: 'SS(mg/l)', - type: 'value', - textStyle: { - color: '#00D1FF', - }, - axisLine: { - show: false, - lineStyle: { - color: '#00D1FF', //刻度线的颜色 - }, - }, - splitLine: { - //x网格样式 - show: true, - lineStyle: { - color: '#00D1FF', - type: 'dashed', - }, + (chartOption.floodOneMapPipewater.yAxis[0] = { + name: 'SS(mg/l)', + type: 'value', + textStyle: { + color: '#00D1FF', + }, + axisLine: { + show: false, + lineStyle: { + color: '#00D1FF', //刻度线的颜色 }, }, - chartOption.floodOneMapPipewater.yAxis[0].name = unitName.value; + splitLine: { + //x网格样式 + show: true, + lineStyle: { + color: '#00D1FF', + type: 'dashed', + }, + }, + }), + (chartOption.floodOneMapPipewater.yAxis[0].name = unitName.value); chartOption.floodOneMapPipewater.yAxis[1].name = ''; chartOption.floodOneMapPipewater.xAxis[0].data = propertyMonitorXList.value; chartOption.floodOneMapPipewater.series[0].name = seleceName.value; chartOption.floodOneMapPipewater.series[0].data = selectData.value; chartOption.floodOneMapPipewater.series[1].data = []; chartOption.floodOneMapPipewater.series[0].markLine = {}; - + // 设置鼠标滚轮放大缩小展示数据区间 chartOption.floodOneMapPipewater.dataZoom = [ { type: 'inside', startValue: propertyMonitorXList.value[propertyMonitorXList.value.length / 2] }, @@ -351,8 +351,6 @@ } else { chartOption.floodOneMapPipewater.series[1].data = []; chartOption.floodOneMapPipewater.series[1].markLine = ''; - - } if (propertyMonitorXList.value.length > 0) { diff --git a/src/views/floodSys/floodOneMap/commonPopupRain.vue b/src/views/floodSys/floodOneMap/commonPopupRain.vue index 56b3cea..d0d85bf 100644 --- a/src/views/floodSys/floodOneMap/commonPopupRain.vue +++ b/src/views/floodSys/floodOneMap/commonPopupRain.vue @@ -119,8 +119,8 @@ allData.dataTime2 = proxy.moment(new Date()).format('YYYY-MM-DD'); allData.popupShow = false; newfiberMapbox.map.easeTo({ - center: [113.953, 30.906], - zoom: 13.6, + center: [114.312, 34.802], + zoom: 12.9, pitch: 55, }); let clearSelectedFeature = []; @@ -222,7 +222,7 @@ z-index: 115; position: absolute; top: 80px; - left: 330px; + left: 530px; .title { padding-top: 30px; display: flex; diff --git a/src/views/floodSys/floodOneMap/commonPopupJCGJ.vue b/src/views/floodSys/floodOneMap/commonPopupJCGJ.vue index ddcb3e9..c6f2d6b 100644 --- a/src/views/floodSys/floodOneMap/commonPopupJCGJ.vue +++ b/src/views/floodSys/floodOneMap/commonPopupJCGJ.vue @@ -233,8 +233,8 @@ allData.dataTime1 = proxy.moment(new Date()).subtract(3, 'days').format('YYYY-MM-DD'); allData.dataTime2 = proxy.moment(new Date()).format('YYYY-MM-DD'); newfiberMapbox.map.easeTo({ - center: [113.953, 30.906], - zoom: 13.6, + center: [114.312, 34.802], + zoom: 12.9, pitch: 55, }); let clearSelectedFeature = []; diff --git a/src/views/floodSys/floodOneMap/commonPopupPK.vue b/src/views/floodSys/floodOneMap/commonPopupPK.vue index c6828f0..d914c05 100644 --- a/src/views/floodSys/floodOneMap/commonPopupPK.vue +++ b/src/views/floodSys/floodOneMap/commonPopupPK.vue @@ -107,8 +107,8 @@ allData.dataTime1 = proxy.moment(new Date()).subtract(3, 'days').format('YYYY-MM-DD'); allData.dataTime2 = proxy.moment(new Date()).format('YYYY-MM-DD'); newfiberMapbox.map.easeTo({ - center: [113.953, 30.906], - zoom: 13.6, + center: [114.312, 34.802], + zoom: 12.9, pitch: 55, }); let clearSelectedFeature = []; @@ -248,35 +248,35 @@ if (!!chartPK) chartPK.dispose(); chartPK = echarts.init(document.getElementById('chartSupervisePK')); chartOption.floodOneMapPipewater.legend.data = [seleceName.value]; - chartOption.floodOneMapPipewater.yAxis[0] = { - name: 'SS(mg/l)', - type: 'value', - textStyle: { - color: '#00D1FF', - }, - axisLine: { - show: false, - lineStyle: { - color: '#00D1FF', //刻度线的颜色 - }, - }, - splitLine: { - //x网格样式 - show: true, - lineStyle: { - color: '#00D1FF', - type: 'dashed', - }, + (chartOption.floodOneMapPipewater.yAxis[0] = { + name: 'SS(mg/l)', + type: 'value', + textStyle: { + color: '#00D1FF', + }, + axisLine: { + show: false, + lineStyle: { + color: '#00D1FF', //刻度线的颜色 }, }, - chartOption.floodOneMapPipewater.yAxis[0].name = unitName.value; + splitLine: { + //x网格样式 + show: true, + lineStyle: { + color: '#00D1FF', + type: 'dashed', + }, + }, + }), + (chartOption.floodOneMapPipewater.yAxis[0].name = unitName.value); chartOption.floodOneMapPipewater.yAxis[1].name = ''; chartOption.floodOneMapPipewater.xAxis[0].data = propertyMonitorXList.value; chartOption.floodOneMapPipewater.series[0].name = seleceName.value; chartOption.floodOneMapPipewater.series[0].data = selectData.value; chartOption.floodOneMapPipewater.series[1].data = []; chartOption.floodOneMapPipewater.series[0].markLine = {}; - + // 设置鼠标滚轮放大缩小展示数据区间 chartOption.floodOneMapPipewater.dataZoom = [ { type: 'inside', startValue: propertyMonitorXList.value[propertyMonitorXList.value.length / 2] }, @@ -351,8 +351,6 @@ } else { chartOption.floodOneMapPipewater.series[1].data = []; chartOption.floodOneMapPipewater.series[1].markLine = ''; - - } if (propertyMonitorXList.value.length > 0) { diff --git a/src/views/floodSys/floodOneMap/commonPopupRain.vue b/src/views/floodSys/floodOneMap/commonPopupRain.vue index 56b3cea..d0d85bf 100644 --- a/src/views/floodSys/floodOneMap/commonPopupRain.vue +++ b/src/views/floodSys/floodOneMap/commonPopupRain.vue @@ -119,8 +119,8 @@ allData.dataTime2 = proxy.moment(new Date()).format('YYYY-MM-DD'); allData.popupShow = false; newfiberMapbox.map.easeTo({ - center: [113.953, 30.906], - zoom: 13.6, + center: [114.312, 34.802], + zoom: 12.9, pitch: 55, }); let clearSelectedFeature = []; @@ -222,7 +222,7 @@ z-index: 115; position: absolute; top: 80px; - left: 330px; + left: 530px; .title { padding-top: 30px; display: flex; diff --git a/src/views/floodSys/floodOneMap/commonPopupRiver.vue b/src/views/floodSys/floodOneMap/commonPopupRiver.vue index 66b5576..2428b27 100644 --- a/src/views/floodSys/floodOneMap/commonPopupRiver.vue +++ b/src/views/floodSys/floodOneMap/commonPopupRiver.vue @@ -98,8 +98,8 @@ allData.dataTime1 = proxy.moment(new Date()).subtract(3, 'days').format('YYYY-MM-DD'); allData.dataTime2 = proxy.moment(new Date()).format('YYYY-MM-DD'); newfiberMapbox.map.easeTo({ - center: [113.953, 30.906], - zoom: 13.6, + center: [114.312, 34.802], + zoom: 12.9, pitch: 55, }); let clearSelectedFeature = []; diff --git a/src/views/floodSys/floodOneMap/commonPopupJCGJ.vue b/src/views/floodSys/floodOneMap/commonPopupJCGJ.vue index ddcb3e9..c6f2d6b 100644 --- a/src/views/floodSys/floodOneMap/commonPopupJCGJ.vue +++ b/src/views/floodSys/floodOneMap/commonPopupJCGJ.vue @@ -233,8 +233,8 @@ allData.dataTime1 = proxy.moment(new Date()).subtract(3, 'days').format('YYYY-MM-DD'); allData.dataTime2 = proxy.moment(new Date()).format('YYYY-MM-DD'); newfiberMapbox.map.easeTo({ - center: [113.953, 30.906], - zoom: 13.6, + center: [114.312, 34.802], + zoom: 12.9, pitch: 55, }); let clearSelectedFeature = []; diff --git a/src/views/floodSys/floodOneMap/commonPopupPK.vue b/src/views/floodSys/floodOneMap/commonPopupPK.vue index c6828f0..d914c05 100644 --- a/src/views/floodSys/floodOneMap/commonPopupPK.vue +++ b/src/views/floodSys/floodOneMap/commonPopupPK.vue @@ -107,8 +107,8 @@ allData.dataTime1 = proxy.moment(new Date()).subtract(3, 'days').format('YYYY-MM-DD'); allData.dataTime2 = proxy.moment(new Date()).format('YYYY-MM-DD'); newfiberMapbox.map.easeTo({ - center: [113.953, 30.906], - zoom: 13.6, + center: [114.312, 34.802], + zoom: 12.9, pitch: 55, }); let clearSelectedFeature = []; @@ -248,35 +248,35 @@ if (!!chartPK) chartPK.dispose(); chartPK = echarts.init(document.getElementById('chartSupervisePK')); chartOption.floodOneMapPipewater.legend.data = [seleceName.value]; - chartOption.floodOneMapPipewater.yAxis[0] = { - name: 'SS(mg/l)', - type: 'value', - textStyle: { - color: '#00D1FF', - }, - axisLine: { - show: false, - lineStyle: { - color: '#00D1FF', //刻度线的颜色 - }, - }, - splitLine: { - //x网格样式 - show: true, - lineStyle: { - color: '#00D1FF', - type: 'dashed', - }, + (chartOption.floodOneMapPipewater.yAxis[0] = { + name: 'SS(mg/l)', + type: 'value', + textStyle: { + color: '#00D1FF', + }, + axisLine: { + show: false, + lineStyle: { + color: '#00D1FF', //刻度线的颜色 }, }, - chartOption.floodOneMapPipewater.yAxis[0].name = unitName.value; + splitLine: { + //x网格样式 + show: true, + lineStyle: { + color: '#00D1FF', + type: 'dashed', + }, + }, + }), + (chartOption.floodOneMapPipewater.yAxis[0].name = unitName.value); chartOption.floodOneMapPipewater.yAxis[1].name = ''; chartOption.floodOneMapPipewater.xAxis[0].data = propertyMonitorXList.value; chartOption.floodOneMapPipewater.series[0].name = seleceName.value; chartOption.floodOneMapPipewater.series[0].data = selectData.value; chartOption.floodOneMapPipewater.series[1].data = []; chartOption.floodOneMapPipewater.series[0].markLine = {}; - + // 设置鼠标滚轮放大缩小展示数据区间 chartOption.floodOneMapPipewater.dataZoom = [ { type: 'inside', startValue: propertyMonitorXList.value[propertyMonitorXList.value.length / 2] }, @@ -351,8 +351,6 @@ } else { chartOption.floodOneMapPipewater.series[1].data = []; chartOption.floodOneMapPipewater.series[1].markLine = ''; - - } if (propertyMonitorXList.value.length > 0) { diff --git a/src/views/floodSys/floodOneMap/commonPopupRain.vue b/src/views/floodSys/floodOneMap/commonPopupRain.vue index 56b3cea..d0d85bf 100644 --- a/src/views/floodSys/floodOneMap/commonPopupRain.vue +++ b/src/views/floodSys/floodOneMap/commonPopupRain.vue @@ -119,8 +119,8 @@ allData.dataTime2 = proxy.moment(new Date()).format('YYYY-MM-DD'); allData.popupShow = false; newfiberMapbox.map.easeTo({ - center: [113.953, 30.906], - zoom: 13.6, + center: [114.312, 34.802], + zoom: 12.9, pitch: 55, }); let clearSelectedFeature = []; @@ -222,7 +222,7 @@ z-index: 115; position: absolute; top: 80px; - left: 330px; + left: 530px; .title { padding-top: 30px; display: flex; diff --git a/src/views/floodSys/floodOneMap/commonPopupRiver.vue b/src/views/floodSys/floodOneMap/commonPopupRiver.vue index 66b5576..2428b27 100644 --- a/src/views/floodSys/floodOneMap/commonPopupRiver.vue +++ b/src/views/floodSys/floodOneMap/commonPopupRiver.vue @@ -98,8 +98,8 @@ allData.dataTime1 = proxy.moment(new Date()).subtract(3, 'days').format('YYYY-MM-DD'); allData.dataTime2 = proxy.moment(new Date()).format('YYYY-MM-DD'); newfiberMapbox.map.easeTo({ - center: [113.953, 30.906], - zoom: 13.6, + center: [114.312, 34.802], + zoom: 12.9, pitch: 55, }); let clearSelectedFeature = []; diff --git a/src/views/floodSys/floodOneMap/commonPopupSupervise.vue b/src/views/floodSys/floodOneMap/commonPopupSupervise.vue index 6cf54ab..c4d40fc 100644 --- a/src/views/floodSys/floodOneMap/commonPopupSupervise.vue +++ b/src/views/floodSys/floodOneMap/commonPopupSupervise.vue @@ -132,8 +132,8 @@ allData.dataTime1 = proxy.moment(new Date()).subtract(3, 'days').format('YYYY-MM-DD'); allData.dataTime2 = proxy.moment(new Date()).format('YYYY-MM-DD'); newfiberMapbox.map.easeTo({ - center: [113.953, 30.906], - zoom: 13.6, + center: [114.312, 34.802], + zoom: 12.9, pitch: 55, }); @@ -313,28 +313,28 @@ if (!!chartPopupSup) chartPopupSup.dispose(); chartPopupSup = echarts.init(document.getElementById('chartPopupSupervise')); chartOption.floodOneMapPipewater.legend.data = [seleceName.value]; - chartOption.floodOneMapPipewater.yAxis[0] = { - name: 'SS(mg/l)', - type: 'value', - textStyle: { - color: '#00D1FF', - }, - axisLine: { - show: false, - lineStyle: { - color: '#00D1FF', //刻度线的颜色 - }, - }, - splitLine: { - //x网格样式 - show: true, - lineStyle: { - color: '#00D1FF', - type: 'dashed', - }, + (chartOption.floodOneMapPipewater.yAxis[0] = { + name: 'SS(mg/l)', + type: 'value', + textStyle: { + color: '#00D1FF', + }, + axisLine: { + show: false, + lineStyle: { + color: '#00D1FF', //刻度线的颜色 }, }, - chartOption.floodOneMapPipewater.yAxis[0].name = unitName.value; + splitLine: { + //x网格样式 + show: true, + lineStyle: { + color: '#00D1FF', + type: 'dashed', + }, + }, + }), + (chartOption.floodOneMapPipewater.yAxis[0].name = unitName.value); chartOption.floodOneMapPipewater.yAxis[1].name = ''; // chartOption.floodOneMapPipewater.xAxis[0].data = propertyMonitorXList.value; @@ -460,7 +460,7 @@ } else { chartOption.floodOneMapPipewater.graphic.invisible = false; //暂无数据 } - console.log( chartOption.floodOneMapPipewater,9999999) + console.log(chartOption.floodOneMapPipewater, 9999999); chartPopupSup.clear(); chartPopupSup.setOption(chartOption.floodOneMapPipewater); }; diff --git a/src/views/floodSys/floodOneMap/commonPopupJCGJ.vue b/src/views/floodSys/floodOneMap/commonPopupJCGJ.vue index ddcb3e9..c6f2d6b 100644 --- a/src/views/floodSys/floodOneMap/commonPopupJCGJ.vue +++ b/src/views/floodSys/floodOneMap/commonPopupJCGJ.vue @@ -233,8 +233,8 @@ allData.dataTime1 = proxy.moment(new Date()).subtract(3, 'days').format('YYYY-MM-DD'); allData.dataTime2 = proxy.moment(new Date()).format('YYYY-MM-DD'); newfiberMapbox.map.easeTo({ - center: [113.953, 30.906], - zoom: 13.6, + center: [114.312, 34.802], + zoom: 12.9, pitch: 55, }); let clearSelectedFeature = []; diff --git a/src/views/floodSys/floodOneMap/commonPopupPK.vue b/src/views/floodSys/floodOneMap/commonPopupPK.vue index c6828f0..d914c05 100644 --- a/src/views/floodSys/floodOneMap/commonPopupPK.vue +++ b/src/views/floodSys/floodOneMap/commonPopupPK.vue @@ -107,8 +107,8 @@ allData.dataTime1 = proxy.moment(new Date()).subtract(3, 'days').format('YYYY-MM-DD'); allData.dataTime2 = proxy.moment(new Date()).format('YYYY-MM-DD'); newfiberMapbox.map.easeTo({ - center: [113.953, 30.906], - zoom: 13.6, + center: [114.312, 34.802], + zoom: 12.9, pitch: 55, }); let clearSelectedFeature = []; @@ -248,35 +248,35 @@ if (!!chartPK) chartPK.dispose(); chartPK = echarts.init(document.getElementById('chartSupervisePK')); chartOption.floodOneMapPipewater.legend.data = [seleceName.value]; - chartOption.floodOneMapPipewater.yAxis[0] = { - name: 'SS(mg/l)', - type: 'value', - textStyle: { - color: '#00D1FF', - }, - axisLine: { - show: false, - lineStyle: { - color: '#00D1FF', //刻度线的颜色 - }, - }, - splitLine: { - //x网格样式 - show: true, - lineStyle: { - color: '#00D1FF', - type: 'dashed', - }, + (chartOption.floodOneMapPipewater.yAxis[0] = { + name: 'SS(mg/l)', + type: 'value', + textStyle: { + color: '#00D1FF', + }, + axisLine: { + show: false, + lineStyle: { + color: '#00D1FF', //刻度线的颜色 }, }, - chartOption.floodOneMapPipewater.yAxis[0].name = unitName.value; + splitLine: { + //x网格样式 + show: true, + lineStyle: { + color: '#00D1FF', + type: 'dashed', + }, + }, + }), + (chartOption.floodOneMapPipewater.yAxis[0].name = unitName.value); chartOption.floodOneMapPipewater.yAxis[1].name = ''; chartOption.floodOneMapPipewater.xAxis[0].data = propertyMonitorXList.value; chartOption.floodOneMapPipewater.series[0].name = seleceName.value; chartOption.floodOneMapPipewater.series[0].data = selectData.value; chartOption.floodOneMapPipewater.series[1].data = []; chartOption.floodOneMapPipewater.series[0].markLine = {}; - + // 设置鼠标滚轮放大缩小展示数据区间 chartOption.floodOneMapPipewater.dataZoom = [ { type: 'inside', startValue: propertyMonitorXList.value[propertyMonitorXList.value.length / 2] }, @@ -351,8 +351,6 @@ } else { chartOption.floodOneMapPipewater.series[1].data = []; chartOption.floodOneMapPipewater.series[1].markLine = ''; - - } if (propertyMonitorXList.value.length > 0) { diff --git a/src/views/floodSys/floodOneMap/commonPopupRain.vue b/src/views/floodSys/floodOneMap/commonPopupRain.vue index 56b3cea..d0d85bf 100644 --- a/src/views/floodSys/floodOneMap/commonPopupRain.vue +++ b/src/views/floodSys/floodOneMap/commonPopupRain.vue @@ -119,8 +119,8 @@ allData.dataTime2 = proxy.moment(new Date()).format('YYYY-MM-DD'); allData.popupShow = false; newfiberMapbox.map.easeTo({ - center: [113.953, 30.906], - zoom: 13.6, + center: [114.312, 34.802], + zoom: 12.9, pitch: 55, }); let clearSelectedFeature = []; @@ -222,7 +222,7 @@ z-index: 115; position: absolute; top: 80px; - left: 330px; + left: 530px; .title { padding-top: 30px; display: flex; diff --git a/src/views/floodSys/floodOneMap/commonPopupRiver.vue b/src/views/floodSys/floodOneMap/commonPopupRiver.vue index 66b5576..2428b27 100644 --- a/src/views/floodSys/floodOneMap/commonPopupRiver.vue +++ b/src/views/floodSys/floodOneMap/commonPopupRiver.vue @@ -98,8 +98,8 @@ allData.dataTime1 = proxy.moment(new Date()).subtract(3, 'days').format('YYYY-MM-DD'); allData.dataTime2 = proxy.moment(new Date()).format('YYYY-MM-DD'); newfiberMapbox.map.easeTo({ - center: [113.953, 30.906], - zoom: 13.6, + center: [114.312, 34.802], + zoom: 12.9, pitch: 55, }); let clearSelectedFeature = []; diff --git a/src/views/floodSys/floodOneMap/commonPopupSupervise.vue b/src/views/floodSys/floodOneMap/commonPopupSupervise.vue index 6cf54ab..c4d40fc 100644 --- a/src/views/floodSys/floodOneMap/commonPopupSupervise.vue +++ b/src/views/floodSys/floodOneMap/commonPopupSupervise.vue @@ -132,8 +132,8 @@ allData.dataTime1 = proxy.moment(new Date()).subtract(3, 'days').format('YYYY-MM-DD'); allData.dataTime2 = proxy.moment(new Date()).format('YYYY-MM-DD'); newfiberMapbox.map.easeTo({ - center: [113.953, 30.906], - zoom: 13.6, + center: [114.312, 34.802], + zoom: 12.9, pitch: 55, }); @@ -313,28 +313,28 @@ if (!!chartPopupSup) chartPopupSup.dispose(); chartPopupSup = echarts.init(document.getElementById('chartPopupSupervise')); chartOption.floodOneMapPipewater.legend.data = [seleceName.value]; - chartOption.floodOneMapPipewater.yAxis[0] = { - name: 'SS(mg/l)', - type: 'value', - textStyle: { - color: '#00D1FF', - }, - axisLine: { - show: false, - lineStyle: { - color: '#00D1FF', //刻度线的颜色 - }, - }, - splitLine: { - //x网格样式 - show: true, - lineStyle: { - color: '#00D1FF', - type: 'dashed', - }, + (chartOption.floodOneMapPipewater.yAxis[0] = { + name: 'SS(mg/l)', + type: 'value', + textStyle: { + color: '#00D1FF', + }, + axisLine: { + show: false, + lineStyle: { + color: '#00D1FF', //刻度线的颜色 }, }, - chartOption.floodOneMapPipewater.yAxis[0].name = unitName.value; + splitLine: { + //x网格样式 + show: true, + lineStyle: { + color: '#00D1FF', + type: 'dashed', + }, + }, + }), + (chartOption.floodOneMapPipewater.yAxis[0].name = unitName.value); chartOption.floodOneMapPipewater.yAxis[1].name = ''; // chartOption.floodOneMapPipewater.xAxis[0].data = propertyMonitorXList.value; @@ -460,7 +460,7 @@ } else { chartOption.floodOneMapPipewater.graphic.invisible = false; //暂无数据 } - console.log( chartOption.floodOneMapPipewater,9999999) + console.log(chartOption.floodOneMapPipewater, 9999999); chartPopupSup.clear(); chartPopupSup.setOption(chartOption.floodOneMapPipewater); }; diff --git a/src/views/floodSys/floodOneMap/commonPopupZS.vue b/src/views/floodSys/floodOneMap/commonPopupZS.vue index 7ec2b96..c8e3f3e 100644 --- a/src/views/floodSys/floodOneMap/commonPopupZS.vue +++ b/src/views/floodSys/floodOneMap/commonPopupZS.vue @@ -87,8 +87,8 @@ allData.dataTime1 = proxy.moment(new Date()).subtract(3, 'days').format('YYYY-MM-DD'); allData.dataTime2 = proxy.moment(new Date()).format('YYYY-MM-DD'); newfiberMapbox.map.easeTo({ - center: [113.953, 30.906], - zoom: 13.6, + center: [114.312, 34.802], + zoom: 12.9, pitch: 55, }); let clearSelectedFeature = []; diff --git a/src/views/floodSys/floodOneMap/commonPopupJCGJ.vue b/src/views/floodSys/floodOneMap/commonPopupJCGJ.vue index ddcb3e9..c6f2d6b 100644 --- a/src/views/floodSys/floodOneMap/commonPopupJCGJ.vue +++ b/src/views/floodSys/floodOneMap/commonPopupJCGJ.vue @@ -233,8 +233,8 @@ allData.dataTime1 = proxy.moment(new Date()).subtract(3, 'days').format('YYYY-MM-DD'); allData.dataTime2 = proxy.moment(new Date()).format('YYYY-MM-DD'); newfiberMapbox.map.easeTo({ - center: [113.953, 30.906], - zoom: 13.6, + center: [114.312, 34.802], + zoom: 12.9, pitch: 55, }); let clearSelectedFeature = []; diff --git a/src/views/floodSys/floodOneMap/commonPopupPK.vue b/src/views/floodSys/floodOneMap/commonPopupPK.vue index c6828f0..d914c05 100644 --- a/src/views/floodSys/floodOneMap/commonPopupPK.vue +++ b/src/views/floodSys/floodOneMap/commonPopupPK.vue @@ -107,8 +107,8 @@ allData.dataTime1 = proxy.moment(new Date()).subtract(3, 'days').format('YYYY-MM-DD'); allData.dataTime2 = proxy.moment(new Date()).format('YYYY-MM-DD'); newfiberMapbox.map.easeTo({ - center: [113.953, 30.906], - zoom: 13.6, + center: [114.312, 34.802], + zoom: 12.9, pitch: 55, }); let clearSelectedFeature = []; @@ -248,35 +248,35 @@ if (!!chartPK) chartPK.dispose(); chartPK = echarts.init(document.getElementById('chartSupervisePK')); chartOption.floodOneMapPipewater.legend.data = [seleceName.value]; - chartOption.floodOneMapPipewater.yAxis[0] = { - name: 'SS(mg/l)', - type: 'value', - textStyle: { - color: '#00D1FF', - }, - axisLine: { - show: false, - lineStyle: { - color: '#00D1FF', //刻度线的颜色 - }, - }, - splitLine: { - //x网格样式 - show: true, - lineStyle: { - color: '#00D1FF', - type: 'dashed', - }, + (chartOption.floodOneMapPipewater.yAxis[0] = { + name: 'SS(mg/l)', + type: 'value', + textStyle: { + color: '#00D1FF', + }, + axisLine: { + show: false, + lineStyle: { + color: '#00D1FF', //刻度线的颜色 }, }, - chartOption.floodOneMapPipewater.yAxis[0].name = unitName.value; + splitLine: { + //x网格样式 + show: true, + lineStyle: { + color: '#00D1FF', + type: 'dashed', + }, + }, + }), + (chartOption.floodOneMapPipewater.yAxis[0].name = unitName.value); chartOption.floodOneMapPipewater.yAxis[1].name = ''; chartOption.floodOneMapPipewater.xAxis[0].data = propertyMonitorXList.value; chartOption.floodOneMapPipewater.series[0].name = seleceName.value; chartOption.floodOneMapPipewater.series[0].data = selectData.value; chartOption.floodOneMapPipewater.series[1].data = []; chartOption.floodOneMapPipewater.series[0].markLine = {}; - + // 设置鼠标滚轮放大缩小展示数据区间 chartOption.floodOneMapPipewater.dataZoom = [ { type: 'inside', startValue: propertyMonitorXList.value[propertyMonitorXList.value.length / 2] }, @@ -351,8 +351,6 @@ } else { chartOption.floodOneMapPipewater.series[1].data = []; chartOption.floodOneMapPipewater.series[1].markLine = ''; - - } if (propertyMonitorXList.value.length > 0) { diff --git a/src/views/floodSys/floodOneMap/commonPopupRain.vue b/src/views/floodSys/floodOneMap/commonPopupRain.vue index 56b3cea..d0d85bf 100644 --- a/src/views/floodSys/floodOneMap/commonPopupRain.vue +++ b/src/views/floodSys/floodOneMap/commonPopupRain.vue @@ -119,8 +119,8 @@ allData.dataTime2 = proxy.moment(new Date()).format('YYYY-MM-DD'); allData.popupShow = false; newfiberMapbox.map.easeTo({ - center: [113.953, 30.906], - zoom: 13.6, + center: [114.312, 34.802], + zoom: 12.9, pitch: 55, }); let clearSelectedFeature = []; @@ -222,7 +222,7 @@ z-index: 115; position: absolute; top: 80px; - left: 330px; + left: 530px; .title { padding-top: 30px; display: flex; diff --git a/src/views/floodSys/floodOneMap/commonPopupRiver.vue b/src/views/floodSys/floodOneMap/commonPopupRiver.vue index 66b5576..2428b27 100644 --- a/src/views/floodSys/floodOneMap/commonPopupRiver.vue +++ b/src/views/floodSys/floodOneMap/commonPopupRiver.vue @@ -98,8 +98,8 @@ allData.dataTime1 = proxy.moment(new Date()).subtract(3, 'days').format('YYYY-MM-DD'); allData.dataTime2 = proxy.moment(new Date()).format('YYYY-MM-DD'); newfiberMapbox.map.easeTo({ - center: [113.953, 30.906], - zoom: 13.6, + center: [114.312, 34.802], + zoom: 12.9, pitch: 55, }); let clearSelectedFeature = []; diff --git a/src/views/floodSys/floodOneMap/commonPopupSupervise.vue b/src/views/floodSys/floodOneMap/commonPopupSupervise.vue index 6cf54ab..c4d40fc 100644 --- a/src/views/floodSys/floodOneMap/commonPopupSupervise.vue +++ b/src/views/floodSys/floodOneMap/commonPopupSupervise.vue @@ -132,8 +132,8 @@ allData.dataTime1 = proxy.moment(new Date()).subtract(3, 'days').format('YYYY-MM-DD'); allData.dataTime2 = proxy.moment(new Date()).format('YYYY-MM-DD'); newfiberMapbox.map.easeTo({ - center: [113.953, 30.906], - zoom: 13.6, + center: [114.312, 34.802], + zoom: 12.9, pitch: 55, }); @@ -313,28 +313,28 @@ if (!!chartPopupSup) chartPopupSup.dispose(); chartPopupSup = echarts.init(document.getElementById('chartPopupSupervise')); chartOption.floodOneMapPipewater.legend.data = [seleceName.value]; - chartOption.floodOneMapPipewater.yAxis[0] = { - name: 'SS(mg/l)', - type: 'value', - textStyle: { - color: '#00D1FF', - }, - axisLine: { - show: false, - lineStyle: { - color: '#00D1FF', //刻度线的颜色 - }, - }, - splitLine: { - //x网格样式 - show: true, - lineStyle: { - color: '#00D1FF', - type: 'dashed', - }, + (chartOption.floodOneMapPipewater.yAxis[0] = { + name: 'SS(mg/l)', + type: 'value', + textStyle: { + color: '#00D1FF', + }, + axisLine: { + show: false, + lineStyle: { + color: '#00D1FF', //刻度线的颜色 }, }, - chartOption.floodOneMapPipewater.yAxis[0].name = unitName.value; + splitLine: { + //x网格样式 + show: true, + lineStyle: { + color: '#00D1FF', + type: 'dashed', + }, + }, + }), + (chartOption.floodOneMapPipewater.yAxis[0].name = unitName.value); chartOption.floodOneMapPipewater.yAxis[1].name = ''; // chartOption.floodOneMapPipewater.xAxis[0].data = propertyMonitorXList.value; @@ -460,7 +460,7 @@ } else { chartOption.floodOneMapPipewater.graphic.invisible = false; //暂无数据 } - console.log( chartOption.floodOneMapPipewater,9999999) + console.log(chartOption.floodOneMapPipewater, 9999999); chartPopupSup.clear(); chartPopupSup.setOption(chartOption.floodOneMapPipewater); }; diff --git a/src/views/floodSys/floodOneMap/commonPopupZS.vue b/src/views/floodSys/floodOneMap/commonPopupZS.vue index 7ec2b96..c8e3f3e 100644 --- a/src/views/floodSys/floodOneMap/commonPopupZS.vue +++ b/src/views/floodSys/floodOneMap/commonPopupZS.vue @@ -87,8 +87,8 @@ allData.dataTime1 = proxy.moment(new Date()).subtract(3, 'days').format('YYYY-MM-DD'); allData.dataTime2 = proxy.moment(new Date()).format('YYYY-MM-DD'); newfiberMapbox.map.easeTo({ - center: [113.953, 30.906], - zoom: 13.6, + center: [114.312, 34.802], + zoom: 12.9, pitch: 55, }); let clearSelectedFeature = []; diff --git a/src/views/floodSys/floodOneMap/index.vue b/src/views/floodSys/floodOneMap/index.vue index 50b52ee..21a248e 100644 --- a/src/views/floodSys/floodOneMap/index.vue +++ b/src/views/floodSys/floodOneMap/index.vue @@ -195,7 +195,6 @@ import { pagepipelineInfo } from '@/api/drainagePipeline/pipelineInfo'; import { pagepipelinePoint } from '@/api/drainagePipeline/pipelinePoint'; - const { proxy } = getCurrentInstance(); const pipeData = ref({}); const pointData = ref({}); @@ -235,8 +234,8 @@ }; newfiberMapbox.map.easeTo({ - center: [Number(properties.lonLat.split(',')[0]) + 0.000025, Number(properties.lonLat.split(',')[1]) + 0.000025], - zoom: 22, + center: [Number(properties.lonLat.split(',')[0]), Number(properties.lonLat.split(',')[1]) + 0.004025], + zoom: 15, }); let closeCommonPopup = false; bus.emit('closeCommonPopup', closeCommonPopup); @@ -296,7 +295,7 @@ lat: data.lat, }, anchor: 'center', - offsets: [0, 200], + offsets: [-120, 200], autoClose: false, }); newfiberMapbox.addPopup(stationPopup); diff --git a/src/views/floodSys/floodOneMap/commonPopupJCGJ.vue b/src/views/floodSys/floodOneMap/commonPopupJCGJ.vue index ddcb3e9..c6f2d6b 100644 --- a/src/views/floodSys/floodOneMap/commonPopupJCGJ.vue +++ b/src/views/floodSys/floodOneMap/commonPopupJCGJ.vue @@ -233,8 +233,8 @@ allData.dataTime1 = proxy.moment(new Date()).subtract(3, 'days').format('YYYY-MM-DD'); allData.dataTime2 = proxy.moment(new Date()).format('YYYY-MM-DD'); newfiberMapbox.map.easeTo({ - center: [113.953, 30.906], - zoom: 13.6, + center: [114.312, 34.802], + zoom: 12.9, pitch: 55, }); let clearSelectedFeature = []; diff --git a/src/views/floodSys/floodOneMap/commonPopupPK.vue b/src/views/floodSys/floodOneMap/commonPopupPK.vue index c6828f0..d914c05 100644 --- a/src/views/floodSys/floodOneMap/commonPopupPK.vue +++ b/src/views/floodSys/floodOneMap/commonPopupPK.vue @@ -107,8 +107,8 @@ allData.dataTime1 = proxy.moment(new Date()).subtract(3, 'days').format('YYYY-MM-DD'); allData.dataTime2 = proxy.moment(new Date()).format('YYYY-MM-DD'); newfiberMapbox.map.easeTo({ - center: [113.953, 30.906], - zoom: 13.6, + center: [114.312, 34.802], + zoom: 12.9, pitch: 55, }); let clearSelectedFeature = []; @@ -248,35 +248,35 @@ if (!!chartPK) chartPK.dispose(); chartPK = echarts.init(document.getElementById('chartSupervisePK')); chartOption.floodOneMapPipewater.legend.data = [seleceName.value]; - chartOption.floodOneMapPipewater.yAxis[0] = { - name: 'SS(mg/l)', - type: 'value', - textStyle: { - color: '#00D1FF', - }, - axisLine: { - show: false, - lineStyle: { - color: '#00D1FF', //刻度线的颜色 - }, - }, - splitLine: { - //x网格样式 - show: true, - lineStyle: { - color: '#00D1FF', - type: 'dashed', - }, + (chartOption.floodOneMapPipewater.yAxis[0] = { + name: 'SS(mg/l)', + type: 'value', + textStyle: { + color: '#00D1FF', + }, + axisLine: { + show: false, + lineStyle: { + color: '#00D1FF', //刻度线的颜色 }, }, - chartOption.floodOneMapPipewater.yAxis[0].name = unitName.value; + splitLine: { + //x网格样式 + show: true, + lineStyle: { + color: '#00D1FF', + type: 'dashed', + }, + }, + }), + (chartOption.floodOneMapPipewater.yAxis[0].name = unitName.value); chartOption.floodOneMapPipewater.yAxis[1].name = ''; chartOption.floodOneMapPipewater.xAxis[0].data = propertyMonitorXList.value; chartOption.floodOneMapPipewater.series[0].name = seleceName.value; chartOption.floodOneMapPipewater.series[0].data = selectData.value; chartOption.floodOneMapPipewater.series[1].data = []; chartOption.floodOneMapPipewater.series[0].markLine = {}; - + // 设置鼠标滚轮放大缩小展示数据区间 chartOption.floodOneMapPipewater.dataZoom = [ { type: 'inside', startValue: propertyMonitorXList.value[propertyMonitorXList.value.length / 2] }, @@ -351,8 +351,6 @@ } else { chartOption.floodOneMapPipewater.series[1].data = []; chartOption.floodOneMapPipewater.series[1].markLine = ''; - - } if (propertyMonitorXList.value.length > 0) { diff --git a/src/views/floodSys/floodOneMap/commonPopupRain.vue b/src/views/floodSys/floodOneMap/commonPopupRain.vue index 56b3cea..d0d85bf 100644 --- a/src/views/floodSys/floodOneMap/commonPopupRain.vue +++ b/src/views/floodSys/floodOneMap/commonPopupRain.vue @@ -119,8 +119,8 @@ allData.dataTime2 = proxy.moment(new Date()).format('YYYY-MM-DD'); allData.popupShow = false; newfiberMapbox.map.easeTo({ - center: [113.953, 30.906], - zoom: 13.6, + center: [114.312, 34.802], + zoom: 12.9, pitch: 55, }); let clearSelectedFeature = []; @@ -222,7 +222,7 @@ z-index: 115; position: absolute; top: 80px; - left: 330px; + left: 530px; .title { padding-top: 30px; display: flex; diff --git a/src/views/floodSys/floodOneMap/commonPopupRiver.vue b/src/views/floodSys/floodOneMap/commonPopupRiver.vue index 66b5576..2428b27 100644 --- a/src/views/floodSys/floodOneMap/commonPopupRiver.vue +++ b/src/views/floodSys/floodOneMap/commonPopupRiver.vue @@ -98,8 +98,8 @@ allData.dataTime1 = proxy.moment(new Date()).subtract(3, 'days').format('YYYY-MM-DD'); allData.dataTime2 = proxy.moment(new Date()).format('YYYY-MM-DD'); newfiberMapbox.map.easeTo({ - center: [113.953, 30.906], - zoom: 13.6, + center: [114.312, 34.802], + zoom: 12.9, pitch: 55, }); let clearSelectedFeature = []; diff --git a/src/views/floodSys/floodOneMap/commonPopupSupervise.vue b/src/views/floodSys/floodOneMap/commonPopupSupervise.vue index 6cf54ab..c4d40fc 100644 --- a/src/views/floodSys/floodOneMap/commonPopupSupervise.vue +++ b/src/views/floodSys/floodOneMap/commonPopupSupervise.vue @@ -132,8 +132,8 @@ allData.dataTime1 = proxy.moment(new Date()).subtract(3, 'days').format('YYYY-MM-DD'); allData.dataTime2 = proxy.moment(new Date()).format('YYYY-MM-DD'); newfiberMapbox.map.easeTo({ - center: [113.953, 30.906], - zoom: 13.6, + center: [114.312, 34.802], + zoom: 12.9, pitch: 55, }); @@ -313,28 +313,28 @@ if (!!chartPopupSup) chartPopupSup.dispose(); chartPopupSup = echarts.init(document.getElementById('chartPopupSupervise')); chartOption.floodOneMapPipewater.legend.data = [seleceName.value]; - chartOption.floodOneMapPipewater.yAxis[0] = { - name: 'SS(mg/l)', - type: 'value', - textStyle: { - color: '#00D1FF', - }, - axisLine: { - show: false, - lineStyle: { - color: '#00D1FF', //刻度线的颜色 - }, - }, - splitLine: { - //x网格样式 - show: true, - lineStyle: { - color: '#00D1FF', - type: 'dashed', - }, + (chartOption.floodOneMapPipewater.yAxis[0] = { + name: 'SS(mg/l)', + type: 'value', + textStyle: { + color: '#00D1FF', + }, + axisLine: { + show: false, + lineStyle: { + color: '#00D1FF', //刻度线的颜色 }, }, - chartOption.floodOneMapPipewater.yAxis[0].name = unitName.value; + splitLine: { + //x网格样式 + show: true, + lineStyle: { + color: '#00D1FF', + type: 'dashed', + }, + }, + }), + (chartOption.floodOneMapPipewater.yAxis[0].name = unitName.value); chartOption.floodOneMapPipewater.yAxis[1].name = ''; // chartOption.floodOneMapPipewater.xAxis[0].data = propertyMonitorXList.value; @@ -460,7 +460,7 @@ } else { chartOption.floodOneMapPipewater.graphic.invisible = false; //暂无数据 } - console.log( chartOption.floodOneMapPipewater,9999999) + console.log(chartOption.floodOneMapPipewater, 9999999); chartPopupSup.clear(); chartPopupSup.setOption(chartOption.floodOneMapPipewater); }; diff --git a/src/views/floodSys/floodOneMap/commonPopupZS.vue b/src/views/floodSys/floodOneMap/commonPopupZS.vue index 7ec2b96..c8e3f3e 100644 --- a/src/views/floodSys/floodOneMap/commonPopupZS.vue +++ b/src/views/floodSys/floodOneMap/commonPopupZS.vue @@ -87,8 +87,8 @@ allData.dataTime1 = proxy.moment(new Date()).subtract(3, 'days').format('YYYY-MM-DD'); allData.dataTime2 = proxy.moment(new Date()).format('YYYY-MM-DD'); newfiberMapbox.map.easeTo({ - center: [113.953, 30.906], - zoom: 13.6, + center: [114.312, 34.802], + zoom: 12.9, pitch: 55, }); let clearSelectedFeature = []; diff --git a/src/views/floodSys/floodOneMap/index.vue b/src/views/floodSys/floodOneMap/index.vue index 50b52ee..21a248e 100644 --- a/src/views/floodSys/floodOneMap/index.vue +++ b/src/views/floodSys/floodOneMap/index.vue @@ -195,7 +195,6 @@ import { pagepipelineInfo } from '@/api/drainagePipeline/pipelineInfo'; import { pagepipelinePoint } from '@/api/drainagePipeline/pipelinePoint'; - const { proxy } = getCurrentInstance(); const pipeData = ref({}); const pointData = ref({}); @@ -235,8 +234,8 @@ }; newfiberMapbox.map.easeTo({ - center: [Number(properties.lonLat.split(',')[0]) + 0.000025, Number(properties.lonLat.split(',')[1]) + 0.000025], - zoom: 22, + center: [Number(properties.lonLat.split(',')[0]), Number(properties.lonLat.split(',')[1]) + 0.004025], + zoom: 15, }); let closeCommonPopup = false; bus.emit('closeCommonPopup', closeCommonPopup); @@ -296,7 +295,7 @@ lat: data.lat, }, anchor: 'center', - offsets: [0, 200], + offsets: [-120, 200], autoClose: false, }); newfiberMapbox.addPopup(stationPopup); diff --git a/src/views/sponeScreen/gisMF/legendKF.vue b/src/views/sponeScreen/gisMF/legendKF.vue index 0f37e4b..c58e808 100644 --- a/src/views/sponeScreen/gisMF/legendKF.vue +++ b/src/views/sponeScreen/gisMF/legendKF.vue @@ -178,18 +178,26 @@ }); bus.on('setIniteLayer', data => { console.log('data---', data); - let legendList_1 = legendList.value[0]['children'] - .concat(legendList.value[1]['children']) - .concat(legendList.value[2]['children']) - .flat(); - data.forEach(layer => { - let selectedLayer = legendList_1.filter(item => item.layername == layer.layername); - console.log('selectedLayer--', selectedLayer); - selectedLayer.map(i => { - i.isCheck = layer.show; - changeLegend(i); + if (!data.length) { + let legendList_1 = legendList.value[1]['children'].concat(legendList.value[2]['children']).flat(); + legendList_1.forEach(layer => { + layer.isCheck = true; + changeLegend(layer); }); - }); + } else { + let legendList_1 = legendList.value[0]['children'] + .concat(legendList.value[1]['children']) + .concat(legendList.value[2]['children']) + .flat(); + data.forEach(layer => { + let selectedLayer = legendList_1.filter(item => item.layername == layer.layername); + console.log('selectedLayer--', selectedLayer); + selectedLayer.map(i => { + i.isCheck = layer.show; + changeLegend(i); + }); + }); + } }); }); diff --git a/src/views/floodSys/floodOneMap/commonPopupJCGJ.vue b/src/views/floodSys/floodOneMap/commonPopupJCGJ.vue index ddcb3e9..c6f2d6b 100644 --- a/src/views/floodSys/floodOneMap/commonPopupJCGJ.vue +++ b/src/views/floodSys/floodOneMap/commonPopupJCGJ.vue @@ -233,8 +233,8 @@ allData.dataTime1 = proxy.moment(new Date()).subtract(3, 'days').format('YYYY-MM-DD'); allData.dataTime2 = proxy.moment(new Date()).format('YYYY-MM-DD'); newfiberMapbox.map.easeTo({ - center: [113.953, 30.906], - zoom: 13.6, + center: [114.312, 34.802], + zoom: 12.9, pitch: 55, }); let clearSelectedFeature = []; diff --git a/src/views/floodSys/floodOneMap/commonPopupPK.vue b/src/views/floodSys/floodOneMap/commonPopupPK.vue index c6828f0..d914c05 100644 --- a/src/views/floodSys/floodOneMap/commonPopupPK.vue +++ b/src/views/floodSys/floodOneMap/commonPopupPK.vue @@ -107,8 +107,8 @@ allData.dataTime1 = proxy.moment(new Date()).subtract(3, 'days').format('YYYY-MM-DD'); allData.dataTime2 = proxy.moment(new Date()).format('YYYY-MM-DD'); newfiberMapbox.map.easeTo({ - center: [113.953, 30.906], - zoom: 13.6, + center: [114.312, 34.802], + zoom: 12.9, pitch: 55, }); let clearSelectedFeature = []; @@ -248,35 +248,35 @@ if (!!chartPK) chartPK.dispose(); chartPK = echarts.init(document.getElementById('chartSupervisePK')); chartOption.floodOneMapPipewater.legend.data = [seleceName.value]; - chartOption.floodOneMapPipewater.yAxis[0] = { - name: 'SS(mg/l)', - type: 'value', - textStyle: { - color: '#00D1FF', - }, - axisLine: { - show: false, - lineStyle: { - color: '#00D1FF', //刻度线的颜色 - }, - }, - splitLine: { - //x网格样式 - show: true, - lineStyle: { - color: '#00D1FF', - type: 'dashed', - }, + (chartOption.floodOneMapPipewater.yAxis[0] = { + name: 'SS(mg/l)', + type: 'value', + textStyle: { + color: '#00D1FF', + }, + axisLine: { + show: false, + lineStyle: { + color: '#00D1FF', //刻度线的颜色 }, }, - chartOption.floodOneMapPipewater.yAxis[0].name = unitName.value; + splitLine: { + //x网格样式 + show: true, + lineStyle: { + color: '#00D1FF', + type: 'dashed', + }, + }, + }), + (chartOption.floodOneMapPipewater.yAxis[0].name = unitName.value); chartOption.floodOneMapPipewater.yAxis[1].name = ''; chartOption.floodOneMapPipewater.xAxis[0].data = propertyMonitorXList.value; chartOption.floodOneMapPipewater.series[0].name = seleceName.value; chartOption.floodOneMapPipewater.series[0].data = selectData.value; chartOption.floodOneMapPipewater.series[1].data = []; chartOption.floodOneMapPipewater.series[0].markLine = {}; - + // 设置鼠标滚轮放大缩小展示数据区间 chartOption.floodOneMapPipewater.dataZoom = [ { type: 'inside', startValue: propertyMonitorXList.value[propertyMonitorXList.value.length / 2] }, @@ -351,8 +351,6 @@ } else { chartOption.floodOneMapPipewater.series[1].data = []; chartOption.floodOneMapPipewater.series[1].markLine = ''; - - } if (propertyMonitorXList.value.length > 0) { diff --git a/src/views/floodSys/floodOneMap/commonPopupRain.vue b/src/views/floodSys/floodOneMap/commonPopupRain.vue index 56b3cea..d0d85bf 100644 --- a/src/views/floodSys/floodOneMap/commonPopupRain.vue +++ b/src/views/floodSys/floodOneMap/commonPopupRain.vue @@ -119,8 +119,8 @@ allData.dataTime2 = proxy.moment(new Date()).format('YYYY-MM-DD'); allData.popupShow = false; newfiberMapbox.map.easeTo({ - center: [113.953, 30.906], - zoom: 13.6, + center: [114.312, 34.802], + zoom: 12.9, pitch: 55, }); let clearSelectedFeature = []; @@ -222,7 +222,7 @@ z-index: 115; position: absolute; top: 80px; - left: 330px; + left: 530px; .title { padding-top: 30px; display: flex; diff --git a/src/views/floodSys/floodOneMap/commonPopupRiver.vue b/src/views/floodSys/floodOneMap/commonPopupRiver.vue index 66b5576..2428b27 100644 --- a/src/views/floodSys/floodOneMap/commonPopupRiver.vue +++ b/src/views/floodSys/floodOneMap/commonPopupRiver.vue @@ -98,8 +98,8 @@ allData.dataTime1 = proxy.moment(new Date()).subtract(3, 'days').format('YYYY-MM-DD'); allData.dataTime2 = proxy.moment(new Date()).format('YYYY-MM-DD'); newfiberMapbox.map.easeTo({ - center: [113.953, 30.906], - zoom: 13.6, + center: [114.312, 34.802], + zoom: 12.9, pitch: 55, }); let clearSelectedFeature = []; diff --git a/src/views/floodSys/floodOneMap/commonPopupSupervise.vue b/src/views/floodSys/floodOneMap/commonPopupSupervise.vue index 6cf54ab..c4d40fc 100644 --- a/src/views/floodSys/floodOneMap/commonPopupSupervise.vue +++ b/src/views/floodSys/floodOneMap/commonPopupSupervise.vue @@ -132,8 +132,8 @@ allData.dataTime1 = proxy.moment(new Date()).subtract(3, 'days').format('YYYY-MM-DD'); allData.dataTime2 = proxy.moment(new Date()).format('YYYY-MM-DD'); newfiberMapbox.map.easeTo({ - center: [113.953, 30.906], - zoom: 13.6, + center: [114.312, 34.802], + zoom: 12.9, pitch: 55, }); @@ -313,28 +313,28 @@ if (!!chartPopupSup) chartPopupSup.dispose(); chartPopupSup = echarts.init(document.getElementById('chartPopupSupervise')); chartOption.floodOneMapPipewater.legend.data = [seleceName.value]; - chartOption.floodOneMapPipewater.yAxis[0] = { - name: 'SS(mg/l)', - type: 'value', - textStyle: { - color: '#00D1FF', - }, - axisLine: { - show: false, - lineStyle: { - color: '#00D1FF', //刻度线的颜色 - }, - }, - splitLine: { - //x网格样式 - show: true, - lineStyle: { - color: '#00D1FF', - type: 'dashed', - }, + (chartOption.floodOneMapPipewater.yAxis[0] = { + name: 'SS(mg/l)', + type: 'value', + textStyle: { + color: '#00D1FF', + }, + axisLine: { + show: false, + lineStyle: { + color: '#00D1FF', //刻度线的颜色 }, }, - chartOption.floodOneMapPipewater.yAxis[0].name = unitName.value; + splitLine: { + //x网格样式 + show: true, + lineStyle: { + color: '#00D1FF', + type: 'dashed', + }, + }, + }), + (chartOption.floodOneMapPipewater.yAxis[0].name = unitName.value); chartOption.floodOneMapPipewater.yAxis[1].name = ''; // chartOption.floodOneMapPipewater.xAxis[0].data = propertyMonitorXList.value; @@ -460,7 +460,7 @@ } else { chartOption.floodOneMapPipewater.graphic.invisible = false; //暂无数据 } - console.log( chartOption.floodOneMapPipewater,9999999) + console.log(chartOption.floodOneMapPipewater, 9999999); chartPopupSup.clear(); chartPopupSup.setOption(chartOption.floodOneMapPipewater); }; diff --git a/src/views/floodSys/floodOneMap/commonPopupZS.vue b/src/views/floodSys/floodOneMap/commonPopupZS.vue index 7ec2b96..c8e3f3e 100644 --- a/src/views/floodSys/floodOneMap/commonPopupZS.vue +++ b/src/views/floodSys/floodOneMap/commonPopupZS.vue @@ -87,8 +87,8 @@ allData.dataTime1 = proxy.moment(new Date()).subtract(3, 'days').format('YYYY-MM-DD'); allData.dataTime2 = proxy.moment(new Date()).format('YYYY-MM-DD'); newfiberMapbox.map.easeTo({ - center: [113.953, 30.906], - zoom: 13.6, + center: [114.312, 34.802], + zoom: 12.9, pitch: 55, }); let clearSelectedFeature = []; diff --git a/src/views/floodSys/floodOneMap/index.vue b/src/views/floodSys/floodOneMap/index.vue index 50b52ee..21a248e 100644 --- a/src/views/floodSys/floodOneMap/index.vue +++ b/src/views/floodSys/floodOneMap/index.vue @@ -195,7 +195,6 @@ import { pagepipelineInfo } from '@/api/drainagePipeline/pipelineInfo'; import { pagepipelinePoint } from '@/api/drainagePipeline/pipelinePoint'; - const { proxy } = getCurrentInstance(); const pipeData = ref({}); const pointData = ref({}); @@ -235,8 +234,8 @@ }; newfiberMapbox.map.easeTo({ - center: [Number(properties.lonLat.split(',')[0]) + 0.000025, Number(properties.lonLat.split(',')[1]) + 0.000025], - zoom: 22, + center: [Number(properties.lonLat.split(',')[0]), Number(properties.lonLat.split(',')[1]) + 0.004025], + zoom: 15, }); let closeCommonPopup = false; bus.emit('closeCommonPopup', closeCommonPopup); @@ -296,7 +295,7 @@ lat: data.lat, }, anchor: 'center', - offsets: [0, 200], + offsets: [-120, 200], autoClose: false, }); newfiberMapbox.addPopup(stationPopup); diff --git a/src/views/sponeScreen/gisMF/legendKF.vue b/src/views/sponeScreen/gisMF/legendKF.vue index 0f37e4b..c58e808 100644 --- a/src/views/sponeScreen/gisMF/legendKF.vue +++ b/src/views/sponeScreen/gisMF/legendKF.vue @@ -178,18 +178,26 @@ }); bus.on('setIniteLayer', data => { console.log('data---', data); - let legendList_1 = legendList.value[0]['children'] - .concat(legendList.value[1]['children']) - .concat(legendList.value[2]['children']) - .flat(); - data.forEach(layer => { - let selectedLayer = legendList_1.filter(item => item.layername == layer.layername); - console.log('selectedLayer--', selectedLayer); - selectedLayer.map(i => { - i.isCheck = layer.show; - changeLegend(i); + if (!data.length) { + let legendList_1 = legendList.value[1]['children'].concat(legendList.value[2]['children']).flat(); + legendList_1.forEach(layer => { + layer.isCheck = true; + changeLegend(layer); }); - }); + } else { + let legendList_1 = legendList.value[0]['children'] + .concat(legendList.value[1]['children']) + .concat(legendList.value[2]['children']) + .flat(); + data.forEach(layer => { + let selectedLayer = legendList_1.filter(item => item.layername == layer.layername); + console.log('selectedLayer--', selectedLayer); + selectedLayer.map(i => { + i.isCheck = layer.show; + changeLegend(i); + }); + }); + } }); }); diff --git a/src/views/sponeScreen/gisMF/newfiberVectorLayer.js b/src/views/sponeScreen/gisMF/newfiberVectorLayer.js index e21db1c..8988191 100644 --- a/src/views/sponeScreen/gisMF/newfiberVectorLayer.js +++ b/src/views/sponeScreen/gisMF/newfiberVectorLayer.js @@ -130,6 +130,7 @@ maximumHeights: maximumHeights || 100, minimunHeights: 0, material: new NewFiberMap.Material.WallTrailMaterialProperty({ + image: NewFiberMapConfig.SDK_INIT_SRC_PREFIX + '/static/images/material/wall/colors_blue_v1.png', color: feature.properties.fillcolor ? new Cesium.Color.fromCssColorString(feature.properties.fillcolor) : new Cesium.Color.fromCssColorString('rgba(55,193,139,.7)'),