diff --git a/src/components/Map/MapBox.vue b/src/components/Map/MapBox.vue index 84554df..7335434 100644 --- a/src/components/Map/MapBox.vue +++ b/src/components/Map/MapBox.vue @@ -448,10 +448,10 @@ let outlet = relationDataList.filter(i => i.dataCode == keys[1])[0]; outlet && outletRouteMethod({id:String(outlet.dataId)},false); - let lake = relationDataList.filter(i => i.dataCode == keys[2])[0]; - let features = newfiberMap.map.getSource("point")._data.features.filter(i => i.properties.id == lake.relationId && i.properties.type == keys[2]).map(i => _.cloneDeep(i)); + let relationIds = relationDataList.filter(i => [keys[2],keys[3]].includes( i.dataCode)).map(i => i.relationId).filter(Boolean); + let features = newfiberMap.map.getSource("point")._data.features.filter(i => relationIds.includes(i.properties.id) && ([keys[2],keys[3]].includes(i.properties.type))).map(i => _.cloneDeep(i)); features.forEach(k => (k.properties.type = undefined)) - lake && busEmit(setGeoJSON.key, { json: turf.featureCollection(features), key: keys[0] }); + relationIds && busEmit(setGeoJSON.key, { json: turf.featureCollection(features), key: keys[0] }); busEmit(setLayerVisible.key, { layername: keys[0], isCheck: true }); } @@ -824,6 +824,9 @@ return (({ lake_water_level:()=>{ return `${item.siteData[0].valueName}:【${item.siteData[0].value}${item.siteData[0].unit}】` + }, + waterlogging:()=>{ + return `${item.name}\n${item.siteData[0].valueName}:【${item.siteData[0].value}${item.siteData[0].unit}】` } })[item.pointType] || (()=> item.name))(); } diff --git a/src/components/Map/MapBox.vue b/src/components/Map/MapBox.vue index 84554df..7335434 100644 --- a/src/components/Map/MapBox.vue +++ b/src/components/Map/MapBox.vue @@ -448,10 +448,10 @@ let outlet = relationDataList.filter(i => i.dataCode == keys[1])[0]; outlet && outletRouteMethod({id:String(outlet.dataId)},false); - let lake = relationDataList.filter(i => i.dataCode == keys[2])[0]; - let features = newfiberMap.map.getSource("point")._data.features.filter(i => i.properties.id == lake.relationId && i.properties.type == keys[2]).map(i => _.cloneDeep(i)); + let relationIds = relationDataList.filter(i => [keys[2],keys[3]].includes( i.dataCode)).map(i => i.relationId).filter(Boolean); + let features = newfiberMap.map.getSource("point")._data.features.filter(i => relationIds.includes(i.properties.id) && ([keys[2],keys[3]].includes(i.properties.type))).map(i => _.cloneDeep(i)); features.forEach(k => (k.properties.type = undefined)) - lake && busEmit(setGeoJSON.key, { json: turf.featureCollection(features), key: keys[0] }); + relationIds && busEmit(setGeoJSON.key, { json: turf.featureCollection(features), key: keys[0] }); busEmit(setLayerVisible.key, { layername: keys[0], isCheck: true }); } @@ -824,6 +824,9 @@ return (({ lake_water_level:()=>{ return `${item.siteData[0].valueName}:【${item.siteData[0].value}${item.siteData[0].unit}】` + }, + waterlogging:()=>{ + return `${item.name}\n${item.siteData[0].valueName}:【${item.siteData[0].value}${item.siteData[0].unit}】` } })[item.pointType] || (()=> item.name))(); } diff --git a/vite.config.js b/vite.config.js index 60aaa88..2190341 100644 --- a/vite.config.js +++ b/vite.config.js @@ -7,10 +7,10 @@ const Timestamp = new Date().getTime(); //随机时间戳 // 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 = 'https://dhgx.wh-nf.cn:8201/prod-api'; // 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/