diff --git a/src/views/oneMap/SmartDrainage/PsLeftBox.vue b/src/views/oneMap/SmartDrainage/PsLeftBox.vue index ed423ba..cdd9ca5 100644 --- a/src/views/oneMap/SmartDrainage/PsLeftBox.vue +++ b/src/views/oneMap/SmartDrainage/PsLeftBox.vue @@ -39,7 +39,7 @@
序号 {{ partName }} - 位置 + 位置
@@ -366,6 +366,10 @@ cursor: pointer; .parttop { height: 76px; + .upImg { + width: 100%; + height: 100%; + } } } .upper { diff --git a/src/views/oneMap/SmartDrainage/PsLeftBox.vue b/src/views/oneMap/SmartDrainage/PsLeftBox.vue index ed423ba..cdd9ca5 100644 --- a/src/views/oneMap/SmartDrainage/PsLeftBox.vue +++ b/src/views/oneMap/SmartDrainage/PsLeftBox.vue @@ -39,7 +39,7 @@
序号 {{ partName }} - 位置 + 位置
@@ -366,6 +366,10 @@ cursor: pointer; .parttop { height: 76px; + .upImg { + width: 100%; + height: 100%; + } } } .upper { diff --git a/src/views/oneMap/components/ZHHM_JCFX.vue b/src/views/oneMap/components/ZHHM_JCFX.vue index f13d25a..c420911 100644 --- a/src/views/oneMap/components/ZHHM_JCFX.vue +++ b/src/views/oneMap/components/ZHHM_JCFX.vue @@ -353,7 +353,7 @@ }); // 项目分析 - selectExponent({ value: val }).then(res => { + selectExponent({ value: val, date: DataList.value }).then(res => { let datas = res.data; chartData2.value.xAxis = datas.time; chartData2.value.yAxis1 = datas.jishuishen; //水深 @@ -362,7 +362,7 @@ }); // 关键管网分析 - selectPipenetwork({ value: val }).then(res => { + selectPipenetwork({ value: val, date: DataList.value }).then(res => { let datas = res.data; chartData3.value.xAxis = datas.time; chartData3.value.yAxis1 = datas.jyl; //降雨量 diff --git a/src/views/oneMap/SmartDrainage/PsLeftBox.vue b/src/views/oneMap/SmartDrainage/PsLeftBox.vue index ed423ba..cdd9ca5 100644 --- a/src/views/oneMap/SmartDrainage/PsLeftBox.vue +++ b/src/views/oneMap/SmartDrainage/PsLeftBox.vue @@ -39,7 +39,7 @@
序号 {{ partName }} - 位置 + 位置
@@ -366,6 +366,10 @@ cursor: pointer; .parttop { height: 76px; + .upImg { + width: 100%; + height: 100%; + } } } .upper { diff --git a/src/views/oneMap/components/ZHHM_JCFX.vue b/src/views/oneMap/components/ZHHM_JCFX.vue index f13d25a..c420911 100644 --- a/src/views/oneMap/components/ZHHM_JCFX.vue +++ b/src/views/oneMap/components/ZHHM_JCFX.vue @@ -353,7 +353,7 @@ }); // 项目分析 - selectExponent({ value: val }).then(res => { + selectExponent({ value: val, date: DataList.value }).then(res => { let datas = res.data; chartData2.value.xAxis = datas.time; chartData2.value.yAxis1 = datas.jishuishen; //水深 @@ -362,7 +362,7 @@ }); // 关键管网分析 - selectPipenetwork({ value: val }).then(res => { + selectPipenetwork({ value: val, date: DataList.value }).then(res => { let datas = res.data; chartData3.value.xAxis = datas.time; chartData3.value.yAxis1 = datas.jyl; //降雨量 diff --git a/src/views/oneMap/floodPrevention/FholRightBox.vue b/src/views/oneMap/floodPrevention/FholRightBox.vue index cc06524..289c2b3 100644 --- a/src/views/oneMap/floodPrevention/FholRightBox.vue +++ b/src/views/oneMap/floodPrevention/FholRightBox.vue @@ -46,24 +46,27 @@
-
-
-
-
泵站联系人:周晓峰
-
电话:1306035468
-
-
- {{ item.name }} -
-
+
+
+
泵站联系人:周晓峰
+
电话:1306035468
+
+ +
+
+ {{ item.name }}
-
+
+
+
+
+
@@ -73,7 +76,7 @@
70%
-
+
累计抽排量
@@ -88,7 +91,7 @@
-
+
@@ -97,7 +100,9 @@
{{ item.name }}
-
视频
+
+
+
@@ -331,47 +336,47 @@ width: 450px; height: 33%; margin-top: 3px; + + .bzxq { + margin-top: 5px; + color: #c6c6c6; + height: 25px; + font-family: Source Han Sans CN; + align-items: center; + + .switch { + position: relative; + left: 18px; + top: 5px; + width: 35%; + height: 25px; + + .head-item { + width: 70px; + margin-left: 5px; + padding: 2px 3px; + background: #00344f; + height: 23px; + text-align: center; + cursor: pointer; + position: relative; + top: -3px; + } + .activedright { + border: 1px solid #2cfce9; + color: #e4f5ff; + background: #166f84; + } + } + } .PumpListBox { - height: calc(100% - 50px); + height: calc(100% - 80px); width: 435px; margin: 3px auto; - // background: #0066e5; - .StationMc { width: 435px; height: 50%; // background: yellow; - .bzxq { - margin-top: 5px; - color: #c6c6c6; - height: 25px; - font-family: Source Han Sans CN; - align-items: center; - .switch { - position: relative; - left: 40px; - top: 5px; - width: 150px; - height: 25px; - // background: red; - .head-item { - width: 70px; - margin-left: 5px; - padding: 2px 3px; - background: #00344f; - height: 23px; - text-align: center; - cursor: pointer; - position: relative; - top: -3px; - } - .activedright { - border: 1px solid #2cfce9; - color: #e4f5ff; - background: #166f84; - } - } - } .drcpl { width: 360px; @@ -465,7 +470,7 @@ // background: black; .item { padding-left: 5px; - margin-top: 25px; + margin-top: 13px; margin-left: 48px; &:first-of-type { margin-left: 0; @@ -487,11 +492,14 @@ } } } - .bzsp { - margin: 5px auto; - width: 430px; + } + .bzsp { + height: calc(100% - 80px); + width: 435px; + margin: 3px auto; + #videoEvent { + width: 100%; height: 100%; - // background: red; } } } diff --git a/src/views/oneMap/SmartDrainage/PsLeftBox.vue b/src/views/oneMap/SmartDrainage/PsLeftBox.vue index ed423ba..cdd9ca5 100644 --- a/src/views/oneMap/SmartDrainage/PsLeftBox.vue +++ b/src/views/oneMap/SmartDrainage/PsLeftBox.vue @@ -39,7 +39,7 @@
序号 {{ partName }} - 位置 + 位置
@@ -366,6 +366,10 @@ cursor: pointer; .parttop { height: 76px; + .upImg { + width: 100%; + height: 100%; + } } } .upper { diff --git a/src/views/oneMap/components/ZHHM_JCFX.vue b/src/views/oneMap/components/ZHHM_JCFX.vue index f13d25a..c420911 100644 --- a/src/views/oneMap/components/ZHHM_JCFX.vue +++ b/src/views/oneMap/components/ZHHM_JCFX.vue @@ -353,7 +353,7 @@ }); // 项目分析 - selectExponent({ value: val }).then(res => { + selectExponent({ value: val, date: DataList.value }).then(res => { let datas = res.data; chartData2.value.xAxis = datas.time; chartData2.value.yAxis1 = datas.jishuishen; //水深 @@ -362,7 +362,7 @@ }); // 关键管网分析 - selectPipenetwork({ value: val }).then(res => { + selectPipenetwork({ value: val, date: DataList.value }).then(res => { let datas = res.data; chartData3.value.xAxis = datas.time; chartData3.value.yAxis1 = datas.jyl; //降雨量 diff --git a/src/views/oneMap/floodPrevention/FholRightBox.vue b/src/views/oneMap/floodPrevention/FholRightBox.vue index cc06524..289c2b3 100644 --- a/src/views/oneMap/floodPrevention/FholRightBox.vue +++ b/src/views/oneMap/floodPrevention/FholRightBox.vue @@ -46,24 +46,27 @@
-
-
-
-
泵站联系人:周晓峰
-
电话:1306035468
-
-
- {{ item.name }} -
-
+
+
+
泵站联系人:周晓峰
+
电话:1306035468
+
+ +
+
+ {{ item.name }}
-
+
+
+
+
+
@@ -73,7 +76,7 @@
70%
-
+
累计抽排量
@@ -88,7 +91,7 @@
-
+
@@ -97,7 +100,9 @@
{{ item.name }}
-
视频
+
+
+
@@ -331,47 +336,47 @@ width: 450px; height: 33%; margin-top: 3px; + + .bzxq { + margin-top: 5px; + color: #c6c6c6; + height: 25px; + font-family: Source Han Sans CN; + align-items: center; + + .switch { + position: relative; + left: 18px; + top: 5px; + width: 35%; + height: 25px; + + .head-item { + width: 70px; + margin-left: 5px; + padding: 2px 3px; + background: #00344f; + height: 23px; + text-align: center; + cursor: pointer; + position: relative; + top: -3px; + } + .activedright { + border: 1px solid #2cfce9; + color: #e4f5ff; + background: #166f84; + } + } + } .PumpListBox { - height: calc(100% - 50px); + height: calc(100% - 80px); width: 435px; margin: 3px auto; - // background: #0066e5; - .StationMc { width: 435px; height: 50%; // background: yellow; - .bzxq { - margin-top: 5px; - color: #c6c6c6; - height: 25px; - font-family: Source Han Sans CN; - align-items: center; - .switch { - position: relative; - left: 40px; - top: 5px; - width: 150px; - height: 25px; - // background: red; - .head-item { - width: 70px; - margin-left: 5px; - padding: 2px 3px; - background: #00344f; - height: 23px; - text-align: center; - cursor: pointer; - position: relative; - top: -3px; - } - .activedright { - border: 1px solid #2cfce9; - color: #e4f5ff; - background: #166f84; - } - } - } .drcpl { width: 360px; @@ -465,7 +470,7 @@ // background: black; .item { padding-left: 5px; - margin-top: 25px; + margin-top: 13px; margin-left: 48px; &:first-of-type { margin-left: 0; @@ -487,11 +492,14 @@ } } } - .bzsp { - margin: 5px auto; - width: 430px; + } + .bzsp { + height: calc(100% - 80px); + width: 435px; + margin: 3px auto; + #videoEvent { + width: 100%; height: 100%; - // background: red; } } } diff --git a/src/views/oneMap/floodPrevention/FhplLeftBox.vue b/src/views/oneMap/floodPrevention/FhplLeftBox.vue index d3da7a7..7d7f27a 100644 --- a/src/views/oneMap/floodPrevention/FhplLeftBox.vue +++ b/src/views/oneMap/floodPrevention/FhplLeftBox.vue @@ -19,7 +19,7 @@
气象预报
未来24h中心城区累计降雨达12mm
-
+
监测降雨
@@ -351,22 +351,26 @@ } } .rainChartInfo { - margin: auto; + margin-top: 5px; height: 20px; - width: 70%; + width: 100%; color: #c6c6c6; - // background: red; + justify-content: center; + .square { width: 10px; height: 10px; + display: inline-block; background-color: #48a0fb; margin-left: 50px; + margin-top: 4px; } .squareA { width: 10px; height: 10px; background-color: #d3c60b; margin-left: 30px; + margin-top: 4px; } } .echartBox {