diff --git a/public/static/libs/mapbox/style/HaiMianScreen.json b/public/static/libs/mapbox/style/HaiMianScreen.json index 66bc19a..25bac94 100644 --- a/public/static/libs/mapbox/style/HaiMianScreen.json +++ b/public/static/libs/mapbox/style/HaiMianScreen.json @@ -731,6 +731,29 @@ "columns": "c_type,name,color,st_asText(geometrys) as geometry" }, { + "id": "hn_kf_hm_haimianprojectpsfq", + "key": "hn_kf_hm_haimianprojectpsfq", + "source-layer": "hn_kf_hm_haimianprojectpsfq", + "type": "line", + "filter": [ + "in", + "c_type", + "" + ], + "paint": { + "line-color": [ + "get", + "outcolor" + ], + "line-width": 2 + }, + "layout": {}, + "minzoom": 17, + "maxzoom": 24, + "mType": "mvt", + "columns": "c_type,color,outcolor,st_asText(geometrys) as geometry" + }, + { "id": "hn_kf_hm_haimianprojection_text", "key": "hn_kf_hm_haimianprojection", "source-layer": "hn_kf_hm_haimianprojection", @@ -1063,7 +1086,8 @@ "市民公共文化综合体": { "layerName": [ "hn_kf_hm_haimianprojection", - "hn_kf_hm_haimianprojection_text" + "hn_kf_hm_haimianprojection_text", + "hn_kf_hm_haimianprojectpsfq" ], "filter": [ [ @@ -1071,6 +1095,9 @@ ], [ "市民公共文化综合体项目" + ], + [ + "市民公共文化综合体项目" ] ] }, diff --git a/public/static/libs/mapbox/style/HaiMianScreen.json b/public/static/libs/mapbox/style/HaiMianScreen.json index 66bc19a..25bac94 100644 --- a/public/static/libs/mapbox/style/HaiMianScreen.json +++ b/public/static/libs/mapbox/style/HaiMianScreen.json @@ -731,6 +731,29 @@ "columns": "c_type,name,color,st_asText(geometrys) as geometry" }, { + "id": "hn_kf_hm_haimianprojectpsfq", + "key": "hn_kf_hm_haimianprojectpsfq", + "source-layer": "hn_kf_hm_haimianprojectpsfq", + "type": "line", + "filter": [ + "in", + "c_type", + "" + ], + "paint": { + "line-color": [ + "get", + "outcolor" + ], + "line-width": 2 + }, + "layout": {}, + "minzoom": 17, + "maxzoom": 24, + "mType": "mvt", + "columns": "c_type,color,outcolor,st_asText(geometrys) as geometry" + }, + { "id": "hn_kf_hm_haimianprojection_text", "key": "hn_kf_hm_haimianprojection", "source-layer": "hn_kf_hm_haimianprojection", @@ -1063,7 +1086,8 @@ "市民公共文化综合体": { "layerName": [ "hn_kf_hm_haimianprojection", - "hn_kf_hm_haimianprojection_text" + "hn_kf_hm_haimianprojection_text", + "hn_kf_hm_haimianprojectpsfq" ], "filter": [ [ @@ -1071,6 +1095,9 @@ ], [ "市民公共文化综合体项目" + ], + [ + "市民公共文化综合体项目" ] ] }, diff --git a/src/utils/request.js b/src/utils/request.js index 54cda54..bdbeb3c 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -16,7 +16,7 @@ // axios中请求配置有baseURL选项,表示请求URL公共部分 baseURL: import.meta.env.VITE_APP_BASE_API, // 超时 - timeout: 300000, + timeout: 5 * 60 * 1000, }); // request拦截器 diff --git a/public/static/libs/mapbox/style/HaiMianScreen.json b/public/static/libs/mapbox/style/HaiMianScreen.json index 66bc19a..25bac94 100644 --- a/public/static/libs/mapbox/style/HaiMianScreen.json +++ b/public/static/libs/mapbox/style/HaiMianScreen.json @@ -731,6 +731,29 @@ "columns": "c_type,name,color,st_asText(geometrys) as geometry" }, { + "id": "hn_kf_hm_haimianprojectpsfq", + "key": "hn_kf_hm_haimianprojectpsfq", + "source-layer": "hn_kf_hm_haimianprojectpsfq", + "type": "line", + "filter": [ + "in", + "c_type", + "" + ], + "paint": { + "line-color": [ + "get", + "outcolor" + ], + "line-width": 2 + }, + "layout": {}, + "minzoom": 17, + "maxzoom": 24, + "mType": "mvt", + "columns": "c_type,color,outcolor,st_asText(geometrys) as geometry" + }, + { "id": "hn_kf_hm_haimianprojection_text", "key": "hn_kf_hm_haimianprojection", "source-layer": "hn_kf_hm_haimianprojection", @@ -1063,7 +1086,8 @@ "市民公共文化综合体": { "layerName": [ "hn_kf_hm_haimianprojection", - "hn_kf_hm_haimianprojection_text" + "hn_kf_hm_haimianprojection_text", + "hn_kf_hm_haimianprojectpsfq" ], "filter": [ [ @@ -1071,6 +1095,9 @@ ], [ "市民公共文化综合体项目" + ], + [ + "市民公共文化综合体项目" ] ] }, diff --git a/src/utils/request.js b/src/utils/request.js index 54cda54..bdbeb3c 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -16,7 +16,7 @@ // axios中请求配置有baseURL选项,表示请求URL公共部分 baseURL: import.meta.env.VITE_APP_BASE_API, // 超时 - timeout: 300000, + timeout: 5 * 60 * 1000, }); // request拦截器 diff --git a/src/views/project/projectIndex/index.vue b/src/views/project/projectIndex/index.vue index cc496f2..a537b2c 100644 --- a/src/views/project/projectIndex/index.vue +++ b/src/views/project/projectIndex/index.vue @@ -493,35 +493,7 @@ // }); // addGuanKongLayer(selectedArea.value); }; -//添加管控分区三级 -const addGuanKongLayer = layerName => { - !!!newfiberMapbox.map.getSource(layerName) && - newfiberMapbox.map.addSource(layerName, { - type: 'raster', - tiles: [ - `/geoserver/xiaoganMapServer/wms?service=WMS&version=1.1.0&request=GetMap&layers=xiaoganMapServer:${layerName}&styles=&bbox={bbox-epsg-3857}&width=768&height=556&srs=EPSG:3857&format=image/png&TRANSPARENT=TRUE`, - ], - tileSize: 768, - }); - !!!newfiberMapbox.map.getLayer(layerName) && - newfiberMapbox.map.addLayer({ - id: layerName, - type: 'raster', - source: layerName, - paint: { - 'raster-opacity': 0.6, - }, - }); - timerProject.value = setInterval(() => { - if (!newfiberMapbox.map.getLayer('point')) { - return; - } else { - newfiberMapbox.map.moveLayer(layerName, 'point'); - clearInterval(timerProject.value); - } - }, 1000); -}; //地图选中高亮 const mapSelectedHeighLight = geojson => { if (!!newfiberMapbox.map.getLayer('heighLightAreaLayer')) { diff --git a/public/static/libs/mapbox/style/HaiMianScreen.json b/public/static/libs/mapbox/style/HaiMianScreen.json index 66bc19a..25bac94 100644 --- a/public/static/libs/mapbox/style/HaiMianScreen.json +++ b/public/static/libs/mapbox/style/HaiMianScreen.json @@ -731,6 +731,29 @@ "columns": "c_type,name,color,st_asText(geometrys) as geometry" }, { + "id": "hn_kf_hm_haimianprojectpsfq", + "key": "hn_kf_hm_haimianprojectpsfq", + "source-layer": "hn_kf_hm_haimianprojectpsfq", + "type": "line", + "filter": [ + "in", + "c_type", + "" + ], + "paint": { + "line-color": [ + "get", + "outcolor" + ], + "line-width": 2 + }, + "layout": {}, + "minzoom": 17, + "maxzoom": 24, + "mType": "mvt", + "columns": "c_type,color,outcolor,st_asText(geometrys) as geometry" + }, + { "id": "hn_kf_hm_haimianprojection_text", "key": "hn_kf_hm_haimianprojection", "source-layer": "hn_kf_hm_haimianprojection", @@ -1063,7 +1086,8 @@ "市民公共文化综合体": { "layerName": [ "hn_kf_hm_haimianprojection", - "hn_kf_hm_haimianprojection_text" + "hn_kf_hm_haimianprojection_text", + "hn_kf_hm_haimianprojectpsfq" ], "filter": [ [ @@ -1071,6 +1095,9 @@ ], [ "市民公共文化综合体项目" + ], + [ + "市民公共文化综合体项目" ] ] }, diff --git a/src/utils/request.js b/src/utils/request.js index 54cda54..bdbeb3c 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -16,7 +16,7 @@ // axios中请求配置有baseURL选项,表示请求URL公共部分 baseURL: import.meta.env.VITE_APP_BASE_API, // 超时 - timeout: 300000, + timeout: 5 * 60 * 1000, }); // request拦截器 diff --git a/src/views/project/projectIndex/index.vue b/src/views/project/projectIndex/index.vue index cc496f2..a537b2c 100644 --- a/src/views/project/projectIndex/index.vue +++ b/src/views/project/projectIndex/index.vue @@ -493,35 +493,7 @@ // }); // addGuanKongLayer(selectedArea.value); }; -//添加管控分区三级 -const addGuanKongLayer = layerName => { - !!!newfiberMapbox.map.getSource(layerName) && - newfiberMapbox.map.addSource(layerName, { - type: 'raster', - tiles: [ - `/geoserver/xiaoganMapServer/wms?service=WMS&version=1.1.0&request=GetMap&layers=xiaoganMapServer:${layerName}&styles=&bbox={bbox-epsg-3857}&width=768&height=556&srs=EPSG:3857&format=image/png&TRANSPARENT=TRUE`, - ], - tileSize: 768, - }); - !!!newfiberMapbox.map.getLayer(layerName) && - newfiberMapbox.map.addLayer({ - id: layerName, - type: 'raster', - source: layerName, - paint: { - 'raster-opacity': 0.6, - }, - }); - timerProject.value = setInterval(() => { - if (!newfiberMapbox.map.getLayer('point')) { - return; - } else { - newfiberMapbox.map.moveLayer(layerName, 'point'); - clearInterval(timerProject.value); - } - }, 1000); -}; //地图选中高亮 const mapSelectedHeighLight = geojson => { if (!!newfiberMapbox.map.getLayer('heighLightAreaLayer')) { diff --git a/src/views/sponeScreen/projectHM/ProjectDisplay.vue b/src/views/sponeScreen/projectHM/ProjectDisplay.vue index 6245517..bfc08a6 100644 --- a/src/views/sponeScreen/projectHM/ProjectDisplay.vue +++ b/src/views/sponeScreen/projectHM/ProjectDisplay.vue @@ -116,10 +116,10 @@ pointList.push(geometryToFrature); } else if (element.projectrange.includes('LINESTRING')) { lineList.push(geometryToFrature); - if (element.projectAbbreviation == '汴京路管网及道路海绵化改造') { - console.log('geometryToFrature---', geometryToFrature); - bufferLine = [turf.buffer(turf.lineString(geometryToFrature.geometry.coordinates[0]), 0.01)]; - } + // if (element.projectAbbreviation == '汴京路管网及道路海绵化改造') { + // console.log('geometryToFrature---', geometryToFrature); + // bufferLine = [turf.buffer(turf.lineString(geometryToFrature.geometry.coordinates[0]), 0.01)]; + // } } else if (element.projectrange.includes('POLYGON')) { polygonList.push(geometryToFrature); } @@ -137,26 +137,26 @@ type: 'FeatureCollection', features: polygonList, }; - let bufferGeojson = { - type: 'FeatureCollection', - features: bufferLine, - }; + // let bufferGeojson = { + // type: 'FeatureCollection', + // features: bufferLine, + // }; // 项目名称图层 newfiberMapBoxVectorLayer.addGeojsonPolygonWithLabel('polygonGeojson', polygonGeojson, 12, 50, 16.9); newfiberMapBoxVectorLayer.addGeojsonLineWithLabel('lineGeojson', lineGeojson, 5, 12); newfiberMapBoxVectorLayer.addGeojsonCircleWithLabel('pointGeojson', pointGeojson, 12); - if (!newfiberMapbox.map.getLayer('projectBuffer')) { - newfiberMapbox.map.addSource('projectBuffer', { type: 'geojson', data: bufferGeojson }); - newfiberMapbox.map.addLayer({ - id: 'projectBuffer', - type: 'fill', - source: 'projectBuffer', - minzoom: 17, - paint: { - 'fill-color': 'rgba(21,230,228,0.4)', - }, - }); - } + // if (!newfiberMapbox.map.getLayer('projectBuffer')) { + // newfiberMapbox.map.addSource('projectBuffer', { type: 'geojson', data: bufferGeojson }); + // newfiberMapbox.map.addLayer({ + // id: 'projectBuffer', + // type: 'fill', + // source: 'projectBuffer', + // minzoom: 17, + // paint: { + // 'fill-color': 'rgba(21,230,228,0.4)', + // }, + // }); + // } newfiberMapbox.map.moveLayer('point', 'pointGeojson'); } }; diff --git a/public/static/libs/mapbox/style/HaiMianScreen.json b/public/static/libs/mapbox/style/HaiMianScreen.json index 66bc19a..25bac94 100644 --- a/public/static/libs/mapbox/style/HaiMianScreen.json +++ b/public/static/libs/mapbox/style/HaiMianScreen.json @@ -731,6 +731,29 @@ "columns": "c_type,name,color,st_asText(geometrys) as geometry" }, { + "id": "hn_kf_hm_haimianprojectpsfq", + "key": "hn_kf_hm_haimianprojectpsfq", + "source-layer": "hn_kf_hm_haimianprojectpsfq", + "type": "line", + "filter": [ + "in", + "c_type", + "" + ], + "paint": { + "line-color": [ + "get", + "outcolor" + ], + "line-width": 2 + }, + "layout": {}, + "minzoom": 17, + "maxzoom": 24, + "mType": "mvt", + "columns": "c_type,color,outcolor,st_asText(geometrys) as geometry" + }, + { "id": "hn_kf_hm_haimianprojection_text", "key": "hn_kf_hm_haimianprojection", "source-layer": "hn_kf_hm_haimianprojection", @@ -1063,7 +1086,8 @@ "市民公共文化综合体": { "layerName": [ "hn_kf_hm_haimianprojection", - "hn_kf_hm_haimianprojection_text" + "hn_kf_hm_haimianprojection_text", + "hn_kf_hm_haimianprojectpsfq" ], "filter": [ [ @@ -1071,6 +1095,9 @@ ], [ "市民公共文化综合体项目" + ], + [ + "市民公共文化综合体项目" ] ] }, diff --git a/src/utils/request.js b/src/utils/request.js index 54cda54..bdbeb3c 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -16,7 +16,7 @@ // axios中请求配置有baseURL选项,表示请求URL公共部分 baseURL: import.meta.env.VITE_APP_BASE_API, // 超时 - timeout: 300000, + timeout: 5 * 60 * 1000, }); // request拦截器 diff --git a/src/views/project/projectIndex/index.vue b/src/views/project/projectIndex/index.vue index cc496f2..a537b2c 100644 --- a/src/views/project/projectIndex/index.vue +++ b/src/views/project/projectIndex/index.vue @@ -493,35 +493,7 @@ // }); // addGuanKongLayer(selectedArea.value); }; -//添加管控分区三级 -const addGuanKongLayer = layerName => { - !!!newfiberMapbox.map.getSource(layerName) && - newfiberMapbox.map.addSource(layerName, { - type: 'raster', - tiles: [ - `/geoserver/xiaoganMapServer/wms?service=WMS&version=1.1.0&request=GetMap&layers=xiaoganMapServer:${layerName}&styles=&bbox={bbox-epsg-3857}&width=768&height=556&srs=EPSG:3857&format=image/png&TRANSPARENT=TRUE`, - ], - tileSize: 768, - }); - !!!newfiberMapbox.map.getLayer(layerName) && - newfiberMapbox.map.addLayer({ - id: layerName, - type: 'raster', - source: layerName, - paint: { - 'raster-opacity': 0.6, - }, - }); - timerProject.value = setInterval(() => { - if (!newfiberMapbox.map.getLayer('point')) { - return; - } else { - newfiberMapbox.map.moveLayer(layerName, 'point'); - clearInterval(timerProject.value); - } - }, 1000); -}; //地图选中高亮 const mapSelectedHeighLight = geojson => { if (!!newfiberMapbox.map.getLayer('heighLightAreaLayer')) { diff --git a/src/views/sponeScreen/projectHM/ProjectDisplay.vue b/src/views/sponeScreen/projectHM/ProjectDisplay.vue index 6245517..bfc08a6 100644 --- a/src/views/sponeScreen/projectHM/ProjectDisplay.vue +++ b/src/views/sponeScreen/projectHM/ProjectDisplay.vue @@ -116,10 +116,10 @@ pointList.push(geometryToFrature); } else if (element.projectrange.includes('LINESTRING')) { lineList.push(geometryToFrature); - if (element.projectAbbreviation == '汴京路管网及道路海绵化改造') { - console.log('geometryToFrature---', geometryToFrature); - bufferLine = [turf.buffer(turf.lineString(geometryToFrature.geometry.coordinates[0]), 0.01)]; - } + // if (element.projectAbbreviation == '汴京路管网及道路海绵化改造') { + // console.log('geometryToFrature---', geometryToFrature); + // bufferLine = [turf.buffer(turf.lineString(geometryToFrature.geometry.coordinates[0]), 0.01)]; + // } } else if (element.projectrange.includes('POLYGON')) { polygonList.push(geometryToFrature); } @@ -137,26 +137,26 @@ type: 'FeatureCollection', features: polygonList, }; - let bufferGeojson = { - type: 'FeatureCollection', - features: bufferLine, - }; + // let bufferGeojson = { + // type: 'FeatureCollection', + // features: bufferLine, + // }; // 项目名称图层 newfiberMapBoxVectorLayer.addGeojsonPolygonWithLabel('polygonGeojson', polygonGeojson, 12, 50, 16.9); newfiberMapBoxVectorLayer.addGeojsonLineWithLabel('lineGeojson', lineGeojson, 5, 12); newfiberMapBoxVectorLayer.addGeojsonCircleWithLabel('pointGeojson', pointGeojson, 12); - if (!newfiberMapbox.map.getLayer('projectBuffer')) { - newfiberMapbox.map.addSource('projectBuffer', { type: 'geojson', data: bufferGeojson }); - newfiberMapbox.map.addLayer({ - id: 'projectBuffer', - type: 'fill', - source: 'projectBuffer', - minzoom: 17, - paint: { - 'fill-color': 'rgba(21,230,228,0.4)', - }, - }); - } + // if (!newfiberMapbox.map.getLayer('projectBuffer')) { + // newfiberMapbox.map.addSource('projectBuffer', { type: 'geojson', data: bufferGeojson }); + // newfiberMapbox.map.addLayer({ + // id: 'projectBuffer', + // type: 'fill', + // source: 'projectBuffer', + // minzoom: 17, + // paint: { + // 'fill-color': 'rgba(21,230,228,0.4)', + // }, + // }); + // } newfiberMapbox.map.moveLayer('point', 'pointGeojson'); } }; diff --git a/src/views/sponeScreen/projectHM/ProjectEvaluation.vue b/src/views/sponeScreen/projectHM/ProjectEvaluation.vue index 5a12469..e388d5f 100644 --- a/src/views/sponeScreen/projectHM/ProjectEvaluation.vue +++ b/src/views/sponeScreen/projectHM/ProjectEvaluation.vue @@ -420,6 +420,22 @@ type: 'FeatureCollection', features: hn_kf_hm_projectboundary.features.filter(feature => feature.properties.name == xmData.data.name), }; + if (newfiberMapbox.map.getLayer('projectBuffer')) { + newfiberMapbox.map.removeLayer('projectBuffer'); + newfiberMapbox.map.removeSource('projectBuffer'); + } + if (xmData.data.name == '汴京路管网及道路海绵化改造' && !newfiberMapbox.map.getLayer('projectBuffer')) { + newfiberMapbox.map.addSource('projectBuffer', { type: 'geojson', data: projectBoundary }); + newfiberMapbox.map.addLayer({ + id: 'projectBuffer', + type: 'fill', + source: 'projectBuffer', + minzoom: 17, + paint: { + 'fill-color': 'rgba(54, 163, 240,0.4)', + }, + }); + } if (newfiberMapbox.getLayerByName('projectBoundary')) { newfiberMapbox.removeLayer(newfiberMapbox.getLayerByName('projectBoundary')); } diff --git a/public/static/libs/mapbox/style/HaiMianScreen.json b/public/static/libs/mapbox/style/HaiMianScreen.json index 66bc19a..25bac94 100644 --- a/public/static/libs/mapbox/style/HaiMianScreen.json +++ b/public/static/libs/mapbox/style/HaiMianScreen.json @@ -731,6 +731,29 @@ "columns": "c_type,name,color,st_asText(geometrys) as geometry" }, { + "id": "hn_kf_hm_haimianprojectpsfq", + "key": "hn_kf_hm_haimianprojectpsfq", + "source-layer": "hn_kf_hm_haimianprojectpsfq", + "type": "line", + "filter": [ + "in", + "c_type", + "" + ], + "paint": { + "line-color": [ + "get", + "outcolor" + ], + "line-width": 2 + }, + "layout": {}, + "minzoom": 17, + "maxzoom": 24, + "mType": "mvt", + "columns": "c_type,color,outcolor,st_asText(geometrys) as geometry" + }, + { "id": "hn_kf_hm_haimianprojection_text", "key": "hn_kf_hm_haimianprojection", "source-layer": "hn_kf_hm_haimianprojection", @@ -1063,7 +1086,8 @@ "市民公共文化综合体": { "layerName": [ "hn_kf_hm_haimianprojection", - "hn_kf_hm_haimianprojection_text" + "hn_kf_hm_haimianprojection_text", + "hn_kf_hm_haimianprojectpsfq" ], "filter": [ [ @@ -1071,6 +1095,9 @@ ], [ "市民公共文化综合体项目" + ], + [ + "市民公共文化综合体项目" ] ] }, diff --git a/src/utils/request.js b/src/utils/request.js index 54cda54..bdbeb3c 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -16,7 +16,7 @@ // axios中请求配置有baseURL选项,表示请求URL公共部分 baseURL: import.meta.env.VITE_APP_BASE_API, // 超时 - timeout: 300000, + timeout: 5 * 60 * 1000, }); // request拦截器 diff --git a/src/views/project/projectIndex/index.vue b/src/views/project/projectIndex/index.vue index cc496f2..a537b2c 100644 --- a/src/views/project/projectIndex/index.vue +++ b/src/views/project/projectIndex/index.vue @@ -493,35 +493,7 @@ // }); // addGuanKongLayer(selectedArea.value); }; -//添加管控分区三级 -const addGuanKongLayer = layerName => { - !!!newfiberMapbox.map.getSource(layerName) && - newfiberMapbox.map.addSource(layerName, { - type: 'raster', - tiles: [ - `/geoserver/xiaoganMapServer/wms?service=WMS&version=1.1.0&request=GetMap&layers=xiaoganMapServer:${layerName}&styles=&bbox={bbox-epsg-3857}&width=768&height=556&srs=EPSG:3857&format=image/png&TRANSPARENT=TRUE`, - ], - tileSize: 768, - }); - !!!newfiberMapbox.map.getLayer(layerName) && - newfiberMapbox.map.addLayer({ - id: layerName, - type: 'raster', - source: layerName, - paint: { - 'raster-opacity': 0.6, - }, - }); - timerProject.value = setInterval(() => { - if (!newfiberMapbox.map.getLayer('point')) { - return; - } else { - newfiberMapbox.map.moveLayer(layerName, 'point'); - clearInterval(timerProject.value); - } - }, 1000); -}; //地图选中高亮 const mapSelectedHeighLight = geojson => { if (!!newfiberMapbox.map.getLayer('heighLightAreaLayer')) { diff --git a/src/views/sponeScreen/projectHM/ProjectDisplay.vue b/src/views/sponeScreen/projectHM/ProjectDisplay.vue index 6245517..bfc08a6 100644 --- a/src/views/sponeScreen/projectHM/ProjectDisplay.vue +++ b/src/views/sponeScreen/projectHM/ProjectDisplay.vue @@ -116,10 +116,10 @@ pointList.push(geometryToFrature); } else if (element.projectrange.includes('LINESTRING')) { lineList.push(geometryToFrature); - if (element.projectAbbreviation == '汴京路管网及道路海绵化改造') { - console.log('geometryToFrature---', geometryToFrature); - bufferLine = [turf.buffer(turf.lineString(geometryToFrature.geometry.coordinates[0]), 0.01)]; - } + // if (element.projectAbbreviation == '汴京路管网及道路海绵化改造') { + // console.log('geometryToFrature---', geometryToFrature); + // bufferLine = [turf.buffer(turf.lineString(geometryToFrature.geometry.coordinates[0]), 0.01)]; + // } } else if (element.projectrange.includes('POLYGON')) { polygonList.push(geometryToFrature); } @@ -137,26 +137,26 @@ type: 'FeatureCollection', features: polygonList, }; - let bufferGeojson = { - type: 'FeatureCollection', - features: bufferLine, - }; + // let bufferGeojson = { + // type: 'FeatureCollection', + // features: bufferLine, + // }; // 项目名称图层 newfiberMapBoxVectorLayer.addGeojsonPolygonWithLabel('polygonGeojson', polygonGeojson, 12, 50, 16.9); newfiberMapBoxVectorLayer.addGeojsonLineWithLabel('lineGeojson', lineGeojson, 5, 12); newfiberMapBoxVectorLayer.addGeojsonCircleWithLabel('pointGeojson', pointGeojson, 12); - if (!newfiberMapbox.map.getLayer('projectBuffer')) { - newfiberMapbox.map.addSource('projectBuffer', { type: 'geojson', data: bufferGeojson }); - newfiberMapbox.map.addLayer({ - id: 'projectBuffer', - type: 'fill', - source: 'projectBuffer', - minzoom: 17, - paint: { - 'fill-color': 'rgba(21,230,228,0.4)', - }, - }); - } + // if (!newfiberMapbox.map.getLayer('projectBuffer')) { + // newfiberMapbox.map.addSource('projectBuffer', { type: 'geojson', data: bufferGeojson }); + // newfiberMapbox.map.addLayer({ + // id: 'projectBuffer', + // type: 'fill', + // source: 'projectBuffer', + // minzoom: 17, + // paint: { + // 'fill-color': 'rgba(21,230,228,0.4)', + // }, + // }); + // } newfiberMapbox.map.moveLayer('point', 'pointGeojson'); } }; diff --git a/src/views/sponeScreen/projectHM/ProjectEvaluation.vue b/src/views/sponeScreen/projectHM/ProjectEvaluation.vue index 5a12469..e388d5f 100644 --- a/src/views/sponeScreen/projectHM/ProjectEvaluation.vue +++ b/src/views/sponeScreen/projectHM/ProjectEvaluation.vue @@ -420,6 +420,22 @@ type: 'FeatureCollection', features: hn_kf_hm_projectboundary.features.filter(feature => feature.properties.name == xmData.data.name), }; + if (newfiberMapbox.map.getLayer('projectBuffer')) { + newfiberMapbox.map.removeLayer('projectBuffer'); + newfiberMapbox.map.removeSource('projectBuffer'); + } + if (xmData.data.name == '汴京路管网及道路海绵化改造' && !newfiberMapbox.map.getLayer('projectBuffer')) { + newfiberMapbox.map.addSource('projectBuffer', { type: 'geojson', data: projectBoundary }); + newfiberMapbox.map.addLayer({ + id: 'projectBuffer', + type: 'fill', + source: 'projectBuffer', + minzoom: 17, + paint: { + 'fill-color': 'rgba(54, 163, 240,0.4)', + }, + }); + } if (newfiberMapbox.getLayerByName('projectBoundary')) { newfiberMapbox.removeLayer(newfiberMapbox.getLayerByName('projectBoundary')); } diff --git a/vite.config.js b/vite.config.js index d5a9e2e..b20c8f4 100644 --- a/vite.config.js +++ b/vite.config.js @@ -82,11 +82,11 @@ changeOrigin: true, rewrite: path => path.replace(/^\/amap/, ''), }, - '/geoserver': { - target: 'http://server1.wh-nf.cn:8023/geoserver', //geoserver服务 - changeOrigin: true, - rewrite: path => path.replace(/^\/geoserver/, ''), - }, + // '/geoserver': { + // target: 'http://server1.wh-nf.cn:8023/geoserver', //geoserver服务 + // changeOrigin: true, + // rewrite: path => path.replace(/^\/geoserver/, ''), + // }, '/supermap1': { target: 'https://supermap1.wh-nf.cn:8090', //mapBox矢量地图 changeOrigin: true,