diff --git "a/public/static/libs/mapbox/images/\346\261\241\346\260\264\345\216\202.png" "b/public/static/libs/mapbox/images/\346\261\241\346\260\264\345\216\202.png" new file mode 100644 index 0000000..8822cc0 --- /dev/null +++ "b/public/static/libs/mapbox/images/\346\261\241\346\260\264\345\216\202.png" Binary files differ diff --git "a/public/static/libs/mapbox/images/\346\261\241\346\260\264\345\216\202.png" "b/public/static/libs/mapbox/images/\346\261\241\346\260\264\345\216\202.png" new file mode 100644 index 0000000..8822cc0 --- /dev/null +++ "b/public/static/libs/mapbox/images/\346\261\241\346\260\264\345\216\202.png" Binary files differ diff --git "a/public/static/libs/mapbox/images/\346\261\241\346\260\264\347\233\221\346\265\213.png" "b/public/static/libs/mapbox/images/\346\261\241\346\260\264\347\233\221\346\265\213.png" new file mode 100644 index 0000000..8f401ed --- /dev/null +++ "b/public/static/libs/mapbox/images/\346\261\241\346\260\264\347\233\221\346\265\213.png" Binary files differ diff --git "a/public/static/libs/mapbox/images/\346\261\241\346\260\264\345\216\202.png" "b/public/static/libs/mapbox/images/\346\261\241\346\260\264\345\216\202.png" new file mode 100644 index 0000000..8822cc0 --- /dev/null +++ "b/public/static/libs/mapbox/images/\346\261\241\346\260\264\345\216\202.png" Binary files differ diff --git "a/public/static/libs/mapbox/images/\346\261\241\346\260\264\347\233\221\346\265\213.png" "b/public/static/libs/mapbox/images/\346\261\241\346\260\264\347\233\221\346\265\213.png" new file mode 100644 index 0000000..8f401ed --- /dev/null +++ "b/public/static/libs/mapbox/images/\346\261\241\346\260\264\347\233\221\346\265\213.png" Binary files differ diff --git a/public/static/libs/mapbox/night-style1.json b/public/static/libs/mapbox/night-style1.json index ca77390..723671a 100644 --- a/public/static/libs/mapbox/night-style1.json +++ b/public/static/libs/mapbox/night-style1.json @@ -18,10 +18,14 @@ "version": "1.0.0", "scheme": "xyz", "tiles": [ + "https://supermap0.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", "https://supermap1.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", "https://supermap3.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", "https://supermap2.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap0.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf" + "https://supermap4.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", + "https://supermap5.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", + "https://supermap6.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", + "https://supermap7.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf" ], "minzoom": 0, "maxzoom": 14 diff --git "a/public/static/libs/mapbox/images/\346\261\241\346\260\264\345\216\202.png" "b/public/static/libs/mapbox/images/\346\261\241\346\260\264\345\216\202.png" new file mode 100644 index 0000000..8822cc0 --- /dev/null +++ "b/public/static/libs/mapbox/images/\346\261\241\346\260\264\345\216\202.png" Binary files differ diff --git "a/public/static/libs/mapbox/images/\346\261\241\346\260\264\347\233\221\346\265\213.png" "b/public/static/libs/mapbox/images/\346\261\241\346\260\264\347\233\221\346\265\213.png" new file mode 100644 index 0000000..8f401ed --- /dev/null +++ "b/public/static/libs/mapbox/images/\346\261\241\346\260\264\347\233\221\346\265\213.png" Binary files differ diff --git a/public/static/libs/mapbox/night-style1.json b/public/static/libs/mapbox/night-style1.json index ca77390..723671a 100644 --- a/public/static/libs/mapbox/night-style1.json +++ b/public/static/libs/mapbox/night-style1.json @@ -18,10 +18,14 @@ "version": "1.0.0", "scheme": "xyz", "tiles": [ + "https://supermap0.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", "https://supermap1.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", "https://supermap3.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", "https://supermap2.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap0.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf" + "https://supermap4.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", + "https://supermap5.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", + "https://supermap6.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", + "https://supermap7.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf" ], "minzoom": 0, "maxzoom": 14 diff --git a/public/static/libs/mapbox/style/wh_dhgx.json b/public/static/libs/mapbox/style/wh_dhgx.json index f239eaa..9bd5157 100644 --- a/public/static/libs/mapbox/style/wh_dhgx.json +++ b/public/static/libs/mapbox/style/wh_dhgx.json @@ -54,6 +54,9 @@ {"name": "排渍调度", "url": "/static/libs/mapbox/images/排渍调度.png"}, {"name": "material5", "url": "/static/libs/mapbox/images/1.jpg"}, {"name": "selectedLocation", "url": "/static/libs/mapbox/images/selectedLocation.png"}, + {"name": "selectedLocation", "url": "/static/libs/mapbox/images/selectedLocation.png"}, + {"name": "污水厂", "url": "/static/libs/mapbox/images/污水厂.png"}, + {"name": "污水监测", "url": "/static/libs/mapbox/images/污水监测.png"}, {"name": "泵车在线", "url": "/static/libs/mapbox/images/泵车在线.png", "width": 15,"height": 20}, {"name": "泵车离线", "url": "/static/libs/mapbox/images/泵车离线.png", "width": 15,"height": 20}, {"name": "heigh", "url": "/static/libs/mapbox/images/full_out.gif", "width": 50,"height": 50} @@ -95,9 +98,9 @@ "params": { "id": "高清地图", "url": "https://supermap{s}.wh-nf.cn:8090/resource/tms/dhgx/{z}/{x}/{y}.png", - "subdomains": ["0", "1", "2", "3"], + "subdomains": ["0", "1", "2", "3","4","5","6","7"], "minZoom": 1, - "maxZoom": 21 + "maxZoom": 22 }, "methods": [ { @@ -1178,7 +1181,7 @@ "rain_water_pump_station_info","雨水泵站扎点@2x", "rain_water_pump_station_info1","雨水泵站扎点@2x", "sewage_pipeline_quality","污水管网水质扎点@2x", - "sewage_pipeline_quality1","污水管网水质扎点@2x", + "sewage_pipeline_quality1","污水监测", "drainage_info","排水户扎点@2x", "rainwater_pipeline_quality","雨水管网水质扎点@2x", "rainwater_pipeline_quality1","雨水管网水质扎点@2x", @@ -1188,7 +1191,7 @@ "reservoir_water_level","水库范围i扎点@2x", "sewage_factory_station_info","污水处理站", "1_泵站", "污水泵站扎点@2x", - "1_污水处理厂", "污水处理厂扎点@2x", + "1_污水处理厂", "污水厂", "问题管线", "帮助", "storehouse", "物资仓库@2x", "dikeGood", "堤防备料@2x", @@ -1206,6 +1209,8 @@ ["get", "type"], "泵车离线",0.5, "泵车在线",0.5, + "1_污水处理厂",0.7, + "sewage_pipeline_quality1",0.7, 1 ], "text-allow-overlap": false, diff --git "a/public/static/libs/mapbox/images/\346\261\241\346\260\264\345\216\202.png" "b/public/static/libs/mapbox/images/\346\261\241\346\260\264\345\216\202.png" new file mode 100644 index 0000000..8822cc0 --- /dev/null +++ "b/public/static/libs/mapbox/images/\346\261\241\346\260\264\345\216\202.png" Binary files differ diff --git "a/public/static/libs/mapbox/images/\346\261\241\346\260\264\347\233\221\346\265\213.png" "b/public/static/libs/mapbox/images/\346\261\241\346\260\264\347\233\221\346\265\213.png" new file mode 100644 index 0000000..8f401ed --- /dev/null +++ "b/public/static/libs/mapbox/images/\346\261\241\346\260\264\347\233\221\346\265\213.png" Binary files differ diff --git a/public/static/libs/mapbox/night-style1.json b/public/static/libs/mapbox/night-style1.json index ca77390..723671a 100644 --- a/public/static/libs/mapbox/night-style1.json +++ b/public/static/libs/mapbox/night-style1.json @@ -18,10 +18,14 @@ "version": "1.0.0", "scheme": "xyz", "tiles": [ + "https://supermap0.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", "https://supermap1.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", "https://supermap3.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", "https://supermap2.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap0.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf" + "https://supermap4.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", + "https://supermap5.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", + "https://supermap6.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", + "https://supermap7.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf" ], "minzoom": 0, "maxzoom": 14 diff --git a/public/static/libs/mapbox/style/wh_dhgx.json b/public/static/libs/mapbox/style/wh_dhgx.json index f239eaa..9bd5157 100644 --- a/public/static/libs/mapbox/style/wh_dhgx.json +++ b/public/static/libs/mapbox/style/wh_dhgx.json @@ -54,6 +54,9 @@ {"name": "排渍调度", "url": "/static/libs/mapbox/images/排渍调度.png"}, {"name": "material5", "url": "/static/libs/mapbox/images/1.jpg"}, {"name": "selectedLocation", "url": "/static/libs/mapbox/images/selectedLocation.png"}, + {"name": "selectedLocation", "url": "/static/libs/mapbox/images/selectedLocation.png"}, + {"name": "污水厂", "url": "/static/libs/mapbox/images/污水厂.png"}, + {"name": "污水监测", "url": "/static/libs/mapbox/images/污水监测.png"}, {"name": "泵车在线", "url": "/static/libs/mapbox/images/泵车在线.png", "width": 15,"height": 20}, {"name": "泵车离线", "url": "/static/libs/mapbox/images/泵车离线.png", "width": 15,"height": 20}, {"name": "heigh", "url": "/static/libs/mapbox/images/full_out.gif", "width": 50,"height": 50} @@ -95,9 +98,9 @@ "params": { "id": "高清地图", "url": "https://supermap{s}.wh-nf.cn:8090/resource/tms/dhgx/{z}/{x}/{y}.png", - "subdomains": ["0", "1", "2", "3"], + "subdomains": ["0", "1", "2", "3","4","5","6","7"], "minZoom": 1, - "maxZoom": 21 + "maxZoom": 22 }, "methods": [ { @@ -1178,7 +1181,7 @@ "rain_water_pump_station_info","雨水泵站扎点@2x", "rain_water_pump_station_info1","雨水泵站扎点@2x", "sewage_pipeline_quality","污水管网水质扎点@2x", - "sewage_pipeline_quality1","污水管网水质扎点@2x", + "sewage_pipeline_quality1","污水监测", "drainage_info","排水户扎点@2x", "rainwater_pipeline_quality","雨水管网水质扎点@2x", "rainwater_pipeline_quality1","雨水管网水质扎点@2x", @@ -1188,7 +1191,7 @@ "reservoir_water_level","水库范围i扎点@2x", "sewage_factory_station_info","污水处理站", "1_泵站", "污水泵站扎点@2x", - "1_污水处理厂", "污水处理厂扎点@2x", + "1_污水处理厂", "污水厂", "问题管线", "帮助", "storehouse", "物资仓库@2x", "dikeGood", "堤防备料@2x", @@ -1206,6 +1209,8 @@ ["get", "type"], "泵车离线",0.5, "泵车在线",0.5, + "1_污水处理厂",0.7, + "sewage_pipeline_quality1",0.7, 1 ], "text-allow-overlap": false, diff --git a/src/components/Map/MapBox.vue b/src/components/Map/MapBox.vue index 3ad638e..3818010 100644 --- a/src/components/Map/MapBox.vue +++ b/src/components/Map/MapBox.vue @@ -619,6 +619,10 @@ const groups = data_default_params[k].groupMethod(data); const g_keys = Object.keys(groups); bus.emit("removeMapDatas", g_keys); + if(k == keys[0]) { + appStore.SET_MapData(filterGeometryNotEmpty(data)); + appStore.SET_MapData_COUNT(_.assign({},...g_keys.map(a => ({[a]:groups[a].length})))); + } g_keys.forEach((key) =>{ busEmit(beansToMap.key, {beans: groups[key].map((i) => ({...i, color: (default_params[key] || {}).color,})), fields: data_default_params[k].fields, type: key}); const other = (data_default_params[k].others || {})[key]; diff --git "a/public/static/libs/mapbox/images/\346\261\241\346\260\264\345\216\202.png" "b/public/static/libs/mapbox/images/\346\261\241\346\260\264\345\216\202.png" new file mode 100644 index 0000000..8822cc0 --- /dev/null +++ "b/public/static/libs/mapbox/images/\346\261\241\346\260\264\345\216\202.png" Binary files differ diff --git "a/public/static/libs/mapbox/images/\346\261\241\346\260\264\347\233\221\346\265\213.png" "b/public/static/libs/mapbox/images/\346\261\241\346\260\264\347\233\221\346\265\213.png" new file mode 100644 index 0000000..8f401ed --- /dev/null +++ "b/public/static/libs/mapbox/images/\346\261\241\346\260\264\347\233\221\346\265\213.png" Binary files differ diff --git a/public/static/libs/mapbox/night-style1.json b/public/static/libs/mapbox/night-style1.json index ca77390..723671a 100644 --- a/public/static/libs/mapbox/night-style1.json +++ b/public/static/libs/mapbox/night-style1.json @@ -18,10 +18,14 @@ "version": "1.0.0", "scheme": "xyz", "tiles": [ + "https://supermap0.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", "https://supermap1.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", "https://supermap3.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", "https://supermap2.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap0.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf" + "https://supermap4.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", + "https://supermap5.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", + "https://supermap6.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", + "https://supermap7.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf" ], "minzoom": 0, "maxzoom": 14 diff --git a/public/static/libs/mapbox/style/wh_dhgx.json b/public/static/libs/mapbox/style/wh_dhgx.json index f239eaa..9bd5157 100644 --- a/public/static/libs/mapbox/style/wh_dhgx.json +++ b/public/static/libs/mapbox/style/wh_dhgx.json @@ -54,6 +54,9 @@ {"name": "排渍调度", "url": "/static/libs/mapbox/images/排渍调度.png"}, {"name": "material5", "url": "/static/libs/mapbox/images/1.jpg"}, {"name": "selectedLocation", "url": "/static/libs/mapbox/images/selectedLocation.png"}, + {"name": "selectedLocation", "url": "/static/libs/mapbox/images/selectedLocation.png"}, + {"name": "污水厂", "url": "/static/libs/mapbox/images/污水厂.png"}, + {"name": "污水监测", "url": "/static/libs/mapbox/images/污水监测.png"}, {"name": "泵车在线", "url": "/static/libs/mapbox/images/泵车在线.png", "width": 15,"height": 20}, {"name": "泵车离线", "url": "/static/libs/mapbox/images/泵车离线.png", "width": 15,"height": 20}, {"name": "heigh", "url": "/static/libs/mapbox/images/full_out.gif", "width": 50,"height": 50} @@ -95,9 +98,9 @@ "params": { "id": "高清地图", "url": "https://supermap{s}.wh-nf.cn:8090/resource/tms/dhgx/{z}/{x}/{y}.png", - "subdomains": ["0", "1", "2", "3"], + "subdomains": ["0", "1", "2", "3","4","5","6","7"], "minZoom": 1, - "maxZoom": 21 + "maxZoom": 22 }, "methods": [ { @@ -1178,7 +1181,7 @@ "rain_water_pump_station_info","雨水泵站扎点@2x", "rain_water_pump_station_info1","雨水泵站扎点@2x", "sewage_pipeline_quality","污水管网水质扎点@2x", - "sewage_pipeline_quality1","污水管网水质扎点@2x", + "sewage_pipeline_quality1","污水监测", "drainage_info","排水户扎点@2x", "rainwater_pipeline_quality","雨水管网水质扎点@2x", "rainwater_pipeline_quality1","雨水管网水质扎点@2x", @@ -1188,7 +1191,7 @@ "reservoir_water_level","水库范围i扎点@2x", "sewage_factory_station_info","污水处理站", "1_泵站", "污水泵站扎点@2x", - "1_污水处理厂", "污水处理厂扎点@2x", + "1_污水处理厂", "污水厂", "问题管线", "帮助", "storehouse", "物资仓库@2x", "dikeGood", "堤防备料@2x", @@ -1206,6 +1209,8 @@ ["get", "type"], "泵车离线",0.5, "泵车在线",0.5, + "1_污水处理厂",0.7, + "sewage_pipeline_quality1",0.7, 1 ], "text-allow-overlap": false, diff --git a/src/components/Map/MapBox.vue b/src/components/Map/MapBox.vue index 3ad638e..3818010 100644 --- a/src/components/Map/MapBox.vue +++ b/src/components/Map/MapBox.vue @@ -619,6 +619,10 @@ const groups = data_default_params[k].groupMethod(data); const g_keys = Object.keys(groups); bus.emit("removeMapDatas", g_keys); + if(k == keys[0]) { + appStore.SET_MapData(filterGeometryNotEmpty(data)); + appStore.SET_MapData_COUNT(_.assign({},...g_keys.map(a => ({[a]:groups[a].length})))); + } g_keys.forEach((key) =>{ busEmit(beansToMap.key, {beans: groups[key].map((i) => ({...i, color: (default_params[key] || {}).color,})), fields: data_default_params[k].fields, type: key}); const other = (data_default_params[k].others || {})[key]; diff --git a/src/store/modules/user.js b/src/store/modules/user.js index 6befe29..bdaf63a 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -11,11 +11,15 @@ userInfo: {}, permissions: [], MapData: [], + MapDataCount: [], }), actions: { SET_MapData(MapData) { this.MapData = MapData; }, + SET_MapData_COUNT(count){ + this.MapDataCount = count; + }, // 登录 login(userInfo) { const username = userInfo.username.trim(); diff --git "a/public/static/libs/mapbox/images/\346\261\241\346\260\264\345\216\202.png" "b/public/static/libs/mapbox/images/\346\261\241\346\260\264\345\216\202.png" new file mode 100644 index 0000000..8822cc0 --- /dev/null +++ "b/public/static/libs/mapbox/images/\346\261\241\346\260\264\345\216\202.png" Binary files differ diff --git "a/public/static/libs/mapbox/images/\346\261\241\346\260\264\347\233\221\346\265\213.png" "b/public/static/libs/mapbox/images/\346\261\241\346\260\264\347\233\221\346\265\213.png" new file mode 100644 index 0000000..8f401ed --- /dev/null +++ "b/public/static/libs/mapbox/images/\346\261\241\346\260\264\347\233\221\346\265\213.png" Binary files differ diff --git a/public/static/libs/mapbox/night-style1.json b/public/static/libs/mapbox/night-style1.json index ca77390..723671a 100644 --- a/public/static/libs/mapbox/night-style1.json +++ b/public/static/libs/mapbox/night-style1.json @@ -18,10 +18,14 @@ "version": "1.0.0", "scheme": "xyz", "tiles": [ + "https://supermap0.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", "https://supermap1.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", "https://supermap3.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", "https://supermap2.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap0.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf" + "https://supermap4.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", + "https://supermap5.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", + "https://supermap6.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", + "https://supermap7.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf" ], "minzoom": 0, "maxzoom": 14 diff --git a/public/static/libs/mapbox/style/wh_dhgx.json b/public/static/libs/mapbox/style/wh_dhgx.json index f239eaa..9bd5157 100644 --- a/public/static/libs/mapbox/style/wh_dhgx.json +++ b/public/static/libs/mapbox/style/wh_dhgx.json @@ -54,6 +54,9 @@ {"name": "排渍调度", "url": "/static/libs/mapbox/images/排渍调度.png"}, {"name": "material5", "url": "/static/libs/mapbox/images/1.jpg"}, {"name": "selectedLocation", "url": "/static/libs/mapbox/images/selectedLocation.png"}, + {"name": "selectedLocation", "url": "/static/libs/mapbox/images/selectedLocation.png"}, + {"name": "污水厂", "url": "/static/libs/mapbox/images/污水厂.png"}, + {"name": "污水监测", "url": "/static/libs/mapbox/images/污水监测.png"}, {"name": "泵车在线", "url": "/static/libs/mapbox/images/泵车在线.png", "width": 15,"height": 20}, {"name": "泵车离线", "url": "/static/libs/mapbox/images/泵车离线.png", "width": 15,"height": 20}, {"name": "heigh", "url": "/static/libs/mapbox/images/full_out.gif", "width": 50,"height": 50} @@ -95,9 +98,9 @@ "params": { "id": "高清地图", "url": "https://supermap{s}.wh-nf.cn:8090/resource/tms/dhgx/{z}/{x}/{y}.png", - "subdomains": ["0", "1", "2", "3"], + "subdomains": ["0", "1", "2", "3","4","5","6","7"], "minZoom": 1, - "maxZoom": 21 + "maxZoom": 22 }, "methods": [ { @@ -1178,7 +1181,7 @@ "rain_water_pump_station_info","雨水泵站扎点@2x", "rain_water_pump_station_info1","雨水泵站扎点@2x", "sewage_pipeline_quality","污水管网水质扎点@2x", - "sewage_pipeline_quality1","污水管网水质扎点@2x", + "sewage_pipeline_quality1","污水监测", "drainage_info","排水户扎点@2x", "rainwater_pipeline_quality","雨水管网水质扎点@2x", "rainwater_pipeline_quality1","雨水管网水质扎点@2x", @@ -1188,7 +1191,7 @@ "reservoir_water_level","水库范围i扎点@2x", "sewage_factory_station_info","污水处理站", "1_泵站", "污水泵站扎点@2x", - "1_污水处理厂", "污水处理厂扎点@2x", + "1_污水处理厂", "污水厂", "问题管线", "帮助", "storehouse", "物资仓库@2x", "dikeGood", "堤防备料@2x", @@ -1206,6 +1209,8 @@ ["get", "type"], "泵车离线",0.5, "泵车在线",0.5, + "1_污水处理厂",0.7, + "sewage_pipeline_quality1",0.7, 1 ], "text-allow-overlap": false, diff --git a/src/components/Map/MapBox.vue b/src/components/Map/MapBox.vue index 3ad638e..3818010 100644 --- a/src/components/Map/MapBox.vue +++ b/src/components/Map/MapBox.vue @@ -619,6 +619,10 @@ const groups = data_default_params[k].groupMethod(data); const g_keys = Object.keys(groups); bus.emit("removeMapDatas", g_keys); + if(k == keys[0]) { + appStore.SET_MapData(filterGeometryNotEmpty(data)); + appStore.SET_MapData_COUNT(_.assign({},...g_keys.map(a => ({[a]:groups[a].length})))); + } g_keys.forEach((key) =>{ busEmit(beansToMap.key, {beans: groups[key].map((i) => ({...i, color: (default_params[key] || {}).color,})), fields: data_default_params[k].fields, type: key}); const other = (data_default_params[k].others || {})[key]; diff --git a/src/store/modules/user.js b/src/store/modules/user.js index 6befe29..bdaf63a 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -11,11 +11,15 @@ userInfo: {}, permissions: [], MapData: [], + MapDataCount: [], }), actions: { SET_MapData(MapData) { this.MapData = MapData; }, + SET_MapData_COUNT(count){ + this.MapDataCount = count; + }, // 登录 login(userInfo) { const username = userInfo.username.trim(); diff --git a/src/views/pictureOnMap/LayerControl.vue b/src/views/pictureOnMap/LayerControl.vue index f752cdf..033e816 100644 --- a/src/views/pictureOnMap/LayerControl.vue +++ b/src/views/pictureOnMap/LayerControl.vue @@ -20,6 +20,7 @@ @@ -31,6 +32,7 @@ import bus from "@/bus/"; import useUserStore from "@/store/modules/user"; const appStore = useUserStore(); + import { getImageUrl } from "@/utils/ruoyi"; import { nextTick } from "vue"; const { proxy } = getCurrentInstance(); @@ -279,6 +281,11 @@ bus.emit(mapInitBusName); } +watch(() => appStore.MapDataCount, (newValue, oldValue) => { + + dataSource.value.forEach(i => i.children.forEach(k => (k.n = newValue[k.value]))) +}, { deep: true, once: true }); + // watch(() => selectList.value, setLayerVisible);