diff --git a/src/assets/newImgs/HMScreen/arrow_img.png b/src/assets/newImgs/HMScreen/arrow_img.png index 27641d0..e5a8d90 100644 --- a/src/assets/newImgs/HMScreen/arrow_img.png +++ b/src/assets/newImgs/HMScreen/arrow_img.png Binary files differ diff --git a/src/assets/newImgs/HMScreen/arrow_img.png b/src/assets/newImgs/HMScreen/arrow_img.png index 27641d0..e5a8d90 100644 --- a/src/assets/newImgs/HMScreen/arrow_img.png +++ b/src/assets/newImgs/HMScreen/arrow_img.png Binary files differ diff --git a/src/assets/newImgs/HMScreen/headBg.png b/src/assets/newImgs/HMScreen/headBg.png index fa7e9dd..d603316 100644 --- a/src/assets/newImgs/HMScreen/headBg.png +++ b/src/assets/newImgs/HMScreen/headBg.png Binary files differ diff --git a/src/assets/newImgs/HMScreen/arrow_img.png b/src/assets/newImgs/HMScreen/arrow_img.png index 27641d0..e5a8d90 100644 --- a/src/assets/newImgs/HMScreen/arrow_img.png +++ b/src/assets/newImgs/HMScreen/arrow_img.png Binary files differ diff --git a/src/assets/newImgs/HMScreen/headBg.png b/src/assets/newImgs/HMScreen/headBg.png index fa7e9dd..d603316 100644 --- a/src/assets/newImgs/HMScreen/headBg.png +++ b/src/assets/newImgs/HMScreen/headBg.png Binary files differ diff --git a/src/assets/newImgs/HMScreen/video.png b/src/assets/newImgs/HMScreen/video.png new file mode 100644 index 0000000..3c9b4a2 --- /dev/null +++ b/src/assets/newImgs/HMScreen/video.png Binary files differ diff --git a/src/assets/newImgs/HMScreen/arrow_img.png b/src/assets/newImgs/HMScreen/arrow_img.png index 27641d0..e5a8d90 100644 --- a/src/assets/newImgs/HMScreen/arrow_img.png +++ b/src/assets/newImgs/HMScreen/arrow_img.png Binary files differ diff --git a/src/assets/newImgs/HMScreen/headBg.png b/src/assets/newImgs/HMScreen/headBg.png index fa7e9dd..d603316 100644 --- a/src/assets/newImgs/HMScreen/headBg.png +++ b/src/assets/newImgs/HMScreen/headBg.png Binary files differ diff --git a/src/assets/newImgs/HMScreen/video.png b/src/assets/newImgs/HMScreen/video.png new file mode 100644 index 0000000..3c9b4a2 --- /dev/null +++ b/src/assets/newImgs/HMScreen/video.png Binary files differ diff --git a/src/assets/newImgs/HMScreen/videoTest.png b/src/assets/newImgs/HMScreen/videoTest.png new file mode 100644 index 0000000..03679d2 --- /dev/null +++ b/src/assets/newImgs/HMScreen/videoTest.png Binary files differ diff --git a/src/assets/newImgs/HMScreen/arrow_img.png b/src/assets/newImgs/HMScreen/arrow_img.png index 27641d0..e5a8d90 100644 --- a/src/assets/newImgs/HMScreen/arrow_img.png +++ b/src/assets/newImgs/HMScreen/arrow_img.png Binary files differ diff --git a/src/assets/newImgs/HMScreen/headBg.png b/src/assets/newImgs/HMScreen/headBg.png index fa7e9dd..d603316 100644 --- a/src/assets/newImgs/HMScreen/headBg.png +++ b/src/assets/newImgs/HMScreen/headBg.png Binary files differ diff --git a/src/assets/newImgs/HMScreen/video.png b/src/assets/newImgs/HMScreen/video.png new file mode 100644 index 0000000..3c9b4a2 --- /dev/null +++ b/src/assets/newImgs/HMScreen/video.png Binary files differ diff --git a/src/assets/newImgs/HMScreen/videoTest.png b/src/assets/newImgs/HMScreen/videoTest.png new file mode 100644 index 0000000..03679d2 --- /dev/null +++ b/src/assets/newImgs/HMScreen/videoTest.png Binary files differ diff --git a/src/assets/styles/variables.module.scss b/src/assets/styles/variables.module.scss index 72823fe..1c4d42e 100644 --- a/src/assets/styles/variables.module.scss +++ b/src/assets/styles/variables.module.scss @@ -1,9 +1,9 @@ // base color $blue: #324157; $light-blue: #3a71a8; -$red: #c03639; +$red: #ff4545; $pink: #e65d6e; -$green: #30b08f; +$green: #18e87a; $tiffany: #4ab7bd; $yellow: #fec171; $panGreen: #30b08f; diff --git a/src/assets/newImgs/HMScreen/arrow_img.png b/src/assets/newImgs/HMScreen/arrow_img.png index 27641d0..e5a8d90 100644 --- a/src/assets/newImgs/HMScreen/arrow_img.png +++ b/src/assets/newImgs/HMScreen/arrow_img.png Binary files differ diff --git a/src/assets/newImgs/HMScreen/headBg.png b/src/assets/newImgs/HMScreen/headBg.png index fa7e9dd..d603316 100644 --- a/src/assets/newImgs/HMScreen/headBg.png +++ b/src/assets/newImgs/HMScreen/headBg.png Binary files differ diff --git a/src/assets/newImgs/HMScreen/video.png b/src/assets/newImgs/HMScreen/video.png new file mode 100644 index 0000000..3c9b4a2 --- /dev/null +++ b/src/assets/newImgs/HMScreen/video.png Binary files differ diff --git a/src/assets/newImgs/HMScreen/videoTest.png b/src/assets/newImgs/HMScreen/videoTest.png new file mode 100644 index 0000000..03679d2 --- /dev/null +++ b/src/assets/newImgs/HMScreen/videoTest.png Binary files differ diff --git a/src/assets/styles/variables.module.scss b/src/assets/styles/variables.module.scss index 72823fe..1c4d42e 100644 --- a/src/assets/styles/variables.module.scss +++ b/src/assets/styles/variables.module.scss @@ -1,9 +1,9 @@ // base color $blue: #324157; $light-blue: #3a71a8; -$red: #c03639; +$red: #ff4545; $pink: #e65d6e; -$green: #30b08f; +$green: #18e87a; $tiffany: #4ab7bd; $yellow: #fec171; $panGreen: #30b08f; diff --git a/src/views/sponeScreen/Echarts/echartBar3D.vue b/src/views/sponeScreen/Echarts/echartBar3D.vue index 0df0053..3d23886 100644 --- a/src/views/sponeScreen/Echarts/echartBar3D.vue +++ b/src/views/sponeScreen/Echarts/echartBar3D.vue @@ -31,9 +31,9 @@ color: [ '#63caff', '#49beff', - '#03387a', - '#03387a', - '#03387a', + 'rgba(18, 81, 210, 0.3)', + 'rgba(18, 81, 210, 0.3)', + 'rgba(18, 81, 210, 0.3)', '#6c93ee', '#a9abff', '#f7a23f', @@ -50,15 +50,15 @@ ], grid: { containLabel: true, - left: 20, + left: 10, right: 20, bottom: 10, - top: 40, + top: 30, }, xAxis: { axisLabel: { color: '#c0c3cd', - fontSize: 14, + fontSize: 12, interval: 0, }, axisTick: { @@ -84,7 +84,7 @@ yAxis: { axisLabel: { color: '#fff', - fontSize: 13, + fontSize: 12, }, axisTick: { lineStyle: { diff --git a/src/assets/newImgs/HMScreen/arrow_img.png b/src/assets/newImgs/HMScreen/arrow_img.png index 27641d0..e5a8d90 100644 --- a/src/assets/newImgs/HMScreen/arrow_img.png +++ b/src/assets/newImgs/HMScreen/arrow_img.png Binary files differ diff --git a/src/assets/newImgs/HMScreen/headBg.png b/src/assets/newImgs/HMScreen/headBg.png index fa7e9dd..d603316 100644 --- a/src/assets/newImgs/HMScreen/headBg.png +++ b/src/assets/newImgs/HMScreen/headBg.png Binary files differ diff --git a/src/assets/newImgs/HMScreen/video.png b/src/assets/newImgs/HMScreen/video.png new file mode 100644 index 0000000..3c9b4a2 --- /dev/null +++ b/src/assets/newImgs/HMScreen/video.png Binary files differ diff --git a/src/assets/newImgs/HMScreen/videoTest.png b/src/assets/newImgs/HMScreen/videoTest.png new file mode 100644 index 0000000..03679d2 --- /dev/null +++ b/src/assets/newImgs/HMScreen/videoTest.png Binary files differ diff --git a/src/assets/styles/variables.module.scss b/src/assets/styles/variables.module.scss index 72823fe..1c4d42e 100644 --- a/src/assets/styles/variables.module.scss +++ b/src/assets/styles/variables.module.scss @@ -1,9 +1,9 @@ // base color $blue: #324157; $light-blue: #3a71a8; -$red: #c03639; +$red: #ff4545; $pink: #e65d6e; -$green: #30b08f; +$green: #18e87a; $tiffany: #4ab7bd; $yellow: #fec171; $panGreen: #30b08f; diff --git a/src/views/sponeScreen/Echarts/echartBar3D.vue b/src/views/sponeScreen/Echarts/echartBar3D.vue index 0df0053..3d23886 100644 --- a/src/views/sponeScreen/Echarts/echartBar3D.vue +++ b/src/views/sponeScreen/Echarts/echartBar3D.vue @@ -31,9 +31,9 @@ color: [ '#63caff', '#49beff', - '#03387a', - '#03387a', - '#03387a', + 'rgba(18, 81, 210, 0.3)', + 'rgba(18, 81, 210, 0.3)', + 'rgba(18, 81, 210, 0.3)', '#6c93ee', '#a9abff', '#f7a23f', @@ -50,15 +50,15 @@ ], grid: { containLabel: true, - left: 20, + left: 10, right: 20, bottom: 10, - top: 40, + top: 30, }, xAxis: { axisLabel: { color: '#c0c3cd', - fontSize: 14, + fontSize: 12, interval: 0, }, axisTick: { @@ -84,7 +84,7 @@ yAxis: { axisLabel: { color: '#fff', - fontSize: 13, + fontSize: 12, }, axisTick: { lineStyle: { diff --git a/src/views/sponeScreen/cityGK/headHMAimg.vue b/src/views/sponeScreen/cityGK/headHMAimg.vue index aa99c96..78e6a6e 100644 --- a/src/views/sponeScreen/cityGK/headHMAimg.vue +++ b/src/views/sponeScreen/cityGK/headHMAimg.vue @@ -6,7 +6,7 @@
入选
-
2022年5月
+
2022-05
@@ -18,7 +18,7 @@
建设期
-
2022年-2024年
+
2022-2024
@@ -30,10 +30,10 @@
评估期
-
2025年
+
2025
-
+
@@ -42,7 +42,7 @@
长效运维期
-
2024年-2030年
+
2024-2030
@@ -55,13 +55,13 @@ margin-top: 50px; // border: 1px solid red; display: flex; + padding-left: 10px; .one, .two, .three, .four { - width: 30%; + width: 24.5%; height: 100px; - // border: 1px solid blue; display: flex; } @@ -72,6 +72,7 @@ display: flex; justify-content: center; /* 水平居中 */ align-items: center; /* 垂直居中 */ + margin-right: 10px; .PhotoClassA { width: 50px; @@ -100,23 +101,20 @@ width: 100%; height: 50px; color: #3afff8; - font-size: 16px; + font-size: 18px; + margin-top: 8px; // line-height: 50px; // background: rgb(66, 50, 205); } } .IconClass { - width: 10%; - height: 100px; - // background: yellowgreen; display: flex; justify-content: center; /* 水平居中 */ align-items: center; /* 垂直居中 */ + .IconClassZp { - width: 20px; - height: 20px; - position: relative; - // left: 10px; + width: 34px; + height: 18px; background: url('@/assets/newImgs/HMScreen/arrow_img.png') no-repeat; background-size: 100% 100%; } diff --git a/src/assets/newImgs/HMScreen/arrow_img.png b/src/assets/newImgs/HMScreen/arrow_img.png index 27641d0..e5a8d90 100644 --- a/src/assets/newImgs/HMScreen/arrow_img.png +++ b/src/assets/newImgs/HMScreen/arrow_img.png Binary files differ diff --git a/src/assets/newImgs/HMScreen/headBg.png b/src/assets/newImgs/HMScreen/headBg.png index fa7e9dd..d603316 100644 --- a/src/assets/newImgs/HMScreen/headBg.png +++ b/src/assets/newImgs/HMScreen/headBg.png Binary files differ diff --git a/src/assets/newImgs/HMScreen/video.png b/src/assets/newImgs/HMScreen/video.png new file mode 100644 index 0000000..3c9b4a2 --- /dev/null +++ b/src/assets/newImgs/HMScreen/video.png Binary files differ diff --git a/src/assets/newImgs/HMScreen/videoTest.png b/src/assets/newImgs/HMScreen/videoTest.png new file mode 100644 index 0000000..03679d2 --- /dev/null +++ b/src/assets/newImgs/HMScreen/videoTest.png Binary files differ diff --git a/src/assets/styles/variables.module.scss b/src/assets/styles/variables.module.scss index 72823fe..1c4d42e 100644 --- a/src/assets/styles/variables.module.scss +++ b/src/assets/styles/variables.module.scss @@ -1,9 +1,9 @@ // base color $blue: #324157; $light-blue: #3a71a8; -$red: #c03639; +$red: #ff4545; $pink: #e65d6e; -$green: #30b08f; +$green: #18e87a; $tiffany: #4ab7bd; $yellow: #fec171; $panGreen: #30b08f; diff --git a/src/views/sponeScreen/Echarts/echartBar3D.vue b/src/views/sponeScreen/Echarts/echartBar3D.vue index 0df0053..3d23886 100644 --- a/src/views/sponeScreen/Echarts/echartBar3D.vue +++ b/src/views/sponeScreen/Echarts/echartBar3D.vue @@ -31,9 +31,9 @@ color: [ '#63caff', '#49beff', - '#03387a', - '#03387a', - '#03387a', + 'rgba(18, 81, 210, 0.3)', + 'rgba(18, 81, 210, 0.3)', + 'rgba(18, 81, 210, 0.3)', '#6c93ee', '#a9abff', '#f7a23f', @@ -50,15 +50,15 @@ ], grid: { containLabel: true, - left: 20, + left: 10, right: 20, bottom: 10, - top: 40, + top: 30, }, xAxis: { axisLabel: { color: '#c0c3cd', - fontSize: 14, + fontSize: 12, interval: 0, }, axisTick: { @@ -84,7 +84,7 @@ yAxis: { axisLabel: { color: '#fff', - fontSize: 13, + fontSize: 12, }, axisTick: { lineStyle: { diff --git a/src/views/sponeScreen/cityGK/headHMAimg.vue b/src/views/sponeScreen/cityGK/headHMAimg.vue index aa99c96..78e6a6e 100644 --- a/src/views/sponeScreen/cityGK/headHMAimg.vue +++ b/src/views/sponeScreen/cityGK/headHMAimg.vue @@ -6,7 +6,7 @@
入选
-
2022年5月
+
2022-05
@@ -18,7 +18,7 @@
建设期
-
2022年-2024年
+
2022-2024
@@ -30,10 +30,10 @@
评估期
-
2025年
+
2025
-
+
@@ -42,7 +42,7 @@
长效运维期
-
2024年-2030年
+
2024-2030
@@ -55,13 +55,13 @@ margin-top: 50px; // border: 1px solid red; display: flex; + padding-left: 10px; .one, .two, .three, .four { - width: 30%; + width: 24.5%; height: 100px; - // border: 1px solid blue; display: flex; } @@ -72,6 +72,7 @@ display: flex; justify-content: center; /* 水平居中 */ align-items: center; /* 垂直居中 */ + margin-right: 10px; .PhotoClassA { width: 50px; @@ -100,23 +101,20 @@ width: 100%; height: 50px; color: #3afff8; - font-size: 16px; + font-size: 18px; + margin-top: 8px; // line-height: 50px; // background: rgb(66, 50, 205); } } .IconClass { - width: 10%; - height: 100px; - // background: yellowgreen; display: flex; justify-content: center; /* 水平居中 */ align-items: center; /* 垂直居中 */ + .IconClassZp { - width: 20px; - height: 20px; - position: relative; - // left: 10px; + width: 34px; + height: 18px; background: url('@/assets/newImgs/HMScreen/arrow_img.png') no-repeat; background-size: 100% 100%; } diff --git a/src/views/sponeScreen/waterFlood/equipMonitor.vue b/src/views/sponeScreen/waterFlood/equipMonitor.vue index 67b024f..f094630 100644 --- a/src/views/sponeScreen/waterFlood/equipMonitor.vue +++ b/src/views/sponeScreen/waterFlood/equipMonitor.vue @@ -2,18 +2,167 @@
监测设备
-
监测设备
+
+ +
+
+ {{ item.label }} +
+
+ +
+ + + +
+

{{ item.stationName }}

+

+ 站点状态 {{ item.status1 }} +

+

+ 数据状态 {{ item.status2 }} +

+

+ 站点类型 {{ item.type }} +

+

+ 最后通讯 {{ item.date }} +

+ +
+
+
+ + + +
diff --git a/src/assets/newImgs/HMScreen/arrow_img.png b/src/assets/newImgs/HMScreen/arrow_img.png index 27641d0..e5a8d90 100644 --- a/src/assets/newImgs/HMScreen/arrow_img.png +++ b/src/assets/newImgs/HMScreen/arrow_img.png Binary files differ diff --git a/src/assets/newImgs/HMScreen/headBg.png b/src/assets/newImgs/HMScreen/headBg.png index fa7e9dd..d603316 100644 --- a/src/assets/newImgs/HMScreen/headBg.png +++ b/src/assets/newImgs/HMScreen/headBg.png Binary files differ diff --git a/src/assets/newImgs/HMScreen/video.png b/src/assets/newImgs/HMScreen/video.png new file mode 100644 index 0000000..3c9b4a2 --- /dev/null +++ b/src/assets/newImgs/HMScreen/video.png Binary files differ diff --git a/src/assets/newImgs/HMScreen/videoTest.png b/src/assets/newImgs/HMScreen/videoTest.png new file mode 100644 index 0000000..03679d2 --- /dev/null +++ b/src/assets/newImgs/HMScreen/videoTest.png Binary files differ diff --git a/src/assets/styles/variables.module.scss b/src/assets/styles/variables.module.scss index 72823fe..1c4d42e 100644 --- a/src/assets/styles/variables.module.scss +++ b/src/assets/styles/variables.module.scss @@ -1,9 +1,9 @@ // base color $blue: #324157; $light-blue: #3a71a8; -$red: #c03639; +$red: #ff4545; $pink: #e65d6e; -$green: #30b08f; +$green: #18e87a; $tiffany: #4ab7bd; $yellow: #fec171; $panGreen: #30b08f; diff --git a/src/views/sponeScreen/Echarts/echartBar3D.vue b/src/views/sponeScreen/Echarts/echartBar3D.vue index 0df0053..3d23886 100644 --- a/src/views/sponeScreen/Echarts/echartBar3D.vue +++ b/src/views/sponeScreen/Echarts/echartBar3D.vue @@ -31,9 +31,9 @@ color: [ '#63caff', '#49beff', - '#03387a', - '#03387a', - '#03387a', + 'rgba(18, 81, 210, 0.3)', + 'rgba(18, 81, 210, 0.3)', + 'rgba(18, 81, 210, 0.3)', '#6c93ee', '#a9abff', '#f7a23f', @@ -50,15 +50,15 @@ ], grid: { containLabel: true, - left: 20, + left: 10, right: 20, bottom: 10, - top: 40, + top: 30, }, xAxis: { axisLabel: { color: '#c0c3cd', - fontSize: 14, + fontSize: 12, interval: 0, }, axisTick: { @@ -84,7 +84,7 @@ yAxis: { axisLabel: { color: '#fff', - fontSize: 13, + fontSize: 12, }, axisTick: { lineStyle: { diff --git a/src/views/sponeScreen/cityGK/headHMAimg.vue b/src/views/sponeScreen/cityGK/headHMAimg.vue index aa99c96..78e6a6e 100644 --- a/src/views/sponeScreen/cityGK/headHMAimg.vue +++ b/src/views/sponeScreen/cityGK/headHMAimg.vue @@ -6,7 +6,7 @@
入选
-
2022年5月
+
2022-05
@@ -18,7 +18,7 @@
建设期
-
2022年-2024年
+
2022-2024
@@ -30,10 +30,10 @@
评估期
-
2025年
+
2025
-
+
@@ -42,7 +42,7 @@
长效运维期
-
2024年-2030年
+
2024-2030
@@ -55,13 +55,13 @@ margin-top: 50px; // border: 1px solid red; display: flex; + padding-left: 10px; .one, .two, .three, .four { - width: 30%; + width: 24.5%; height: 100px; - // border: 1px solid blue; display: flex; } @@ -72,6 +72,7 @@ display: flex; justify-content: center; /* 水平居中 */ align-items: center; /* 垂直居中 */ + margin-right: 10px; .PhotoClassA { width: 50px; @@ -100,23 +101,20 @@ width: 100%; height: 50px; color: #3afff8; - font-size: 16px; + font-size: 18px; + margin-top: 8px; // line-height: 50px; // background: rgb(66, 50, 205); } } .IconClass { - width: 10%; - height: 100px; - // background: yellowgreen; display: flex; justify-content: center; /* 水平居中 */ align-items: center; /* 垂直居中 */ + .IconClassZp { - width: 20px; - height: 20px; - position: relative; - // left: 10px; + width: 34px; + height: 18px; background: url('@/assets/newImgs/HMScreen/arrow_img.png') no-repeat; background-size: 100% 100%; } diff --git a/src/views/sponeScreen/waterFlood/equipMonitor.vue b/src/views/sponeScreen/waterFlood/equipMonitor.vue index 67b024f..f094630 100644 --- a/src/views/sponeScreen/waterFlood/equipMonitor.vue +++ b/src/views/sponeScreen/waterFlood/equipMonitor.vue @@ -2,18 +2,167 @@
监测设备
-
监测设备
+
+ +
+
+ {{ item.label }} +
+
+ +
+ + + +
+

{{ item.stationName }}

+

+ 站点状态 {{ item.status1 }} +

+

+ 数据状态 {{ item.status2 }} +

+

+ 站点类型 {{ item.type }} +

+

+ 最后通讯 {{ item.date }} +

+ +
+
+
+ + + +
diff --git a/src/views/sponeScreen/waterFlood/floodWZ.vue b/src/views/sponeScreen/waterFlood/floodWZ.vue index ab7696a..0c67b6d 100644 --- a/src/views/sponeScreen/waterFlood/floodWZ.vue +++ b/src/views/sponeScreen/waterFlood/floodWZ.vue @@ -49,9 +49,13 @@ .floodWZPage { width: 100%; .scrollMapHM { + height: 270px; p { width: 30%; } + .scroll { + height: 230px; + } } } diff --git a/src/assets/newImgs/HMScreen/arrow_img.png b/src/assets/newImgs/HMScreen/arrow_img.png index 27641d0..e5a8d90 100644 --- a/src/assets/newImgs/HMScreen/arrow_img.png +++ b/src/assets/newImgs/HMScreen/arrow_img.png Binary files differ diff --git a/src/assets/newImgs/HMScreen/headBg.png b/src/assets/newImgs/HMScreen/headBg.png index fa7e9dd..d603316 100644 --- a/src/assets/newImgs/HMScreen/headBg.png +++ b/src/assets/newImgs/HMScreen/headBg.png Binary files differ diff --git a/src/assets/newImgs/HMScreen/video.png b/src/assets/newImgs/HMScreen/video.png new file mode 100644 index 0000000..3c9b4a2 --- /dev/null +++ b/src/assets/newImgs/HMScreen/video.png Binary files differ diff --git a/src/assets/newImgs/HMScreen/videoTest.png b/src/assets/newImgs/HMScreen/videoTest.png new file mode 100644 index 0000000..03679d2 --- /dev/null +++ b/src/assets/newImgs/HMScreen/videoTest.png Binary files differ diff --git a/src/assets/styles/variables.module.scss b/src/assets/styles/variables.module.scss index 72823fe..1c4d42e 100644 --- a/src/assets/styles/variables.module.scss +++ b/src/assets/styles/variables.module.scss @@ -1,9 +1,9 @@ // base color $blue: #324157; $light-blue: #3a71a8; -$red: #c03639; +$red: #ff4545; $pink: #e65d6e; -$green: #30b08f; +$green: #18e87a; $tiffany: #4ab7bd; $yellow: #fec171; $panGreen: #30b08f; diff --git a/src/views/sponeScreen/Echarts/echartBar3D.vue b/src/views/sponeScreen/Echarts/echartBar3D.vue index 0df0053..3d23886 100644 --- a/src/views/sponeScreen/Echarts/echartBar3D.vue +++ b/src/views/sponeScreen/Echarts/echartBar3D.vue @@ -31,9 +31,9 @@ color: [ '#63caff', '#49beff', - '#03387a', - '#03387a', - '#03387a', + 'rgba(18, 81, 210, 0.3)', + 'rgba(18, 81, 210, 0.3)', + 'rgba(18, 81, 210, 0.3)', '#6c93ee', '#a9abff', '#f7a23f', @@ -50,15 +50,15 @@ ], grid: { containLabel: true, - left: 20, + left: 10, right: 20, bottom: 10, - top: 40, + top: 30, }, xAxis: { axisLabel: { color: '#c0c3cd', - fontSize: 14, + fontSize: 12, interval: 0, }, axisTick: { @@ -84,7 +84,7 @@ yAxis: { axisLabel: { color: '#fff', - fontSize: 13, + fontSize: 12, }, axisTick: { lineStyle: { diff --git a/src/views/sponeScreen/cityGK/headHMAimg.vue b/src/views/sponeScreen/cityGK/headHMAimg.vue index aa99c96..78e6a6e 100644 --- a/src/views/sponeScreen/cityGK/headHMAimg.vue +++ b/src/views/sponeScreen/cityGK/headHMAimg.vue @@ -6,7 +6,7 @@
入选
-
2022年5月
+
2022-05
@@ -18,7 +18,7 @@
建设期
-
2022年-2024年
+
2022-2024
@@ -30,10 +30,10 @@
评估期
-
2025年
+
2025
-
+
@@ -42,7 +42,7 @@
长效运维期
-
2024年-2030年
+
2024-2030
@@ -55,13 +55,13 @@ margin-top: 50px; // border: 1px solid red; display: flex; + padding-left: 10px; .one, .two, .three, .four { - width: 30%; + width: 24.5%; height: 100px; - // border: 1px solid blue; display: flex; } @@ -72,6 +72,7 @@ display: flex; justify-content: center; /* 水平居中 */ align-items: center; /* 垂直居中 */ + margin-right: 10px; .PhotoClassA { width: 50px; @@ -100,23 +101,20 @@ width: 100%; height: 50px; color: #3afff8; - font-size: 16px; + font-size: 18px; + margin-top: 8px; // line-height: 50px; // background: rgb(66, 50, 205); } } .IconClass { - width: 10%; - height: 100px; - // background: yellowgreen; display: flex; justify-content: center; /* 水平居中 */ align-items: center; /* 垂直居中 */ + .IconClassZp { - width: 20px; - height: 20px; - position: relative; - // left: 10px; + width: 34px; + height: 18px; background: url('@/assets/newImgs/HMScreen/arrow_img.png') no-repeat; background-size: 100% 100%; } diff --git a/src/views/sponeScreen/waterFlood/equipMonitor.vue b/src/views/sponeScreen/waterFlood/equipMonitor.vue index 67b024f..f094630 100644 --- a/src/views/sponeScreen/waterFlood/equipMonitor.vue +++ b/src/views/sponeScreen/waterFlood/equipMonitor.vue @@ -2,18 +2,167 @@
监测设备
-
监测设备
+
+ +
+
+ {{ item.label }} +
+
+ +
+ + + +
+

{{ item.stationName }}

+

+ 站点状态 {{ item.status1 }} +

+

+ 数据状态 {{ item.status2 }} +

+

+ 站点类型 {{ item.type }} +

+

+ 最后通讯 {{ item.date }} +

+ +
+
+
+ + + +
diff --git a/src/views/sponeScreen/waterFlood/floodWZ.vue b/src/views/sponeScreen/waterFlood/floodWZ.vue index ab7696a..0c67b6d 100644 --- a/src/views/sponeScreen/waterFlood/floodWZ.vue +++ b/src/views/sponeScreen/waterFlood/floodWZ.vue @@ -49,9 +49,13 @@ .floodWZPage { width: 100%; .scrollMapHM { + height: 270px; p { width: 30%; } + .scroll { + height: 230px; + } } } diff --git a/src/views/sponeScreen/waterFlood/futureRain.vue b/src/views/sponeScreen/waterFlood/futureRain.vue new file mode 100644 index 0000000..402cd94 --- /dev/null +++ b/src/views/sponeScreen/waterFlood/futureRain.vue @@ -0,0 +1,36 @@ + + + + + diff --git a/src/assets/newImgs/HMScreen/arrow_img.png b/src/assets/newImgs/HMScreen/arrow_img.png index 27641d0..e5a8d90 100644 --- a/src/assets/newImgs/HMScreen/arrow_img.png +++ b/src/assets/newImgs/HMScreen/arrow_img.png Binary files differ diff --git a/src/assets/newImgs/HMScreen/headBg.png b/src/assets/newImgs/HMScreen/headBg.png index fa7e9dd..d603316 100644 --- a/src/assets/newImgs/HMScreen/headBg.png +++ b/src/assets/newImgs/HMScreen/headBg.png Binary files differ diff --git a/src/assets/newImgs/HMScreen/video.png b/src/assets/newImgs/HMScreen/video.png new file mode 100644 index 0000000..3c9b4a2 --- /dev/null +++ b/src/assets/newImgs/HMScreen/video.png Binary files differ diff --git a/src/assets/newImgs/HMScreen/videoTest.png b/src/assets/newImgs/HMScreen/videoTest.png new file mode 100644 index 0000000..03679d2 --- /dev/null +++ b/src/assets/newImgs/HMScreen/videoTest.png Binary files differ diff --git a/src/assets/styles/variables.module.scss b/src/assets/styles/variables.module.scss index 72823fe..1c4d42e 100644 --- a/src/assets/styles/variables.module.scss +++ b/src/assets/styles/variables.module.scss @@ -1,9 +1,9 @@ // base color $blue: #324157; $light-blue: #3a71a8; -$red: #c03639; +$red: #ff4545; $pink: #e65d6e; -$green: #30b08f; +$green: #18e87a; $tiffany: #4ab7bd; $yellow: #fec171; $panGreen: #30b08f; diff --git a/src/views/sponeScreen/Echarts/echartBar3D.vue b/src/views/sponeScreen/Echarts/echartBar3D.vue index 0df0053..3d23886 100644 --- a/src/views/sponeScreen/Echarts/echartBar3D.vue +++ b/src/views/sponeScreen/Echarts/echartBar3D.vue @@ -31,9 +31,9 @@ color: [ '#63caff', '#49beff', - '#03387a', - '#03387a', - '#03387a', + 'rgba(18, 81, 210, 0.3)', + 'rgba(18, 81, 210, 0.3)', + 'rgba(18, 81, 210, 0.3)', '#6c93ee', '#a9abff', '#f7a23f', @@ -50,15 +50,15 @@ ], grid: { containLabel: true, - left: 20, + left: 10, right: 20, bottom: 10, - top: 40, + top: 30, }, xAxis: { axisLabel: { color: '#c0c3cd', - fontSize: 14, + fontSize: 12, interval: 0, }, axisTick: { @@ -84,7 +84,7 @@ yAxis: { axisLabel: { color: '#fff', - fontSize: 13, + fontSize: 12, }, axisTick: { lineStyle: { diff --git a/src/views/sponeScreen/cityGK/headHMAimg.vue b/src/views/sponeScreen/cityGK/headHMAimg.vue index aa99c96..78e6a6e 100644 --- a/src/views/sponeScreen/cityGK/headHMAimg.vue +++ b/src/views/sponeScreen/cityGK/headHMAimg.vue @@ -6,7 +6,7 @@
入选
-
2022年5月
+
2022-05
@@ -18,7 +18,7 @@
建设期
-
2022年-2024年
+
2022-2024
@@ -30,10 +30,10 @@
评估期
-
2025年
+
2025
-
+
@@ -42,7 +42,7 @@
长效运维期
-
2024年-2030年
+
2024-2030
@@ -55,13 +55,13 @@ margin-top: 50px; // border: 1px solid red; display: flex; + padding-left: 10px; .one, .two, .three, .four { - width: 30%; + width: 24.5%; height: 100px; - // border: 1px solid blue; display: flex; } @@ -72,6 +72,7 @@ display: flex; justify-content: center; /* 水平居中 */ align-items: center; /* 垂直居中 */ + margin-right: 10px; .PhotoClassA { width: 50px; @@ -100,23 +101,20 @@ width: 100%; height: 50px; color: #3afff8; - font-size: 16px; + font-size: 18px; + margin-top: 8px; // line-height: 50px; // background: rgb(66, 50, 205); } } .IconClass { - width: 10%; - height: 100px; - // background: yellowgreen; display: flex; justify-content: center; /* 水平居中 */ align-items: center; /* 垂直居中 */ + .IconClassZp { - width: 20px; - height: 20px; - position: relative; - // left: 10px; + width: 34px; + height: 18px; background: url('@/assets/newImgs/HMScreen/arrow_img.png') no-repeat; background-size: 100% 100%; } diff --git a/src/views/sponeScreen/waterFlood/equipMonitor.vue b/src/views/sponeScreen/waterFlood/equipMonitor.vue index 67b024f..f094630 100644 --- a/src/views/sponeScreen/waterFlood/equipMonitor.vue +++ b/src/views/sponeScreen/waterFlood/equipMonitor.vue @@ -2,18 +2,167 @@
监测设备
-
监测设备
+
+ +
+
+ {{ item.label }} +
+
+ +
+ + + +
+

{{ item.stationName }}

+

+ 站点状态 {{ item.status1 }} +

+

+ 数据状态 {{ item.status2 }} +

+

+ 站点类型 {{ item.type }} +

+

+ 最后通讯 {{ item.date }} +

+ +
+
+
+ + + +
diff --git a/src/views/sponeScreen/waterFlood/floodWZ.vue b/src/views/sponeScreen/waterFlood/floodWZ.vue index ab7696a..0c67b6d 100644 --- a/src/views/sponeScreen/waterFlood/floodWZ.vue +++ b/src/views/sponeScreen/waterFlood/floodWZ.vue @@ -49,9 +49,13 @@ .floodWZPage { width: 100%; .scrollMapHM { + height: 270px; p { width: 30%; } + .scroll { + height: 230px; + } } } diff --git a/src/views/sponeScreen/waterFlood/futureRain.vue b/src/views/sponeScreen/waterFlood/futureRain.vue new file mode 100644 index 0000000..402cd94 --- /dev/null +++ b/src/views/sponeScreen/waterFlood/futureRain.vue @@ -0,0 +1,36 @@ + + + + + diff --git a/src/views/sponeScreen/waterFlood/index.vue b/src/views/sponeScreen/waterFlood/index.vue index a48905c..1e36418 100644 --- a/src/views/sponeScreen/waterFlood/index.vue +++ b/src/views/sponeScreen/waterFlood/index.vue @@ -12,6 +12,12 @@ + + +
+ +
+
@@ -29,6 +35,7 @@ import FloodWZ from '@/views/sponeScreen/waterFlood/floodWZ.vue'; //防汛物资 import MonitorBZ from '@/views/sponeScreen/waterFlood/pumpMonitor.vue'; //泵站运行监控 import MonitorEquip from '@/views/sponeScreen/waterFlood/equipMonitor.vue'; //监测设备 +import HeadRain from '@/views/sponeScreen/waterFlood/futureRain.vue'; //降雨预报 const { proxy } = getCurrentInstance(); const showPanel = ref(true); //面板展开收起 @@ -50,4 +57,12 @@ onMounted(() => {}); - +