diff --git a/index.html b/index.html index 3560ea9..5596916 100644 --- a/index.html +++ b/index.html @@ -1,258 +1,257 @@ - - - - - - - - 开封市海绵城市信息管理系统建设项目 - - + - - - - - - + + + + + + - - - + + + - - - - + + + + - - + - .loaded #loader-wrapper .loader-section.section-right { - -webkit-transform: translateX(100%); - -ms-transform: translateX(100%); - transform: translateX(100%); - -webkit-transition: all 0.7s 0.3s cubic-bezier(0.645, 0.045, 0.355, 1); - transition: all 0.7s 0.3s cubic-bezier(0.645, 0.045, 0.355, 1); - } - - .loaded #loader { - opacity: 0; - -webkit-transition: all 0.3s ease-out; - transition: all 0.3s ease-out; - } - - .loaded #loader-wrapper { - visibility: hidden; - -webkit-transform: translateY(-100%); - -ms-transform: translateY(-100%); - transform: translateY(-100%); - -webkit-transition: all 0.3s 1s ease-out; - transition: all 0.3s 1s ease-out; - } - - .no-js #loader-wrapper { - display: none; - } - - .no-js h1, - .class2 { - color: #222222; - } - - #loader-wrapper .load_title { - font-family: 'Open Sans'; - color: #fff; - font-size: 0.8rem; - width: 100%; - text-align: center; - z-index: 9999999999999; - position: absolute; - top: 60%; - opacity: 1; - line-height: 30px; - } - - #loader-wrapper .load_title span { - font-weight: normal; - font-style: italic; - font-size: 1rem; - color: #fff; - opacity: 0.5; - } - - - - -
-
-
-
-
-
正在加载系统资源，请耐心等待
-
+ +
+
+
+
+
+
正在加载系统资源，请耐心等待
- - +
+ + + - + - + \ No newline at end of file diff --git a/index.html b/index.html index 3560ea9..5596916 100644 --- a/index.html +++ b/index.html @@ -1,258 +1,257 @@ - - - - - - - - 开封市海绵城市信息管理系统建设项目 - - + - - - - - - + + + + + + - - - + + + - - - - + + + + - - + - .loaded #loader-wrapper .loader-section.section-right { - -webkit-transform: translateX(100%); - -ms-transform: translateX(100%); - transform: translateX(100%); - -webkit-transition: all 0.7s 0.3s cubic-bezier(0.645, 0.045, 0.355, 1); - transition: all 0.7s 0.3s cubic-bezier(0.645, 0.045, 0.355, 1); - } - - .loaded #loader { - opacity: 0; - -webkit-transition: all 0.3s ease-out; - transition: all 0.3s ease-out; - } - - .loaded #loader-wrapper { - visibility: hidden; - -webkit-transform: translateY(-100%); - -ms-transform: translateY(-100%); - transform: translateY(-100%); - -webkit-transition: all 0.3s 1s ease-out; - transition: all 0.3s 1s ease-out; - } - - .no-js #loader-wrapper { - display: none; - } - - .no-js h1, - .class2 { - color: #222222; - } - - #loader-wrapper .load_title { - font-family: 'Open Sans'; - color: #fff; - font-size: 0.8rem; - width: 100%; - text-align: center; - z-index: 9999999999999; - position: absolute; - top: 60%; - opacity: 1; - line-height: 30px; - } - - #loader-wrapper .load_title span { - font-weight: normal; - font-style: italic; - font-size: 1rem; - color: #fff; - opacity: 0.5; - } - - - - -
-
-
-
-
-
正在加载系统资源，请耐心等待
-
+ +
+
+
+
+
+
正在加载系统资源，请耐心等待
- - +
+ + + - + - + \ No newline at end of file diff --git a/src/views/sponeScreen/gisMF/cesiumMapLegend.js b/src/views/sponeScreen/gisMF/cesiumMapLegend.js index 737e566..10e9ba4 100644 --- a/src/views/sponeScreen/gisMF/cesiumMapLegend.js +++ b/src/views/sponeScreen/gisMF/cesiumMapLegend.js @@ -37,7 +37,8 @@ name: '三维建筑', url: 'building_icon.png', layername: 'buildingModel', - type: '3dTileset', + type: '3dModel', + data: ['https://server1.wh-nf.cn:9000/newfiber-standard-kaifeng/2024/06/24/kaifengBuilding/kaifengBuilding/kaifengBuilding.scp'], }, ], [ @@ -129,7 +130,11 @@ name: '雨水管网', layername: 'rainLine', url: 'rainLine_icon.png', //图层+json √ - type: 'mapServer', + 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', + ], }, { isCheck: false, @@ -148,7 +153,11 @@ name: '污水管网', layername: 'sewageLine', url: 'sewageLine_icon.png', //服务 √ - type: 'mapServer', + 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, @@ -167,7 +176,11 @@ name: '合流管网', layername: 'combineLine', url: 'combineLine_icon.png', //服务 √ - type: 'mapServer', + 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, diff --git a/index.html b/index.html index 3560ea9..5596916 100644 --- a/index.html +++ b/index.html @@ -1,258 +1,257 @@ - - - - - - - - 开封市海绵城市信息管理系统建设项目 - - + - - - - - - + + + + + + - - - + + + - - - - + + + + - - + - .loaded #loader-wrapper .loader-section.section-right { - -webkit-transform: translateX(100%); - -ms-transform: translateX(100%); - transform: translateX(100%); - -webkit-transition: all 0.7s 0.3s cubic-bezier(0.645, 0.045, 0.355, 1); - transition: all 0.7s 0.3s cubic-bezier(0.645, 0.045, 0.355, 1); - } - - .loaded #loader { - opacity: 0; - -webkit-transition: all 0.3s ease-out; - transition: all 0.3s ease-out; - } - - .loaded #loader-wrapper { - visibility: hidden; - -webkit-transform: translateY(-100%); - -ms-transform: translateY(-100%); - transform: translateY(-100%); - -webkit-transition: all 0.3s 1s ease-out; - transition: all 0.3s 1s ease-out; - } - - .no-js #loader-wrapper { - display: none; - } - - .no-js h1, - .class2 { - color: #222222; - } - - #loader-wrapper .load_title { - font-family: 'Open Sans'; - color: #fff; - font-size: 0.8rem; - width: 100%; - text-align: center; - z-index: 9999999999999; - position: absolute; - top: 60%; - opacity: 1; - line-height: 30px; - } - - #loader-wrapper .load_title span { - font-weight: normal; - font-style: italic; - font-size: 1rem; - color: #fff; - opacity: 0.5; - } - - - - -
-
-
-
-
-
正在加载系统资源，请耐心等待
-
+ +
+
+
+
+
+
正在加载系统资源，请耐心等待
- - +
+ + + - + - + \ No newline at end of file diff --git a/src/views/sponeScreen/gisMF/cesiumMapLegend.js b/src/views/sponeScreen/gisMF/cesiumMapLegend.js index 737e566..10e9ba4 100644 --- a/src/views/sponeScreen/gisMF/cesiumMapLegend.js +++ b/src/views/sponeScreen/gisMF/cesiumMapLegend.js @@ -37,7 +37,8 @@ name: '三维建筑', url: 'building_icon.png', layername: 'buildingModel', - type: '3dTileset', + type: '3dModel', + data: ['https://server1.wh-nf.cn:9000/newfiber-standard-kaifeng/2024/06/24/kaifengBuilding/kaifengBuilding/kaifengBuilding.scp'], }, ], [ @@ -129,7 +130,11 @@ name: '雨水管网', layername: 'rainLine', url: 'rainLine_icon.png', //图层+json √ - type: 'mapServer', + 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', + ], }, { isCheck: false, @@ -148,7 +153,11 @@ name: '污水管网', layername: 'sewageLine', url: 'sewageLine_icon.png', //服务 √ - type: 'mapServer', + 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, @@ -167,7 +176,11 @@ name: '合流管网', layername: 'combineLine', url: 'combineLine_icon.png', //服务 √ - type: 'mapServer', + 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, diff --git a/src/views/sponeScreen/gisMF/legendKF.vue b/src/views/sponeScreen/gisMF/legendKF.vue index bfaa987..4dc9f72 100644 --- a/src/views/sponeScreen/gisMF/legendKF.vue +++ b/src/views/sponeScreen/gisMF/legendKF.vue @@ -132,6 +132,11 @@ newfiberVectorLayer.setDynamicWaterVisible(item.isCheck); } } + if (item.type == '3dModel') { + item.data.forEach(element => { + newfiberVectorLayer.add3DModelLayers(newfiberMap, url, item.layername); + }); + } } if (!item.isCheck) { if (item.layername == 'topography') { @@ -140,6 +145,9 @@ if (item.layername == 'dynamicWater') { newfiberVectorLayer.setDynamicWaterVisible(item.isCheck); } + if (item.type == '3dModel') { + newfiberVectorLayer.set3DModelVisible(item.layername, item.isCheck); + } newfiberMap.removeByIds([item.layername]); } }; diff --git a/index.html b/index.html index 3560ea9..5596916 100644 --- a/index.html +++ b/index.html @@ -1,258 +1,257 @@ - - - - - - - - 开封市海绵城市信息管理系统建设项目 - - + - - - - - - + + + + + + - - - + + + - - - - + + + + - - + - .loaded #loader-wrapper .loader-section.section-right { - -webkit-transform: translateX(100%); - -ms-transform: translateX(100%); - transform: translateX(100%); - -webkit-transition: all 0.7s 0.3s cubic-bezier(0.645, 0.045, 0.355, 1); - transition: all 0.7s 0.3s cubic-bezier(0.645, 0.045, 0.355, 1); - } - - .loaded #loader { - opacity: 0; - -webkit-transition: all 0.3s ease-out; - transition: all 0.3s ease-out; - } - - .loaded #loader-wrapper { - visibility: hidden; - -webkit-transform: translateY(-100%); - -ms-transform: translateY(-100%); - transform: translateY(-100%); - -webkit-transition: all 0.3s 1s ease-out; - transition: all 0.3s 1s ease-out; - } - - .no-js #loader-wrapper { - display: none; - } - - .no-js h1, - .class2 { - color: #222222; - } - - #loader-wrapper .load_title { - font-family: 'Open Sans'; - color: #fff; - font-size: 0.8rem; - width: 100%; - text-align: center; - z-index: 9999999999999; - position: absolute; - top: 60%; - opacity: 1; - line-height: 30px; - } - - #loader-wrapper .load_title span { - font-weight: normal; - font-style: italic; - font-size: 1rem; - color: #fff; - opacity: 0.5; - } - - - - -
-
-
-
-
-
正在加载系统资源，请耐心等待
-
+ +
+
+
+
+
+
正在加载系统资源，请耐心等待
- - +
+ + + - + - + \ No newline at end of file diff --git a/src/views/sponeScreen/gisMF/cesiumMapLegend.js b/src/views/sponeScreen/gisMF/cesiumMapLegend.js index 737e566..10e9ba4 100644 --- a/src/views/sponeScreen/gisMF/cesiumMapLegend.js +++ b/src/views/sponeScreen/gisMF/cesiumMapLegend.js @@ -37,7 +37,8 @@ name: '三维建筑', url: 'building_icon.png', layername: 'buildingModel', - type: '3dTileset', + type: '3dModel', + data: ['https://server1.wh-nf.cn:9000/newfiber-standard-kaifeng/2024/06/24/kaifengBuilding/kaifengBuilding/kaifengBuilding.scp'], }, ], [ @@ -129,7 +130,11 @@ name: '雨水管网', layername: 'rainLine', url: 'rainLine_icon.png', //图层+json √ - type: 'mapServer', + 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', + ], }, { isCheck: false, @@ -148,7 +153,11 @@ name: '污水管网', layername: 'sewageLine', url: 'sewageLine_icon.png', //服务 √ - type: 'mapServer', + 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, @@ -167,7 +176,11 @@ name: '合流管网', layername: 'combineLine', url: 'combineLine_icon.png', //服务 √ - type: 'mapServer', + 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, diff --git a/src/views/sponeScreen/gisMF/legendKF.vue b/src/views/sponeScreen/gisMF/legendKF.vue index bfaa987..4dc9f72 100644 --- a/src/views/sponeScreen/gisMF/legendKF.vue +++ b/src/views/sponeScreen/gisMF/legendKF.vue @@ -132,6 +132,11 @@ newfiberVectorLayer.setDynamicWaterVisible(item.isCheck); } } + if (item.type == '3dModel') { + item.data.forEach(element => { + newfiberVectorLayer.add3DModelLayers(newfiberMap, url, item.layername); + }); + } } if (!item.isCheck) { if (item.layername == 'topography') { @@ -140,6 +145,9 @@ if (item.layername == 'dynamicWater') { newfiberVectorLayer.setDynamicWaterVisible(item.isCheck); } + if (item.type == '3dModel') { + newfiberVectorLayer.set3DModelVisible(item.layername, item.isCheck); + } newfiberMap.removeByIds([item.layername]); } }; diff --git a/src/views/sponeScreen/gisMF/newfiberVectorLayer.js b/src/views/sponeScreen/gisMF/newfiberVectorLayer.js index 67e991a..1ba4bfa 100644 --- a/src/views/sponeScreen/gisMF/newfiberVectorLayer.js +++ b/src/views/sponeScreen/gisMF/newfiberVectorLayer.js @@ -66,4 +66,25 @@ feature.show = visible; }); } + //添加三维模型 + static add3DModelLayers(newfiberMap, url, newfiberId) { + let modelList = newfiberMap.getMap().scene.primitives._primitives.filter(i => i.newfiberId == newfiberId); + if (!modelList.length) { + let models = new SuperMap3D.S3MTilesLayer({ + context: newfiberMap.getMap().scene.context, + url: url, + }); + models.newfiberId = newfiberId; + newfiberMap.getMap().scene.primitives.add(models); + } else { + newfiberVectorLayer.set3DModelVisible(newfiberId, true); + } + } + //隐藏三维模型 + static set3DModelVisible(newfiberId, visible) { + let models = newfiberMap.getMap().scene.primitives._primitives.filter(i => i.newfiberId == newfiberId); + models.map(feature => { + feature.show = visible; + }); + } }