diff --git a/src/views/oneMap/ConstructionEvaluation/JSPGLeftBox.vue b/src/views/oneMap/ConstructionEvaluation/JSPGLeftBox.vue index 2a7ff07..3ee47c4 100644 --- a/src/views/oneMap/ConstructionEvaluation/JSPGLeftBox.vue +++ b/src/views/oneMap/ConstructionEvaluation/JSPGLeftBox.vue @@ -65,8 +65,9 @@
-
-
污水收集处理
+
+
+
污水收集处理
@@ -293,7 +294,31 @@ .Sewagecollection { width: 450px; height: 25%; - // background: yellowgreen; + + .topVehicl { + font-family: Source Han Sans CN; + font-weight: bold; + font-size: 14px; + color: #ebfeff; + align-items: center; + height: 30px; + // background: teal; + .icon { + position: relative; + top: -1px; + width: 25px; + height: 25px; + background: url('@/assets/newImgs/xtb_img.png') no-repeat; + } + + .name { + background: linear-gradient(0deg, rgba(0, 242, 255, 0.5) 0%, rgba(0, 242, 255, 0) 100%); + padding: 0px 3px; + height: 10px; + line-height: 0px; + margin-top: 6px; + } + } .wssjEch { margin: 5px auto; width: 420px; diff --git a/src/views/oneMap/ConstructionEvaluation/JSPGLeftBox.vue b/src/views/oneMap/ConstructionEvaluation/JSPGLeftBox.vue index 2a7ff07..3ee47c4 100644 --- a/src/views/oneMap/ConstructionEvaluation/JSPGLeftBox.vue +++ b/src/views/oneMap/ConstructionEvaluation/JSPGLeftBox.vue @@ -65,8 +65,9 @@
-
-
污水收集处理
+
+
+
污水收集处理
@@ -293,7 +294,31 @@ .Sewagecollection { width: 450px; height: 25%; - // background: yellowgreen; + + .topVehicl { + font-family: Source Han Sans CN; + font-weight: bold; + font-size: 14px; + color: #ebfeff; + align-items: center; + height: 30px; + // background: teal; + .icon { + position: relative; + top: -1px; + width: 25px; + height: 25px; + background: url('@/assets/newImgs/xtb_img.png') no-repeat; + } + + .name { + background: linear-gradient(0deg, rgba(0, 242, 255, 0.5) 0%, rgba(0, 242, 255, 0) 100%); + padding: 0px 3px; + height: 10px; + line-height: 0px; + margin-top: 6px; + } + } .wssjEch { margin: 5px auto; width: 420px; diff --git a/src/views/oneMap/ConstructionEvaluation/JSPGRightBox.vue b/src/views/oneMap/ConstructionEvaluation/JSPGRightBox.vue index dbeddc8..3f696aa 100644 --- a/src/views/oneMap/ConstructionEvaluation/JSPGRightBox.vue +++ b/src/views/oneMap/ConstructionEvaluation/JSPGRightBox.vue @@ -2,7 +2,7 @@
-
绩效管理
+
管理绩效
diff --git a/src/views/oneMap/ConstructionEvaluation/JSPGLeftBox.vue b/src/views/oneMap/ConstructionEvaluation/JSPGLeftBox.vue index 2a7ff07..3ee47c4 100644 --- a/src/views/oneMap/ConstructionEvaluation/JSPGLeftBox.vue +++ b/src/views/oneMap/ConstructionEvaluation/JSPGLeftBox.vue @@ -65,8 +65,9 @@
-
-
污水收集处理
+
+
+
污水收集处理
@@ -293,7 +294,31 @@ .Sewagecollection { width: 450px; height: 25%; - // background: yellowgreen; + + .topVehicl { + font-family: Source Han Sans CN; + font-weight: bold; + font-size: 14px; + color: #ebfeff; + align-items: center; + height: 30px; + // background: teal; + .icon { + position: relative; + top: -1px; + width: 25px; + height: 25px; + background: url('@/assets/newImgs/xtb_img.png') no-repeat; + } + + .name { + background: linear-gradient(0deg, rgba(0, 242, 255, 0.5) 0%, rgba(0, 242, 255, 0) 100%); + padding: 0px 3px; + height: 10px; + line-height: 0px; + margin-top: 6px; + } + } .wssjEch { margin: 5px auto; width: 420px; diff --git a/src/views/oneMap/ConstructionEvaluation/JSPGRightBox.vue b/src/views/oneMap/ConstructionEvaluation/JSPGRightBox.vue index dbeddc8..3f696aa 100644 --- a/src/views/oneMap/ConstructionEvaluation/JSPGRightBox.vue +++ b/src/views/oneMap/ConstructionEvaluation/JSPGRightBox.vue @@ -2,7 +2,7 @@
-
绩效管理
+
管理绩效
diff --git a/src/views/oneMap/FloodStuationReview/xqhgLeftBox.vue b/src/views/oneMap/FloodStuationReview/xqhgLeftBox.vue index 14170d1..c43cb7b 100644 --- a/src/views/oneMap/FloodStuationReview/xqhgLeftBox.vue +++ b/src/views/oneMap/FloodStuationReview/xqhgLeftBox.vue @@ -122,7 +122,7 @@ background: linear-gradient(0deg, rgba(0, 242, 255, 0.5) 0%, rgba(0, 242, 255, 0) 100%); height: 10px; line-height: 0px; - margin-top: 10px; + margin-top: 12px; } } .ScheduEcharts { @@ -161,7 +161,7 @@ background: linear-gradient(0deg, rgba(0, 242, 255, 0.5) 0%, rgba(0, 242, 255, 0) 100%); height: 10px; line-height: 0px; - margin-top: 10px; + margin-top: 12px; } } .VehiclEcharts { @@ -196,7 +196,7 @@ background: linear-gradient(0deg, rgba(0, 242, 255, 0.5) 0%, rgba(0, 242, 255, 0) 100%); height: 10px; line-height: 0px; - margin-top: 10px; + margin-top: 12px; } } .MaterialEcharts { diff --git a/src/views/oneMap/ConstructionEvaluation/JSPGLeftBox.vue b/src/views/oneMap/ConstructionEvaluation/JSPGLeftBox.vue index 2a7ff07..3ee47c4 100644 --- a/src/views/oneMap/ConstructionEvaluation/JSPGLeftBox.vue +++ b/src/views/oneMap/ConstructionEvaluation/JSPGLeftBox.vue @@ -65,8 +65,9 @@
-
-
污水收集处理
+
+
+
污水收集处理
@@ -293,7 +294,31 @@ .Sewagecollection { width: 450px; height: 25%; - // background: yellowgreen; + + .topVehicl { + font-family: Source Han Sans CN; + font-weight: bold; + font-size: 14px; + color: #ebfeff; + align-items: center; + height: 30px; + // background: teal; + .icon { + position: relative; + top: -1px; + width: 25px; + height: 25px; + background: url('@/assets/newImgs/xtb_img.png') no-repeat; + } + + .name { + background: linear-gradient(0deg, rgba(0, 242, 255, 0.5) 0%, rgba(0, 242, 255, 0) 100%); + padding: 0px 3px; + height: 10px; + line-height: 0px; + margin-top: 6px; + } + } .wssjEch { margin: 5px auto; width: 420px; diff --git a/src/views/oneMap/ConstructionEvaluation/JSPGRightBox.vue b/src/views/oneMap/ConstructionEvaluation/JSPGRightBox.vue index dbeddc8..3f696aa 100644 --- a/src/views/oneMap/ConstructionEvaluation/JSPGRightBox.vue +++ b/src/views/oneMap/ConstructionEvaluation/JSPGRightBox.vue @@ -2,7 +2,7 @@
-
绩效管理
+
管理绩效
diff --git a/src/views/oneMap/FloodStuationReview/xqhgLeftBox.vue b/src/views/oneMap/FloodStuationReview/xqhgLeftBox.vue index 14170d1..c43cb7b 100644 --- a/src/views/oneMap/FloodStuationReview/xqhgLeftBox.vue +++ b/src/views/oneMap/FloodStuationReview/xqhgLeftBox.vue @@ -122,7 +122,7 @@ background: linear-gradient(0deg, rgba(0, 242, 255, 0.5) 0%, rgba(0, 242, 255, 0) 100%); height: 10px; line-height: 0px; - margin-top: 10px; + margin-top: 12px; } } .ScheduEcharts { @@ -161,7 +161,7 @@ background: linear-gradient(0deg, rgba(0, 242, 255, 0.5) 0%, rgba(0, 242, 255, 0) 100%); height: 10px; line-height: 0px; - margin-top: 10px; + margin-top: 12px; } } .VehiclEcharts { @@ -196,7 +196,7 @@ background: linear-gradient(0deg, rgba(0, 242, 255, 0.5) 0%, rgba(0, 242, 255, 0) 100%); height: 10px; line-height: 0px; - margin-top: 10px; + margin-top: 12px; } } .MaterialEcharts { diff --git a/src/views/oneMap/components/chartLogging.vue b/src/views/oneMap/components/chartLogging.vue index c9fdcc4..2ea8b4d 100644 --- a/src/views/oneMap/components/chartLogging.vue +++ b/src/views/oneMap/components/chartLogging.vue @@ -45,6 +45,7 @@ color: '#fff', }, }, + xAxis: [ { type: 'category', @@ -81,6 +82,7 @@ }, }, }, + { name: props.data.yAxisName2 || '', inverse: false, @@ -101,6 +103,16 @@ }, }, ], + // 时间轴滑动选择器 + dataZoom: [ + { + show: true, + realtime: true, + start: 30, + end: 70, + xAxisIndex: [0, 1], + }, + ], series: [ { name: '降雨量(mm)', diff --git a/src/views/oneMap/ConstructionEvaluation/JSPGLeftBox.vue b/src/views/oneMap/ConstructionEvaluation/JSPGLeftBox.vue index 2a7ff07..3ee47c4 100644 --- a/src/views/oneMap/ConstructionEvaluation/JSPGLeftBox.vue +++ b/src/views/oneMap/ConstructionEvaluation/JSPGLeftBox.vue @@ -65,8 +65,9 @@
-
-
污水收集处理
+
+
+
污水收集处理
@@ -293,7 +294,31 @@ .Sewagecollection { width: 450px; height: 25%; - // background: yellowgreen; + + .topVehicl { + font-family: Source Han Sans CN; + font-weight: bold; + font-size: 14px; + color: #ebfeff; + align-items: center; + height: 30px; + // background: teal; + .icon { + position: relative; + top: -1px; + width: 25px; + height: 25px; + background: url('@/assets/newImgs/xtb_img.png') no-repeat; + } + + .name { + background: linear-gradient(0deg, rgba(0, 242, 255, 0.5) 0%, rgba(0, 242, 255, 0) 100%); + padding: 0px 3px; + height: 10px; + line-height: 0px; + margin-top: 6px; + } + } .wssjEch { margin: 5px auto; width: 420px; diff --git a/src/views/oneMap/ConstructionEvaluation/JSPGRightBox.vue b/src/views/oneMap/ConstructionEvaluation/JSPGRightBox.vue index dbeddc8..3f696aa 100644 --- a/src/views/oneMap/ConstructionEvaluation/JSPGRightBox.vue +++ b/src/views/oneMap/ConstructionEvaluation/JSPGRightBox.vue @@ -2,7 +2,7 @@
-
绩效管理
+
管理绩效
diff --git a/src/views/oneMap/FloodStuationReview/xqhgLeftBox.vue b/src/views/oneMap/FloodStuationReview/xqhgLeftBox.vue index 14170d1..c43cb7b 100644 --- a/src/views/oneMap/FloodStuationReview/xqhgLeftBox.vue +++ b/src/views/oneMap/FloodStuationReview/xqhgLeftBox.vue @@ -122,7 +122,7 @@ background: linear-gradient(0deg, rgba(0, 242, 255, 0.5) 0%, rgba(0, 242, 255, 0) 100%); height: 10px; line-height: 0px; - margin-top: 10px; + margin-top: 12px; } } .ScheduEcharts { @@ -161,7 +161,7 @@ background: linear-gradient(0deg, rgba(0, 242, 255, 0.5) 0%, rgba(0, 242, 255, 0) 100%); height: 10px; line-height: 0px; - margin-top: 10px; + margin-top: 12px; } } .VehiclEcharts { @@ -196,7 +196,7 @@ background: linear-gradient(0deg, rgba(0, 242, 255, 0.5) 0%, rgba(0, 242, 255, 0) 100%); height: 10px; line-height: 0px; - margin-top: 10px; + margin-top: 12px; } } .MaterialEcharts { diff --git a/src/views/oneMap/components/chartLogging.vue b/src/views/oneMap/components/chartLogging.vue index c9fdcc4..2ea8b4d 100644 --- a/src/views/oneMap/components/chartLogging.vue +++ b/src/views/oneMap/components/chartLogging.vue @@ -45,6 +45,7 @@ color: '#fff', }, }, + xAxis: [ { type: 'category', @@ -81,6 +82,7 @@ }, }, }, + { name: props.data.yAxisName2 || '', inverse: false, @@ -101,6 +103,16 @@ }, }, ], + // 时间轴滑动选择器 + dataZoom: [ + { + show: true, + realtime: true, + start: 30, + end: 70, + xAxisIndex: [0, 1], + }, + ], series: [ { name: '降雨量(mm)', diff --git a/src/views/oneMap/components/pipeFX.vue b/src/views/oneMap/components/pipeFX.vue index df0894c..ea1db5e 100644 --- a/src/views/oneMap/components/pipeFX.vue +++ b/src/views/oneMap/components/pipeFX.vue @@ -121,6 +121,16 @@ }, }, ], + // 时间轴滑动选择器 + dataZoom: [ + { + show: true, + realtime: true, + start: 30, + end: 70, + xAxisIndex: [0, 1], + }, + ], series: [ { name: '降雨量(mm)', diff --git a/src/views/oneMap/ConstructionEvaluation/JSPGLeftBox.vue b/src/views/oneMap/ConstructionEvaluation/JSPGLeftBox.vue index 2a7ff07..3ee47c4 100644 --- a/src/views/oneMap/ConstructionEvaluation/JSPGLeftBox.vue +++ b/src/views/oneMap/ConstructionEvaluation/JSPGLeftBox.vue @@ -65,8 +65,9 @@
-
-
污水收集处理
+
+
+
污水收集处理
@@ -293,7 +294,31 @@ .Sewagecollection { width: 450px; height: 25%; - // background: yellowgreen; + + .topVehicl { + font-family: Source Han Sans CN; + font-weight: bold; + font-size: 14px; + color: #ebfeff; + align-items: center; + height: 30px; + // background: teal; + .icon { + position: relative; + top: -1px; + width: 25px; + height: 25px; + background: url('@/assets/newImgs/xtb_img.png') no-repeat; + } + + .name { + background: linear-gradient(0deg, rgba(0, 242, 255, 0.5) 0%, rgba(0, 242, 255, 0) 100%); + padding: 0px 3px; + height: 10px; + line-height: 0px; + margin-top: 6px; + } + } .wssjEch { margin: 5px auto; width: 420px; diff --git a/src/views/oneMap/ConstructionEvaluation/JSPGRightBox.vue b/src/views/oneMap/ConstructionEvaluation/JSPGRightBox.vue index dbeddc8..3f696aa 100644 --- a/src/views/oneMap/ConstructionEvaluation/JSPGRightBox.vue +++ b/src/views/oneMap/ConstructionEvaluation/JSPGRightBox.vue @@ -2,7 +2,7 @@
-
绩效管理
+
管理绩效
diff --git a/src/views/oneMap/FloodStuationReview/xqhgLeftBox.vue b/src/views/oneMap/FloodStuationReview/xqhgLeftBox.vue index 14170d1..c43cb7b 100644 --- a/src/views/oneMap/FloodStuationReview/xqhgLeftBox.vue +++ b/src/views/oneMap/FloodStuationReview/xqhgLeftBox.vue @@ -122,7 +122,7 @@ background: linear-gradient(0deg, rgba(0, 242, 255, 0.5) 0%, rgba(0, 242, 255, 0) 100%); height: 10px; line-height: 0px; - margin-top: 10px; + margin-top: 12px; } } .ScheduEcharts { @@ -161,7 +161,7 @@ background: linear-gradient(0deg, rgba(0, 242, 255, 0.5) 0%, rgba(0, 242, 255, 0) 100%); height: 10px; line-height: 0px; - margin-top: 10px; + margin-top: 12px; } } .VehiclEcharts { @@ -196,7 +196,7 @@ background: linear-gradient(0deg, rgba(0, 242, 255, 0.5) 0%, rgba(0, 242, 255, 0) 100%); height: 10px; line-height: 0px; - margin-top: 10px; + margin-top: 12px; } } .MaterialEcharts { diff --git a/src/views/oneMap/components/chartLogging.vue b/src/views/oneMap/components/chartLogging.vue index c9fdcc4..2ea8b4d 100644 --- a/src/views/oneMap/components/chartLogging.vue +++ b/src/views/oneMap/components/chartLogging.vue @@ -45,6 +45,7 @@ color: '#fff', }, }, + xAxis: [ { type: 'category', @@ -81,6 +82,7 @@ }, }, }, + { name: props.data.yAxisName2 || '', inverse: false, @@ -101,6 +103,16 @@ }, }, ], + // 时间轴滑动选择器 + dataZoom: [ + { + show: true, + realtime: true, + start: 30, + end: 70, + xAxisIndex: [0, 1], + }, + ], series: [ { name: '降雨量(mm)', diff --git a/src/views/oneMap/components/pipeFX.vue b/src/views/oneMap/components/pipeFX.vue index df0894c..ea1db5e 100644 --- a/src/views/oneMap/components/pipeFX.vue +++ b/src/views/oneMap/components/pipeFX.vue @@ -121,6 +121,16 @@ }, }, ], + // 时间轴滑动选择器 + dataZoom: [ + { + show: true, + realtime: true, + start: 30, + end: 70, + xAxisIndex: [0, 1], + }, + ], series: [ { name: '降雨量(mm)', diff --git a/src/views/oneMap/components/projectDX.vue b/src/views/oneMap/components/projectDX.vue index cecd854..ec593c1 100644 --- a/src/views/oneMap/components/projectDX.vue +++ b/src/views/oneMap/components/projectDX.vue @@ -93,6 +93,16 @@ }, }, ], + // 时间轴滑动选择器 + dataZoom: [ + { + show: true, + realtime: true, + start: 30, + end: 70, + xAxisIndex: [0, 1], + }, + ], series: [ { // smooth: true, //变为曲线 默认false折线 diff --git a/src/views/oneMap/ConstructionEvaluation/JSPGLeftBox.vue b/src/views/oneMap/ConstructionEvaluation/JSPGLeftBox.vue index 2a7ff07..3ee47c4 100644 --- a/src/views/oneMap/ConstructionEvaluation/JSPGLeftBox.vue +++ b/src/views/oneMap/ConstructionEvaluation/JSPGLeftBox.vue @@ -65,8 +65,9 @@
-
-
污水收集处理
+
+
+
污水收集处理
@@ -293,7 +294,31 @@ .Sewagecollection { width: 450px; height: 25%; - // background: yellowgreen; + + .topVehicl { + font-family: Source Han Sans CN; + font-weight: bold; + font-size: 14px; + color: #ebfeff; + align-items: center; + height: 30px; + // background: teal; + .icon { + position: relative; + top: -1px; + width: 25px; + height: 25px; + background: url('@/assets/newImgs/xtb_img.png') no-repeat; + } + + .name { + background: linear-gradient(0deg, rgba(0, 242, 255, 0.5) 0%, rgba(0, 242, 255, 0) 100%); + padding: 0px 3px; + height: 10px; + line-height: 0px; + margin-top: 6px; + } + } .wssjEch { margin: 5px auto; width: 420px; diff --git a/src/views/oneMap/ConstructionEvaluation/JSPGRightBox.vue b/src/views/oneMap/ConstructionEvaluation/JSPGRightBox.vue index dbeddc8..3f696aa 100644 --- a/src/views/oneMap/ConstructionEvaluation/JSPGRightBox.vue +++ b/src/views/oneMap/ConstructionEvaluation/JSPGRightBox.vue @@ -2,7 +2,7 @@
-
绩效管理
+
管理绩效
diff --git a/src/views/oneMap/FloodStuationReview/xqhgLeftBox.vue b/src/views/oneMap/FloodStuationReview/xqhgLeftBox.vue index 14170d1..c43cb7b 100644 --- a/src/views/oneMap/FloodStuationReview/xqhgLeftBox.vue +++ b/src/views/oneMap/FloodStuationReview/xqhgLeftBox.vue @@ -122,7 +122,7 @@ background: linear-gradient(0deg, rgba(0, 242, 255, 0.5) 0%, rgba(0, 242, 255, 0) 100%); height: 10px; line-height: 0px; - margin-top: 10px; + margin-top: 12px; } } .ScheduEcharts { @@ -161,7 +161,7 @@ background: linear-gradient(0deg, rgba(0, 242, 255, 0.5) 0%, rgba(0, 242, 255, 0) 100%); height: 10px; line-height: 0px; - margin-top: 10px; + margin-top: 12px; } } .VehiclEcharts { @@ -196,7 +196,7 @@ background: linear-gradient(0deg, rgba(0, 242, 255, 0.5) 0%, rgba(0, 242, 255, 0) 100%); height: 10px; line-height: 0px; - margin-top: 10px; + margin-top: 12px; } } .MaterialEcharts { diff --git a/src/views/oneMap/components/chartLogging.vue b/src/views/oneMap/components/chartLogging.vue index c9fdcc4..2ea8b4d 100644 --- a/src/views/oneMap/components/chartLogging.vue +++ b/src/views/oneMap/components/chartLogging.vue @@ -45,6 +45,7 @@ color: '#fff', }, }, + xAxis: [ { type: 'category', @@ -81,6 +82,7 @@ }, }, }, + { name: props.data.yAxisName2 || '', inverse: false, @@ -101,6 +103,16 @@ }, }, ], + // 时间轴滑动选择器 + dataZoom: [ + { + show: true, + realtime: true, + start: 30, + end: 70, + xAxisIndex: [0, 1], + }, + ], series: [ { name: '降雨量(mm)', diff --git a/src/views/oneMap/components/pipeFX.vue b/src/views/oneMap/components/pipeFX.vue index df0894c..ea1db5e 100644 --- a/src/views/oneMap/components/pipeFX.vue +++ b/src/views/oneMap/components/pipeFX.vue @@ -121,6 +121,16 @@ }, }, ], + // 时间轴滑动选择器 + dataZoom: [ + { + show: true, + realtime: true, + start: 30, + end: 70, + xAxisIndex: [0, 1], + }, + ], series: [ { name: '降雨量(mm)', diff --git a/src/views/oneMap/components/projectDX.vue b/src/views/oneMap/components/projectDX.vue index cecd854..ec593c1 100644 --- a/src/views/oneMap/components/projectDX.vue +++ b/src/views/oneMap/components/projectDX.vue @@ -93,6 +93,16 @@ }, }, ], + // 时间轴滑动选择器 + dataZoom: [ + { + show: true, + realtime: true, + start: 30, + end: 70, + xAxisIndex: [0, 1], + }, + ], series: [ { // smooth: true, //变为曲线 默认false折线 diff --git a/src/views/oneMap/floodPrevention/FhplLeftBox.vue b/src/views/oneMap/floodPrevention/FhplLeftBox.vue index 7d7f27a..6495375 100644 --- a/src/views/oneMap/floodPrevention/FhplLeftBox.vue +++ b/src/views/oneMap/floodPrevention/FhplLeftBox.vue @@ -17,7 +17,7 @@
气象预报
-
未来24h中心城区累计降雨达12mm
+
未来24h中心城区累计降雨达19.8mm
@@ -278,15 +278,28 @@ // 气象假数据 function getRainTrend() { - monitorData.value.history = ['0.50', '0.00']; - monitorData.value.forecast = ['0.50', '0.00']; + monitorData.value.history = ['0.50', '0.20', '0.30', '0.40', '0.60', '0.20', '0.40']; + monitorData.value.forecast = ['0.50', '0.80', '0.50', '0.40', '0.30', '0.60', '0.70', '2.8', '1.0', '0.80', '0.30']; monitorData.value.totalData = [...monitorData.value.history, ...monitorData.value.forecast]; monitorData.value.dateRange = [ - '2024-10-09 16:00:00', - '2024-10-09 19:00:00', - '2024-10-09 22:00:00', - '2024-10-10 01:00:00', - '2024-10-10 04:00:00', + '2024-10-12 13:00:00', + '2024-10-12 13:30:00', + '2024-10-12 14:00:00', + '2024-10-12 14:30:00', + '2024-10-12 15:00:00', + '2024-10-12 15:30:00', + '2024-10-12 16:00:00', + '2024-10-12 16:30:00', + '2024-10-12 17:00:00', + '2024-10-12 17:30:00', + '2024-10-12 18:00:00', + '2024-10-12 18:30:00', + '2024-10-12 19:00:00', + '2024-10-12 19:30:00', + '2024-10-12 20:00:00', + '2024-10-12 20:30:00', + '2024-10-12 21:00:00', + '2024-10-12 21:30:00', ]; console.log(monitorData.value, '111111111'); diff --git a/src/views/oneMap/ConstructionEvaluation/JSPGLeftBox.vue b/src/views/oneMap/ConstructionEvaluation/JSPGLeftBox.vue index 2a7ff07..3ee47c4 100644 --- a/src/views/oneMap/ConstructionEvaluation/JSPGLeftBox.vue +++ b/src/views/oneMap/ConstructionEvaluation/JSPGLeftBox.vue @@ -65,8 +65,9 @@
-
-
污水收集处理
+
+
+
污水收集处理
@@ -293,7 +294,31 @@ .Sewagecollection { width: 450px; height: 25%; - // background: yellowgreen; + + .topVehicl { + font-family: Source Han Sans CN; + font-weight: bold; + font-size: 14px; + color: #ebfeff; + align-items: center; + height: 30px; + // background: teal; + .icon { + position: relative; + top: -1px; + width: 25px; + height: 25px; + background: url('@/assets/newImgs/xtb_img.png') no-repeat; + } + + .name { + background: linear-gradient(0deg, rgba(0, 242, 255, 0.5) 0%, rgba(0, 242, 255, 0) 100%); + padding: 0px 3px; + height: 10px; + line-height: 0px; + margin-top: 6px; + } + } .wssjEch { margin: 5px auto; width: 420px; diff --git a/src/views/oneMap/ConstructionEvaluation/JSPGRightBox.vue b/src/views/oneMap/ConstructionEvaluation/JSPGRightBox.vue index dbeddc8..3f696aa 100644 --- a/src/views/oneMap/ConstructionEvaluation/JSPGRightBox.vue +++ b/src/views/oneMap/ConstructionEvaluation/JSPGRightBox.vue @@ -2,7 +2,7 @@
-
绩效管理
+
管理绩效
diff --git a/src/views/oneMap/FloodStuationReview/xqhgLeftBox.vue b/src/views/oneMap/FloodStuationReview/xqhgLeftBox.vue index 14170d1..c43cb7b 100644 --- a/src/views/oneMap/FloodStuationReview/xqhgLeftBox.vue +++ b/src/views/oneMap/FloodStuationReview/xqhgLeftBox.vue @@ -122,7 +122,7 @@ background: linear-gradient(0deg, rgba(0, 242, 255, 0.5) 0%, rgba(0, 242, 255, 0) 100%); height: 10px; line-height: 0px; - margin-top: 10px; + margin-top: 12px; } } .ScheduEcharts { @@ -161,7 +161,7 @@ background: linear-gradient(0deg, rgba(0, 242, 255, 0.5) 0%, rgba(0, 242, 255, 0) 100%); height: 10px; line-height: 0px; - margin-top: 10px; + margin-top: 12px; } } .VehiclEcharts { @@ -196,7 +196,7 @@ background: linear-gradient(0deg, rgba(0, 242, 255, 0.5) 0%, rgba(0, 242, 255, 0) 100%); height: 10px; line-height: 0px; - margin-top: 10px; + margin-top: 12px; } } .MaterialEcharts { diff --git a/src/views/oneMap/components/chartLogging.vue b/src/views/oneMap/components/chartLogging.vue index c9fdcc4..2ea8b4d 100644 --- a/src/views/oneMap/components/chartLogging.vue +++ b/src/views/oneMap/components/chartLogging.vue @@ -45,6 +45,7 @@ color: '#fff', }, }, + xAxis: [ { type: 'category', @@ -81,6 +82,7 @@ }, }, }, + { name: props.data.yAxisName2 || '', inverse: false, @@ -101,6 +103,16 @@ }, }, ], + // 时间轴滑动选择器 + dataZoom: [ + { + show: true, + realtime: true, + start: 30, + end: 70, + xAxisIndex: [0, 1], + }, + ], series: [ { name: '降雨量(mm)', diff --git a/src/views/oneMap/components/pipeFX.vue b/src/views/oneMap/components/pipeFX.vue index df0894c..ea1db5e 100644 --- a/src/views/oneMap/components/pipeFX.vue +++ b/src/views/oneMap/components/pipeFX.vue @@ -121,6 +121,16 @@ }, }, ], + // 时间轴滑动选择器 + dataZoom: [ + { + show: true, + realtime: true, + start: 30, + end: 70, + xAxisIndex: [0, 1], + }, + ], series: [ { name: '降雨量(mm)', diff --git a/src/views/oneMap/components/projectDX.vue b/src/views/oneMap/components/projectDX.vue index cecd854..ec593c1 100644 --- a/src/views/oneMap/components/projectDX.vue +++ b/src/views/oneMap/components/projectDX.vue @@ -93,6 +93,16 @@ }, }, ], + // 时间轴滑动选择器 + dataZoom: [ + { + show: true, + realtime: true, + start: 30, + end: 70, + xAxisIndex: [0, 1], + }, + ], series: [ { // smooth: true, //变为曲线 默认false折线 diff --git a/src/views/oneMap/floodPrevention/FhplLeftBox.vue b/src/views/oneMap/floodPrevention/FhplLeftBox.vue index 7d7f27a..6495375 100644 --- a/src/views/oneMap/floodPrevention/FhplLeftBox.vue +++ b/src/views/oneMap/floodPrevention/FhplLeftBox.vue @@ -17,7 +17,7 @@
气象预报
-
未来24h中心城区累计降雨达12mm
+
未来24h中心城区累计降雨达19.8mm
@@ -278,15 +278,28 @@ // 气象假数据 function getRainTrend() { - monitorData.value.history = ['0.50', '0.00']; - monitorData.value.forecast = ['0.50', '0.00']; + monitorData.value.history = ['0.50', '0.20', '0.30', '0.40', '0.60', '0.20', '0.40']; + monitorData.value.forecast = ['0.50', '0.80', '0.50', '0.40', '0.30', '0.60', '0.70', '2.8', '1.0', '0.80', '0.30']; monitorData.value.totalData = [...monitorData.value.history, ...monitorData.value.forecast]; monitorData.value.dateRange = [ - '2024-10-09 16:00:00', - '2024-10-09 19:00:00', - '2024-10-09 22:00:00', - '2024-10-10 01:00:00', - '2024-10-10 04:00:00', + '2024-10-12 13:00:00', + '2024-10-12 13:30:00', + '2024-10-12 14:00:00', + '2024-10-12 14:30:00', + '2024-10-12 15:00:00', + '2024-10-12 15:30:00', + '2024-10-12 16:00:00', + '2024-10-12 16:30:00', + '2024-10-12 17:00:00', + '2024-10-12 17:30:00', + '2024-10-12 18:00:00', + '2024-10-12 18:30:00', + '2024-10-12 19:00:00', + '2024-10-12 19:30:00', + '2024-10-12 20:00:00', + '2024-10-12 20:30:00', + '2024-10-12 21:00:00', + '2024-10-12 21:30:00', ]; console.log(monitorData.value, '111111111'); diff --git a/vite.config.js b/vite.config.js index ea2e86d..afb2c95 100644 --- a/vite.config.js +++ b/vite.config.js @@ -7,8 +7,8 @@ const Timestamp = new Date().getTime(); //随机时间戳 // const targetUrl = 'http://192.168.48.145:13000'; //张鸿志 -const targetUrl = 'http://192.168.16.105:13000'; //张亚辉 -// const targetUrl = 'https://server2.wh-nf.cn:8088/prod-api'; //线上 +// const targetUrl = 'http://192.168.16.105:13000'; //张亚辉 +const targetUrl = 'https://server2.wh-nf.cn:8088/prod-api'; //线上 // https://vitejs.dev/config/ export default defineConfig(({ mode, command }) => {