diff --git a/public/config/mars3dConfig.json b/public/config/mars3dConfig.json index 498d918..7752593 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, @@ -60,5 +60,25 @@ "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..7752593 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, @@ -60,5 +60,25 @@ "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/mars3dConfiggz.json b/public/config/mars3dConfiggz.json new file mode 100644 index 0000000..498d918 --- /dev/null +++ b/public/config/mars3dConfiggz.json @@ -0,0 +1,64 @@ +{ + "scene": { + "center": { + "lat": "25.675", "lng": "114.875", "alt": 10000, "heading": 360, "pitch": -45 + }, + "requestRenderMode": true, + "showSun": false, + "showSkyAtmosphere": false, + "fog": true, + "fxaa": true, + "globe": { + "depthTestAgainstTerrain": true, + "baseColor": "#1A2126", + "showGroundAtmosphere": false, + "enableLighting": false + }, + "control": { + "infoBox": true + }, + "cameraController": { + "zoomFactor": 3.0, + "minimumZoomDistance": 1, + "maximumZoomDistance": 500000.0, + "enableRotate": true, + "enableTranslate": true, + "enableTilt": true, + "enableZoom": true, + "enableCollisionDetection": false + } + }, + "basemaps": [ + { + "pid": 10, + "id": 1112, + "name": "天地图", + "type": "group", + "layers": [ + { "name": "注记", "type": "tdt", "layer": "ter_z", "key": ["216ee92889e17ab1b083fae665d522b8"] }, + { "name": "注记", "type": "tdt", "layer": "img_z", "key": ["216ee92889e17ab1b083fae665d522b8"] } + ] + }, + { + "id": 1111, + "pid": 10, + "name": "天地图电子", + "icon": "http://mars3d.cn/example/img/basemaps/tdt_vec.png", + "type": "group", + "layers": [ + { "name": "底图", "type": "tdt", "layer": "vec_d", "key": ["216ee92889e17ab1b083fae665d522b8"] }, + { "name": "注记", "type": "tdt", "layer": "vec_z", "key": ["216ee92889e17ab1b083fae665d522b8"] } + ] + }, + { + "id": 1113, + "pid": 10, + "name": "天地图影像", + "icon": "http://mars3d.cn/example/img/basemaps/tdt_img.png", + "type": "tdt", + "layer": "img_d", + "key": ["216ee92889e17ab1b083fae665d522b8"], + "show": true + } + ] +} diff --git a/public/config/mars3dConfig.json b/public/config/mars3dConfig.json index 498d918..7752593 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, @@ -60,5 +60,25 @@ "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/mars3dConfiggz.json b/public/config/mars3dConfiggz.json new file mode 100644 index 0000000..498d918 --- /dev/null +++ b/public/config/mars3dConfiggz.json @@ -0,0 +1,64 @@ +{ + "scene": { + "center": { + "lat": "25.675", "lng": "114.875", "alt": 10000, "heading": 360, "pitch": -45 + }, + "requestRenderMode": true, + "showSun": false, + "showSkyAtmosphere": false, + "fog": true, + "fxaa": true, + "globe": { + "depthTestAgainstTerrain": true, + "baseColor": "#1A2126", + "showGroundAtmosphere": false, + "enableLighting": false + }, + "control": { + "infoBox": true + }, + "cameraController": { + "zoomFactor": 3.0, + "minimumZoomDistance": 1, + "maximumZoomDistance": 500000.0, + "enableRotate": true, + "enableTranslate": true, + "enableTilt": true, + "enableZoom": true, + "enableCollisionDetection": false + } + }, + "basemaps": [ + { + "pid": 10, + "id": 1112, + "name": "天地图", + "type": "group", + "layers": [ + { "name": "注记", "type": "tdt", "layer": "ter_z", "key": ["216ee92889e17ab1b083fae665d522b8"] }, + { "name": "注记", "type": "tdt", "layer": "img_z", "key": ["216ee92889e17ab1b083fae665d522b8"] } + ] + }, + { + "id": 1111, + "pid": 10, + "name": "天地图电子", + "icon": "http://mars3d.cn/example/img/basemaps/tdt_vec.png", + "type": "group", + "layers": [ + { "name": "底图", "type": "tdt", "layer": "vec_d", "key": ["216ee92889e17ab1b083fae665d522b8"] }, + { "name": "注记", "type": "tdt", "layer": "vec_z", "key": ["216ee92889e17ab1b083fae665d522b8"] } + ] + }, + { + "id": 1113, + "pid": 10, + "name": "天地图影像", + "icon": "http://mars3d.cn/example/img/basemaps/tdt_img.png", + "type": "tdt", + "layer": "img_d", + "key": ["216ee92889e17ab1b083fae665d522b8"], + "show": true + } + ] +} diff --git a/public/config/project.config.json b/public/config/project.config.json index a9cb472..3c61685 100644 --- a/public/config/project.config.json +++ b/public/config/project.config.json @@ -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_GxData0825/MapServer/" } diff --git a/public/config/mars3dConfig.json b/public/config/mars3dConfig.json index 498d918..7752593 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, @@ -60,5 +60,25 @@ "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/mars3dConfiggz.json b/public/config/mars3dConfiggz.json new file mode 100644 index 0000000..498d918 --- /dev/null +++ b/public/config/mars3dConfiggz.json @@ -0,0 +1,64 @@ +{ + "scene": { + "center": { + "lat": "25.675", "lng": "114.875", "alt": 10000, "heading": 360, "pitch": -45 + }, + "requestRenderMode": true, + "showSun": false, + "showSkyAtmosphere": false, + "fog": true, + "fxaa": true, + "globe": { + "depthTestAgainstTerrain": true, + "baseColor": "#1A2126", + "showGroundAtmosphere": false, + "enableLighting": false + }, + "control": { + "infoBox": true + }, + "cameraController": { + "zoomFactor": 3.0, + "minimumZoomDistance": 1, + "maximumZoomDistance": 500000.0, + "enableRotate": true, + "enableTranslate": true, + "enableTilt": true, + "enableZoom": true, + "enableCollisionDetection": false + } + }, + "basemaps": [ + { + "pid": 10, + "id": 1112, + "name": "天地图", + "type": "group", + "layers": [ + { "name": "注记", "type": "tdt", "layer": "ter_z", "key": ["216ee92889e17ab1b083fae665d522b8"] }, + { "name": "注记", "type": "tdt", "layer": "img_z", "key": ["216ee92889e17ab1b083fae665d522b8"] } + ] + }, + { + "id": 1111, + "pid": 10, + "name": "天地图电子", + "icon": "http://mars3d.cn/example/img/basemaps/tdt_vec.png", + "type": "group", + "layers": [ + { "name": "底图", "type": "tdt", "layer": "vec_d", "key": ["216ee92889e17ab1b083fae665d522b8"] }, + { "name": "注记", "type": "tdt", "layer": "vec_z", "key": ["216ee92889e17ab1b083fae665d522b8"] } + ] + }, + { + "id": 1113, + "pid": 10, + "name": "天地图影像", + "icon": "http://mars3d.cn/example/img/basemaps/tdt_img.png", + "type": "tdt", + "layer": "img_d", + "key": ["216ee92889e17ab1b083fae665d522b8"], + "show": true + } + ] +} diff --git a/public/config/project.config.json b/public/config/project.config.json index a9cb472..3c61685 100644 --- a/public/config/project.config.json +++ b/public/config/project.config.json @@ -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_GxData0825/MapServer/" } diff --git a/public/config/project.configgz.json b/public/config/project.configgz.json new file mode 100644 index 0000000..7c4ca91 --- /dev/null +++ b/public/config/project.configgz.json @@ -0,0 +1,21 @@ +{ + "title": "管网运行监测系统", + "subtitle": "", + "theme":"blue", + "baseUrl": "http://11.100.6.182:5001/", + "wsUrl": "ws://11.100.6.182:5001/websocket/", + "mainPage": "http://111.198.10.15:11404/dcms/#", + "amapSecurityCode": "182a2c5889f7fe6d90546d9b8f4781ad", + "amapKey": "1733551f35b56f6d8e9c0a9d4c2523b", + "mapType": "gaode", + "alarmSound": true, + "refreshTime": 60, + "singleSys": true, + "refreshType":"websocket", + "showPointType":"massMarkers", + "showAllWells": true, + "provinceCode":"360000", + "cityCode":"361000", + "areaCode":"361024", + "arcgisUrl": "http://111.198.10.15:13002/arcgis/rest/services/gztest/MapServer/" +} diff --git a/public/config/mars3dConfig.json b/public/config/mars3dConfig.json index 498d918..7752593 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, @@ -60,5 +60,25 @@ "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/mars3dConfiggz.json b/public/config/mars3dConfiggz.json new file mode 100644 index 0000000..498d918 --- /dev/null +++ b/public/config/mars3dConfiggz.json @@ -0,0 +1,64 @@ +{ + "scene": { + "center": { + "lat": "25.675", "lng": "114.875", "alt": 10000, "heading": 360, "pitch": -45 + }, + "requestRenderMode": true, + "showSun": false, + "showSkyAtmosphere": false, + "fog": true, + "fxaa": true, + "globe": { + "depthTestAgainstTerrain": true, + "baseColor": "#1A2126", + "showGroundAtmosphere": false, + "enableLighting": false + }, + "control": { + "infoBox": true + }, + "cameraController": { + "zoomFactor": 3.0, + "minimumZoomDistance": 1, + "maximumZoomDistance": 500000.0, + "enableRotate": true, + "enableTranslate": true, + "enableTilt": true, + "enableZoom": true, + "enableCollisionDetection": false + } + }, + "basemaps": [ + { + "pid": 10, + "id": 1112, + "name": "天地图", + "type": "group", + "layers": [ + { "name": "注记", "type": "tdt", "layer": "ter_z", "key": ["216ee92889e17ab1b083fae665d522b8"] }, + { "name": "注记", "type": "tdt", "layer": "img_z", "key": ["216ee92889e17ab1b083fae665d522b8"] } + ] + }, + { + "id": 1111, + "pid": 10, + "name": "天地图电子", + "icon": "http://mars3d.cn/example/img/basemaps/tdt_vec.png", + "type": "group", + "layers": [ + { "name": "底图", "type": "tdt", "layer": "vec_d", "key": ["216ee92889e17ab1b083fae665d522b8"] }, + { "name": "注记", "type": "tdt", "layer": "vec_z", "key": ["216ee92889e17ab1b083fae665d522b8"] } + ] + }, + { + "id": 1113, + "pid": 10, + "name": "天地图影像", + "icon": "http://mars3d.cn/example/img/basemaps/tdt_img.png", + "type": "tdt", + "layer": "img_d", + "key": ["216ee92889e17ab1b083fae665d522b8"], + "show": true + } + ] +} diff --git a/public/config/project.config.json b/public/config/project.config.json index a9cb472..3c61685 100644 --- a/public/config/project.config.json +++ b/public/config/project.config.json @@ -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_GxData0825/MapServer/" } diff --git a/public/config/project.configgz.json b/public/config/project.configgz.json new file mode 100644 index 0000000..7c4ca91 --- /dev/null +++ b/public/config/project.configgz.json @@ -0,0 +1,21 @@ +{ + "title": "管网运行监测系统", + "subtitle": "", + "theme":"blue", + "baseUrl": "http://11.100.6.182:5001/", + "wsUrl": "ws://11.100.6.182:5001/websocket/", + "mainPage": "http://111.198.10.15:11404/dcms/#", + "amapSecurityCode": "182a2c5889f7fe6d90546d9b8f4781ad", + "amapKey": "1733551f35b56f6d8e9c0a9d4c2523b", + "mapType": "gaode", + "alarmSound": true, + "refreshTime": 60, + "singleSys": true, + "refreshType":"websocket", + "showPointType":"massMarkers", + "showAllWells": true, + "provinceCode":"360000", + "cityCode":"361000", + "areaCode":"361024", + "arcgisUrl": "http://111.198.10.15:13002/arcgis/rest/services/gztest/MapServer/" +} diff --git a/src/router/modules/well.js b/src/router/modules/well.js index 17ed4e1..38be55c 100644 --- a/src/router/modules/well.js +++ b/src/router/modules/well.js @@ -20,20 +20,38 @@ ] }, { - path: 'overview3D', + path: '/overview/3d', + component: Layout, + redirect: '/overview/3dgz', + meta: { + title: '管网运行总览', + icon: 'icon-globe', // 图标 + permission: ['/overview/3dgz']// 权限名称 + }, + children: [ + { + path: '/overview/3dgz', + component: () => import('@/views/overview/overview3d'), // 赣州 + name: 'overview3dgz', + meta: { title: '管网运行总览', icon: 'icon-globe', permission: ['/overview/3dgz'] } + } + ] + }, + { + path: '/overview3D', component: Layout, redirect: '/overview3d', meta: { title: '管网运行总览', - icon: 'icon-globe' // 图标 - // permission: ['/overview/3d']// 权限名称 + icon: 'icon-globe', // 图标 + permission: ['/overview/3d']// 权限名称 }, children: [ { path: '/overview3d', - component: () => import('@/views/overview/overview3d'), + component: () => import('@/views/overview/overview3dzq'), // 章丘 name: 'overview3d', - meta: { title: '管网运行总览', icon: 'icon-config', permission: ['/overview/3d'] } + meta: { title: '管网运行总览', icon: 'icon-globe', permission: ['/overview/3d'] } } ] },