diff --git a/public/config/project.config.json b/public/config/project.config.json index 3c61685..4021326 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/zq_GxData0825/MapServer/" + "arcgisUrl": "http://111.198.10.15:13002/arcgis/rest/services/zq_publish/MapServer/" } diff --git a/public/config/project.config.json b/public/config/project.config.json index 3c61685..4021326 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/zq_GxData0825/MapServer/" + "arcgisUrl": "http://111.198.10.15:13002/arcgis/rest/services/zq_publish/MapServer/" } diff --git a/public/config/project.configgz.json b/public/config/project.configgz.json index 7c4ca91..a9cb472 100644 --- a/public/config/project.configgz.json +++ b/public/config/project.configgz.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", diff --git a/public/config/project.config.json b/public/config/project.config.json index 3c61685..4021326 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/zq_GxData0825/MapServer/" + "arcgisUrl": "http://111.198.10.15:13002/arcgis/rest/services/zq_publish/MapServer/" } diff --git a/public/config/project.configgz.json b/public/config/project.configgz.json index 7c4ca91..a9cb472 100644 --- a/public/config/project.configgz.json +++ b/public/config/project.configgz.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", diff --git a/public/config/project.configzq.json b/public/config/project.configzq.json index 3c61685..4021326 100644 --- a/public/config/project.configzq.json +++ b/public/config/project.configzq.json @@ -17,5 +17,5 @@ "provinceCode":"360000", "cityCode":"361000", "areaCode":"361024", - "arcgisUrl": "http://111.198.10.15:13002/arcgis/rest/services/zq_GxData0825/MapServer/" + "arcgisUrl": "http://111.198.10.15:13002/arcgis/rest/services/zq_publish/MapServer/" } diff --git a/public/config/project.config.json b/public/config/project.config.json index 3c61685..4021326 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/zq_GxData0825/MapServer/" + "arcgisUrl": "http://111.198.10.15:13002/arcgis/rest/services/zq_publish/MapServer/" } diff --git a/public/config/project.configgz.json b/public/config/project.configgz.json index 7c4ca91..a9cb472 100644 --- a/public/config/project.configgz.json +++ b/public/config/project.configgz.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", diff --git a/public/config/project.configzq.json b/public/config/project.configzq.json index 3c61685..4021326 100644 --- a/public/config/project.configzq.json +++ b/public/config/project.configzq.json @@ -17,5 +17,5 @@ "provinceCode":"360000", "cityCode":"361000", "areaCode":"361024", - "arcgisUrl": "http://111.198.10.15:13002/arcgis/rest/services/zq_GxData0825/MapServer/" + "arcgisUrl": "http://111.198.10.15:13002/arcgis/rest/services/zq_publish/MapServer/" } 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" new file mode 100644 index 0000000..c429ac9 --- /dev/null +++ "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" Binary files differ diff --git a/public/config/project.config.json b/public/config/project.config.json index 3c61685..4021326 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/zq_GxData0825/MapServer/" + "arcgisUrl": "http://111.198.10.15:13002/arcgis/rest/services/zq_publish/MapServer/" } diff --git a/public/config/project.configgz.json b/public/config/project.configgz.json index 7c4ca91..a9cb472 100644 --- a/public/config/project.configgz.json +++ b/public/config/project.configgz.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", diff --git a/public/config/project.configzq.json b/public/config/project.configzq.json index 3c61685..4021326 100644 --- a/public/config/project.configzq.json +++ b/public/config/project.configzq.json @@ -17,5 +17,5 @@ "provinceCode":"360000", "cityCode":"361000", "areaCode":"361024", - "arcgisUrl": "http://111.198.10.15:13002/arcgis/rest/services/zq_GxData0825/MapServer/" + "arcgisUrl": "http://111.198.10.15:13002/arcgis/rest/services/zq_publish/MapServer/" } 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" new file mode 100644 index 0000000..c429ac9 --- /dev/null +++ "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" Binary files differ diff --git a/src/router/modules/well.js b/src/router/modules/well.js index 38be55c..0f6d5a6 100644 --- a/src/router/modules/well.js +++ b/src/router/modules/well.js @@ -20,38 +20,20 @@ ] }, { - 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', + 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/overview3dzq'), // 章丘 + component: () => import('@/views/overview/overview3dzq'), name: 'overview3d', - meta: { title: '管网运行总览', icon: 'icon-globe', permission: ['/overview/3d'] } + meta: { title: '管网运行总览', icon: 'icon-config', permission: ['/overview/3d'] } } ] }, diff --git a/public/config/project.config.json b/public/config/project.config.json index 3c61685..4021326 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/zq_GxData0825/MapServer/" + "arcgisUrl": "http://111.198.10.15:13002/arcgis/rest/services/zq_publish/MapServer/" } diff --git a/public/config/project.configgz.json b/public/config/project.configgz.json index 7c4ca91..a9cb472 100644 --- a/public/config/project.configgz.json +++ b/public/config/project.configgz.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", diff --git a/public/config/project.configzq.json b/public/config/project.configzq.json index 3c61685..4021326 100644 --- a/public/config/project.configzq.json +++ b/public/config/project.configzq.json @@ -17,5 +17,5 @@ "provinceCode":"360000", "cityCode":"361000", "areaCode":"361024", - "arcgisUrl": "http://111.198.10.15:13002/arcgis/rest/services/zq_GxData0825/MapServer/" + "arcgisUrl": "http://111.198.10.15:13002/arcgis/rest/services/zq_publish/MapServer/" } 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" new file mode 100644 index 0000000..c429ac9 --- /dev/null +++ "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" Binary files differ diff --git a/src/router/modules/well.js b/src/router/modules/well.js index 38be55c..0f6d5a6 100644 --- a/src/router/modules/well.js +++ b/src/router/modules/well.js @@ -20,38 +20,20 @@ ] }, { - 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', + 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/overview3dzq'), // 章丘 + component: () => import('@/views/overview/overview3dzq'), name: 'overview3d', - meta: { title: '管网运行总览', icon: 'icon-globe', permission: ['/overview/3d'] } + meta: { title: '管网运行总览', icon: 'icon-config', permission: ['/overview/3d'] } } ] }, diff --git a/src/views/overview/overview3d.vue b/src/views/overview/overview3d.vue index a984ea7..84b9615 100644 --- a/src/views/overview/overview3d.vue +++ b/src/views/overview/overview3d.vue @@ -69,7 +69,6 @@ return { initWell: false, // 是否初始化井信息 showLine: true, - showModel: false, basemap: 1113, colors: ['#7f0000', '#804000', '#ff7fe9', '#ff7fe9', '#00bfff', '#00ff00', '#ff0000', '#00ff00', '#ff0000'], layerName: @@ -246,14 +245,22 @@ if(this.alpha <= 80 && window.map.level > 19){ const lineTypes = this.checkedLayer.filter(item => item.indexOf('line-') > -1).map(item => item.substring(5)) const wellTypes = lineTypes.map(item => item.replace('管线','附属物')) + // 显示三维井 point_layer_3D.forEach(layer => { layer.show = wellTypes.indexOf(layer.options.name) > -1 }) + // 显示三维管线 line_layer_3D.forEach(layer => { layer.show = lineTypes.indexOf(layer.options.name) > -1 }) + // 隐藏二维管线 + //line_layer.forEach(layer => { layer.show = false }) this.showModel = true } }else{ if(this.alpha >80 || window.map.level <= 19){ + const lineTypes = this.checkedLayer.filter(item => item.indexOf('line-') > -1).map(item => item.substring(5)) + // 隐藏三维 point_layer_3D.forEach(layer => { layer.show = false }) line_layer_3D.forEach(layer => { layer.show = false }) + // 显示二维管线 + //line_layer.forEach(layer => { layer.show = lineTypes.indexOf(layer.options.name) > -1 }) this.showModel = false } } diff --git a/public/config/project.config.json b/public/config/project.config.json index 3c61685..4021326 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/zq_GxData0825/MapServer/" + "arcgisUrl": "http://111.198.10.15:13002/arcgis/rest/services/zq_publish/MapServer/" } diff --git a/public/config/project.configgz.json b/public/config/project.configgz.json index 7c4ca91..a9cb472 100644 --- a/public/config/project.configgz.json +++ b/public/config/project.configgz.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", diff --git a/public/config/project.configzq.json b/public/config/project.configzq.json index 3c61685..4021326 100644 --- a/public/config/project.configzq.json +++ b/public/config/project.configzq.json @@ -17,5 +17,5 @@ "provinceCode":"360000", "cityCode":"361000", "areaCode":"361024", - "arcgisUrl": "http://111.198.10.15:13002/arcgis/rest/services/zq_GxData0825/MapServer/" + "arcgisUrl": "http://111.198.10.15:13002/arcgis/rest/services/zq_publish/MapServer/" } 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" new file mode 100644 index 0000000..c429ac9 --- /dev/null +++ "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" Binary files differ diff --git a/src/router/modules/well.js b/src/router/modules/well.js index 38be55c..0f6d5a6 100644 --- a/src/router/modules/well.js +++ b/src/router/modules/well.js @@ -20,38 +20,20 @@ ] }, { - 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', + 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/overview3dzq'), // 章丘 + component: () => import('@/views/overview/overview3dzq'), name: 'overview3d', - meta: { title: '管网运行总览', icon: 'icon-globe', permission: ['/overview/3d'] } + meta: { title: '管网运行总览', icon: 'icon-config', permission: ['/overview/3d'] } } ] }, diff --git a/src/views/overview/overview3d.vue b/src/views/overview/overview3d.vue index a984ea7..84b9615 100644 --- a/src/views/overview/overview3d.vue +++ b/src/views/overview/overview3d.vue @@ -69,7 +69,6 @@ return { initWell: false, // 是否初始化井信息 showLine: true, - showModel: false, basemap: 1113, colors: ['#7f0000', '#804000', '#ff7fe9', '#ff7fe9', '#00bfff', '#00ff00', '#ff0000', '#00ff00', '#ff0000'], layerName: @@ -246,14 +245,22 @@ if(this.alpha <= 80 && window.map.level > 19){ const lineTypes = this.checkedLayer.filter(item => item.indexOf('line-') > -1).map(item => item.substring(5)) const wellTypes = lineTypes.map(item => item.replace('管线','附属物')) + // 显示三维井 point_layer_3D.forEach(layer => { layer.show = wellTypes.indexOf(layer.options.name) > -1 }) + // 显示三维管线 line_layer_3D.forEach(layer => { layer.show = lineTypes.indexOf(layer.options.name) > -1 }) + // 隐藏二维管线 + //line_layer.forEach(layer => { layer.show = false }) this.showModel = true } }else{ if(this.alpha >80 || window.map.level <= 19){ + const lineTypes = this.checkedLayer.filter(item => item.indexOf('line-') > -1).map(item => item.substring(5)) + // 隐藏三维 point_layer_3D.forEach(layer => { layer.show = false }) line_layer_3D.forEach(layer => { layer.show = false }) + // 显示二维管线 + //line_layer.forEach(layer => { layer.show = lineTypes.indexOf(layer.options.name) > -1 }) this.showModel = false } } diff --git a/src/views/overview/overview3dzq.vue b/src/views/overview/overview3dzq.vue index 78df80b..d458e68 100644 --- a/src/views/overview/overview3dzq.vue +++ b/src/views/overview/overview3dzq.vue @@ -59,7 +59,7 @@ let layer2021 = null let layer2020 = null // 设备 -const dev_layer = [] +let dev_layer = [] let alarm_layer = null const rqline_layer = [] let rqwell_layer = null @@ -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: '报警图层' }], // 图层列表 @@ -273,7 +273,7 @@ const bsq = condition === '' ? '1<>1' : "编号 LIKE '%" + condition + "%' or 对象名称 LIKE '%" + condition + "%' or 所属道路 LIKE '%" + condition + "%'" rqwell_layer = createPointModelLayer('1', '燃气阀门井', '../static/images/燃气阀门井.png', '../static/model/ys.gltf', 1.5, rq) rqbox_layer = createPointModelLayer('2', '燃气调压箱', '../static/images/燃气调压箱.png', '../static/model/tyx.glb', 0.1, rq) - for (let i = 2; i < 10; i++) { + for (let i = 2; i < 11; i++) { dev_layer.push(createPointLayer(this.layerName[i], i + 1 , i <= 6 ? '../static/images/标识器.png' : '../static/images/' + this.layerName[i] + '.png', bsq)) } const that = this @@ -403,7 +403,7 @@ id: 'line-' + item, name: item } - }).splice(10, 1) + }).splice(11, 1) } const devLayer = { id: 'dev', @@ -413,7 +413,7 @@ id: 'dev-' + item, name: item } - }).splice(2, 8) + }).splice(2, 9) } this.layers.splice(0, 1, wellLayer) this.layers.splice(1, 1, lineLayer)