diff --git a/public/static/libs/mapbox/style/wh_dhgx.json b/public/static/libs/mapbox/style/wh_dhgx.json index 2db3a72..82a4694 100644 --- a/public/static/libs/mapbox/style/wh_dhgx.json +++ b/public/static/libs/mapbox/style/wh_dhgx.json @@ -951,6 +951,7 @@ "sewage_pipeline_quality","污水管网水质扎点@2x", "drainage_info","排水户扎点@2x", "rainwater_pipeline_quality","雨水管网水质扎点@2x", + "rainwater_pipeline_quality_area","接驳口扎点@2x", "reservoir_info","水库扎点@2x", "reservoir_water_level","水库范围i扎点@2x", "sewage_factory_station_info","污水处理站", diff --git a/public/static/libs/mapbox/style/wh_dhgx.json b/public/static/libs/mapbox/style/wh_dhgx.json index 2db3a72..82a4694 100644 --- a/public/static/libs/mapbox/style/wh_dhgx.json +++ b/public/static/libs/mapbox/style/wh_dhgx.json @@ -951,6 +951,7 @@ "sewage_pipeline_quality","污水管网水质扎点@2x", "drainage_info","排水户扎点@2x", "rainwater_pipeline_quality","雨水管网水质扎点@2x", + "rainwater_pipeline_quality_area","接驳口扎点@2x", "reservoir_info","水库扎点@2x", "reservoir_water_level","水库范围i扎点@2x", "sewage_factory_station_info","污水处理站", diff --git a/src/components/Map/MapBox.vue b/src/components/Map/MapBox.vue index d2c6c62..dc07d3e 100644 --- a/src/components/Map/MapBox.vue +++ b/src/components/Map/MapBox.vue @@ -450,7 +450,7 @@ .flat() .filter((i) => i.geometry) .map((item) => ({ ...item })), - (v) => v.pointType + (v) => v.pointType + (v.connectType?+"_"+v.connectType:'') ), }, //车辆 diff --git a/public/static/libs/mapbox/style/wh_dhgx.json b/public/static/libs/mapbox/style/wh_dhgx.json index 2db3a72..82a4694 100644 --- a/public/static/libs/mapbox/style/wh_dhgx.json +++ b/public/static/libs/mapbox/style/wh_dhgx.json @@ -951,6 +951,7 @@ "sewage_pipeline_quality","污水管网水质扎点@2x", "drainage_info","排水户扎点@2x", "rainwater_pipeline_quality","雨水管网水质扎点@2x", + "rainwater_pipeline_quality_area","接驳口扎点@2x", "reservoir_info","水库扎点@2x", "reservoir_water_level","水库范围i扎点@2x", "sewage_factory_station_info","污水处理站", diff --git a/src/components/Map/MapBox.vue b/src/components/Map/MapBox.vue index d2c6c62..dc07d3e 100644 --- a/src/components/Map/MapBox.vue +++ b/src/components/Map/MapBox.vue @@ -450,7 +450,7 @@ .flat() .filter((i) => i.geometry) .map((item) => ({ ...item })), - (v) => v.pointType + (v) => v.pointType + (v.connectType?+"_"+v.connectType:'') ), }, //车辆 diff --git a/src/views/pictureOnMap/LayerControl.vue b/src/views/pictureOnMap/LayerControl.vue index 693890a..3cc29cf 100644 --- a/src/views/pictureOnMap/LayerControl.vue +++ b/src/views/pictureOnMap/LayerControl.vue @@ -96,7 +96,7 @@ class: 'target-class', children: [ { - value: 'rainwater_pipeline_quality', + value: 'rainwater_pipeline_quality_area', label: '接驳口', }, ], diff --git a/public/static/libs/mapbox/style/wh_dhgx.json b/public/static/libs/mapbox/style/wh_dhgx.json index 2db3a72..82a4694 100644 --- a/public/static/libs/mapbox/style/wh_dhgx.json +++ b/public/static/libs/mapbox/style/wh_dhgx.json @@ -951,6 +951,7 @@ "sewage_pipeline_quality","污水管网水质扎点@2x", "drainage_info","排水户扎点@2x", "rainwater_pipeline_quality","雨水管网水质扎点@2x", + "rainwater_pipeline_quality_area","接驳口扎点@2x", "reservoir_info","水库扎点@2x", "reservoir_water_level","水库范围i扎点@2x", "sewage_factory_station_info","污水处理站", diff --git a/src/components/Map/MapBox.vue b/src/components/Map/MapBox.vue index d2c6c62..dc07d3e 100644 --- a/src/components/Map/MapBox.vue +++ b/src/components/Map/MapBox.vue @@ -450,7 +450,7 @@ .flat() .filter((i) => i.geometry) .map((item) => ({ ...item })), - (v) => v.pointType + (v) => v.pointType + (v.connectType?+"_"+v.connectType:'') ), }, //车辆 diff --git a/src/views/pictureOnMap/LayerControl.vue b/src/views/pictureOnMap/LayerControl.vue index 693890a..3cc29cf 100644 --- a/src/views/pictureOnMap/LayerControl.vue +++ b/src/views/pictureOnMap/LayerControl.vue @@ -96,7 +96,7 @@ class: 'target-class', children: [ { - value: 'rainwater_pipeline_quality', + value: 'rainwater_pipeline_quality_area', label: '接驳口', }, ], diff --git a/vite.config.js b/vite.config.js index 78c14b2..6ec9540 100644 --- a/vite.config.js +++ b/vite.config.js @@ -5,9 +5,9 @@ import autoprefixer from 'autoprefixer'; const Timestamp = new Date().getTime(); //随机时间戳 -let ipLink = 'http://139.155.49.237:8201/prod-api'; +// let ipLink = 'http://139.155.49.237:8201/prod-api'; // let ipLink = 'http://192.168.16.135:9100'; -// let ipLink = 'http://192.168.16.124:9100'; +let ipLink = 'http://192.168.16.124:9100'; // let ipLink = 'http://192.168.20.43:9100'; // https://vitejs.dev/config/