-
-
-
-
-
远期
-
88.7
-
万立方米/日
+
+
@@ -146,242 +148,248 @@
diff --git a/src/views/sponeScreen/cityGK/index.vue b/src/views/sponeScreen/cityGK/index.vue
index db4c3ef..1d99508 100644
--- a/src/views/sponeScreen/cityGK/index.vue
+++ b/src/views/sponeScreen/cityGK/index.vue
@@ -48,6 +48,9 @@
+
+
+
@@ -56,6 +59,9 @@
import tslyqk_constituent_3d from '@/views/sponeScreen/Echarts/tslyqk_constituent_3d.vue'; //3d图例
import rainfall from '@/views/sponeScreen/cityGK/rainfall.vue'; //降雨页面
import cityplanning from '@/views/sponeScreen/cityGK/cityplanning.vue'; //城市规划页面
+
+import CurrentIssues from '@/views/sponeScreen/cityGK/CurrentIssues.vue'; //现状问题
+
const { proxy } = getCurrentInstance();
const policiesList = ref([
{
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 @@
- 城市规划
-
-
-
-
水安全规划
-
-
-
年径流总量控制率
-
-
-
目标:
-
70%
+
+
城市规划
+
+
+
+
水安全规划
+
+
+
排涝规则
+
+ 新建改造泵站
+ 54 座
+
+
+ 新建雨水管渠
+ 723.83 公里
-
-
排涝规则
-
- 新建改造泵站
- 54 座
-
-
- 新建雨水管渠
- 723.83 公里
-
-
-
-
-
-
水环境规划
-
-
-
{{ item.name }}
-
-
-
目标:
-
{{ item.NumberA }}
+
+
+
水环境规划
+
+
+
{{ item.name }}
+
+
+ 目标:
+ {{ item.NumberA }}
+
+
{{ item.content }}
-
{{ item.content }}
-
-
-
-
水生态规划
-
-
-
-
{{ item.NumberA }}
-
{{ item.content }}
+
+
+
水生态规划
+
+
+
+
{{ item.NumberA }}
+
{{ item.content }}
+
-
-
-
-
水资源规划
-
-
-
-
-
雨水资源利用
+
+
+
水资源规划
+
-
-
-
-
污水资源利用
-
7座污水处理厂总设计规模:55 万吨/日
-
-
-
+
+
+
+
污水资源利用
+
7座污水处理厂总设计规模:55 万吨/日
+
+
+
+
-
-
-
-
供水规划
-
-
-
-
-
-
-
远期
-
88.7
-
万立方米/日
+
+
@@ -146,242 +148,248 @@
diff --git a/src/views/sponeScreen/cityGK/index.vue b/src/views/sponeScreen/cityGK/index.vue
index db4c3ef..1d99508 100644
--- a/src/views/sponeScreen/cityGK/index.vue
+++ b/src/views/sponeScreen/cityGK/index.vue
@@ -48,6 +48,9 @@
+
+
+
@@ -56,6 +59,9 @@
import tslyqk_constituent_3d from '@/views/sponeScreen/Echarts/tslyqk_constituent_3d.vue'; //3d图例
import rainfall from '@/views/sponeScreen/cityGK/rainfall.vue'; //降雨页面
import cityplanning from '@/views/sponeScreen/cityGK/cityplanning.vue'; //城市规划页面
+
+import CurrentIssues from '@/views/sponeScreen/cityGK/CurrentIssues.vue'; //现状问题
+
const { proxy } = getCurrentInstance();
const policiesList = ref([
{
diff --git a/src/views/sponeScreen/cityGK/rainfall.vue b/src/views/sponeScreen/cityGK/rainfall.vue
index 8b00175..17a7b23 100644
--- a/src/views/sponeScreen/cityGK/rainfall.vue
+++ b/src/views/sponeScreen/cityGK/rainfall.vue
@@ -1,26 +1,28 @@
-
- 降雨特征
-
-
- {{ item.name }}
+
-
-
丰、枯年交替出现,且降雨量变化幅度大
-
年内降雨量分配不均匀,冬季干旱,雨雪稀少
-
-
-
-
+
+
丰、枯年交替出现,且降雨量变化幅度大
+
年内降雨量分配不均匀,冬季干旱,雨雪稀少
+
@@ -79,47 +81,52 @@