diff --git a/src/assets/geojson/kaifeng/oneCenter.json b/src/assets/geojson/kaifeng/oneCenter.json index 20b5820..3ad6fe0 100644 --- a/src/assets/geojson/kaifeng/oneCenter.json +++ b/src/assets/geojson/kaifeng/oneCenter.json @@ -3,6 +3,7 @@ "features": [ { "type": "Feature", + "id": 0, "geometry": { "type": "Polygon", "coordinates": [ @@ -439,6 +440,7 @@ }, { "type": "Feature", + "id": 1, "geometry": { "type": "Polygon", "coordinates": [ @@ -863,6 +865,7 @@ }, { "type": "Feature", + "id": 2, "geometry": { "type": "Polygon", "coordinates": [ @@ -1304,6 +1307,183 @@ "name": "南部卫生防护区", "fillcolor": "rgba(243,233,99,0.4)" } + }, + { + "type": "Feature", + "id": 3, + "geometry": { + "type": "Polygon", + "coordinates": [ + [ + [ + 114.12401658160695, + 34.9072047436145 + ], + [ + 114.1300434232104, + 34.911878909225152 + ], + [ + 114.13018619087063, + 34.911878909225152 + ], + [ + 114.12718807000329, + 34.914448727111278 + ], + [ + 114.11119809204399, + 34.902170708321364 + ], + [ + 114.12718807000329, + 34.890320992512272 + ], + [ + 114.12990065554993, + 34.893033578058805 + ], + [ + 114.1251893227585, + 34.896888304888307 + ], + [ + 114.143035280302, + 34.897459375529763 + ], + [ + 114.15488499611115, + 34.87932788266528 + ], + [ + 114.17501523622047, + 34.879756185646443 + ], + [ + 114.18972030523662, + 34.897031072548771 + ], + [ + 114.27823625465339, + 34.896745537228014 + ], + [ + 114.27937839593619, + 34.89760214319017 + ], + [ + 114.33893154599025, + 34.89627916287094 + ], + [ + 114.35387456110675, + 34.905416293133271 + ], + [ + 114.39759715708908, + 34.904744095398996 + ], + [ + 114.42942244804203, + 34.88407252791086 + ], + [ + 114.49470890938949, + 34.88407252791086 + ], + [ + 114.51820608682203, + 34.89894415919747 + ], + [ + 114.53976995218738, + 34.89879544288442 + ], + [ + 114.53426744861144, + 34.894482669811396 + ], + [ + 114.5370930585558, + 34.89165705986693 + ], + [ + 114.55270827140657, + 34.90370308120913 + ], + [ + 114.53679562593015, + 34.916195251489739 + ], + [ + 114.53411873229857, + 34.91336964154516 + ], + [ + 114.53858022168447, + 34.909503017410657 + ], + [ + 114.52088298045362, + 34.909354301097835 + ], + [ + 114.50378060447417, + 34.920061875624071 + ], + [ + 114.45871956167616, + 34.9209541735014 + ], + [ + 114.42525839128166, + 34.941923173615294 + ], + [ + 114.37335639809214, + 34.942220606240824 + ], + [ + 114.33974651138465, + 34.920359308249942 + ], + [ + 114.2930495891452, + 34.920805457188351 + ], + [ + 114.28249073093184, + 34.914708088360953 + ], + [ + 114.25810125562202, + 34.915451669925233 + ], + [ + 114.23754085655207, + 34.928462277169785 + ], + [ + 114.17512511972973, + 34.928763802468552 + ], + [ + 114.16095343069264, + 34.906752455666435 + ], + [ + 114.12401658160695, + 34.9072047436145 + ] + ] + ] + }, + "properties": { + "FID": 3, + "Id": 34, + "name": "黄河生态文化带", + "fillcolor": "rgba(134, 140, 255,0.6)" + } } ] } \ No newline at end of file diff --git a/src/assets/geojson/kaifeng/oneCenter.json b/src/assets/geojson/kaifeng/oneCenter.json index 20b5820..3ad6fe0 100644 --- a/src/assets/geojson/kaifeng/oneCenter.json +++ b/src/assets/geojson/kaifeng/oneCenter.json @@ -3,6 +3,7 @@ "features": [ { "type": "Feature", + "id": 0, "geometry": { "type": "Polygon", "coordinates": [ @@ -439,6 +440,7 @@ }, { "type": "Feature", + "id": 1, "geometry": { "type": "Polygon", "coordinates": [ @@ -863,6 +865,7 @@ }, { "type": "Feature", + "id": 2, "geometry": { "type": "Polygon", "coordinates": [ @@ -1304,6 +1307,183 @@ "name": "南部卫生防护区", "fillcolor": "rgba(243,233,99,0.4)" } + }, + { + "type": "Feature", + "id": 3, + "geometry": { + "type": "Polygon", + "coordinates": [ + [ + [ + 114.12401658160695, + 34.9072047436145 + ], + [ + 114.1300434232104, + 34.911878909225152 + ], + [ + 114.13018619087063, + 34.911878909225152 + ], + [ + 114.12718807000329, + 34.914448727111278 + ], + [ + 114.11119809204399, + 34.902170708321364 + ], + [ + 114.12718807000329, + 34.890320992512272 + ], + [ + 114.12990065554993, + 34.893033578058805 + ], + [ + 114.1251893227585, + 34.896888304888307 + ], + [ + 114.143035280302, + 34.897459375529763 + ], + [ + 114.15488499611115, + 34.87932788266528 + ], + [ + 114.17501523622047, + 34.879756185646443 + ], + [ + 114.18972030523662, + 34.897031072548771 + ], + [ + 114.27823625465339, + 34.896745537228014 + ], + [ + 114.27937839593619, + 34.89760214319017 + ], + [ + 114.33893154599025, + 34.89627916287094 + ], + [ + 114.35387456110675, + 34.905416293133271 + ], + [ + 114.39759715708908, + 34.904744095398996 + ], + [ + 114.42942244804203, + 34.88407252791086 + ], + [ + 114.49470890938949, + 34.88407252791086 + ], + [ + 114.51820608682203, + 34.89894415919747 + ], + [ + 114.53976995218738, + 34.89879544288442 + ], + [ + 114.53426744861144, + 34.894482669811396 + ], + [ + 114.5370930585558, + 34.89165705986693 + ], + [ + 114.55270827140657, + 34.90370308120913 + ], + [ + 114.53679562593015, + 34.916195251489739 + ], + [ + 114.53411873229857, + 34.91336964154516 + ], + [ + 114.53858022168447, + 34.909503017410657 + ], + [ + 114.52088298045362, + 34.909354301097835 + ], + [ + 114.50378060447417, + 34.920061875624071 + ], + [ + 114.45871956167616, + 34.9209541735014 + ], + [ + 114.42525839128166, + 34.941923173615294 + ], + [ + 114.37335639809214, + 34.942220606240824 + ], + [ + 114.33974651138465, + 34.920359308249942 + ], + [ + 114.2930495891452, + 34.920805457188351 + ], + [ + 114.28249073093184, + 34.914708088360953 + ], + [ + 114.25810125562202, + 34.915451669925233 + ], + [ + 114.23754085655207, + 34.928462277169785 + ], + [ + 114.17512511972973, + 34.928763802468552 + ], + [ + 114.16095343069264, + 34.906752455666435 + ], + [ + 114.12401658160695, + 34.9072047436145 + ] + ] + ] + }, + "properties": { + "FID": 3, + "Id": 34, + "name": "黄河生态文化带", + "fillcolor": "rgba(134, 140, 255,0.6)" + } } ] } \ No newline at end of file diff --git a/src/views/sponeScreen/cityGK/PhysicalGeography.vue b/src/views/sponeScreen/cityGK/PhysicalGeography.vue index 17be5f4..cd667cb 100644 --- a/src/views/sponeScreen/cityGK/PhysicalGeography.vue +++ b/src/views/sponeScreen/cityGK/PhysicalGeography.vue @@ -188,10 +188,10 @@ newfiberVectorLayer.addGeojsonPolygon(newfiberMap, oneCenter, 'oneCenter'); newfiberMap.setCenter({ lng: 114.312, - lat: 34.262, + lat: 34.742, heading: 2.281299097855777, - zoom: 42358.12942752382, - pitch: -35.2508969308367, + zoom: 75358.12942752382, + pitch: -80.2508969308367, roll: 0.005453465256790101, }); }; diff --git a/src/assets/geojson/kaifeng/oneCenter.json b/src/assets/geojson/kaifeng/oneCenter.json index 20b5820..3ad6fe0 100644 --- a/src/assets/geojson/kaifeng/oneCenter.json +++ b/src/assets/geojson/kaifeng/oneCenter.json @@ -3,6 +3,7 @@ "features": [ { "type": "Feature", + "id": 0, "geometry": { "type": "Polygon", "coordinates": [ @@ -439,6 +440,7 @@ }, { "type": "Feature", + "id": 1, "geometry": { "type": "Polygon", "coordinates": [ @@ -863,6 +865,7 @@ }, { "type": "Feature", + "id": 2, "geometry": { "type": "Polygon", "coordinates": [ @@ -1304,6 +1307,183 @@ "name": "南部卫生防护区", "fillcolor": "rgba(243,233,99,0.4)" } + }, + { + "type": "Feature", + "id": 3, + "geometry": { + "type": "Polygon", + "coordinates": [ + [ + [ + 114.12401658160695, + 34.9072047436145 + ], + [ + 114.1300434232104, + 34.911878909225152 + ], + [ + 114.13018619087063, + 34.911878909225152 + ], + [ + 114.12718807000329, + 34.914448727111278 + ], + [ + 114.11119809204399, + 34.902170708321364 + ], + [ + 114.12718807000329, + 34.890320992512272 + ], + [ + 114.12990065554993, + 34.893033578058805 + ], + [ + 114.1251893227585, + 34.896888304888307 + ], + [ + 114.143035280302, + 34.897459375529763 + ], + [ + 114.15488499611115, + 34.87932788266528 + ], + [ + 114.17501523622047, + 34.879756185646443 + ], + [ + 114.18972030523662, + 34.897031072548771 + ], + [ + 114.27823625465339, + 34.896745537228014 + ], + [ + 114.27937839593619, + 34.89760214319017 + ], + [ + 114.33893154599025, + 34.89627916287094 + ], + [ + 114.35387456110675, + 34.905416293133271 + ], + [ + 114.39759715708908, + 34.904744095398996 + ], + [ + 114.42942244804203, + 34.88407252791086 + ], + [ + 114.49470890938949, + 34.88407252791086 + ], + [ + 114.51820608682203, + 34.89894415919747 + ], + [ + 114.53976995218738, + 34.89879544288442 + ], + [ + 114.53426744861144, + 34.894482669811396 + ], + [ + 114.5370930585558, + 34.89165705986693 + ], + [ + 114.55270827140657, + 34.90370308120913 + ], + [ + 114.53679562593015, + 34.916195251489739 + ], + [ + 114.53411873229857, + 34.91336964154516 + ], + [ + 114.53858022168447, + 34.909503017410657 + ], + [ + 114.52088298045362, + 34.909354301097835 + ], + [ + 114.50378060447417, + 34.920061875624071 + ], + [ + 114.45871956167616, + 34.9209541735014 + ], + [ + 114.42525839128166, + 34.941923173615294 + ], + [ + 114.37335639809214, + 34.942220606240824 + ], + [ + 114.33974651138465, + 34.920359308249942 + ], + [ + 114.2930495891452, + 34.920805457188351 + ], + [ + 114.28249073093184, + 34.914708088360953 + ], + [ + 114.25810125562202, + 34.915451669925233 + ], + [ + 114.23754085655207, + 34.928462277169785 + ], + [ + 114.17512511972973, + 34.928763802468552 + ], + [ + 114.16095343069264, + 34.906752455666435 + ], + [ + 114.12401658160695, + 34.9072047436145 + ] + ] + ] + }, + "properties": { + "FID": 3, + "Id": 34, + "name": "黄河生态文化带", + "fillcolor": "rgba(134, 140, 255,0.6)" + } } ] } \ No newline at end of file diff --git a/src/views/sponeScreen/cityGK/PhysicalGeography.vue b/src/views/sponeScreen/cityGK/PhysicalGeography.vue index 17be5f4..cd667cb 100644 --- a/src/views/sponeScreen/cityGK/PhysicalGeography.vue +++ b/src/views/sponeScreen/cityGK/PhysicalGeography.vue @@ -188,10 +188,10 @@ newfiberVectorLayer.addGeojsonPolygon(newfiberMap, oneCenter, 'oneCenter'); newfiberMap.setCenter({ lng: 114.312, - lat: 34.262, + lat: 34.742, heading: 2.281299097855777, - zoom: 42358.12942752382, - pitch: -35.2508969308367, + zoom: 75358.12942752382, + pitch: -80.2508969308367, roll: 0.005453465256790101, }); }; diff --git a/src/views/sponeScreen/gisMF/cesiumMapLegend.js b/src/views/sponeScreen/gisMF/cesiumMapLegend.js index ebb14b3..2159fbc 100644 --- a/src/views/sponeScreen/gisMF/cesiumMapLegend.js +++ b/src/views/sponeScreen/gisMF/cesiumMapLegend.js @@ -272,13 +272,17 @@ [ { isCheck: false, - name: '雨水管网', + name: '排水管网', layername: 'rainLine', url: 'rainLine_icon.png', //图层+json √ type: '3dModel', data: [ 'https://server1.wh-nf.cn:9000/newfiber-standard-kaifeng/2024/06/24/pipeData/ysline/ysline.scp', 'https://server1.wh-nf.cn:9000/newfiber-standard-kaifeng/2024/06/24/pipeData/YS_Point/YS_Point.scp', + 'https://server1.wh-nf.cn:9000/newfiber-standard-kaifeng/2024/06/24/pipeData/wsLine/wsLine.scp', + 'https://server1.wh-nf.cn:9000/newfiber-standard-kaifeng/2024/06/24/pipeData/WS_Point/WS_Point.scp', + 'https://server1.wh-nf.cn:9000/newfiber-standard-kaifeng/2024/06/24/pipeData/hsLine/hsLine.scp', + 'https://server1.wh-nf.cn:9000/newfiber-standard-kaifeng/2024/06/24/pipeData/hs_Point/hs_Point.scp', ], }, { @@ -295,17 +299,6 @@ [ { isCheck: false, - name: '污水管网', - layername: 'sewageLine', - url: 'sewageLine_icon.png', //服务 √ - type: '3dModel', - data: [ - 'https://server1.wh-nf.cn:9000/newfiber-standard-kaifeng/2024/06/24/pipeData/wsLine/wsLine.scp', - 'https://server1.wh-nf.cn:9000/newfiber-standard-kaifeng/2024/06/24/pipeData/WS_Point/WS_Point.scp', - ], - }, - { - isCheck: false, name: '污水泵站', //图层+json √ layername: 'WSBZ', url: 'sewageBenZhan_icon.png', @@ -314,19 +307,6 @@ data: WSBZ, dataArea: wsArea, }, - ], - [ - { - isCheck: false, - name: '合流管网', - layername: 'combineLine', - url: 'combineLine_icon.png', //服务 √ - type: '3dModel', - data: [ - 'https://server1.wh-nf.cn:9000/newfiber-standard-kaifeng/2024/06/24/pipeData/hsLine/hsLine.scp', - 'https://server1.wh-nf.cn:9000/newfiber-standard-kaifeng/2024/06/24/pipeData/hs_Point/hs_Point.scp', - ], - }, { isCheck: false, name: '合流泵站', //图层+json √ diff --git a/src/assets/geojson/kaifeng/oneCenter.json b/src/assets/geojson/kaifeng/oneCenter.json index 20b5820..3ad6fe0 100644 --- a/src/assets/geojson/kaifeng/oneCenter.json +++ b/src/assets/geojson/kaifeng/oneCenter.json @@ -3,6 +3,7 @@ "features": [ { "type": "Feature", + "id": 0, "geometry": { "type": "Polygon", "coordinates": [ @@ -439,6 +440,7 @@ }, { "type": "Feature", + "id": 1, "geometry": { "type": "Polygon", "coordinates": [ @@ -863,6 +865,7 @@ }, { "type": "Feature", + "id": 2, "geometry": { "type": "Polygon", "coordinates": [ @@ -1304,6 +1307,183 @@ "name": "南部卫生防护区", "fillcolor": "rgba(243,233,99,0.4)" } + }, + { + "type": "Feature", + "id": 3, + "geometry": { + "type": "Polygon", + "coordinates": [ + [ + [ + 114.12401658160695, + 34.9072047436145 + ], + [ + 114.1300434232104, + 34.911878909225152 + ], + [ + 114.13018619087063, + 34.911878909225152 + ], + [ + 114.12718807000329, + 34.914448727111278 + ], + [ + 114.11119809204399, + 34.902170708321364 + ], + [ + 114.12718807000329, + 34.890320992512272 + ], + [ + 114.12990065554993, + 34.893033578058805 + ], + [ + 114.1251893227585, + 34.896888304888307 + ], + [ + 114.143035280302, + 34.897459375529763 + ], + [ + 114.15488499611115, + 34.87932788266528 + ], + [ + 114.17501523622047, + 34.879756185646443 + ], + [ + 114.18972030523662, + 34.897031072548771 + ], + [ + 114.27823625465339, + 34.896745537228014 + ], + [ + 114.27937839593619, + 34.89760214319017 + ], + [ + 114.33893154599025, + 34.89627916287094 + ], + [ + 114.35387456110675, + 34.905416293133271 + ], + [ + 114.39759715708908, + 34.904744095398996 + ], + [ + 114.42942244804203, + 34.88407252791086 + ], + [ + 114.49470890938949, + 34.88407252791086 + ], + [ + 114.51820608682203, + 34.89894415919747 + ], + [ + 114.53976995218738, + 34.89879544288442 + ], + [ + 114.53426744861144, + 34.894482669811396 + ], + [ + 114.5370930585558, + 34.89165705986693 + ], + [ + 114.55270827140657, + 34.90370308120913 + ], + [ + 114.53679562593015, + 34.916195251489739 + ], + [ + 114.53411873229857, + 34.91336964154516 + ], + [ + 114.53858022168447, + 34.909503017410657 + ], + [ + 114.52088298045362, + 34.909354301097835 + ], + [ + 114.50378060447417, + 34.920061875624071 + ], + [ + 114.45871956167616, + 34.9209541735014 + ], + [ + 114.42525839128166, + 34.941923173615294 + ], + [ + 114.37335639809214, + 34.942220606240824 + ], + [ + 114.33974651138465, + 34.920359308249942 + ], + [ + 114.2930495891452, + 34.920805457188351 + ], + [ + 114.28249073093184, + 34.914708088360953 + ], + [ + 114.25810125562202, + 34.915451669925233 + ], + [ + 114.23754085655207, + 34.928462277169785 + ], + [ + 114.17512511972973, + 34.928763802468552 + ], + [ + 114.16095343069264, + 34.906752455666435 + ], + [ + 114.12401658160695, + 34.9072047436145 + ] + ] + ] + }, + "properties": { + "FID": 3, + "Id": 34, + "name": "黄河生态文化带", + "fillcolor": "rgba(134, 140, 255,0.6)" + } } ] } \ No newline at end of file diff --git a/src/views/sponeScreen/cityGK/PhysicalGeography.vue b/src/views/sponeScreen/cityGK/PhysicalGeography.vue index 17be5f4..cd667cb 100644 --- a/src/views/sponeScreen/cityGK/PhysicalGeography.vue +++ b/src/views/sponeScreen/cityGK/PhysicalGeography.vue @@ -188,10 +188,10 @@ newfiberVectorLayer.addGeojsonPolygon(newfiberMap, oneCenter, 'oneCenter'); newfiberMap.setCenter({ lng: 114.312, - lat: 34.262, + lat: 34.742, heading: 2.281299097855777, - zoom: 42358.12942752382, - pitch: -35.2508969308367, + zoom: 75358.12942752382, + pitch: -80.2508969308367, roll: 0.005453465256790101, }); }; diff --git a/src/views/sponeScreen/gisMF/cesiumMapLegend.js b/src/views/sponeScreen/gisMF/cesiumMapLegend.js index ebb14b3..2159fbc 100644 --- a/src/views/sponeScreen/gisMF/cesiumMapLegend.js +++ b/src/views/sponeScreen/gisMF/cesiumMapLegend.js @@ -272,13 +272,17 @@ [ { isCheck: false, - name: '雨水管网', + name: '排水管网', layername: 'rainLine', url: 'rainLine_icon.png', //图层+json √ type: '3dModel', data: [ 'https://server1.wh-nf.cn:9000/newfiber-standard-kaifeng/2024/06/24/pipeData/ysline/ysline.scp', 'https://server1.wh-nf.cn:9000/newfiber-standard-kaifeng/2024/06/24/pipeData/YS_Point/YS_Point.scp', + 'https://server1.wh-nf.cn:9000/newfiber-standard-kaifeng/2024/06/24/pipeData/wsLine/wsLine.scp', + 'https://server1.wh-nf.cn:9000/newfiber-standard-kaifeng/2024/06/24/pipeData/WS_Point/WS_Point.scp', + 'https://server1.wh-nf.cn:9000/newfiber-standard-kaifeng/2024/06/24/pipeData/hsLine/hsLine.scp', + 'https://server1.wh-nf.cn:9000/newfiber-standard-kaifeng/2024/06/24/pipeData/hs_Point/hs_Point.scp', ], }, { @@ -295,17 +299,6 @@ [ { isCheck: false, - name: '污水管网', - layername: 'sewageLine', - url: 'sewageLine_icon.png', //服务 √ - type: '3dModel', - data: [ - 'https://server1.wh-nf.cn:9000/newfiber-standard-kaifeng/2024/06/24/pipeData/wsLine/wsLine.scp', - 'https://server1.wh-nf.cn:9000/newfiber-standard-kaifeng/2024/06/24/pipeData/WS_Point/WS_Point.scp', - ], - }, - { - isCheck: false, name: '污水泵站', //图层+json √ layername: 'WSBZ', url: 'sewageBenZhan_icon.png', @@ -314,19 +307,6 @@ data: WSBZ, dataArea: wsArea, }, - ], - [ - { - isCheck: false, - name: '合流管网', - layername: 'combineLine', - url: 'combineLine_icon.png', //服务 √ - type: '3dModel', - data: [ - 'https://server1.wh-nf.cn:9000/newfiber-standard-kaifeng/2024/06/24/pipeData/hsLine/hsLine.scp', - 'https://server1.wh-nf.cn:9000/newfiber-standard-kaifeng/2024/06/24/pipeData/hs_Point/hs_Point.scp', - ], - }, { isCheck: false, name: '合流泵站', //图层+json √ diff --git a/src/views/sponeScreen/gisMF/cesiumPopup.vue b/src/views/sponeScreen/gisMF/cesiumPopup.vue index 8786b09..f5cbdef 100644 --- a/src/views/sponeScreen/gisMF/cesiumPopup.vue +++ b/src/views/sponeScreen/gisMF/cesiumPopup.vue @@ -224,8 +224,8 @@ width: 500px; height: 300px; padding: 10px; - background: rgba(0, 49, 78, 0.5); - border: 1px solid #094065; + background: #003b6d; + border: 1px solid #6acefe; .title { display: flex; align-items: center; @@ -237,7 +237,7 @@ font-size: 16px; font-family: PingFang SC; font-weight: 400; - color: #ccf1ff; + color: #b8ecff; line-height: 22px; margin: 5px; width: 330px; @@ -273,7 +273,7 @@ font-size: 14px; font-weight: 400; line-height: 20px; - color: #00d1ff; + color: #b8ecff; } .contentName1 { margin: 3px; @@ -281,14 +281,14 @@ font-size: 14px; font-weight: 400; line-height: 20px; - color: #00d1ff; + color: #b8ecff; } .contentValue { margin: 3px; width: 100px; font-size: 14px; font-weight: 400; - color: #00d1ff; + color: #b8ecff; word-wrap: break-word; } } diff --git a/src/assets/geojson/kaifeng/oneCenter.json b/src/assets/geojson/kaifeng/oneCenter.json index 20b5820..3ad6fe0 100644 --- a/src/assets/geojson/kaifeng/oneCenter.json +++ b/src/assets/geojson/kaifeng/oneCenter.json @@ -3,6 +3,7 @@ "features": [ { "type": "Feature", + "id": 0, "geometry": { "type": "Polygon", "coordinates": [ @@ -439,6 +440,7 @@ }, { "type": "Feature", + "id": 1, "geometry": { "type": "Polygon", "coordinates": [ @@ -863,6 +865,7 @@ }, { "type": "Feature", + "id": 2, "geometry": { "type": "Polygon", "coordinates": [ @@ -1304,6 +1307,183 @@ "name": "南部卫生防护区", "fillcolor": "rgba(243,233,99,0.4)" } + }, + { + "type": "Feature", + "id": 3, + "geometry": { + "type": "Polygon", + "coordinates": [ + [ + [ + 114.12401658160695, + 34.9072047436145 + ], + [ + 114.1300434232104, + 34.911878909225152 + ], + [ + 114.13018619087063, + 34.911878909225152 + ], + [ + 114.12718807000329, + 34.914448727111278 + ], + [ + 114.11119809204399, + 34.902170708321364 + ], + [ + 114.12718807000329, + 34.890320992512272 + ], + [ + 114.12990065554993, + 34.893033578058805 + ], + [ + 114.1251893227585, + 34.896888304888307 + ], + [ + 114.143035280302, + 34.897459375529763 + ], + [ + 114.15488499611115, + 34.87932788266528 + ], + [ + 114.17501523622047, + 34.879756185646443 + ], + [ + 114.18972030523662, + 34.897031072548771 + ], + [ + 114.27823625465339, + 34.896745537228014 + ], + [ + 114.27937839593619, + 34.89760214319017 + ], + [ + 114.33893154599025, + 34.89627916287094 + ], + [ + 114.35387456110675, + 34.905416293133271 + ], + [ + 114.39759715708908, + 34.904744095398996 + ], + [ + 114.42942244804203, + 34.88407252791086 + ], + [ + 114.49470890938949, + 34.88407252791086 + ], + [ + 114.51820608682203, + 34.89894415919747 + ], + [ + 114.53976995218738, + 34.89879544288442 + ], + [ + 114.53426744861144, + 34.894482669811396 + ], + [ + 114.5370930585558, + 34.89165705986693 + ], + [ + 114.55270827140657, + 34.90370308120913 + ], + [ + 114.53679562593015, + 34.916195251489739 + ], + [ + 114.53411873229857, + 34.91336964154516 + ], + [ + 114.53858022168447, + 34.909503017410657 + ], + [ + 114.52088298045362, + 34.909354301097835 + ], + [ + 114.50378060447417, + 34.920061875624071 + ], + [ + 114.45871956167616, + 34.9209541735014 + ], + [ + 114.42525839128166, + 34.941923173615294 + ], + [ + 114.37335639809214, + 34.942220606240824 + ], + [ + 114.33974651138465, + 34.920359308249942 + ], + [ + 114.2930495891452, + 34.920805457188351 + ], + [ + 114.28249073093184, + 34.914708088360953 + ], + [ + 114.25810125562202, + 34.915451669925233 + ], + [ + 114.23754085655207, + 34.928462277169785 + ], + [ + 114.17512511972973, + 34.928763802468552 + ], + [ + 114.16095343069264, + 34.906752455666435 + ], + [ + 114.12401658160695, + 34.9072047436145 + ] + ] + ] + }, + "properties": { + "FID": 3, + "Id": 34, + "name": "黄河生态文化带", + "fillcolor": "rgba(134, 140, 255,0.6)" + } } ] } \ No newline at end of file diff --git a/src/views/sponeScreen/cityGK/PhysicalGeography.vue b/src/views/sponeScreen/cityGK/PhysicalGeography.vue index 17be5f4..cd667cb 100644 --- a/src/views/sponeScreen/cityGK/PhysicalGeography.vue +++ b/src/views/sponeScreen/cityGK/PhysicalGeography.vue @@ -188,10 +188,10 @@ newfiberVectorLayer.addGeojsonPolygon(newfiberMap, oneCenter, 'oneCenter'); newfiberMap.setCenter({ lng: 114.312, - lat: 34.262, + lat: 34.742, heading: 2.281299097855777, - zoom: 42358.12942752382, - pitch: -35.2508969308367, + zoom: 75358.12942752382, + pitch: -80.2508969308367, roll: 0.005453465256790101, }); }; diff --git a/src/views/sponeScreen/gisMF/cesiumMapLegend.js b/src/views/sponeScreen/gisMF/cesiumMapLegend.js index ebb14b3..2159fbc 100644 --- a/src/views/sponeScreen/gisMF/cesiumMapLegend.js +++ b/src/views/sponeScreen/gisMF/cesiumMapLegend.js @@ -272,13 +272,17 @@ [ { isCheck: false, - name: '雨水管网', + name: '排水管网', layername: 'rainLine', url: 'rainLine_icon.png', //图层+json √ type: '3dModel', data: [ 'https://server1.wh-nf.cn:9000/newfiber-standard-kaifeng/2024/06/24/pipeData/ysline/ysline.scp', 'https://server1.wh-nf.cn:9000/newfiber-standard-kaifeng/2024/06/24/pipeData/YS_Point/YS_Point.scp', + 'https://server1.wh-nf.cn:9000/newfiber-standard-kaifeng/2024/06/24/pipeData/wsLine/wsLine.scp', + 'https://server1.wh-nf.cn:9000/newfiber-standard-kaifeng/2024/06/24/pipeData/WS_Point/WS_Point.scp', + 'https://server1.wh-nf.cn:9000/newfiber-standard-kaifeng/2024/06/24/pipeData/hsLine/hsLine.scp', + 'https://server1.wh-nf.cn:9000/newfiber-standard-kaifeng/2024/06/24/pipeData/hs_Point/hs_Point.scp', ], }, { @@ -295,17 +299,6 @@ [ { isCheck: false, - name: '污水管网', - layername: 'sewageLine', - url: 'sewageLine_icon.png', //服务 √ - type: '3dModel', - data: [ - 'https://server1.wh-nf.cn:9000/newfiber-standard-kaifeng/2024/06/24/pipeData/wsLine/wsLine.scp', - 'https://server1.wh-nf.cn:9000/newfiber-standard-kaifeng/2024/06/24/pipeData/WS_Point/WS_Point.scp', - ], - }, - { - isCheck: false, name: '污水泵站', //图层+json √ layername: 'WSBZ', url: 'sewageBenZhan_icon.png', @@ -314,19 +307,6 @@ data: WSBZ, dataArea: wsArea, }, - ], - [ - { - isCheck: false, - name: '合流管网', - layername: 'combineLine', - url: 'combineLine_icon.png', //服务 √ - type: '3dModel', - data: [ - 'https://server1.wh-nf.cn:9000/newfiber-standard-kaifeng/2024/06/24/pipeData/hsLine/hsLine.scp', - 'https://server1.wh-nf.cn:9000/newfiber-standard-kaifeng/2024/06/24/pipeData/hs_Point/hs_Point.scp', - ], - }, { isCheck: false, name: '合流泵站', //图层+json √ diff --git a/src/views/sponeScreen/gisMF/cesiumPopup.vue b/src/views/sponeScreen/gisMF/cesiumPopup.vue index 8786b09..f5cbdef 100644 --- a/src/views/sponeScreen/gisMF/cesiumPopup.vue +++ b/src/views/sponeScreen/gisMF/cesiumPopup.vue @@ -224,8 +224,8 @@ width: 500px; height: 300px; padding: 10px; - background: rgba(0, 49, 78, 0.5); - border: 1px solid #094065; + background: #003b6d; + border: 1px solid #6acefe; .title { display: flex; align-items: center; @@ -237,7 +237,7 @@ font-size: 16px; font-family: PingFang SC; font-weight: 400; - color: #ccf1ff; + color: #b8ecff; line-height: 22px; margin: 5px; width: 330px; @@ -273,7 +273,7 @@ font-size: 14px; font-weight: 400; line-height: 20px; - color: #00d1ff; + color: #b8ecff; } .contentName1 { margin: 3px; @@ -281,14 +281,14 @@ font-size: 14px; font-weight: 400; line-height: 20px; - color: #00d1ff; + color: #b8ecff; } .contentValue { margin: 3px; width: 100px; font-size: 14px; font-weight: 400; - color: #00d1ff; + color: #b8ecff; word-wrap: break-word; } } diff --git a/src/views/sponeScreen/gisMF/legendKF.vue b/src/views/sponeScreen/gisMF/legendKF.vue index 00c3118..9f2b8e0 100644 --- a/src/views/sponeScreen/gisMF/legendKF.vue +++ b/src/views/sponeScreen/gisMF/legendKF.vue @@ -126,9 +126,9 @@ if (item.type == 'polygon') { newfiberVectorLayer.addGeojsonPolygon(newfiberMap, item.data, item.layername); } - if (item.type == 'point') { - newfiberVectorLayer.addGeojsonPoint(newfiberMap, item.data, item.url, item.layername); - } + // if (item.type == 'point') { + // newfiberVectorLayer.addGeojsonPoint(newfiberMap, item.data, item.url, item.layername); + // } if (item.type == 'areaWall') { newfiberVectorLayer.addGeojsonWall(newfiberMap, item.data, item.layername); } @@ -140,11 +140,11 @@ newfiberVectorLayer.setDynamicWaterVisible(item.isCheck); } } - // if (item.type == '3dModel') { - // item.data.forEach((url, index) => { - // newfiberVectorLayer.add3DModelLayers(newfiberMap, url, item.layername + index); - // }); - // } + if (item.type == '3dModel') { + item.data.forEach((url, index) => { + newfiberVectorLayer.add3DModelLayers(newfiberMap, url, item.layername + index); + }); + } if (item.type == 'point') { newfiberVectorLayer.addGeojsonPoint(newfiberMap, item.data, getImageUrl(item.url, 'cesiumMap/legendIcon'), item.layername); if (item.dataArea) { @@ -180,11 +180,11 @@ if (item.layername == 'dynamicWater') { newfiberVectorLayer.setDynamicWaterVisible(item.isCheck); } - // if (item.type == '3dModel') { - // item.data.forEach((url, index) => { - // newfiberVectorLayer.set3DModelVisible(item.layername + index, item.isCheck); - // }); - // } + if (item.type == '3dModel') { + item.data.forEach((url, index) => { + newfiberVectorLayer.set3DModelVisible(item.layername + index, item.isCheck); + }); + } newfiberMap.removeByIds([item.layername]); if (rainDataTimer.value) { clearInterval(rainDataTimer.value); diff --git a/src/assets/geojson/kaifeng/oneCenter.json b/src/assets/geojson/kaifeng/oneCenter.json index 20b5820..3ad6fe0 100644 --- a/src/assets/geojson/kaifeng/oneCenter.json +++ b/src/assets/geojson/kaifeng/oneCenter.json @@ -3,6 +3,7 @@ "features": [ { "type": "Feature", + "id": 0, "geometry": { "type": "Polygon", "coordinates": [ @@ -439,6 +440,7 @@ }, { "type": "Feature", + "id": 1, "geometry": { "type": "Polygon", "coordinates": [ @@ -863,6 +865,7 @@ }, { "type": "Feature", + "id": 2, "geometry": { "type": "Polygon", "coordinates": [ @@ -1304,6 +1307,183 @@ "name": "南部卫生防护区", "fillcolor": "rgba(243,233,99,0.4)" } + }, + { + "type": "Feature", + "id": 3, + "geometry": { + "type": "Polygon", + "coordinates": [ + [ + [ + 114.12401658160695, + 34.9072047436145 + ], + [ + 114.1300434232104, + 34.911878909225152 + ], + [ + 114.13018619087063, + 34.911878909225152 + ], + [ + 114.12718807000329, + 34.914448727111278 + ], + [ + 114.11119809204399, + 34.902170708321364 + ], + [ + 114.12718807000329, + 34.890320992512272 + ], + [ + 114.12990065554993, + 34.893033578058805 + ], + [ + 114.1251893227585, + 34.896888304888307 + ], + [ + 114.143035280302, + 34.897459375529763 + ], + [ + 114.15488499611115, + 34.87932788266528 + ], + [ + 114.17501523622047, + 34.879756185646443 + ], + [ + 114.18972030523662, + 34.897031072548771 + ], + [ + 114.27823625465339, + 34.896745537228014 + ], + [ + 114.27937839593619, + 34.89760214319017 + ], + [ + 114.33893154599025, + 34.89627916287094 + ], + [ + 114.35387456110675, + 34.905416293133271 + ], + [ + 114.39759715708908, + 34.904744095398996 + ], + [ + 114.42942244804203, + 34.88407252791086 + ], + [ + 114.49470890938949, + 34.88407252791086 + ], + [ + 114.51820608682203, + 34.89894415919747 + ], + [ + 114.53976995218738, + 34.89879544288442 + ], + [ + 114.53426744861144, + 34.894482669811396 + ], + [ + 114.5370930585558, + 34.89165705986693 + ], + [ + 114.55270827140657, + 34.90370308120913 + ], + [ + 114.53679562593015, + 34.916195251489739 + ], + [ + 114.53411873229857, + 34.91336964154516 + ], + [ + 114.53858022168447, + 34.909503017410657 + ], + [ + 114.52088298045362, + 34.909354301097835 + ], + [ + 114.50378060447417, + 34.920061875624071 + ], + [ + 114.45871956167616, + 34.9209541735014 + ], + [ + 114.42525839128166, + 34.941923173615294 + ], + [ + 114.37335639809214, + 34.942220606240824 + ], + [ + 114.33974651138465, + 34.920359308249942 + ], + [ + 114.2930495891452, + 34.920805457188351 + ], + [ + 114.28249073093184, + 34.914708088360953 + ], + [ + 114.25810125562202, + 34.915451669925233 + ], + [ + 114.23754085655207, + 34.928462277169785 + ], + [ + 114.17512511972973, + 34.928763802468552 + ], + [ + 114.16095343069264, + 34.906752455666435 + ], + [ + 114.12401658160695, + 34.9072047436145 + ] + ] + ] + }, + "properties": { + "FID": 3, + "Id": 34, + "name": "黄河生态文化带", + "fillcolor": "rgba(134, 140, 255,0.6)" + } } ] } \ No newline at end of file diff --git a/src/views/sponeScreen/cityGK/PhysicalGeography.vue b/src/views/sponeScreen/cityGK/PhysicalGeography.vue index 17be5f4..cd667cb 100644 --- a/src/views/sponeScreen/cityGK/PhysicalGeography.vue +++ b/src/views/sponeScreen/cityGK/PhysicalGeography.vue @@ -188,10 +188,10 @@ newfiberVectorLayer.addGeojsonPolygon(newfiberMap, oneCenter, 'oneCenter'); newfiberMap.setCenter({ lng: 114.312, - lat: 34.262, + lat: 34.742, heading: 2.281299097855777, - zoom: 42358.12942752382, - pitch: -35.2508969308367, + zoom: 75358.12942752382, + pitch: -80.2508969308367, roll: 0.005453465256790101, }); }; diff --git a/src/views/sponeScreen/gisMF/cesiumMapLegend.js b/src/views/sponeScreen/gisMF/cesiumMapLegend.js index ebb14b3..2159fbc 100644 --- a/src/views/sponeScreen/gisMF/cesiumMapLegend.js +++ b/src/views/sponeScreen/gisMF/cesiumMapLegend.js @@ -272,13 +272,17 @@ [ { isCheck: false, - name: '雨水管网', + name: '排水管网', layername: 'rainLine', url: 'rainLine_icon.png', //图层+json √ type: '3dModel', data: [ 'https://server1.wh-nf.cn:9000/newfiber-standard-kaifeng/2024/06/24/pipeData/ysline/ysline.scp', 'https://server1.wh-nf.cn:9000/newfiber-standard-kaifeng/2024/06/24/pipeData/YS_Point/YS_Point.scp', + 'https://server1.wh-nf.cn:9000/newfiber-standard-kaifeng/2024/06/24/pipeData/wsLine/wsLine.scp', + 'https://server1.wh-nf.cn:9000/newfiber-standard-kaifeng/2024/06/24/pipeData/WS_Point/WS_Point.scp', + 'https://server1.wh-nf.cn:9000/newfiber-standard-kaifeng/2024/06/24/pipeData/hsLine/hsLine.scp', + 'https://server1.wh-nf.cn:9000/newfiber-standard-kaifeng/2024/06/24/pipeData/hs_Point/hs_Point.scp', ], }, { @@ -295,17 +299,6 @@ [ { isCheck: false, - name: '污水管网', - layername: 'sewageLine', - url: 'sewageLine_icon.png', //服务 √ - type: '3dModel', - data: [ - 'https://server1.wh-nf.cn:9000/newfiber-standard-kaifeng/2024/06/24/pipeData/wsLine/wsLine.scp', - 'https://server1.wh-nf.cn:9000/newfiber-standard-kaifeng/2024/06/24/pipeData/WS_Point/WS_Point.scp', - ], - }, - { - isCheck: false, name: '污水泵站', //图层+json √ layername: 'WSBZ', url: 'sewageBenZhan_icon.png', @@ -314,19 +307,6 @@ data: WSBZ, dataArea: wsArea, }, - ], - [ - { - isCheck: false, - name: '合流管网', - layername: 'combineLine', - url: 'combineLine_icon.png', //服务 √ - type: '3dModel', - data: [ - 'https://server1.wh-nf.cn:9000/newfiber-standard-kaifeng/2024/06/24/pipeData/hsLine/hsLine.scp', - 'https://server1.wh-nf.cn:9000/newfiber-standard-kaifeng/2024/06/24/pipeData/hs_Point/hs_Point.scp', - ], - }, { isCheck: false, name: '合流泵站', //图层+json √ diff --git a/src/views/sponeScreen/gisMF/cesiumPopup.vue b/src/views/sponeScreen/gisMF/cesiumPopup.vue index 8786b09..f5cbdef 100644 --- a/src/views/sponeScreen/gisMF/cesiumPopup.vue +++ b/src/views/sponeScreen/gisMF/cesiumPopup.vue @@ -224,8 +224,8 @@ width: 500px; height: 300px; padding: 10px; - background: rgba(0, 49, 78, 0.5); - border: 1px solid #094065; + background: #003b6d; + border: 1px solid #6acefe; .title { display: flex; align-items: center; @@ -237,7 +237,7 @@ font-size: 16px; font-family: PingFang SC; font-weight: 400; - color: #ccf1ff; + color: #b8ecff; line-height: 22px; margin: 5px; width: 330px; @@ -273,7 +273,7 @@ font-size: 14px; font-weight: 400; line-height: 20px; - color: #00d1ff; + color: #b8ecff; } .contentName1 { margin: 3px; @@ -281,14 +281,14 @@ font-size: 14px; font-weight: 400; line-height: 20px; - color: #00d1ff; + color: #b8ecff; } .contentValue { margin: 3px; width: 100px; font-size: 14px; font-weight: 400; - color: #00d1ff; + color: #b8ecff; word-wrap: break-word; } } diff --git a/src/views/sponeScreen/gisMF/legendKF.vue b/src/views/sponeScreen/gisMF/legendKF.vue index 00c3118..9f2b8e0 100644 --- a/src/views/sponeScreen/gisMF/legendKF.vue +++ b/src/views/sponeScreen/gisMF/legendKF.vue @@ -126,9 +126,9 @@ if (item.type == 'polygon') { newfiberVectorLayer.addGeojsonPolygon(newfiberMap, item.data, item.layername); } - if (item.type == 'point') { - newfiberVectorLayer.addGeojsonPoint(newfiberMap, item.data, item.url, item.layername); - } + // if (item.type == 'point') { + // newfiberVectorLayer.addGeojsonPoint(newfiberMap, item.data, item.url, item.layername); + // } if (item.type == 'areaWall') { newfiberVectorLayer.addGeojsonWall(newfiberMap, item.data, item.layername); } @@ -140,11 +140,11 @@ newfiberVectorLayer.setDynamicWaterVisible(item.isCheck); } } - // if (item.type == '3dModel') { - // item.data.forEach((url, index) => { - // newfiberVectorLayer.add3DModelLayers(newfiberMap, url, item.layername + index); - // }); - // } + if (item.type == '3dModel') { + item.data.forEach((url, index) => { + newfiberVectorLayer.add3DModelLayers(newfiberMap, url, item.layername + index); + }); + } if (item.type == 'point') { newfiberVectorLayer.addGeojsonPoint(newfiberMap, item.data, getImageUrl(item.url, 'cesiumMap/legendIcon'), item.layername); if (item.dataArea) { @@ -180,11 +180,11 @@ if (item.layername == 'dynamicWater') { newfiberVectorLayer.setDynamicWaterVisible(item.isCheck); } - // if (item.type == '3dModel') { - // item.data.forEach((url, index) => { - // newfiberVectorLayer.set3DModelVisible(item.layername + index, item.isCheck); - // }); - // } + if (item.type == '3dModel') { + item.data.forEach((url, index) => { + newfiberVectorLayer.set3DModelVisible(item.layername + index, item.isCheck); + }); + } newfiberMap.removeByIds([item.layername]); if (rainDataTimer.value) { clearInterval(rainDataTimer.value); diff --git a/src/views/sponeScreen/gisMF/newfiberVectorLayer.js b/src/views/sponeScreen/gisMF/newfiberVectorLayer.js index 2a5f6a2..0115a63 100644 --- a/src/views/sponeScreen/gisMF/newfiberVectorLayer.js +++ b/src/views/sponeScreen/gisMF/newfiberVectorLayer.js @@ -13,7 +13,6 @@ width: 30, height: 30, pixelOffset: [0, 0], - distanceDisplayCondition: [Number.MIN_VALUE, 7000000], }, name: feature.properties.name || @@ -24,7 +23,7 @@ id: newfiberId, labelOptions: { font: '16px PingFang SC', - color: 'rgba(197, 234, 255, 1)', + color: 'rgba(16, 117, 224, 1)', pixelOffset: [0, 0], backgroundColor: 'rgba(0,0,0,1)', showBackground: false, @@ -56,6 +55,7 @@ // outlineColorBottom: !!feature.properties.outcolor ? feature.properties.outcolor : 'rgba(189,127,171,0.75)', // outlineWidthBottom: 2, }, + name: feature.properties.name != ' ' ? feature.properties.name : null, id: newfiberId, labelOptions: { @@ -78,6 +78,7 @@ newfiberMap.geojsonToMap(geojson); } } + //添加发光线 static addLightenLine(geojson, newfiberId) { let width = 10;