diff --git a/public/static/libs/mapbox/style/wh_dhgx.json b/public/static/libs/mapbox/style/wh_dhgx.json index 8dcba8c..39cf7c5 100644 --- a/public/static/libs/mapbox/style/wh_dhgx.json +++ b/public/static/libs/mapbox/style/wh_dhgx.json @@ -1213,7 +1213,7 @@ "filter": { "污水分区": { "layerName": ["hb_wh_dhgx_merge", "hb_wh_dhgx_merge_border", "hb_wh_dhgx_merge_text"], - "filter": [["排水分区_污水分区_1","排水分区_污水分区_2","排水分区_污水分区_3","排水分区_雨水分区_4"], ["排水分区_污水分区_1","排水分区_污水分区_2","排水分区_污水分区_3","排水分区_雨水分区_4"],["排水分区_污水分区_1","排水分区_污水分区_2","排水分区_污水分区_3","排水分区_雨水分区_4"]] + "filter": [["排水分区_污水分区_1","排水分区_污水分区_2","排水分区_污水分区_3","排水分区_污水分区_4"], ["排水分区_污水分区_1","排水分区_污水分区_2","排水分区_污水分区_3","排水分区_污水分区_4"],["排水分区_污水分区_1","排水分区_污水分区_2","排水分区_污水分区_3","排水分区_污水分区_4"]] }, "雨水分区": { "layerName": ["hb_wh_dhgx_merge", "hb_wh_dhgx_merge_border", "hb_wh_dhgx_merge_text"], diff --git a/public/static/libs/mapbox/style/wh_dhgx.json b/public/static/libs/mapbox/style/wh_dhgx.json index 8dcba8c..39cf7c5 100644 --- a/public/static/libs/mapbox/style/wh_dhgx.json +++ b/public/static/libs/mapbox/style/wh_dhgx.json @@ -1213,7 +1213,7 @@ "filter": { "污水分区": { "layerName": ["hb_wh_dhgx_merge", "hb_wh_dhgx_merge_border", "hb_wh_dhgx_merge_text"], - "filter": [["排水分区_污水分区_1","排水分区_污水分区_2","排水分区_污水分区_3","排水分区_雨水分区_4"], ["排水分区_污水分区_1","排水分区_污水分区_2","排水分区_污水分区_3","排水分区_雨水分区_4"],["排水分区_污水分区_1","排水分区_污水分区_2","排水分区_污水分区_3","排水分区_雨水分区_4"]] + "filter": [["排水分区_污水分区_1","排水分区_污水分区_2","排水分区_污水分区_3","排水分区_污水分区_4"], ["排水分区_污水分区_1","排水分区_污水分区_2","排水分区_污水分区_3","排水分区_污水分区_4"],["排水分区_污水分区_1","排水分区_污水分区_2","排水分区_污水分区_3","排水分区_污水分区_4"]] }, "雨水分区": { "layerName": ["hb_wh_dhgx_merge", "hb_wh_dhgx_merge_border", "hb_wh_dhgx_merge_text"], diff --git a/src/components/Map/MapBox.vue b/src/components/Map/MapBox.vue index 63d867d..384f16e 100644 --- a/src/components/Map/MapBox.vue +++ b/src/components/Map/MapBox.vue @@ -288,13 +288,12 @@ const nameKey = "龙王咀" || properties.name.substring(0, 2); let features = line.features.filter((i) => i.properties.area.includes(key)); // let features1 = point.features.filter(i => i.properties.type.includes(key) ); - debugger; let points = _.groupBy(point.features, (a) => a.properties.type); features.forEach((i) => { i.properties.type = keys[2]; i.properties.color = key == keys_[0] ? "rgba(21,127,176,1)" : "rgba(255,0,0,1)"; }); - Object.keys(points).map((key) => +/* Object.keys(points).map((key) => bus.emit("setGeoJSON", { json: turf.featureCollection( points[key].map((i) => ({ @@ -305,13 +304,13 @@ ), key: "1_" + key, }) - ); - bus.emit("setGeoJSON", { json: turf.featureCollection(features), key: keys[2] }); - newfiberMap + );*/ + // bus.emit("setGeoJSON", { json: turf.featureCollection(features), key: keys[2] }); + /* newfiberMap .getLayers() .filter((i) => i.newfiberId == keys[3])[0] .getSource() - .setData(turf.featureCollection(features)); + .setData(turf.featureCollection(features));*/ setHighlight_(properties); } }; diff --git a/public/static/libs/mapbox/style/wh_dhgx.json b/public/static/libs/mapbox/style/wh_dhgx.json index 8dcba8c..39cf7c5 100644 --- a/public/static/libs/mapbox/style/wh_dhgx.json +++ b/public/static/libs/mapbox/style/wh_dhgx.json @@ -1213,7 +1213,7 @@ "filter": { "污水分区": { "layerName": ["hb_wh_dhgx_merge", "hb_wh_dhgx_merge_border", "hb_wh_dhgx_merge_text"], - "filter": [["排水分区_污水分区_1","排水分区_污水分区_2","排水分区_污水分区_3","排水分区_雨水分区_4"], ["排水分区_污水分区_1","排水分区_污水分区_2","排水分区_污水分区_3","排水分区_雨水分区_4"],["排水分区_污水分区_1","排水分区_污水分区_2","排水分区_污水分区_3","排水分区_雨水分区_4"]] + "filter": [["排水分区_污水分区_1","排水分区_污水分区_2","排水分区_污水分区_3","排水分区_污水分区_4"], ["排水分区_污水分区_1","排水分区_污水分区_2","排水分区_污水分区_3","排水分区_污水分区_4"],["排水分区_污水分区_1","排水分区_污水分区_2","排水分区_污水分区_3","排水分区_污水分区_4"]] }, "雨水分区": { "layerName": ["hb_wh_dhgx_merge", "hb_wh_dhgx_merge_border", "hb_wh_dhgx_merge_text"], diff --git a/src/components/Map/MapBox.vue b/src/components/Map/MapBox.vue index 63d867d..384f16e 100644 --- a/src/components/Map/MapBox.vue +++ b/src/components/Map/MapBox.vue @@ -288,13 +288,12 @@ const nameKey = "龙王咀" || properties.name.substring(0, 2); let features = line.features.filter((i) => i.properties.area.includes(key)); // let features1 = point.features.filter(i => i.properties.type.includes(key) ); - debugger; let points = _.groupBy(point.features, (a) => a.properties.type); features.forEach((i) => { i.properties.type = keys[2]; i.properties.color = key == keys_[0] ? "rgba(21,127,176,1)" : "rgba(255,0,0,1)"; }); - Object.keys(points).map((key) => +/* Object.keys(points).map((key) => bus.emit("setGeoJSON", { json: turf.featureCollection( points[key].map((i) => ({ @@ -305,13 +304,13 @@ ), key: "1_" + key, }) - ); - bus.emit("setGeoJSON", { json: turf.featureCollection(features), key: keys[2] }); - newfiberMap + );*/ + // bus.emit("setGeoJSON", { json: turf.featureCollection(features), key: keys[2] }); + /* newfiberMap .getLayers() .filter((i) => i.newfiberId == keys[3])[0] .getSource() - .setData(turf.featureCollection(features)); + .setData(turf.featureCollection(features));*/ setHighlight_(properties); } }; diff --git a/src/views/pictureOnMap/page/MonitoringAnalysis/index.vue b/src/views/pictureOnMap/page/MonitoringAnalysis/index.vue index d05cc00..538b966 100644 --- a/src/views/pictureOnMap/page/MonitoringAnalysis/index.vue +++ b/src/views/pictureOnMap/page/MonitoringAnalysis/index.vue @@ -295,7 +295,7 @@ regionGrade: "one", //分区级别(one:一级 || two:二级 || three:三级 || four:四级) regionName: "", //分区名称 yw_type: [ - { name: "污水体系", value: "污水分区", key: "sewage" }, + { name: "污水体系", value: "污水分区,尾水路径", key: "sewage" }, { name: "雨水体系", value: "雨水分区,雨水系统流向,雨水系统流向1,rain_water_pump_station_info,water_gate_info,storage_tank_info", key: "rain" }, ], TitleName: [ diff --git a/public/static/libs/mapbox/style/wh_dhgx.json b/public/static/libs/mapbox/style/wh_dhgx.json index 8dcba8c..39cf7c5 100644 --- a/public/static/libs/mapbox/style/wh_dhgx.json +++ b/public/static/libs/mapbox/style/wh_dhgx.json @@ -1213,7 +1213,7 @@ "filter": { "污水分区": { "layerName": ["hb_wh_dhgx_merge", "hb_wh_dhgx_merge_border", "hb_wh_dhgx_merge_text"], - "filter": [["排水分区_污水分区_1","排水分区_污水分区_2","排水分区_污水分区_3","排水分区_雨水分区_4"], ["排水分区_污水分区_1","排水分区_污水分区_2","排水分区_污水分区_3","排水分区_雨水分区_4"],["排水分区_污水分区_1","排水分区_污水分区_2","排水分区_污水分区_3","排水分区_雨水分区_4"]] + "filter": [["排水分区_污水分区_1","排水分区_污水分区_2","排水分区_污水分区_3","排水分区_污水分区_4"], ["排水分区_污水分区_1","排水分区_污水分区_2","排水分区_污水分区_3","排水分区_污水分区_4"],["排水分区_污水分区_1","排水分区_污水分区_2","排水分区_污水分区_3","排水分区_污水分区_4"]] }, "雨水分区": { "layerName": ["hb_wh_dhgx_merge", "hb_wh_dhgx_merge_border", "hb_wh_dhgx_merge_text"], diff --git a/src/components/Map/MapBox.vue b/src/components/Map/MapBox.vue index 63d867d..384f16e 100644 --- a/src/components/Map/MapBox.vue +++ b/src/components/Map/MapBox.vue @@ -288,13 +288,12 @@ const nameKey = "龙王咀" || properties.name.substring(0, 2); let features = line.features.filter((i) => i.properties.area.includes(key)); // let features1 = point.features.filter(i => i.properties.type.includes(key) ); - debugger; let points = _.groupBy(point.features, (a) => a.properties.type); features.forEach((i) => { i.properties.type = keys[2]; i.properties.color = key == keys_[0] ? "rgba(21,127,176,1)" : "rgba(255,0,0,1)"; }); - Object.keys(points).map((key) => +/* Object.keys(points).map((key) => bus.emit("setGeoJSON", { json: turf.featureCollection( points[key].map((i) => ({ @@ -305,13 +304,13 @@ ), key: "1_" + key, }) - ); - bus.emit("setGeoJSON", { json: turf.featureCollection(features), key: keys[2] }); - newfiberMap + );*/ + // bus.emit("setGeoJSON", { json: turf.featureCollection(features), key: keys[2] }); + /* newfiberMap .getLayers() .filter((i) => i.newfiberId == keys[3])[0] .getSource() - .setData(turf.featureCollection(features)); + .setData(turf.featureCollection(features));*/ setHighlight_(properties); } }; diff --git a/src/views/pictureOnMap/page/MonitoringAnalysis/index.vue b/src/views/pictureOnMap/page/MonitoringAnalysis/index.vue index d05cc00..538b966 100644 --- a/src/views/pictureOnMap/page/MonitoringAnalysis/index.vue +++ b/src/views/pictureOnMap/page/MonitoringAnalysis/index.vue @@ -295,7 +295,7 @@ regionGrade: "one", //分区级别(one:一级 || two:二级 || three:三级 || four:四级) regionName: "", //分区名称 yw_type: [ - { name: "污水体系", value: "污水分区", key: "sewage" }, + { name: "污水体系", value: "污水分区,尾水路径", key: "sewage" }, { name: "雨水体系", value: "雨水分区,雨水系统流向,雨水系统流向1,rain_water_pump_station_info,water_gate_info,storage_tank_info", key: "rain" }, ], TitleName: [ diff --git a/vite.config.js b/vite.config.js index c5c2346..02ad574 100644 --- a/vite.config.js +++ b/vite.config.js @@ -5,10 +5,10 @@ import autoprefixer from 'autoprefixer'; const Timestamp = new Date().getTime(); //随机时间戳 -// let ipLink = 'https://server1.wh-nf.cn:8201/prod-api'; +let ipLink = 'https://server1.wh-nf.cn:8201/prod-api'; // let ipLink = 'http://192.168.16.135:9100'; // let ipLink = 'http://192.168.16.124:9100'; -let ipLink = 'http://192.168.20.43:9100'; +// let ipLink = 'http://192.168.20.43:9100'; /* */ // https://vitejs.dev/config/ export default defineConfig(({ mode, command }) => {