diff --git a/public/static/libs/mapbox/style/wh_dhgx.json b/public/static/libs/mapbox/style/wh_dhgx.json
index 076ebf1..c953001 100644
--- a/public/static/libs/mapbox/style/wh_dhgx.json
+++ b/public/static/libs/mapbox/style/wh_dhgx.json
@@ -1266,12 +1266,20 @@
"text-halo-blur": 1.5,
"text-halo-color": [
"match",
- [
- "get",
- "type"
- ],
- "waterlog_community_text","rgba(255,0,0,1)",
- "rgba(255,0,0,1)"
+ ["get", "type"],
+ "QTCL","rgba(255,0,0,1)",
+ "WSHR","rgba(255,0,0,1)",
+ "DXSZR","rgba(255,0,0,1)",
+ "GJMY","rgba(255,0,0,1)",
+ "GWMG","rgba(255,0,0,1)",
+ "GWGSWYX","rgba(255,0,0,1)",
+ "GJMYFX","rgba(255,0,0,1)",
+ "YSHR","rgba(255,0,0,1)",
+ "YDFX","rgba(255,0,0,1)",
+ "SZYC","rgba(255,0,0,1)",
+ "泵车离线", "rgba(255,0,0,1)",
+ "问题管线", "rgba(255,0,0,1)",
+ "rgba(58,229,139,1)"
],
"text-halo-width": 1.5,
"text-opacity": ["step", ["zoom"], 0, 11, 1]
@@ -1363,6 +1371,7 @@
["get", "_image"],
"泵车离线",0.5,
"泵车在线",0.5,
+ "qd_zsxc",0.5,
"1_污水处理厂",0.7,
"sewage_pipeline_quality1",0.7,
"sewage_pipeline_quality_city",0.7,
diff --git a/public/static/libs/mapbox/style/wh_dhgx.json b/public/static/libs/mapbox/style/wh_dhgx.json
index 076ebf1..c953001 100644
--- a/public/static/libs/mapbox/style/wh_dhgx.json
+++ b/public/static/libs/mapbox/style/wh_dhgx.json
@@ -1266,12 +1266,20 @@
"text-halo-blur": 1.5,
"text-halo-color": [
"match",
- [
- "get",
- "type"
- ],
- "waterlog_community_text","rgba(255,0,0,1)",
- "rgba(255,0,0,1)"
+ ["get", "type"],
+ "QTCL","rgba(255,0,0,1)",
+ "WSHR","rgba(255,0,0,1)",
+ "DXSZR","rgba(255,0,0,1)",
+ "GJMY","rgba(255,0,0,1)",
+ "GWMG","rgba(255,0,0,1)",
+ "GWGSWYX","rgba(255,0,0,1)",
+ "GJMYFX","rgba(255,0,0,1)",
+ "YSHR","rgba(255,0,0,1)",
+ "YDFX","rgba(255,0,0,1)",
+ "SZYC","rgba(255,0,0,1)",
+ "泵车离线", "rgba(255,0,0,1)",
+ "问题管线", "rgba(255,0,0,1)",
+ "rgba(58,229,139,1)"
],
"text-halo-width": 1.5,
"text-opacity": ["step", ["zoom"], 0, 11, 1]
@@ -1363,6 +1371,7 @@
["get", "_image"],
"泵车离线",0.5,
"泵车在线",0.5,
+ "qd_zsxc",0.5,
"1_污水处理厂",0.7,
"sewage_pipeline_quality1",0.7,
"sewage_pipeline_quality_city",0.7,
diff --git a/src/components/Map/MapBox.vue b/src/components/Map/MapBox.vue
index a024760..23bcda0 100644
--- a/src/components/Map/MapBox.vue
+++ b/src/components/Map/MapBox.vue
@@ -892,12 +892,12 @@
const groups = data_default_params[k].groupMethod(data);
const g_keys = Object.keys(groups);
bus.emit("removeMapDatas", g_keys);
- /* if (k == keys[0]) {
+ 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) => ({
diff --git a/public/static/libs/mapbox/style/wh_dhgx.json b/public/static/libs/mapbox/style/wh_dhgx.json
index 076ebf1..c953001 100644
--- a/public/static/libs/mapbox/style/wh_dhgx.json
+++ b/public/static/libs/mapbox/style/wh_dhgx.json
@@ -1266,12 +1266,20 @@
"text-halo-blur": 1.5,
"text-halo-color": [
"match",
- [
- "get",
- "type"
- ],
- "waterlog_community_text","rgba(255,0,0,1)",
- "rgba(255,0,0,1)"
+ ["get", "type"],
+ "QTCL","rgba(255,0,0,1)",
+ "WSHR","rgba(255,0,0,1)",
+ "DXSZR","rgba(255,0,0,1)",
+ "GJMY","rgba(255,0,0,1)",
+ "GWMG","rgba(255,0,0,1)",
+ "GWGSWYX","rgba(255,0,0,1)",
+ "GJMYFX","rgba(255,0,0,1)",
+ "YSHR","rgba(255,0,0,1)",
+ "YDFX","rgba(255,0,0,1)",
+ "SZYC","rgba(255,0,0,1)",
+ "泵车离线", "rgba(255,0,0,1)",
+ "问题管线", "rgba(255,0,0,1)",
+ "rgba(58,229,139,1)"
],
"text-halo-width": 1.5,
"text-opacity": ["step", ["zoom"], 0, 11, 1]
@@ -1363,6 +1371,7 @@
["get", "_image"],
"泵车离线",0.5,
"泵车在线",0.5,
+ "qd_zsxc",0.5,
"1_污水处理厂",0.7,
"sewage_pipeline_quality1",0.7,
"sewage_pipeline_quality_city",0.7,
diff --git a/src/components/Map/MapBox.vue b/src/components/Map/MapBox.vue
index a024760..23bcda0 100644
--- a/src/components/Map/MapBox.vue
+++ b/src/components/Map/MapBox.vue
@@ -892,12 +892,12 @@
const groups = data_default_params[k].groupMethod(data);
const g_keys = Object.keys(groups);
bus.emit("removeMapDatas", g_keys);
- /* if (k == keys[0]) {
+ 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) => ({
diff --git a/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningRigh/components/fxjc.vue b/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningRigh/components/fxjc.vue
index 6ec5ccc..97b3b2d 100644
--- a/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningRigh/components/fxjc.vue
+++ b/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningRigh/components/fxjc.vue
@@ -32,6 +32,7 @@
\ No newline at end of file
+
diff --git a/public/static/libs/mapbox/style/wh_dhgx.json b/public/static/libs/mapbox/style/wh_dhgx.json
index 076ebf1..c953001 100644
--- a/public/static/libs/mapbox/style/wh_dhgx.json
+++ b/public/static/libs/mapbox/style/wh_dhgx.json
@@ -1266,12 +1266,20 @@
"text-halo-blur": 1.5,
"text-halo-color": [
"match",
- [
- "get",
- "type"
- ],
- "waterlog_community_text","rgba(255,0,0,1)",
- "rgba(255,0,0,1)"
+ ["get", "type"],
+ "QTCL","rgba(255,0,0,1)",
+ "WSHR","rgba(255,0,0,1)",
+ "DXSZR","rgba(255,0,0,1)",
+ "GJMY","rgba(255,0,0,1)",
+ "GWMG","rgba(255,0,0,1)",
+ "GWGSWYX","rgba(255,0,0,1)",
+ "GJMYFX","rgba(255,0,0,1)",
+ "YSHR","rgba(255,0,0,1)",
+ "YDFX","rgba(255,0,0,1)",
+ "SZYC","rgba(255,0,0,1)",
+ "泵车离线", "rgba(255,0,0,1)",
+ "问题管线", "rgba(255,0,0,1)",
+ "rgba(58,229,139,1)"
],
"text-halo-width": 1.5,
"text-opacity": ["step", ["zoom"], 0, 11, 1]
@@ -1363,6 +1371,7 @@
["get", "_image"],
"泵车离线",0.5,
"泵车在线",0.5,
+ "qd_zsxc",0.5,
"1_污水处理厂",0.7,
"sewage_pipeline_quality1",0.7,
"sewage_pipeline_quality_city",0.7,
diff --git a/src/components/Map/MapBox.vue b/src/components/Map/MapBox.vue
index a024760..23bcda0 100644
--- a/src/components/Map/MapBox.vue
+++ b/src/components/Map/MapBox.vue
@@ -892,12 +892,12 @@
const groups = data_default_params[k].groupMethod(data);
const g_keys = Object.keys(groups);
bus.emit("removeMapDatas", g_keys);
- /* if (k == keys[0]) {
+ 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) => ({
diff --git a/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningRigh/components/fxjc.vue b/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningRigh/components/fxjc.vue
index 6ec5ccc..97b3b2d 100644
--- a/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningRigh/components/fxjc.vue
+++ b/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningRigh/components/fxjc.vue
@@ -32,6 +32,7 @@
\ No newline at end of file
+
diff --git a/vite.config.js b/vite.config.js
index a2944ea..0f2460a 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -8,9 +8,9 @@
// let ipLink = 'https://server1.wh-nf.cn:8201/prod-api';
// let ipLink = 'http://192.168.16.135:9100';
// let ipLink = 'https://dhgx.wh-nf.cn:8201/prod-api';
-let ipLink = 'http://192.168.16.124:9100';
+// let ipLink = 'http://192.168.16.124:9100';
// let ipLink = 'http://192.168.20.43:9100'; // 刘总
-// let ipLink = 'http://192.168.16.43:9100';
+let ipLink = 'http://192.168.16.43:9100';
/* */
// https://vitejs.dev/config/