diff --git a/package.json b/package.json index 39861ad..e784d82 100644 --- a/package.json +++ b/package.json @@ -72,4 +72,4 @@ "vite-plugin-svg-icons": "2.0.1", "vite-plugin-vue-setup-extend": "0.4.0" } -} +} \ No newline at end of file diff --git a/package.json b/package.json index 39861ad..e784d82 100644 --- a/package.json +++ b/package.json @@ -72,4 +72,4 @@ "vite-plugin-svg-icons": "2.0.1", "vite-plugin-vue-setup-extend": "0.4.0" } -} +} \ No newline at end of file diff --git a/src/assets/images/fhpl/sqjca.png b/src/assets/images/fhpl/sqjca.png index 0eb531c..00e619c 100644 --- a/src/assets/images/fhpl/sqjca.png +++ b/src/assets/images/fhpl/sqjca.png Binary files differ diff --git a/package.json b/package.json index 39861ad..e784d82 100644 --- a/package.json +++ b/package.json @@ -72,4 +72,4 @@ "vite-plugin-svg-icons": "2.0.1", "vite-plugin-vue-setup-extend": "0.4.0" } -} +} \ No newline at end of file diff --git a/src/assets/images/fhpl/sqjca.png b/src/assets/images/fhpl/sqjca.png index 0eb531c..00e619c 100644 --- a/src/assets/images/fhpl/sqjca.png +++ b/src/assets/images/fhpl/sqjca.png Binary files differ 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/package.json b/package.json index 39861ad..e784d82 100644 --- a/package.json +++ b/package.json @@ -72,4 +72,4 @@ "vite-plugin-svg-icons": "2.0.1", "vite-plugin-vue-setup-extend": "0.4.0" } -} +} \ No newline at end of file diff --git a/src/assets/images/fhpl/sqjca.png b/src/assets/images/fhpl/sqjca.png index 0eb531c..00e619c 100644 --- a/src/assets/images/fhpl/sqjca.png +++ b/src/assets/images/fhpl/sqjca.png Binary files differ 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/package.json b/package.json index 39861ad..e784d82 100644 --- a/package.json +++ b/package.json @@ -72,4 +72,4 @@ "vite-plugin-svg-icons": "2.0.1", "vite-plugin-vue-setup-extend": "0.4.0" } -} +} \ No newline at end of file diff --git a/src/assets/images/fhpl/sqjca.png b/src/assets/images/fhpl/sqjca.png index 0eb531c..00e619c 100644 --- a/src/assets/images/fhpl/sqjca.png +++ b/src/assets/images/fhpl/sqjca.png Binary files differ 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/sqhgBottomBox.vue b/src/views/oneMap/FloodStuationReview/sqhgBottomBox.vue index 53d38bb..d178c59 100644 --- a/src/views/oneMap/FloodStuationReview/sqhgBottomBox.vue +++ b/src/views/oneMap/FloodStuationReview/sqhgBottomBox.vue @@ -117,8 +117,8 @@ const ranLeng = [ [ { value: '0-0.2', color: 'rgba(7, 213, 118, 0)' }, - { value: '0.2-5', color: 'rgba(7, 213, 118, 1)' }, - { value: '5-25', color: 'rgba(38, 129, 240,1)' }, + { value: '0.2-5', color: 'rgba(38, 129, 240,1)' }, + { value: '5-25', color: 'rgb(222, 230, 0)' }, { value: '>25', color: 'rgba(255, 26, 26, 1)' }, ], [ @@ -235,14 +235,18 @@ stepNum.value = 0; hgEngPlay.value = false; showRainLegend.value = false; - // NewFiberMapUtils.disposeRainfall('') - // newfiberMap.setLayersVisible(["krigingImage"],false) + // newfiberMapbox.map.removeLayer('canvas-layer0'); + // newfiberMapbox.map.removeSource('canvas-source0'); hoursList.value.activeIndex = stepNum.value; clearInterval(runDayInterval.value); if (runDayInterval.value) { runDayInterval.value = null; refresh.value = Math.random(); } + // if (newfiberMapbox.map.getLayer('canvas-layer0')) { + // newfiberMapbox.map.removeLayer('canvas-layer0'); + // newfiberMapbox.map.removeSource('canvas-source0'); + // } } function changeChartData() { @@ -375,10 +379,10 @@ ];*/ let colorScale = [ { value: '0', color: 'rgba(7, 213, 118, 0)' }, - { value: '0.2', color: 'rgba(7, 213, 118, 1)' }, - { value: '5', color: 'rgba(38, 129, 240,1)' }, - { value: '25', color: 'rgba(255, 26, 26, 1)' }, - { value: '250', color: 'rgba(255, 26, 26, 1)' }, + { value: '0.2', color: 'rgb(38, 129, 240)' }, + { value: '5', color: 'rgb(222, 230, 0)' }, + { value: '25', color: 'rgb(255, 26, 26)' }, + { value: '250', color: 'rgb(255, 26, 26)' }, ]; let imageFiles = []; let canvas = []; diff --git a/package.json b/package.json index 39861ad..e784d82 100644 --- a/package.json +++ b/package.json @@ -72,4 +72,4 @@ "vite-plugin-svg-icons": "2.0.1", "vite-plugin-vue-setup-extend": "0.4.0" } -} +} \ No newline at end of file diff --git a/src/assets/images/fhpl/sqjca.png b/src/assets/images/fhpl/sqjca.png index 0eb531c..00e619c 100644 --- a/src/assets/images/fhpl/sqjca.png +++ b/src/assets/images/fhpl/sqjca.png Binary files differ 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/sqhgBottomBox.vue b/src/views/oneMap/FloodStuationReview/sqhgBottomBox.vue index 53d38bb..d178c59 100644 --- a/src/views/oneMap/FloodStuationReview/sqhgBottomBox.vue +++ b/src/views/oneMap/FloodStuationReview/sqhgBottomBox.vue @@ -117,8 +117,8 @@ const ranLeng = [ [ { value: '0-0.2', color: 'rgba(7, 213, 118, 0)' }, - { value: '0.2-5', color: 'rgba(7, 213, 118, 1)' }, - { value: '5-25', color: 'rgba(38, 129, 240,1)' }, + { value: '0.2-5', color: 'rgba(38, 129, 240,1)' }, + { value: '5-25', color: 'rgb(222, 230, 0)' }, { value: '>25', color: 'rgba(255, 26, 26, 1)' }, ], [ @@ -235,14 +235,18 @@ stepNum.value = 0; hgEngPlay.value = false; showRainLegend.value = false; - // NewFiberMapUtils.disposeRainfall('') - // newfiberMap.setLayersVisible(["krigingImage"],false) + // newfiberMapbox.map.removeLayer('canvas-layer0'); + // newfiberMapbox.map.removeSource('canvas-source0'); hoursList.value.activeIndex = stepNum.value; clearInterval(runDayInterval.value); if (runDayInterval.value) { runDayInterval.value = null; refresh.value = Math.random(); } + // if (newfiberMapbox.map.getLayer('canvas-layer0')) { + // newfiberMapbox.map.removeLayer('canvas-layer0'); + // newfiberMapbox.map.removeSource('canvas-source0'); + // } } function changeChartData() { @@ -375,10 +379,10 @@ ];*/ let colorScale = [ { value: '0', color: 'rgba(7, 213, 118, 0)' }, - { value: '0.2', color: 'rgba(7, 213, 118, 1)' }, - { value: '5', color: 'rgba(38, 129, 240,1)' }, - { value: '25', color: 'rgba(255, 26, 26, 1)' }, - { value: '250', color: 'rgba(255, 26, 26, 1)' }, + { value: '0.2', color: 'rgb(38, 129, 240)' }, + { value: '5', color: 'rgb(222, 230, 0)' }, + { value: '25', color: 'rgb(255, 26, 26)' }, + { value: '250', color: 'rgb(255, 26, 26)' }, ]; let imageFiles = []; let canvas = []; 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/package.json b/package.json index 39861ad..e784d82 100644 --- a/package.json +++ b/package.json @@ -72,4 +72,4 @@ "vite-plugin-svg-icons": "2.0.1", "vite-plugin-vue-setup-extend": "0.4.0" } -} +} \ No newline at end of file diff --git a/src/assets/images/fhpl/sqjca.png b/src/assets/images/fhpl/sqjca.png index 0eb531c..00e619c 100644 --- a/src/assets/images/fhpl/sqjca.png +++ b/src/assets/images/fhpl/sqjca.png Binary files differ 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/sqhgBottomBox.vue b/src/views/oneMap/FloodStuationReview/sqhgBottomBox.vue index 53d38bb..d178c59 100644 --- a/src/views/oneMap/FloodStuationReview/sqhgBottomBox.vue +++ b/src/views/oneMap/FloodStuationReview/sqhgBottomBox.vue @@ -117,8 +117,8 @@ const ranLeng = [ [ { value: '0-0.2', color: 'rgba(7, 213, 118, 0)' }, - { value: '0.2-5', color: 'rgba(7, 213, 118, 1)' }, - { value: '5-25', color: 'rgba(38, 129, 240,1)' }, + { value: '0.2-5', color: 'rgba(38, 129, 240,1)' }, + { value: '5-25', color: 'rgb(222, 230, 0)' }, { value: '>25', color: 'rgba(255, 26, 26, 1)' }, ], [ @@ -235,14 +235,18 @@ stepNum.value = 0; hgEngPlay.value = false; showRainLegend.value = false; - // NewFiberMapUtils.disposeRainfall('') - // newfiberMap.setLayersVisible(["krigingImage"],false) + // newfiberMapbox.map.removeLayer('canvas-layer0'); + // newfiberMapbox.map.removeSource('canvas-source0'); hoursList.value.activeIndex = stepNum.value; clearInterval(runDayInterval.value); if (runDayInterval.value) { runDayInterval.value = null; refresh.value = Math.random(); } + // if (newfiberMapbox.map.getLayer('canvas-layer0')) { + // newfiberMapbox.map.removeLayer('canvas-layer0'); + // newfiberMapbox.map.removeSource('canvas-source0'); + // } } function changeChartData() { @@ -375,10 +379,10 @@ ];*/ let colorScale = [ { value: '0', color: 'rgba(7, 213, 118, 0)' }, - { value: '0.2', color: 'rgba(7, 213, 118, 1)' }, - { value: '5', color: 'rgba(38, 129, 240,1)' }, - { value: '25', color: 'rgba(255, 26, 26, 1)' }, - { value: '250', color: 'rgba(255, 26, 26, 1)' }, + { value: '0.2', color: 'rgb(38, 129, 240)' }, + { value: '5', color: 'rgb(222, 230, 0)' }, + { value: '25', color: 'rgb(255, 26, 26)' }, + { value: '250', color: 'rgb(255, 26, 26)' }, ]; let imageFiles = []; let canvas = []; 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/LayerControl/LayerControl.vue b/src/views/oneMap/LayerControl/LayerControl.vue index 37d0576..cc8e024 100644 --- a/src/views/oneMap/LayerControl/LayerControl.vue +++ b/src/views/oneMap/LayerControl/LayerControl.vue @@ -30,29 +30,30 @@ @@ -470,7 +531,7 @@ position: absolute; top: 150px; right: 476px; - background: url("@/assets/images/Sponge_screen/TuChengBG.png") no-repeat center; + background: url('@/assets/images/Sponge_screen/TuChengBG.png') no-repeat center; background-size: contain; box-sizing: border-box; padding: 25px 0px; @@ -486,7 +547,7 @@ width: 190px; height: 25px; line-height: 25px; - background-image: url("@/assets/images/Sponge_screen/TuChengFenZuBG.png"), + background-image: url('@/assets/images/Sponge_screen/TuChengFenZuBG.png'), linear-gradient(to right, #1c899600, #1c8996, #1c899600); background-repeat: no-repeat; background-position: center; diff --git a/package.json b/package.json index 39861ad..e784d82 100644 --- a/package.json +++ b/package.json @@ -72,4 +72,4 @@ "vite-plugin-svg-icons": "2.0.1", "vite-plugin-vue-setup-extend": "0.4.0" } -} +} \ No newline at end of file diff --git a/src/assets/images/fhpl/sqjca.png b/src/assets/images/fhpl/sqjca.png index 0eb531c..00e619c 100644 --- a/src/assets/images/fhpl/sqjca.png +++ b/src/assets/images/fhpl/sqjca.png Binary files differ 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/sqhgBottomBox.vue b/src/views/oneMap/FloodStuationReview/sqhgBottomBox.vue index 53d38bb..d178c59 100644 --- a/src/views/oneMap/FloodStuationReview/sqhgBottomBox.vue +++ b/src/views/oneMap/FloodStuationReview/sqhgBottomBox.vue @@ -117,8 +117,8 @@ const ranLeng = [ [ { value: '0-0.2', color: 'rgba(7, 213, 118, 0)' }, - { value: '0.2-5', color: 'rgba(7, 213, 118, 1)' }, - { value: '5-25', color: 'rgba(38, 129, 240,1)' }, + { value: '0.2-5', color: 'rgba(38, 129, 240,1)' }, + { value: '5-25', color: 'rgb(222, 230, 0)' }, { value: '>25', color: 'rgba(255, 26, 26, 1)' }, ], [ @@ -235,14 +235,18 @@ stepNum.value = 0; hgEngPlay.value = false; showRainLegend.value = false; - // NewFiberMapUtils.disposeRainfall('') - // newfiberMap.setLayersVisible(["krigingImage"],false) + // newfiberMapbox.map.removeLayer('canvas-layer0'); + // newfiberMapbox.map.removeSource('canvas-source0'); hoursList.value.activeIndex = stepNum.value; clearInterval(runDayInterval.value); if (runDayInterval.value) { runDayInterval.value = null; refresh.value = Math.random(); } + // if (newfiberMapbox.map.getLayer('canvas-layer0')) { + // newfiberMapbox.map.removeLayer('canvas-layer0'); + // newfiberMapbox.map.removeSource('canvas-source0'); + // } } function changeChartData() { @@ -375,10 +379,10 @@ ];*/ let colorScale = [ { value: '0', color: 'rgba(7, 213, 118, 0)' }, - { value: '0.2', color: 'rgba(7, 213, 118, 1)' }, - { value: '5', color: 'rgba(38, 129, 240,1)' }, - { value: '25', color: 'rgba(255, 26, 26, 1)' }, - { value: '250', color: 'rgba(255, 26, 26, 1)' }, + { value: '0.2', color: 'rgb(38, 129, 240)' }, + { value: '5', color: 'rgb(222, 230, 0)' }, + { value: '25', color: 'rgb(255, 26, 26)' }, + { value: '250', color: 'rgb(255, 26, 26)' }, ]; let imageFiles = []; let canvas = []; 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/LayerControl/LayerControl.vue b/src/views/oneMap/LayerControl/LayerControl.vue index 37d0576..cc8e024 100644 --- a/src/views/oneMap/LayerControl/LayerControl.vue +++ b/src/views/oneMap/LayerControl/LayerControl.vue @@ -30,29 +30,30 @@ @@ -470,7 +531,7 @@ position: absolute; top: 150px; right: 476px; - background: url("@/assets/images/Sponge_screen/TuChengBG.png") no-repeat center; + background: url('@/assets/images/Sponge_screen/TuChengBG.png') no-repeat center; background-size: contain; box-sizing: border-box; padding: 25px 0px; @@ -486,7 +547,7 @@ width: 190px; height: 25px; line-height: 25px; - background-image: url("@/assets/images/Sponge_screen/TuChengFenZuBG.png"), + background-image: url('@/assets/images/Sponge_screen/TuChengFenZuBG.png'), linear-gradient(to right, #1c899600, #1c8996, #1c899600); background-repeat: no-repeat; background-position: center; diff --git a/src/views/oneMap/components/FXHG.vue b/src/views/oneMap/components/FXHG.vue index 8924475..44e9c21 100644 --- a/src/views/oneMap/components/FXHG.vue +++ b/src/views/oneMap/components/FXHG.vue @@ -40,6 +40,7 @@ showPanel.value = true; showBottom.value = false; curType.value = true; + bus.emit('SetLayerShow', ['蓝色地图']); if (newfiberMapbox.map.getLayer('dynamicRoute')) { newfiberMapbox.map.removeLayer('dynamicRoute'); newfiberMapbox.map.removeLayer('dynamicRoute_Symbol'); @@ -68,6 +69,7 @@ let initePSTimer = setInterval(() => { if (!newfiberMapbox) return; + bus.emit('SetLayerShow', ['白色地图']); bus.emit('setLayerVisible', { layername: 'ysLine1', isCheck: true }); //bus.emit('setLayerVisible', { layername: 'wsLine1', isCheck: true }); clearInterval(initePSTimer); diff --git a/package.json b/package.json index 39861ad..e784d82 100644 --- a/package.json +++ b/package.json @@ -72,4 +72,4 @@ "vite-plugin-svg-icons": "2.0.1", "vite-plugin-vue-setup-extend": "0.4.0" } -} +} \ No newline at end of file diff --git a/src/assets/images/fhpl/sqjca.png b/src/assets/images/fhpl/sqjca.png index 0eb531c..00e619c 100644 --- a/src/assets/images/fhpl/sqjca.png +++ b/src/assets/images/fhpl/sqjca.png Binary files differ 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/sqhgBottomBox.vue b/src/views/oneMap/FloodStuationReview/sqhgBottomBox.vue index 53d38bb..d178c59 100644 --- a/src/views/oneMap/FloodStuationReview/sqhgBottomBox.vue +++ b/src/views/oneMap/FloodStuationReview/sqhgBottomBox.vue @@ -117,8 +117,8 @@ const ranLeng = [ [ { value: '0-0.2', color: 'rgba(7, 213, 118, 0)' }, - { value: '0.2-5', color: 'rgba(7, 213, 118, 1)' }, - { value: '5-25', color: 'rgba(38, 129, 240,1)' }, + { value: '0.2-5', color: 'rgba(38, 129, 240,1)' }, + { value: '5-25', color: 'rgb(222, 230, 0)' }, { value: '>25', color: 'rgba(255, 26, 26, 1)' }, ], [ @@ -235,14 +235,18 @@ stepNum.value = 0; hgEngPlay.value = false; showRainLegend.value = false; - // NewFiberMapUtils.disposeRainfall('') - // newfiberMap.setLayersVisible(["krigingImage"],false) + // newfiberMapbox.map.removeLayer('canvas-layer0'); + // newfiberMapbox.map.removeSource('canvas-source0'); hoursList.value.activeIndex = stepNum.value; clearInterval(runDayInterval.value); if (runDayInterval.value) { runDayInterval.value = null; refresh.value = Math.random(); } + // if (newfiberMapbox.map.getLayer('canvas-layer0')) { + // newfiberMapbox.map.removeLayer('canvas-layer0'); + // newfiberMapbox.map.removeSource('canvas-source0'); + // } } function changeChartData() { @@ -375,10 +379,10 @@ ];*/ let colorScale = [ { value: '0', color: 'rgba(7, 213, 118, 0)' }, - { value: '0.2', color: 'rgba(7, 213, 118, 1)' }, - { value: '5', color: 'rgba(38, 129, 240,1)' }, - { value: '25', color: 'rgba(255, 26, 26, 1)' }, - { value: '250', color: 'rgba(255, 26, 26, 1)' }, + { value: '0.2', color: 'rgb(38, 129, 240)' }, + { value: '5', color: 'rgb(222, 230, 0)' }, + { value: '25', color: 'rgb(255, 26, 26)' }, + { value: '250', color: 'rgb(255, 26, 26)' }, ]; let imageFiles = []; let canvas = []; 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/LayerControl/LayerControl.vue b/src/views/oneMap/LayerControl/LayerControl.vue index 37d0576..cc8e024 100644 --- a/src/views/oneMap/LayerControl/LayerControl.vue +++ b/src/views/oneMap/LayerControl/LayerControl.vue @@ -30,29 +30,30 @@ @@ -470,7 +531,7 @@ position: absolute; top: 150px; right: 476px; - background: url("@/assets/images/Sponge_screen/TuChengBG.png") no-repeat center; + background: url('@/assets/images/Sponge_screen/TuChengBG.png') no-repeat center; background-size: contain; box-sizing: border-box; padding: 25px 0px; @@ -486,7 +547,7 @@ width: 190px; height: 25px; line-height: 25px; - background-image: url("@/assets/images/Sponge_screen/TuChengFenZuBG.png"), + background-image: url('@/assets/images/Sponge_screen/TuChengFenZuBG.png'), linear-gradient(to right, #1c899600, #1c8996, #1c899600); background-repeat: no-repeat; background-position: center; diff --git a/src/views/oneMap/components/FXHG.vue b/src/views/oneMap/components/FXHG.vue index 8924475..44e9c21 100644 --- a/src/views/oneMap/components/FXHG.vue +++ b/src/views/oneMap/components/FXHG.vue @@ -40,6 +40,7 @@ showPanel.value = true; showBottom.value = false; curType.value = true; + bus.emit('SetLayerShow', ['蓝色地图']); if (newfiberMapbox.map.getLayer('dynamicRoute')) { newfiberMapbox.map.removeLayer('dynamicRoute'); newfiberMapbox.map.removeLayer('dynamicRoute_Symbol'); @@ -68,6 +69,7 @@ let initePSTimer = setInterval(() => { if (!newfiberMapbox) return; + bus.emit('SetLayerShow', ['白色地图']); bus.emit('setLayerVisible', { layername: 'ysLine1', isCheck: true }); //bus.emit('setLayerVisible', { layername: 'wsLine1', isCheck: true }); clearInterval(initePSTimer); diff --git a/src/views/oneMap/components/ZHHM.vue b/src/views/oneMap/components/ZHHM.vue index d68bdc5..1f29507 100644 --- a/src/views/oneMap/components/ZHHM.vue +++ b/src/views/oneMap/components/ZHHM.vue @@ -648,6 +648,7 @@ zoom: 12, pitch: 55, }); + bus.emit('SetLayerShow', ['蓝色地图']); // 先清空 bus.emit('clearAllLayer'); let removedLayer = ['HMJZYSQ', 'HMXGYLD', 'HMXDLGC', 'HMXSX', 'GWPCYXF']; diff --git a/package.json b/package.json index 39861ad..e784d82 100644 --- a/package.json +++ b/package.json @@ -72,4 +72,4 @@ "vite-plugin-svg-icons": "2.0.1", "vite-plugin-vue-setup-extend": "0.4.0" } -} +} \ No newline at end of file diff --git a/src/assets/images/fhpl/sqjca.png b/src/assets/images/fhpl/sqjca.png index 0eb531c..00e619c 100644 --- a/src/assets/images/fhpl/sqjca.png +++ b/src/assets/images/fhpl/sqjca.png Binary files differ 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/sqhgBottomBox.vue b/src/views/oneMap/FloodStuationReview/sqhgBottomBox.vue index 53d38bb..d178c59 100644 --- a/src/views/oneMap/FloodStuationReview/sqhgBottomBox.vue +++ b/src/views/oneMap/FloodStuationReview/sqhgBottomBox.vue @@ -117,8 +117,8 @@ const ranLeng = [ [ { value: '0-0.2', color: 'rgba(7, 213, 118, 0)' }, - { value: '0.2-5', color: 'rgba(7, 213, 118, 1)' }, - { value: '5-25', color: 'rgba(38, 129, 240,1)' }, + { value: '0.2-5', color: 'rgba(38, 129, 240,1)' }, + { value: '5-25', color: 'rgb(222, 230, 0)' }, { value: '>25', color: 'rgba(255, 26, 26, 1)' }, ], [ @@ -235,14 +235,18 @@ stepNum.value = 0; hgEngPlay.value = false; showRainLegend.value = false; - // NewFiberMapUtils.disposeRainfall('') - // newfiberMap.setLayersVisible(["krigingImage"],false) + // newfiberMapbox.map.removeLayer('canvas-layer0'); + // newfiberMapbox.map.removeSource('canvas-source0'); hoursList.value.activeIndex = stepNum.value; clearInterval(runDayInterval.value); if (runDayInterval.value) { runDayInterval.value = null; refresh.value = Math.random(); } + // if (newfiberMapbox.map.getLayer('canvas-layer0')) { + // newfiberMapbox.map.removeLayer('canvas-layer0'); + // newfiberMapbox.map.removeSource('canvas-source0'); + // } } function changeChartData() { @@ -375,10 +379,10 @@ ];*/ let colorScale = [ { value: '0', color: 'rgba(7, 213, 118, 0)' }, - { value: '0.2', color: 'rgba(7, 213, 118, 1)' }, - { value: '5', color: 'rgba(38, 129, 240,1)' }, - { value: '25', color: 'rgba(255, 26, 26, 1)' }, - { value: '250', color: 'rgba(255, 26, 26, 1)' }, + { value: '0.2', color: 'rgb(38, 129, 240)' }, + { value: '5', color: 'rgb(222, 230, 0)' }, + { value: '25', color: 'rgb(255, 26, 26)' }, + { value: '250', color: 'rgb(255, 26, 26)' }, ]; let imageFiles = []; let canvas = []; 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/LayerControl/LayerControl.vue b/src/views/oneMap/LayerControl/LayerControl.vue index 37d0576..cc8e024 100644 --- a/src/views/oneMap/LayerControl/LayerControl.vue +++ b/src/views/oneMap/LayerControl/LayerControl.vue @@ -30,29 +30,30 @@ @@ -470,7 +531,7 @@ position: absolute; top: 150px; right: 476px; - background: url("@/assets/images/Sponge_screen/TuChengBG.png") no-repeat center; + background: url('@/assets/images/Sponge_screen/TuChengBG.png') no-repeat center; background-size: contain; box-sizing: border-box; padding: 25px 0px; @@ -486,7 +547,7 @@ width: 190px; height: 25px; line-height: 25px; - background-image: url("@/assets/images/Sponge_screen/TuChengFenZuBG.png"), + background-image: url('@/assets/images/Sponge_screen/TuChengFenZuBG.png'), linear-gradient(to right, #1c899600, #1c8996, #1c899600); background-repeat: no-repeat; background-position: center; diff --git a/src/views/oneMap/components/FXHG.vue b/src/views/oneMap/components/FXHG.vue index 8924475..44e9c21 100644 --- a/src/views/oneMap/components/FXHG.vue +++ b/src/views/oneMap/components/FXHG.vue @@ -40,6 +40,7 @@ showPanel.value = true; showBottom.value = false; curType.value = true; + bus.emit('SetLayerShow', ['蓝色地图']); if (newfiberMapbox.map.getLayer('dynamicRoute')) { newfiberMapbox.map.removeLayer('dynamicRoute'); newfiberMapbox.map.removeLayer('dynamicRoute_Symbol'); @@ -68,6 +69,7 @@ let initePSTimer = setInterval(() => { if (!newfiberMapbox) return; + bus.emit('SetLayerShow', ['白色地图']); bus.emit('setLayerVisible', { layername: 'ysLine1', isCheck: true }); //bus.emit('setLayerVisible', { layername: 'wsLine1', isCheck: true }); clearInterval(initePSTimer); diff --git a/src/views/oneMap/components/ZHHM.vue b/src/views/oneMap/components/ZHHM.vue index d68bdc5..1f29507 100644 --- a/src/views/oneMap/components/ZHHM.vue +++ b/src/views/oneMap/components/ZHHM.vue @@ -648,6 +648,7 @@ zoom: 12, pitch: 55, }); + bus.emit('SetLayerShow', ['蓝色地图']); // 先清空 bus.emit('clearAllLayer'); let removedLayer = ['HMJZYSQ', 'HMXGYLD', 'HMXDLGC', 'HMXSX', 'GWPCYXF']; diff --git a/src/views/oneMap/components/ZHHM_JCFX.vue b/src/views/oneMap/components/ZHHM_JCFX.vue index c420911..42e81e6 100644 --- a/src/views/oneMap/components/ZHHM_JCFX.vue +++ b/src/views/oneMap/components/ZHHM_JCFX.vue @@ -411,6 +411,7 @@ }); onBeforeUnmount(() => { bus.emit('clearAllLayer'); + bus.emit('SetLayerShow', ['蓝色地图']); let removedLayer = ['HMJZYSQ', 'HMXGYLD', 'HMXDLGC', 'HMXSX', 'GWPCYXF']; removedLayer.forEach(layer => { bus.emit('setLayerVisible', { layername: layer, isCheck: false }); diff --git a/package.json b/package.json index 39861ad..e784d82 100644 --- a/package.json +++ b/package.json @@ -72,4 +72,4 @@ "vite-plugin-svg-icons": "2.0.1", "vite-plugin-vue-setup-extend": "0.4.0" } -} +} \ No newline at end of file diff --git a/src/assets/images/fhpl/sqjca.png b/src/assets/images/fhpl/sqjca.png index 0eb531c..00e619c 100644 --- a/src/assets/images/fhpl/sqjca.png +++ b/src/assets/images/fhpl/sqjca.png Binary files differ 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/sqhgBottomBox.vue b/src/views/oneMap/FloodStuationReview/sqhgBottomBox.vue index 53d38bb..d178c59 100644 --- a/src/views/oneMap/FloodStuationReview/sqhgBottomBox.vue +++ b/src/views/oneMap/FloodStuationReview/sqhgBottomBox.vue @@ -117,8 +117,8 @@ const ranLeng = [ [ { value: '0-0.2', color: 'rgba(7, 213, 118, 0)' }, - { value: '0.2-5', color: 'rgba(7, 213, 118, 1)' }, - { value: '5-25', color: 'rgba(38, 129, 240,1)' }, + { value: '0.2-5', color: 'rgba(38, 129, 240,1)' }, + { value: '5-25', color: 'rgb(222, 230, 0)' }, { value: '>25', color: 'rgba(255, 26, 26, 1)' }, ], [ @@ -235,14 +235,18 @@ stepNum.value = 0; hgEngPlay.value = false; showRainLegend.value = false; - // NewFiberMapUtils.disposeRainfall('') - // newfiberMap.setLayersVisible(["krigingImage"],false) + // newfiberMapbox.map.removeLayer('canvas-layer0'); + // newfiberMapbox.map.removeSource('canvas-source0'); hoursList.value.activeIndex = stepNum.value; clearInterval(runDayInterval.value); if (runDayInterval.value) { runDayInterval.value = null; refresh.value = Math.random(); } + // if (newfiberMapbox.map.getLayer('canvas-layer0')) { + // newfiberMapbox.map.removeLayer('canvas-layer0'); + // newfiberMapbox.map.removeSource('canvas-source0'); + // } } function changeChartData() { @@ -375,10 +379,10 @@ ];*/ let colorScale = [ { value: '0', color: 'rgba(7, 213, 118, 0)' }, - { value: '0.2', color: 'rgba(7, 213, 118, 1)' }, - { value: '5', color: 'rgba(38, 129, 240,1)' }, - { value: '25', color: 'rgba(255, 26, 26, 1)' }, - { value: '250', color: 'rgba(255, 26, 26, 1)' }, + { value: '0.2', color: 'rgb(38, 129, 240)' }, + { value: '5', color: 'rgb(222, 230, 0)' }, + { value: '25', color: 'rgb(255, 26, 26)' }, + { value: '250', color: 'rgb(255, 26, 26)' }, ]; let imageFiles = []; let canvas = []; 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/LayerControl/LayerControl.vue b/src/views/oneMap/LayerControl/LayerControl.vue index 37d0576..cc8e024 100644 --- a/src/views/oneMap/LayerControl/LayerControl.vue +++ b/src/views/oneMap/LayerControl/LayerControl.vue @@ -30,29 +30,30 @@ @@ -470,7 +531,7 @@ position: absolute; top: 150px; right: 476px; - background: url("@/assets/images/Sponge_screen/TuChengBG.png") no-repeat center; + background: url('@/assets/images/Sponge_screen/TuChengBG.png') no-repeat center; background-size: contain; box-sizing: border-box; padding: 25px 0px; @@ -486,7 +547,7 @@ width: 190px; height: 25px; line-height: 25px; - background-image: url("@/assets/images/Sponge_screen/TuChengFenZuBG.png"), + background-image: url('@/assets/images/Sponge_screen/TuChengFenZuBG.png'), linear-gradient(to right, #1c899600, #1c8996, #1c899600); background-repeat: no-repeat; background-position: center; diff --git a/src/views/oneMap/components/FXHG.vue b/src/views/oneMap/components/FXHG.vue index 8924475..44e9c21 100644 --- a/src/views/oneMap/components/FXHG.vue +++ b/src/views/oneMap/components/FXHG.vue @@ -40,6 +40,7 @@ showPanel.value = true; showBottom.value = false; curType.value = true; + bus.emit('SetLayerShow', ['蓝色地图']); if (newfiberMapbox.map.getLayer('dynamicRoute')) { newfiberMapbox.map.removeLayer('dynamicRoute'); newfiberMapbox.map.removeLayer('dynamicRoute_Symbol'); @@ -68,6 +69,7 @@ let initePSTimer = setInterval(() => { if (!newfiberMapbox) return; + bus.emit('SetLayerShow', ['白色地图']); bus.emit('setLayerVisible', { layername: 'ysLine1', isCheck: true }); //bus.emit('setLayerVisible', { layername: 'wsLine1', isCheck: true }); clearInterval(initePSTimer); diff --git a/src/views/oneMap/components/ZHHM.vue b/src/views/oneMap/components/ZHHM.vue index d68bdc5..1f29507 100644 --- a/src/views/oneMap/components/ZHHM.vue +++ b/src/views/oneMap/components/ZHHM.vue @@ -648,6 +648,7 @@ zoom: 12, pitch: 55, }); + bus.emit('SetLayerShow', ['蓝色地图']); // 先清空 bus.emit('clearAllLayer'); let removedLayer = ['HMJZYSQ', 'HMXGYLD', 'HMXDLGC', 'HMXSX', 'GWPCYXF']; diff --git a/src/views/oneMap/components/ZHHM_JCFX.vue b/src/views/oneMap/components/ZHHM_JCFX.vue index c420911..42e81e6 100644 --- a/src/views/oneMap/components/ZHHM_JCFX.vue +++ b/src/views/oneMap/components/ZHHM_JCFX.vue @@ -411,6 +411,7 @@ }); onBeforeUnmount(() => { bus.emit('clearAllLayer'); + bus.emit('SetLayerShow', ['蓝色地图']); let removedLayer = ['HMJZYSQ', 'HMXGYLD', 'HMXDLGC', 'HMXSX', 'GWPCYXF']; removedLayer.forEach(layer => { bus.emit('setLayerVisible', { layername: layer, isCheck: false }); diff --git a/src/views/oneMap/components/ZHHM_JSPG.vue b/src/views/oneMap/components/ZHHM_JSPG.vue index 7400f1b..df2c85f 100644 --- a/src/views/oneMap/components/ZHHM_JSPG.vue +++ b/src/views/oneMap/components/ZHHM_JSPG.vue @@ -53,6 +53,7 @@ }; onMounted(() => { + bus.emit('SetLayerShow', ['蓝色地图']); newfiberMapbox.map.easeTo({ center: [109.488, 36.596], zoom: 13, diff --git a/package.json b/package.json index 39861ad..e784d82 100644 --- a/package.json +++ b/package.json @@ -72,4 +72,4 @@ "vite-plugin-svg-icons": "2.0.1", "vite-plugin-vue-setup-extend": "0.4.0" } -} +} \ No newline at end of file diff --git a/src/assets/images/fhpl/sqjca.png b/src/assets/images/fhpl/sqjca.png index 0eb531c..00e619c 100644 --- a/src/assets/images/fhpl/sqjca.png +++ b/src/assets/images/fhpl/sqjca.png Binary files differ 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/sqhgBottomBox.vue b/src/views/oneMap/FloodStuationReview/sqhgBottomBox.vue index 53d38bb..d178c59 100644 --- a/src/views/oneMap/FloodStuationReview/sqhgBottomBox.vue +++ b/src/views/oneMap/FloodStuationReview/sqhgBottomBox.vue @@ -117,8 +117,8 @@ const ranLeng = [ [ { value: '0-0.2', color: 'rgba(7, 213, 118, 0)' }, - { value: '0.2-5', color: 'rgba(7, 213, 118, 1)' }, - { value: '5-25', color: 'rgba(38, 129, 240,1)' }, + { value: '0.2-5', color: 'rgba(38, 129, 240,1)' }, + { value: '5-25', color: 'rgb(222, 230, 0)' }, { value: '>25', color: 'rgba(255, 26, 26, 1)' }, ], [ @@ -235,14 +235,18 @@ stepNum.value = 0; hgEngPlay.value = false; showRainLegend.value = false; - // NewFiberMapUtils.disposeRainfall('') - // newfiberMap.setLayersVisible(["krigingImage"],false) + // newfiberMapbox.map.removeLayer('canvas-layer0'); + // newfiberMapbox.map.removeSource('canvas-source0'); hoursList.value.activeIndex = stepNum.value; clearInterval(runDayInterval.value); if (runDayInterval.value) { runDayInterval.value = null; refresh.value = Math.random(); } + // if (newfiberMapbox.map.getLayer('canvas-layer0')) { + // newfiberMapbox.map.removeLayer('canvas-layer0'); + // newfiberMapbox.map.removeSource('canvas-source0'); + // } } function changeChartData() { @@ -375,10 +379,10 @@ ];*/ let colorScale = [ { value: '0', color: 'rgba(7, 213, 118, 0)' }, - { value: '0.2', color: 'rgba(7, 213, 118, 1)' }, - { value: '5', color: 'rgba(38, 129, 240,1)' }, - { value: '25', color: 'rgba(255, 26, 26, 1)' }, - { value: '250', color: 'rgba(255, 26, 26, 1)' }, + { value: '0.2', color: 'rgb(38, 129, 240)' }, + { value: '5', color: 'rgb(222, 230, 0)' }, + { value: '25', color: 'rgb(255, 26, 26)' }, + { value: '250', color: 'rgb(255, 26, 26)' }, ]; let imageFiles = []; let canvas = []; 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/LayerControl/LayerControl.vue b/src/views/oneMap/LayerControl/LayerControl.vue index 37d0576..cc8e024 100644 --- a/src/views/oneMap/LayerControl/LayerControl.vue +++ b/src/views/oneMap/LayerControl/LayerControl.vue @@ -30,29 +30,30 @@ @@ -470,7 +531,7 @@ position: absolute; top: 150px; right: 476px; - background: url("@/assets/images/Sponge_screen/TuChengBG.png") no-repeat center; + background: url('@/assets/images/Sponge_screen/TuChengBG.png') no-repeat center; background-size: contain; box-sizing: border-box; padding: 25px 0px; @@ -486,7 +547,7 @@ width: 190px; height: 25px; line-height: 25px; - background-image: url("@/assets/images/Sponge_screen/TuChengFenZuBG.png"), + background-image: url('@/assets/images/Sponge_screen/TuChengFenZuBG.png'), linear-gradient(to right, #1c899600, #1c8996, #1c899600); background-repeat: no-repeat; background-position: center; diff --git a/src/views/oneMap/components/FXHG.vue b/src/views/oneMap/components/FXHG.vue index 8924475..44e9c21 100644 --- a/src/views/oneMap/components/FXHG.vue +++ b/src/views/oneMap/components/FXHG.vue @@ -40,6 +40,7 @@ showPanel.value = true; showBottom.value = false; curType.value = true; + bus.emit('SetLayerShow', ['蓝色地图']); if (newfiberMapbox.map.getLayer('dynamicRoute')) { newfiberMapbox.map.removeLayer('dynamicRoute'); newfiberMapbox.map.removeLayer('dynamicRoute_Symbol'); @@ -68,6 +69,7 @@ let initePSTimer = setInterval(() => { if (!newfiberMapbox) return; + bus.emit('SetLayerShow', ['白色地图']); bus.emit('setLayerVisible', { layername: 'ysLine1', isCheck: true }); //bus.emit('setLayerVisible', { layername: 'wsLine1', isCheck: true }); clearInterval(initePSTimer); diff --git a/src/views/oneMap/components/ZHHM.vue b/src/views/oneMap/components/ZHHM.vue index d68bdc5..1f29507 100644 --- a/src/views/oneMap/components/ZHHM.vue +++ b/src/views/oneMap/components/ZHHM.vue @@ -648,6 +648,7 @@ zoom: 12, pitch: 55, }); + bus.emit('SetLayerShow', ['蓝色地图']); // 先清空 bus.emit('clearAllLayer'); let removedLayer = ['HMJZYSQ', 'HMXGYLD', 'HMXDLGC', 'HMXSX', 'GWPCYXF']; diff --git a/src/views/oneMap/components/ZHHM_JCFX.vue b/src/views/oneMap/components/ZHHM_JCFX.vue index c420911..42e81e6 100644 --- a/src/views/oneMap/components/ZHHM_JCFX.vue +++ b/src/views/oneMap/components/ZHHM_JCFX.vue @@ -411,6 +411,7 @@ }); onBeforeUnmount(() => { bus.emit('clearAllLayer'); + bus.emit('SetLayerShow', ['蓝色地图']); let removedLayer = ['HMJZYSQ', 'HMXGYLD', 'HMXDLGC', 'HMXSX', 'GWPCYXF']; removedLayer.forEach(layer => { bus.emit('setLayerVisible', { layername: layer, isCheck: false }); diff --git a/src/views/oneMap/components/ZHHM_JSPG.vue b/src/views/oneMap/components/ZHHM_JSPG.vue index 7400f1b..df2c85f 100644 --- a/src/views/oneMap/components/ZHHM_JSPG.vue +++ b/src/views/oneMap/components/ZHHM_JSPG.vue @@ -53,6 +53,7 @@ }; onMounted(() => { + bus.emit('SetLayerShow', ['蓝色地图']); newfiberMapbox.map.easeTo({ center: [109.488, 36.596], zoom: 13, diff --git a/src/views/oneMap/components/ZHPS.vue b/src/views/oneMap/components/ZHPS.vue index 7ce8bb0..f09ddbc 100644 --- a/src/views/oneMap/components/ZHPS.vue +++ b/src/views/oneMap/components/ZHPS.vue @@ -43,6 +43,7 @@ }); }); onBeforeUnmount(() => { + bus.emit('SetLayerShow', ['蓝色地图']); // bus.emit('setLayerVisible', { layername: 'ysLine1', isCheck: false }); // bus.emit('setLayerVisible', { layername: 'wsLine1', isCheck: false }); }); diff --git a/package.json b/package.json index 39861ad..e784d82 100644 --- a/package.json +++ b/package.json @@ -72,4 +72,4 @@ "vite-plugin-svg-icons": "2.0.1", "vite-plugin-vue-setup-extend": "0.4.0" } -} +} \ No newline at end of file diff --git a/src/assets/images/fhpl/sqjca.png b/src/assets/images/fhpl/sqjca.png index 0eb531c..00e619c 100644 --- a/src/assets/images/fhpl/sqjca.png +++ b/src/assets/images/fhpl/sqjca.png Binary files differ 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/sqhgBottomBox.vue b/src/views/oneMap/FloodStuationReview/sqhgBottomBox.vue index 53d38bb..d178c59 100644 --- a/src/views/oneMap/FloodStuationReview/sqhgBottomBox.vue +++ b/src/views/oneMap/FloodStuationReview/sqhgBottomBox.vue @@ -117,8 +117,8 @@ const ranLeng = [ [ { value: '0-0.2', color: 'rgba(7, 213, 118, 0)' }, - { value: '0.2-5', color: 'rgba(7, 213, 118, 1)' }, - { value: '5-25', color: 'rgba(38, 129, 240,1)' }, + { value: '0.2-5', color: 'rgba(38, 129, 240,1)' }, + { value: '5-25', color: 'rgb(222, 230, 0)' }, { value: '>25', color: 'rgba(255, 26, 26, 1)' }, ], [ @@ -235,14 +235,18 @@ stepNum.value = 0; hgEngPlay.value = false; showRainLegend.value = false; - // NewFiberMapUtils.disposeRainfall('') - // newfiberMap.setLayersVisible(["krigingImage"],false) + // newfiberMapbox.map.removeLayer('canvas-layer0'); + // newfiberMapbox.map.removeSource('canvas-source0'); hoursList.value.activeIndex = stepNum.value; clearInterval(runDayInterval.value); if (runDayInterval.value) { runDayInterval.value = null; refresh.value = Math.random(); } + // if (newfiberMapbox.map.getLayer('canvas-layer0')) { + // newfiberMapbox.map.removeLayer('canvas-layer0'); + // newfiberMapbox.map.removeSource('canvas-source0'); + // } } function changeChartData() { @@ -375,10 +379,10 @@ ];*/ let colorScale = [ { value: '0', color: 'rgba(7, 213, 118, 0)' }, - { value: '0.2', color: 'rgba(7, 213, 118, 1)' }, - { value: '5', color: 'rgba(38, 129, 240,1)' }, - { value: '25', color: 'rgba(255, 26, 26, 1)' }, - { value: '250', color: 'rgba(255, 26, 26, 1)' }, + { value: '0.2', color: 'rgb(38, 129, 240)' }, + { value: '5', color: 'rgb(222, 230, 0)' }, + { value: '25', color: 'rgb(255, 26, 26)' }, + { value: '250', color: 'rgb(255, 26, 26)' }, ]; let imageFiles = []; let canvas = []; 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/LayerControl/LayerControl.vue b/src/views/oneMap/LayerControl/LayerControl.vue index 37d0576..cc8e024 100644 --- a/src/views/oneMap/LayerControl/LayerControl.vue +++ b/src/views/oneMap/LayerControl/LayerControl.vue @@ -30,29 +30,30 @@ @@ -470,7 +531,7 @@ position: absolute; top: 150px; right: 476px; - background: url("@/assets/images/Sponge_screen/TuChengBG.png") no-repeat center; + background: url('@/assets/images/Sponge_screen/TuChengBG.png') no-repeat center; background-size: contain; box-sizing: border-box; padding: 25px 0px; @@ -486,7 +547,7 @@ width: 190px; height: 25px; line-height: 25px; - background-image: url("@/assets/images/Sponge_screen/TuChengFenZuBG.png"), + background-image: url('@/assets/images/Sponge_screen/TuChengFenZuBG.png'), linear-gradient(to right, #1c899600, #1c8996, #1c899600); background-repeat: no-repeat; background-position: center; diff --git a/src/views/oneMap/components/FXHG.vue b/src/views/oneMap/components/FXHG.vue index 8924475..44e9c21 100644 --- a/src/views/oneMap/components/FXHG.vue +++ b/src/views/oneMap/components/FXHG.vue @@ -40,6 +40,7 @@ showPanel.value = true; showBottom.value = false; curType.value = true; + bus.emit('SetLayerShow', ['蓝色地图']); if (newfiberMapbox.map.getLayer('dynamicRoute')) { newfiberMapbox.map.removeLayer('dynamicRoute'); newfiberMapbox.map.removeLayer('dynamicRoute_Symbol'); @@ -68,6 +69,7 @@ let initePSTimer = setInterval(() => { if (!newfiberMapbox) return; + bus.emit('SetLayerShow', ['白色地图']); bus.emit('setLayerVisible', { layername: 'ysLine1', isCheck: true }); //bus.emit('setLayerVisible', { layername: 'wsLine1', isCheck: true }); clearInterval(initePSTimer); diff --git a/src/views/oneMap/components/ZHHM.vue b/src/views/oneMap/components/ZHHM.vue index d68bdc5..1f29507 100644 --- a/src/views/oneMap/components/ZHHM.vue +++ b/src/views/oneMap/components/ZHHM.vue @@ -648,6 +648,7 @@ zoom: 12, pitch: 55, }); + bus.emit('SetLayerShow', ['蓝色地图']); // 先清空 bus.emit('clearAllLayer'); let removedLayer = ['HMJZYSQ', 'HMXGYLD', 'HMXDLGC', 'HMXSX', 'GWPCYXF']; diff --git a/src/views/oneMap/components/ZHHM_JCFX.vue b/src/views/oneMap/components/ZHHM_JCFX.vue index c420911..42e81e6 100644 --- a/src/views/oneMap/components/ZHHM_JCFX.vue +++ b/src/views/oneMap/components/ZHHM_JCFX.vue @@ -411,6 +411,7 @@ }); onBeforeUnmount(() => { bus.emit('clearAllLayer'); + bus.emit('SetLayerShow', ['蓝色地图']); let removedLayer = ['HMJZYSQ', 'HMXGYLD', 'HMXDLGC', 'HMXSX', 'GWPCYXF']; removedLayer.forEach(layer => { bus.emit('setLayerVisible', { layername: layer, isCheck: false }); diff --git a/src/views/oneMap/components/ZHHM_JSPG.vue b/src/views/oneMap/components/ZHHM_JSPG.vue index 7400f1b..df2c85f 100644 --- a/src/views/oneMap/components/ZHHM_JSPG.vue +++ b/src/views/oneMap/components/ZHHM_JSPG.vue @@ -53,6 +53,7 @@ }; onMounted(() => { + bus.emit('SetLayerShow', ['蓝色地图']); newfiberMapbox.map.easeTo({ center: [109.488, 36.596], zoom: 13, diff --git a/src/views/oneMap/components/ZHPS.vue b/src/views/oneMap/components/ZHPS.vue index 7ce8bb0..f09ddbc 100644 --- a/src/views/oneMap/components/ZHPS.vue +++ b/src/views/oneMap/components/ZHPS.vue @@ -43,6 +43,7 @@ }); }); onBeforeUnmount(() => { + bus.emit('SetLayerShow', ['蓝色地图']); // bus.emit('setLayerVisible', { layername: 'ysLine1', isCheck: false }); // bus.emit('setLayerVisible', { layername: 'wsLine1', isCheck: false }); }); diff --git a/src/views/oneMap/components/ZHRQ.vue b/src/views/oneMap/components/ZHRQ.vue index 40a70cc..493c201 100644 --- a/src/views/oneMap/components/ZHRQ.vue +++ b/src/views/oneMap/components/ZHRQ.vue @@ -1,31 +1,17 @@