diff --git a/public/config/mars3dConfig.json b/public/config/mars3dConfig.json index 498d918..9b96e4e 100644 --- a/public/config/mars3dConfig.json +++ b/public/config/mars3dConfig.json @@ -1,7 +1,7 @@ { "scene": { "center": { - "lat": "25.675", "lng": "114.875", "alt": 10000, "heading": 360, "pitch": -45 + "lat": "36.48", "lng": "117.48", "alt": 20000, "heading": 360, "pitch": -45 }, "requestRenderMode": true, "showSun": false, diff --git a/public/config/mars3dConfig.json b/public/config/mars3dConfig.json index 498d918..9b96e4e 100644 --- a/public/config/mars3dConfig.json +++ b/public/config/mars3dConfig.json @@ -1,7 +1,7 @@ { "scene": { "center": { - "lat": "25.675", "lng": "114.875", "alt": 10000, "heading": 360, "pitch": -45 + "lat": "36.48", "lng": "117.48", "alt": 20000, "heading": 360, "pitch": -45 }, "requestRenderMode": true, "showSun": false, diff --git a/public/config/mars3dConfigzq.json b/public/config/mars3dConfigzq.json index 7752593..9b96e4e 100644 --- a/public/config/mars3dConfigzq.json +++ b/public/config/mars3dConfigzq.json @@ -60,25 +60,5 @@ "key": ["216ee92889e17ab1b083fae665d522b8"], "show": true } - ], - "layers": [ - { - "type": "geojson", - "id": "building", - "url": "http://111.198.10.15:11404/3d/zqBuilding.json", - "symbol": { - "type": "polygonP", - "styleOptions": { - "color": "rgb(52,125,246)", - "outline": false, - "opacity": 0.8 - } - }, - "buildings": { - "height": 100 - }, - "popup": "{name}", - "show": true - } ] } diff --git a/public/config/mars3dConfig.json b/public/config/mars3dConfig.json index 498d918..9b96e4e 100644 --- a/public/config/mars3dConfig.json +++ b/public/config/mars3dConfig.json @@ -1,7 +1,7 @@ { "scene": { "center": { - "lat": "25.675", "lng": "114.875", "alt": 10000, "heading": 360, "pitch": -45 + "lat": "36.48", "lng": "117.48", "alt": 20000, "heading": 360, "pitch": -45 }, "requestRenderMode": true, "showSun": false, diff --git a/public/config/mars3dConfigzq.json b/public/config/mars3dConfigzq.json index 7752593..9b96e4e 100644 --- a/public/config/mars3dConfigzq.json +++ b/public/config/mars3dConfigzq.json @@ -60,25 +60,5 @@ "key": ["216ee92889e17ab1b083fae665d522b8"], "show": true } - ], - "layers": [ - { - "type": "geojson", - "id": "building", - "url": "http://111.198.10.15:11404/3d/zqBuilding.json", - "symbol": { - "type": "polygonP", - "styleOptions": { - "color": "rgb(52,125,246)", - "outline": false, - "opacity": 0.8 - } - }, - "buildings": { - "height": 100 - }, - "popup": "{name}", - "show": true - } ] } diff --git a/public/config/project.config.json b/public/config/project.config.json index 7c4ca91..4021326 100644 --- a/public/config/project.config.json +++ b/public/config/project.config.json @@ -2,8 +2,8 @@ "title": "管网运行监测系统", "subtitle": "", "theme":"blue", - "baseUrl": "http://11.100.6.182:5001/", - "wsUrl": "ws://11.100.6.182:5001/websocket/", + "baseUrl": "http://60.208.121.150:5001/", + "wsUrl": "ws://60.208.121.150:5001/websocket/", "mainPage": "http://111.198.10.15:11404/dcms/#", "amapSecurityCode": "182a2c5889f7fe6d90546d9b8f4781ad", "amapKey": "1733551f35b56f6d8e9c0a9d4c2523b", @@ -17,5 +17,5 @@ "provinceCode":"360000", "cityCode":"361000", "areaCode":"361024", - "arcgisUrl": "http://111.198.10.15:13002/arcgis/rest/services/gztest/MapServer/" + "arcgisUrl": "http://111.198.10.15:13002/arcgis/rest/services/zq_publish/MapServer/" } diff --git a/public/config/mars3dConfig.json b/public/config/mars3dConfig.json index 498d918..9b96e4e 100644 --- a/public/config/mars3dConfig.json +++ b/public/config/mars3dConfig.json @@ -1,7 +1,7 @@ { "scene": { "center": { - "lat": "25.675", "lng": "114.875", "alt": 10000, "heading": 360, "pitch": -45 + "lat": "36.48", "lng": "117.48", "alt": 20000, "heading": 360, "pitch": -45 }, "requestRenderMode": true, "showSun": false, diff --git a/public/config/mars3dConfigzq.json b/public/config/mars3dConfigzq.json index 7752593..9b96e4e 100644 --- a/public/config/mars3dConfigzq.json +++ b/public/config/mars3dConfigzq.json @@ -60,25 +60,5 @@ "key": ["216ee92889e17ab1b083fae665d522b8"], "show": true } - ], - "layers": [ - { - "type": "geojson", - "id": "building", - "url": "http://111.198.10.15:11404/3d/zqBuilding.json", - "symbol": { - "type": "polygonP", - "styleOptions": { - "color": "rgb(52,125,246)", - "outline": false, - "opacity": 0.8 - } - }, - "buildings": { - "height": 100 - }, - "popup": "{name}", - "show": true - } ] } diff --git a/public/config/project.config.json b/public/config/project.config.json index 7c4ca91..4021326 100644 --- a/public/config/project.config.json +++ b/public/config/project.config.json @@ -2,8 +2,8 @@ "title": "管网运行监测系统", "subtitle": "", "theme":"blue", - "baseUrl": "http://11.100.6.182:5001/", - "wsUrl": "ws://11.100.6.182:5001/websocket/", + "baseUrl": "http://60.208.121.150:5001/", + "wsUrl": "ws://60.208.121.150:5001/websocket/", "mainPage": "http://111.198.10.15:11404/dcms/#", "amapSecurityCode": "182a2c5889f7fe6d90546d9b8f4781ad", "amapKey": "1733551f35b56f6d8e9c0a9d4c2523b", @@ -17,5 +17,5 @@ "provinceCode":"360000", "cityCode":"361000", "areaCode":"361024", - "arcgisUrl": "http://111.198.10.15:13002/arcgis/rest/services/gztest/MapServer/" + "arcgisUrl": "http://111.198.10.15:13002/arcgis/rest/services/zq_publish/MapServer/" } diff --git "a/public/static/images/\346\277\200\345\205\211\351\201\245\346\265\213\344\272\221\345\217\260.png" "b/public/static/images/\346\277\200\345\205\211\351\201\245\346\265\213\344\272\221\345\217\260.png" new file mode 100644 index 0000000..c429ac9 --- /dev/null +++ "b/public/static/images/\346\277\200\345\205\211\351\201\245\346\265\213\344\272\221\345\217\260.png" Binary files differ diff --git a/public/config/mars3dConfig.json b/public/config/mars3dConfig.json index 498d918..9b96e4e 100644 --- a/public/config/mars3dConfig.json +++ b/public/config/mars3dConfig.json @@ -1,7 +1,7 @@ { "scene": { "center": { - "lat": "25.675", "lng": "114.875", "alt": 10000, "heading": 360, "pitch": -45 + "lat": "36.48", "lng": "117.48", "alt": 20000, "heading": 360, "pitch": -45 }, "requestRenderMode": true, "showSun": false, diff --git a/public/config/mars3dConfigzq.json b/public/config/mars3dConfigzq.json index 7752593..9b96e4e 100644 --- a/public/config/mars3dConfigzq.json +++ b/public/config/mars3dConfigzq.json @@ -60,25 +60,5 @@ "key": ["216ee92889e17ab1b083fae665d522b8"], "show": true } - ], - "layers": [ - { - "type": "geojson", - "id": "building", - "url": "http://111.198.10.15:11404/3d/zqBuilding.json", - "symbol": { - "type": "polygonP", - "styleOptions": { - "color": "rgb(52,125,246)", - "outline": false, - "opacity": 0.8 - } - }, - "buildings": { - "height": 100 - }, - "popup": "{name}", - "show": true - } ] } diff --git a/public/config/project.config.json b/public/config/project.config.json index 7c4ca91..4021326 100644 --- a/public/config/project.config.json +++ b/public/config/project.config.json @@ -2,8 +2,8 @@ "title": "管网运行监测系统", "subtitle": "", "theme":"blue", - "baseUrl": "http://11.100.6.182:5001/", - "wsUrl": "ws://11.100.6.182:5001/websocket/", + "baseUrl": "http://60.208.121.150:5001/", + "wsUrl": "ws://60.208.121.150:5001/websocket/", "mainPage": "http://111.198.10.15:11404/dcms/#", "amapSecurityCode": "182a2c5889f7fe6d90546d9b8f4781ad", "amapKey": "1733551f35b56f6d8e9c0a9d4c2523b", @@ -17,5 +17,5 @@ "provinceCode":"360000", "cityCode":"361000", "areaCode":"361024", - "arcgisUrl": "http://111.198.10.15:13002/arcgis/rest/services/gztest/MapServer/" + "arcgisUrl": "http://111.198.10.15:13002/arcgis/rest/services/zq_publish/MapServer/" } diff --git "a/public/static/images/\346\277\200\345\205\211\351\201\245\346\265\213\344\272\221\345\217\260.png" "b/public/static/images/\346\277\200\345\205\211\351\201\245\346\265\213\344\272\221\345\217\260.png" new file mode 100644 index 0000000..c429ac9 --- /dev/null +++ "b/public/static/images/\346\277\200\345\205\211\351\201\245\346\265\213\344\272\221\345\217\260.png" Binary files differ diff --git "a/public/static/images/\347\207\203\346\260\224\346\231\272\350\203\275\347\233\221\346\265\213\344\272\221\345\217\260.png" "b/public/static/images/\347\207\203\346\260\224\346\231\272\350\203\275\347\233\221\346\265\213\344\272\221\345\217\260.png" deleted file mode 100644 index c429ac9..0000000 --- "a/public/static/images/\347\207\203\346\260\224\346\231\272\350\203\275\347\233\221\346\265\213\344\272\221\345\217\260.png" +++ /dev/null Binary files differ diff --git a/public/config/mars3dConfig.json b/public/config/mars3dConfig.json index 498d918..9b96e4e 100644 --- a/public/config/mars3dConfig.json +++ b/public/config/mars3dConfig.json @@ -1,7 +1,7 @@ { "scene": { "center": { - "lat": "25.675", "lng": "114.875", "alt": 10000, "heading": 360, "pitch": -45 + "lat": "36.48", "lng": "117.48", "alt": 20000, "heading": 360, "pitch": -45 }, "requestRenderMode": true, "showSun": false, diff --git a/public/config/mars3dConfigzq.json b/public/config/mars3dConfigzq.json index 7752593..9b96e4e 100644 --- a/public/config/mars3dConfigzq.json +++ b/public/config/mars3dConfigzq.json @@ -60,25 +60,5 @@ "key": ["216ee92889e17ab1b083fae665d522b8"], "show": true } - ], - "layers": [ - { - "type": "geojson", - "id": "building", - "url": "http://111.198.10.15:11404/3d/zqBuilding.json", - "symbol": { - "type": "polygonP", - "styleOptions": { - "color": "rgb(52,125,246)", - "outline": false, - "opacity": 0.8 - } - }, - "buildings": { - "height": 100 - }, - "popup": "{name}", - "show": true - } ] } diff --git a/public/config/project.config.json b/public/config/project.config.json index 7c4ca91..4021326 100644 --- a/public/config/project.config.json +++ b/public/config/project.config.json @@ -2,8 +2,8 @@ "title": "管网运行监测系统", "subtitle": "", "theme":"blue", - "baseUrl": "http://11.100.6.182:5001/", - "wsUrl": "ws://11.100.6.182:5001/websocket/", + "baseUrl": "http://60.208.121.150:5001/", + "wsUrl": "ws://60.208.121.150:5001/websocket/", "mainPage": "http://111.198.10.15:11404/dcms/#", "amapSecurityCode": "182a2c5889f7fe6d90546d9b8f4781ad", "amapKey": "1733551f35b56f6d8e9c0a9d4c2523b", @@ -17,5 +17,5 @@ "provinceCode":"360000", "cityCode":"361000", "areaCode":"361024", - "arcgisUrl": "http://111.198.10.15:13002/arcgis/rest/services/gztest/MapServer/" + "arcgisUrl": "http://111.198.10.15:13002/arcgis/rest/services/zq_publish/MapServer/" } diff --git "a/public/static/images/\346\277\200\345\205\211\351\201\245\346\265\213\344\272\221\345\217\260.png" "b/public/static/images/\346\277\200\345\205\211\351\201\245\346\265\213\344\272\221\345\217\260.png" new file mode 100644 index 0000000..c429ac9 --- /dev/null +++ "b/public/static/images/\346\277\200\345\205\211\351\201\245\346\265\213\344\272\221\345\217\260.png" Binary files differ diff --git "a/public/static/images/\347\207\203\346\260\224\346\231\272\350\203\275\347\233\221\346\265\213\344\272\221\345\217\260.png" "b/public/static/images/\347\207\203\346\260\224\346\231\272\350\203\275\347\233\221\346\265\213\344\272\221\345\217\260.png" deleted file mode 100644 index c429ac9..0000000 --- "a/public/static/images/\347\207\203\346\260\224\346\231\272\350\203\275\347\233\221\346\265\213\344\272\221\345\217\260.png" +++ /dev/null Binary files differ diff --git a/src/views/overview/overview3dzq.vue b/src/views/overview/overview3dzq.vue index d458e68..109c66d 100644 --- a/src/views/overview/overview3dzq.vue +++ b/src/views/overview/overview3dzq.vue @@ -70,8 +70,8 @@ components: { Mars3dMap, MapSearchComp, PopupLocation, PopupDataFilter, ToolBox, AlarmList }, data() { return { - layerName: ['燃气阀门井', '燃气调压箱', '中燃燃气标识器', '圣井燃气标识器', '正和燃气标识器', '华润燃气标识器', '华气燃气标识器', '井盖状态监测仪', '管盯', '燃气智能监测终端', '燃气智能监测云台', '燃气管线'], - labelName: ['燃气管线', '燃气阀门井', '燃气调压箱', '中燃-圣井-正和-华润-华气标识器', '井盖状态监测仪', '管盯', '燃气智能监测终端', '燃气智能监测云台'], + layerName: ['燃气阀门井', '燃气调压箱', '中燃燃气标识器', '圣井燃气标识器', '正和燃气标识器', '华润燃气标识器', '华气燃气标识器', '井盖状态监测仪', '管盯', '燃气智能监测终端', '激光遥测云台', '燃气管线'], + labelName: ['燃气管线', '燃气阀门井', '燃气调压箱', '中燃-圣井-正和-华润-华气标识器', '井盖状态监测仪', '管盯', '燃气智能监测终端', '激光遥测云台'], basemap: 1112, baseLayer: 'dark', // 底图图层 layers: [{ id: 'well', name: '井图层', children: [] }, { id: 'line', name: '管线图层', children: [] }, { id: 'dev', name: '设备图层', children: [] }, { id: 'alarm', name: '报警图层' }], // 图层列表 @@ -130,7 +130,7 @@ // layer.alpha = val / 100 // 我们可以设置为0 // }) window.map.basemap.opacity = val / 100 - window.map.getLayer('building', 'name').show = val / 100 > 0.5 + // window.map.getLayer('building', 'name').show = val / 100 > 0.5 if (window.map.level >= 19 && this.alpha < 90) { // 展示该展示的 rqwell_layer['3D'].show = this.checkedLayer.indexOf('well-燃气阀门井') !== -1