diff --git "a/public/static/libs/mapbox/images/\346\263\265\350\275\246\345\234\250\347\272\277.png" "b/public/static/libs/mapbox/images/\346\263\265\350\275\246\345\234\250\347\272\277.png" index 07fa179..de23f52 100644 --- "a/public/static/libs/mapbox/images/\346\263\265\350\275\246\345\234\250\347\272\277.png" +++ "b/public/static/libs/mapbox/images/\346\263\265\350\275\246\345\234\250\347\272\277.png" Binary files differ diff --git "a/public/static/libs/mapbox/images/\346\263\265\350\275\246\345\234\250\347\272\277.png" "b/public/static/libs/mapbox/images/\346\263\265\350\275\246\345\234\250\347\272\277.png" index 07fa179..de23f52 100644 --- "a/public/static/libs/mapbox/images/\346\263\265\350\275\246\345\234\250\347\272\277.png" +++ "b/public/static/libs/mapbox/images/\346\263\265\350\275\246\345\234\250\347\272\277.png" Binary files differ diff --git "a/public/static/libs/mapbox/images/\346\263\265\350\275\246\347\246\273\347\272\277.png" "b/public/static/libs/mapbox/images/\346\263\265\350\275\246\347\246\273\347\272\277.png" index 9afe894..af9fff2 100644 --- "a/public/static/libs/mapbox/images/\346\263\265\350\275\246\347\246\273\347\272\277.png" +++ "b/public/static/libs/mapbox/images/\346\263\265\350\275\246\347\246\273\347\272\277.png" Binary files differ diff --git "a/public/static/libs/mapbox/images/\346\263\265\350\275\246\345\234\250\347\272\277.png" "b/public/static/libs/mapbox/images/\346\263\265\350\275\246\345\234\250\347\272\277.png" index 07fa179..de23f52 100644 --- "a/public/static/libs/mapbox/images/\346\263\265\350\275\246\345\234\250\347\272\277.png" +++ "b/public/static/libs/mapbox/images/\346\263\265\350\275\246\345\234\250\347\272\277.png" Binary files differ diff --git "a/public/static/libs/mapbox/images/\346\263\265\350\275\246\347\246\273\347\272\277.png" "b/public/static/libs/mapbox/images/\346\263\265\350\275\246\347\246\273\347\272\277.png" index 9afe894..af9fff2 100644 --- "a/public/static/libs/mapbox/images/\346\263\265\350\275\246\347\246\273\347\272\277.png" +++ "b/public/static/libs/mapbox/images/\346\263\265\350\275\246\347\246\273\347\272\277.png" Binary files differ diff --git a/src/components/Map/MapBox.vue b/src/components/Map/MapBox.vue index 8ea3c5d..451219c 100644 --- a/src/components/Map/MapBox.vue +++ b/src/components/Map/MapBox.vue @@ -816,7 +816,7 @@ const { setLayerVisible, beansToMap } = events_params; const fullnessColor = (value) => { value = Number(value); - const colors = [{value:0,color:"rgba(52,176,0,1)"},{value:60,color:"rgba(254,203,0,1)"},{value:70,color:"rgba(223,1,0,1)"},{value:90,color:"rgba(142,14,11,1)"}]; + const colors = [{value:0,color:"rgba(52,176,0,0)"},{value:60,color:"rgba(254,203,0,1)"},{value:70,color:"rgba(223,1,0,1)"},{value:90,color:"rgba(142,14,11,1)"}]; return (colors.filter((i,idx) => idx!= colors.length-1 && i.value{ diff --git "a/public/static/libs/mapbox/images/\346\263\265\350\275\246\345\234\250\347\272\277.png" "b/public/static/libs/mapbox/images/\346\263\265\350\275\246\345\234\250\347\272\277.png" index 07fa179..de23f52 100644 --- "a/public/static/libs/mapbox/images/\346\263\265\350\275\246\345\234\250\347\272\277.png" +++ "b/public/static/libs/mapbox/images/\346\263\265\350\275\246\345\234\250\347\272\277.png" Binary files differ diff --git "a/public/static/libs/mapbox/images/\346\263\265\350\275\246\347\246\273\347\272\277.png" "b/public/static/libs/mapbox/images/\346\263\265\350\275\246\347\246\273\347\272\277.png" index 9afe894..af9fff2 100644 --- "a/public/static/libs/mapbox/images/\346\263\265\350\275\246\347\246\273\347\272\277.png" +++ "b/public/static/libs/mapbox/images/\346\263\265\350\275\246\347\246\273\347\272\277.png" Binary files differ diff --git a/src/components/Map/MapBox.vue b/src/components/Map/MapBox.vue index 8ea3c5d..451219c 100644 --- a/src/components/Map/MapBox.vue +++ b/src/components/Map/MapBox.vue @@ -816,7 +816,7 @@ const { setLayerVisible, beansToMap } = events_params; const fullnessColor = (value) => { value = Number(value); - const colors = [{value:0,color:"rgba(52,176,0,1)"},{value:60,color:"rgba(254,203,0,1)"},{value:70,color:"rgba(223,1,0,1)"},{value:90,color:"rgba(142,14,11,1)"}]; + const colors = [{value:0,color:"rgba(52,176,0,0)"},{value:60,color:"rgba(254,203,0,1)"},{value:70,color:"rgba(223,1,0,1)"},{value:90,color:"rgba(142,14,11,1)"}]; return (colors.filter((i,idx) => idx!= colors.length-1 && i.value{ diff --git a/src/views/pictureOnMap/LayerControl.vue b/src/views/pictureOnMap/LayerControl.vue index 634846e..822bc4d 100644 --- a/src/views/pictureOnMap/LayerControl.vue +++ b/src/views/pictureOnMap/LayerControl.vue @@ -4,7 +4,7 @@ class="layericon" @click="allData.showControlBox = !allData.showControlBox" > -
返回
+
返回
diff --git "a/public/static/libs/mapbox/images/\346\263\265\350\275\246\345\234\250\347\272\277.png" "b/public/static/libs/mapbox/images/\346\263\265\350\275\246\345\234\250\347\272\277.png" index 07fa179..de23f52 100644 --- "a/public/static/libs/mapbox/images/\346\263\265\350\275\246\345\234\250\347\272\277.png" +++ "b/public/static/libs/mapbox/images/\346\263\265\350\275\246\345\234\250\347\272\277.png" Binary files differ diff --git "a/public/static/libs/mapbox/images/\346\263\265\350\275\246\347\246\273\347\272\277.png" "b/public/static/libs/mapbox/images/\346\263\265\350\275\246\347\246\273\347\272\277.png" index 9afe894..af9fff2 100644 --- "a/public/static/libs/mapbox/images/\346\263\265\350\275\246\347\246\273\347\272\277.png" +++ "b/public/static/libs/mapbox/images/\346\263\265\350\275\246\347\246\273\347\272\277.png" Binary files differ diff --git a/src/components/Map/MapBox.vue b/src/components/Map/MapBox.vue index 8ea3c5d..451219c 100644 --- a/src/components/Map/MapBox.vue +++ b/src/components/Map/MapBox.vue @@ -816,7 +816,7 @@ const { setLayerVisible, beansToMap } = events_params; const fullnessColor = (value) => { value = Number(value); - const colors = [{value:0,color:"rgba(52,176,0,1)"},{value:60,color:"rgba(254,203,0,1)"},{value:70,color:"rgba(223,1,0,1)"},{value:90,color:"rgba(142,14,11,1)"}]; + const colors = [{value:0,color:"rgba(52,176,0,0)"},{value:60,color:"rgba(254,203,0,1)"},{value:70,color:"rgba(223,1,0,1)"},{value:90,color:"rgba(142,14,11,1)"}]; return (colors.filter((i,idx) => idx!= colors.length-1 && i.value{ diff --git a/src/views/pictureOnMap/LayerControl.vue b/src/views/pictureOnMap/LayerControl.vue index 634846e..822bc4d 100644 --- a/src/views/pictureOnMap/LayerControl.vue +++ b/src/views/pictureOnMap/LayerControl.vue @@ -4,7 +4,7 @@ class="layericon" @click="allData.showControlBox = !allData.showControlBox" >
-
返回
+
返回
diff --git a/src/views/pictureOnMap/page/FloodControlAndDrainage/index.vue b/src/views/pictureOnMap/page/FloodControlAndDrainage/index.vue index 0cc5d4b..668c057 100644 --- a/src/views/pictureOnMap/page/FloodControlAndDrainage/index.vue +++ b/src/views/pictureOnMap/page/FloodControlAndDrainage/index.vue @@ -142,13 +142,12 @@ }; const TabClick = (item) => { const { setLayerVisible } = events_params; + bus.emit("clearTemporaryData"); + bus.emit("set_area_parent",null); + closeAllLayer(); newfiberMap.map.easeTo(newfiberMap.config_.params.init); activeSublevel.value = item.value; - closeAllLayer(); - item.keys && - item.keys - .filter((i) => i.visible) - .forEach((i) => bus.emit(setLayerVisible.key, { layername: i.key, isCheck: true })); + item.keys && item.keys.filter((i) => i.visible).forEach((i) => bus.emit(setLayerVisible.key, { layername: i.key, isCheck: true })); }; const closeAllLayer = () => { @@ -216,6 +215,10 @@ return munberTimg; // return leftd + "天" + lefth + "时" + leftm + "分" + lefts + "秒"; //返回倒计时的字符串 } +const init = ()=> { + bus.emit("clearTemporaryData"); + TabClick(tabArr.value.filter(i => i.value == activeSublevel.value)[0]); +} onMounted(() => { getPsLevel(); @@ -223,7 +226,7 @@ getPsLevel(); }); - const init = ()=> TabClick(tabArr.value.filter(i => i.value == activeSublevel.value)[0]); + init(); bus.on(mapInitBusName,init); });