diff --git a/src/assets/newImgs/HMScreen/bottom_img .png b/src/assets/newImgs/HMScreen/bottom_img .png new file mode 100644 index 0000000..e56a338 --- /dev/null +++ b/src/assets/newImgs/HMScreen/bottom_img .png Binary files differ diff --git a/src/assets/newImgs/HMScreen/bottom_img .png b/src/assets/newImgs/HMScreen/bottom_img .png new file mode 100644 index 0000000..e56a338 --- /dev/null +++ b/src/assets/newImgs/HMScreen/bottom_img .png Binary files differ diff --git a/src/assets/styles/publicXG.scss b/src/assets/styles/publicXG.scss index 246d150..5166ebd 100644 --- a/src/assets/styles/publicXG.scss +++ b/src/assets/styles/publicXG.scss @@ -472,8 +472,8 @@ padding: 10px; } .publicLeftHM { - height: calc(100vh - 110px); - border: 1px solid red; + height: calc(100vh - 150px); + // border: 1px solid red; position: absolute; left: 0px; top: 0px; @@ -482,7 +482,7 @@ overflow-y: auto; } .publicRightHM { - height: calc(100vh - 110px); + height: calc(100vh - 150px); border: 1px solid red; overflow-y: auto; position: absolute; diff --git a/src/assets/newImgs/HMScreen/bottom_img .png b/src/assets/newImgs/HMScreen/bottom_img .png new file mode 100644 index 0000000..e56a338 --- /dev/null +++ b/src/assets/newImgs/HMScreen/bottom_img .png Binary files differ diff --git a/src/assets/styles/publicXG.scss b/src/assets/styles/publicXG.scss index 246d150..5166ebd 100644 --- a/src/assets/styles/publicXG.scss +++ b/src/assets/styles/publicXG.scss @@ -472,8 +472,8 @@ padding: 10px; } .publicLeftHM { - height: calc(100vh - 110px); - border: 1px solid red; + height: calc(100vh - 150px); + // border: 1px solid red; position: absolute; left: 0px; top: 0px; @@ -482,7 +482,7 @@ overflow-y: auto; } .publicRightHM { - height: calc(100vh - 110px); + height: calc(100vh - 150px); border: 1px solid red; overflow-y: auto; position: absolute; diff --git a/src/views/sponeScreen/Echarts/RainfallLegend.vue b/src/views/sponeScreen/Echarts/RainfallLegend.vue index 99ee08e..f6069cc 100644 --- a/src/views/sponeScreen/Echarts/RainfallLegend.vue +++ b/src/views/sponeScreen/Echarts/RainfallLegend.vue @@ -33,13 +33,41 @@ // backgroundColor: '#0e2147', grid: { // left: '5%', - // top: '5%', - bottom: '10%', + top: '10%', + bottom: '20%', right: '5%', }, + 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; + for (var i = 0, l = params.length; i < l; i++) { + if (params[i].seriesName) { + let unit = params[i].seriesName == 'K线性拟合' ? 'mm' : '毫米'; + relVal += '
' + params[i].marker + params[i].seriesName + ' ' + params[i].value + unit; + } + } + return relVal; + }, + }, legend: { - type: 'scroll', - data: '来电量', + // type: 'scroll', + data: '降雨量', itemWidth: 18, itemHeight: 12, textStyle: { @@ -101,10 +129,10 @@ series: [ { symbolSize: 10, - - name: '来电量', + name: '降雨量', type: 'line', data: props.data.data1, + itemStyle: { normal: { borderWidth: 5, @@ -113,7 +141,6 @@ }, }, { - name: '滑行的光点', type: 'lines', coordinateSystem: 'cartesian2d', symbolSize: 30, diff --git a/src/assets/newImgs/HMScreen/bottom_img .png b/src/assets/newImgs/HMScreen/bottom_img .png new file mode 100644 index 0000000..e56a338 --- /dev/null +++ b/src/assets/newImgs/HMScreen/bottom_img .png Binary files differ diff --git a/src/assets/styles/publicXG.scss b/src/assets/styles/publicXG.scss index 246d150..5166ebd 100644 --- a/src/assets/styles/publicXG.scss +++ b/src/assets/styles/publicXG.scss @@ -472,8 +472,8 @@ padding: 10px; } .publicLeftHM { - height: calc(100vh - 110px); - border: 1px solid red; + height: calc(100vh - 150px); + // border: 1px solid red; position: absolute; left: 0px; top: 0px; @@ -482,7 +482,7 @@ overflow-y: auto; } .publicRightHM { - height: calc(100vh - 110px); + height: calc(100vh - 150px); border: 1px solid red; overflow-y: auto; position: absolute; diff --git a/src/views/sponeScreen/Echarts/RainfallLegend.vue b/src/views/sponeScreen/Echarts/RainfallLegend.vue index 99ee08e..f6069cc 100644 --- a/src/views/sponeScreen/Echarts/RainfallLegend.vue +++ b/src/views/sponeScreen/Echarts/RainfallLegend.vue @@ -33,13 +33,41 @@ // backgroundColor: '#0e2147', grid: { // left: '5%', - // top: '5%', - bottom: '10%', + top: '10%', + bottom: '20%', right: '5%', }, + 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; + for (var i = 0, l = params.length; i < l; i++) { + if (params[i].seriesName) { + let unit = params[i].seriesName == 'K线性拟合' ? 'mm' : '毫米'; + relVal += '
' + params[i].marker + params[i].seriesName + ' ' + params[i].value + unit; + } + } + return relVal; + }, + }, legend: { - type: 'scroll', - data: '来电量', + // type: 'scroll', + data: '降雨量', itemWidth: 18, itemHeight: 12, textStyle: { @@ -101,10 +129,10 @@ series: [ { symbolSize: 10, - - name: '来电量', + name: '降雨量', type: 'line', data: props.data.data1, + itemStyle: { normal: { borderWidth: 5, @@ -113,7 +141,6 @@ }, }, { - name: '滑行的光点', type: 'lines', coordinateSystem: 'cartesian2d', symbolSize: 30, diff --git a/src/views/sponeScreen/Echarts/RainwaterTakeAdvantage.vue b/src/views/sponeScreen/Echarts/RainwaterTakeAdvantage.vue index ff57445..f381603 100644 --- a/src/views/sponeScreen/Echarts/RainwaterTakeAdvantage.vue +++ b/src/views/sponeScreen/Echarts/RainwaterTakeAdvantage.vue @@ -29,7 +29,7 @@ }, grid: { top: '10%', - left: '-18%', + left: '-20%', right: '4%', bottom: '3%', containLabel: true, @@ -62,7 +62,7 @@ nameTextStyle: { color: 'rgba(96, 194, 255, 1)', nameLocation: 'start', - padding: [1, 10, -118, -142], + padding: [10, 10, -118, -142], }, axisLabel: { color: '#fff', @@ -133,8 +133,9 @@ diff --git a/src/assets/newImgs/HMScreen/bottom_img .png b/src/assets/newImgs/HMScreen/bottom_img .png new file mode 100644 index 0000000..e56a338 --- /dev/null +++ b/src/assets/newImgs/HMScreen/bottom_img .png Binary files differ diff --git a/src/assets/styles/publicXG.scss b/src/assets/styles/publicXG.scss index 246d150..5166ebd 100644 --- a/src/assets/styles/publicXG.scss +++ b/src/assets/styles/publicXG.scss @@ -472,8 +472,8 @@ padding: 10px; } .publicLeftHM { - height: calc(100vh - 110px); - border: 1px solid red; + height: calc(100vh - 150px); + // border: 1px solid red; position: absolute; left: 0px; top: 0px; @@ -482,7 +482,7 @@ overflow-y: auto; } .publicRightHM { - height: calc(100vh - 110px); + height: calc(100vh - 150px); border: 1px solid red; overflow-y: auto; position: absolute; diff --git a/src/views/sponeScreen/Echarts/RainfallLegend.vue b/src/views/sponeScreen/Echarts/RainfallLegend.vue index 99ee08e..f6069cc 100644 --- a/src/views/sponeScreen/Echarts/RainfallLegend.vue +++ b/src/views/sponeScreen/Echarts/RainfallLegend.vue @@ -33,13 +33,41 @@ // backgroundColor: '#0e2147', grid: { // left: '5%', - // top: '5%', - bottom: '10%', + top: '10%', + bottom: '20%', right: '5%', }, + 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; + for (var i = 0, l = params.length; i < l; i++) { + if (params[i].seriesName) { + let unit = params[i].seriesName == 'K线性拟合' ? 'mm' : '毫米'; + relVal += '
' + params[i].marker + params[i].seriesName + ' ' + params[i].value + unit; + } + } + return relVal; + }, + }, legend: { - type: 'scroll', - data: '来电量', + // type: 'scroll', + data: '降雨量', itemWidth: 18, itemHeight: 12, textStyle: { @@ -101,10 +129,10 @@ series: [ { symbolSize: 10, - - name: '来电量', + name: '降雨量', type: 'line', data: props.data.data1, + itemStyle: { normal: { borderWidth: 5, @@ -113,7 +141,6 @@ }, }, { - name: '滑行的光点', type: 'lines', coordinateSystem: 'cartesian2d', symbolSize: 30, diff --git a/src/views/sponeScreen/Echarts/RainwaterTakeAdvantage.vue b/src/views/sponeScreen/Echarts/RainwaterTakeAdvantage.vue index ff57445..f381603 100644 --- a/src/views/sponeScreen/Echarts/RainwaterTakeAdvantage.vue +++ b/src/views/sponeScreen/Echarts/RainwaterTakeAdvantage.vue @@ -29,7 +29,7 @@ }, grid: { top: '10%', - left: '-18%', + left: '-20%', right: '4%', bottom: '3%', containLabel: true, @@ -62,7 +62,7 @@ nameTextStyle: { color: 'rgba(96, 194, 255, 1)', nameLocation: 'start', - padding: [1, 10, -118, -142], + padding: [10, 10, -118, -142], }, axisLabel: { color: '#fff', @@ -133,8 +133,9 @@ diff --git a/src/views/sponeScreen/cityGK/CurrentIssues.vue b/src/views/sponeScreen/cityGK/CurrentIssues.vue new file mode 100644 index 0000000..90a8d2b --- /dev/null +++ b/src/views/sponeScreen/cityGK/CurrentIssues.vue @@ -0,0 +1,149 @@ + + + + + diff --git a/src/assets/newImgs/HMScreen/bottom_img .png b/src/assets/newImgs/HMScreen/bottom_img .png new file mode 100644 index 0000000..e56a338 --- /dev/null +++ b/src/assets/newImgs/HMScreen/bottom_img .png Binary files differ diff --git a/src/assets/styles/publicXG.scss b/src/assets/styles/publicXG.scss index 246d150..5166ebd 100644 --- a/src/assets/styles/publicXG.scss +++ b/src/assets/styles/publicXG.scss @@ -472,8 +472,8 @@ padding: 10px; } .publicLeftHM { - height: calc(100vh - 110px); - border: 1px solid red; + height: calc(100vh - 150px); + // border: 1px solid red; position: absolute; left: 0px; top: 0px; @@ -482,7 +482,7 @@ overflow-y: auto; } .publicRightHM { - height: calc(100vh - 110px); + height: calc(100vh - 150px); border: 1px solid red; overflow-y: auto; position: absolute; diff --git a/src/views/sponeScreen/Echarts/RainfallLegend.vue b/src/views/sponeScreen/Echarts/RainfallLegend.vue index 99ee08e..f6069cc 100644 --- a/src/views/sponeScreen/Echarts/RainfallLegend.vue +++ b/src/views/sponeScreen/Echarts/RainfallLegend.vue @@ -33,13 +33,41 @@ // backgroundColor: '#0e2147', grid: { // left: '5%', - // top: '5%', - bottom: '10%', + top: '10%', + bottom: '20%', right: '5%', }, + 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; + for (var i = 0, l = params.length; i < l; i++) { + if (params[i].seriesName) { + let unit = params[i].seriesName == 'K线性拟合' ? 'mm' : '毫米'; + relVal += '
' + params[i].marker + params[i].seriesName + ' ' + params[i].value + unit; + } + } + return relVal; + }, + }, legend: { - type: 'scroll', - data: '来电量', + // type: 'scroll', + data: '降雨量', itemWidth: 18, itemHeight: 12, textStyle: { @@ -101,10 +129,10 @@ series: [ { symbolSize: 10, - - name: '来电量', + name: '降雨量', type: 'line', data: props.data.data1, + itemStyle: { normal: { borderWidth: 5, @@ -113,7 +141,6 @@ }, }, { - name: '滑行的光点', type: 'lines', coordinateSystem: 'cartesian2d', symbolSize: 30, diff --git a/src/views/sponeScreen/Echarts/RainwaterTakeAdvantage.vue b/src/views/sponeScreen/Echarts/RainwaterTakeAdvantage.vue index ff57445..f381603 100644 --- a/src/views/sponeScreen/Echarts/RainwaterTakeAdvantage.vue +++ b/src/views/sponeScreen/Echarts/RainwaterTakeAdvantage.vue @@ -29,7 +29,7 @@ }, grid: { top: '10%', - left: '-18%', + left: '-20%', right: '4%', bottom: '3%', containLabel: true, @@ -62,7 +62,7 @@ nameTextStyle: { color: 'rgba(96, 194, 255, 1)', nameLocation: 'start', - padding: [1, 10, -118, -142], + padding: [10, 10, -118, -142], }, axisLabel: { color: '#fff', @@ -133,8 +133,9 @@ diff --git a/src/views/sponeScreen/cityGK/CurrentIssues.vue b/src/views/sponeScreen/cityGK/CurrentIssues.vue new file mode 100644 index 0000000..90a8d2b --- /dev/null +++ b/src/views/sponeScreen/cityGK/CurrentIssues.vue @@ -0,0 +1,149 @@ + + + + + diff --git a/src/views/sponeScreen/cityGK/cityplanning.vue b/src/views/sponeScreen/cityGK/cityplanning.vue index 6aaad04..7a36e6e 100644 --- a/src/views/sponeScreen/cityGK/cityplanning.vue +++ b/src/views/sponeScreen/cityGK/cityplanning.vue @@ -1,107 +1,109 @@