diff --git a/public/config/mars3dConfig.json b/public/config/mars3dConfig.json index 9b96e4e..498d918 100644 --- a/public/config/mars3dConfig.json +++ b/public/config/mars3dConfig.json @@ -1,7 +1,7 @@ { "scene": { "center": { - "lat": "36.48", "lng": "117.48", "alt": 20000, "heading": 360, "pitch": -45 + "lat": "25.675", "lng": "114.875", "alt": 10000, "heading": 360, "pitch": -45 }, "requestRenderMode": true, "showSun": false, diff --git a/public/config/mars3dConfig.json b/public/config/mars3dConfig.json index 9b96e4e..498d918 100644 --- a/public/config/mars3dConfig.json +++ b/public/config/mars3dConfig.json @@ -1,7 +1,7 @@ { "scene": { "center": { - "lat": "36.48", "lng": "117.48", "alt": 20000, "heading": 360, "pitch": -45 + "lat": "25.675", "lng": "114.875", "alt": 10000, "heading": 360, "pitch": -45 }, "requestRenderMode": true, "showSun": false, diff --git a/public/config/project.config.json b/public/config/project.config.json index 4021326..7c4ca91 100644 --- a/public/config/project.config.json +++ b/public/config/project.config.json @@ -2,8 +2,8 @@ "title": "管网运行监测系统", "subtitle": "", "theme":"blue", - "baseUrl": "http://60.208.121.150:5001/", - "wsUrl": "ws://60.208.121.150:5001/websocket/", + "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", @@ -17,5 +17,5 @@ "provinceCode":"360000", "cityCode":"361000", "areaCode":"361024", - "arcgisUrl": "http://111.198.10.15:13002/arcgis/rest/services/zq_publish/MapServer/" + "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 9b96e4e..498d918 100644 --- a/public/config/mars3dConfig.json +++ b/public/config/mars3dConfig.json @@ -1,7 +1,7 @@ { "scene": { "center": { - "lat": "36.48", "lng": "117.48", "alt": 20000, "heading": 360, "pitch": -45 + "lat": "25.675", "lng": "114.875", "alt": 10000, "heading": 360, "pitch": -45 }, "requestRenderMode": true, "showSun": false, diff --git a/public/config/project.config.json b/public/config/project.config.json index 4021326..7c4ca91 100644 --- a/public/config/project.config.json +++ b/public/config/project.config.json @@ -2,8 +2,8 @@ "title": "管网运行监测系统", "subtitle": "", "theme":"blue", - "baseUrl": "http://60.208.121.150:5001/", - "wsUrl": "ws://60.208.121.150:5001/websocket/", + "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", @@ -17,5 +17,5 @@ "provinceCode":"360000", "cityCode":"361000", "areaCode":"361024", - "arcgisUrl": "http://111.198.10.15:13002/arcgis/rest/services/zq_publish/MapServer/" + "arcgisUrl": "http://111.198.10.15:13002/arcgis/rest/services/gztest/MapServer/" } diff --git "a/public/static/images/\346\266\210\351\230\262\346\240\223\351\230\262\347\233\227\346\260\264.png" "b/public/static/images/\346\266\210\351\230\262\346\240\223\351\230\262\347\233\227\346\260\264.png" deleted file mode 100644 index 1988fdf..0000000 --- "a/public/static/images/\346\266\210\351\230\262\346\240\223\351\230\262\347\233\227\346\260\264.png" +++ /dev/null Binary files differ diff --git a/public/config/mars3dConfig.json b/public/config/mars3dConfig.json index 9b96e4e..498d918 100644 --- a/public/config/mars3dConfig.json +++ b/public/config/mars3dConfig.json @@ -1,7 +1,7 @@ { "scene": { "center": { - "lat": "36.48", "lng": "117.48", "alt": 20000, "heading": 360, "pitch": -45 + "lat": "25.675", "lng": "114.875", "alt": 10000, "heading": 360, "pitch": -45 }, "requestRenderMode": true, "showSun": false, diff --git a/public/config/project.config.json b/public/config/project.config.json index 4021326..7c4ca91 100644 --- a/public/config/project.config.json +++ b/public/config/project.config.json @@ -2,8 +2,8 @@ "title": "管网运行监测系统", "subtitle": "", "theme":"blue", - "baseUrl": "http://60.208.121.150:5001/", - "wsUrl": "ws://60.208.121.150:5001/websocket/", + "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", @@ -17,5 +17,5 @@ "provinceCode":"360000", "cityCode":"361000", "areaCode":"361024", - "arcgisUrl": "http://111.198.10.15:13002/arcgis/rest/services/zq_publish/MapServer/" + "arcgisUrl": "http://111.198.10.15:13002/arcgis/rest/services/gztest/MapServer/" } diff --git "a/public/static/images/\346\266\210\351\230\262\346\240\223\351\230\262\347\233\227\346\260\264.png" "b/public/static/images/\346\266\210\351\230\262\346\240\223\351\230\262\347\233\227\346\260\264.png" deleted file mode 100644 index 1988fdf..0000000 --- "a/public/static/images/\346\266\210\351\230\262\346\240\223\351\230\262\347\233\227\346\260\264.png" +++ /dev/null Binary files differ diff --git "a/public/static/images/\346\266\210\351\230\262\346\240\223\351\230\262\347\233\227\346\260\264\347\233\221\346\265\213\344\273\252.png" "b/public/static/images/\346\266\210\351\230\262\346\240\223\351\230\262\347\233\227\346\260\264\347\233\221\346\265\213\344\273\252.png" index 6efac42..1988fdf 100644 --- "a/public/static/images/\346\266\210\351\230\262\346\240\223\351\230\262\347\233\227\346\260\264\347\233\221\346\265\213\344\273\252.png" +++ "b/public/static/images/\346\266\210\351\230\262\346\240\223\351\230\262\347\233\227\346\260\264\347\233\221\346\265\213\344\273\252.png" Binary files differ diff --git a/public/config/mars3dConfig.json b/public/config/mars3dConfig.json index 9b96e4e..498d918 100644 --- a/public/config/mars3dConfig.json +++ b/public/config/mars3dConfig.json @@ -1,7 +1,7 @@ { "scene": { "center": { - "lat": "36.48", "lng": "117.48", "alt": 20000, "heading": 360, "pitch": -45 + "lat": "25.675", "lng": "114.875", "alt": 10000, "heading": 360, "pitch": -45 }, "requestRenderMode": true, "showSun": false, diff --git a/public/config/project.config.json b/public/config/project.config.json index 4021326..7c4ca91 100644 --- a/public/config/project.config.json +++ b/public/config/project.config.json @@ -2,8 +2,8 @@ "title": "管网运行监测系统", "subtitle": "", "theme":"blue", - "baseUrl": "http://60.208.121.150:5001/", - "wsUrl": "ws://60.208.121.150:5001/websocket/", + "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", @@ -17,5 +17,5 @@ "provinceCode":"360000", "cityCode":"361000", "areaCode":"361024", - "arcgisUrl": "http://111.198.10.15:13002/arcgis/rest/services/zq_publish/MapServer/" + "arcgisUrl": "http://111.198.10.15:13002/arcgis/rest/services/gztest/MapServer/" } diff --git "a/public/static/images/\346\266\210\351\230\262\346\240\223\351\230\262\347\233\227\346\260\264.png" "b/public/static/images/\346\266\210\351\230\262\346\240\223\351\230\262\347\233\227\346\260\264.png" deleted file mode 100644 index 1988fdf..0000000 --- "a/public/static/images/\346\266\210\351\230\262\346\240\223\351\230\262\347\233\227\346\260\264.png" +++ /dev/null Binary files differ diff --git "a/public/static/images/\346\266\210\351\230\262\346\240\223\351\230\262\347\233\227\346\260\264\347\233\221\346\265\213\344\273\252.png" "b/public/static/images/\346\266\210\351\230\262\346\240\223\351\230\262\347\233\227\346\260\264\347\233\221\346\265\213\344\273\252.png" index 6efac42..1988fdf 100644 --- "a/public/static/images/\346\266\210\351\230\262\346\240\223\351\230\262\347\233\227\346\260\264\347\233\221\346\265\213\344\273\252.png" +++ "b/public/static/images/\346\266\210\351\230\262\346\240\223\351\230\262\347\233\227\346\260\264\347\233\221\346\265\213\344\273\252.png" Binary files differ diff --git "a/public/static/images/\347\207\203\346\260\224\350\260\203\345\216\213\347\256\261.png" "b/public/static/images/\347\207\203\346\260\224\350\260\203\345\216\213\347\256\261.png" index 8f94d81..c4f049f 100644 --- "a/public/static/images/\347\207\203\346\260\224\350\260\203\345\216\213\347\256\261.png" +++ "b/public/static/images/\347\207\203\346\260\224\350\260\203\345\216\213\347\256\261.png" Binary files differ diff --git a/public/config/mars3dConfig.json b/public/config/mars3dConfig.json index 9b96e4e..498d918 100644 --- a/public/config/mars3dConfig.json +++ b/public/config/mars3dConfig.json @@ -1,7 +1,7 @@ { "scene": { "center": { - "lat": "36.48", "lng": "117.48", "alt": 20000, "heading": 360, "pitch": -45 + "lat": "25.675", "lng": "114.875", "alt": 10000, "heading": 360, "pitch": -45 }, "requestRenderMode": true, "showSun": false, diff --git a/public/config/project.config.json b/public/config/project.config.json index 4021326..7c4ca91 100644 --- a/public/config/project.config.json +++ b/public/config/project.config.json @@ -2,8 +2,8 @@ "title": "管网运行监测系统", "subtitle": "", "theme":"blue", - "baseUrl": "http://60.208.121.150:5001/", - "wsUrl": "ws://60.208.121.150:5001/websocket/", + "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", @@ -17,5 +17,5 @@ "provinceCode":"360000", "cityCode":"361000", "areaCode":"361024", - "arcgisUrl": "http://111.198.10.15:13002/arcgis/rest/services/zq_publish/MapServer/" + "arcgisUrl": "http://111.198.10.15:13002/arcgis/rest/services/gztest/MapServer/" } diff --git "a/public/static/images/\346\266\210\351\230\262\346\240\223\351\230\262\347\233\227\346\260\264.png" "b/public/static/images/\346\266\210\351\230\262\346\240\223\351\230\262\347\233\227\346\260\264.png" deleted file mode 100644 index 1988fdf..0000000 --- "a/public/static/images/\346\266\210\351\230\262\346\240\223\351\230\262\347\233\227\346\260\264.png" +++ /dev/null Binary files differ diff --git "a/public/static/images/\346\266\210\351\230\262\346\240\223\351\230\262\347\233\227\346\260\264\347\233\221\346\265\213\344\273\252.png" "b/public/static/images/\346\266\210\351\230\262\346\240\223\351\230\262\347\233\227\346\260\264\347\233\221\346\265\213\344\273\252.png" index 6efac42..1988fdf 100644 --- "a/public/static/images/\346\266\210\351\230\262\346\240\223\351\230\262\347\233\227\346\260\264\347\233\221\346\265\213\344\273\252.png" +++ "b/public/static/images/\346\266\210\351\230\262\346\240\223\351\230\262\347\233\227\346\260\264\347\233\221\346\265\213\344\273\252.png" Binary files differ diff --git "a/public/static/images/\347\207\203\346\260\224\350\260\203\345\216\213\347\256\261.png" "b/public/static/images/\347\207\203\346\260\224\350\260\203\345\216\213\347\256\261.png" index 8f94d81..c4f049f 100644 --- "a/public/static/images/\347\207\203\346\260\224\350\260\203\345\216\213\347\256\261.png" +++ "b/public/static/images/\347\207\203\346\260\224\350\260\203\345\216\213\347\256\261.png" Binary files differ diff --git "a/public/static/images/\347\207\203\346\260\224\350\260\203\345\216\213\347\256\2611.png" "b/public/static/images/\347\207\203\346\260\224\350\260\203\345\216\213\347\256\2611.png" new file mode 100644 index 0000000..8f94d81 --- /dev/null +++ "b/public/static/images/\347\207\203\346\260\224\350\260\203\345\216\213\347\256\2611.png" Binary files differ diff --git a/public/config/mars3dConfig.json b/public/config/mars3dConfig.json index 9b96e4e..498d918 100644 --- a/public/config/mars3dConfig.json +++ b/public/config/mars3dConfig.json @@ -1,7 +1,7 @@ { "scene": { "center": { - "lat": "36.48", "lng": "117.48", "alt": 20000, "heading": 360, "pitch": -45 + "lat": "25.675", "lng": "114.875", "alt": 10000, "heading": 360, "pitch": -45 }, "requestRenderMode": true, "showSun": false, diff --git a/public/config/project.config.json b/public/config/project.config.json index 4021326..7c4ca91 100644 --- a/public/config/project.config.json +++ b/public/config/project.config.json @@ -2,8 +2,8 @@ "title": "管网运行监测系统", "subtitle": "", "theme":"blue", - "baseUrl": "http://60.208.121.150:5001/", - "wsUrl": "ws://60.208.121.150:5001/websocket/", + "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", @@ -17,5 +17,5 @@ "provinceCode":"360000", "cityCode":"361000", "areaCode":"361024", - "arcgisUrl": "http://111.198.10.15:13002/arcgis/rest/services/zq_publish/MapServer/" + "arcgisUrl": "http://111.198.10.15:13002/arcgis/rest/services/gztest/MapServer/" } diff --git "a/public/static/images/\346\266\210\351\230\262\346\240\223\351\230\262\347\233\227\346\260\264.png" "b/public/static/images/\346\266\210\351\230\262\346\240\223\351\230\262\347\233\227\346\260\264.png" deleted file mode 100644 index 1988fdf..0000000 --- "a/public/static/images/\346\266\210\351\230\262\346\240\223\351\230\262\347\233\227\346\260\264.png" +++ /dev/null Binary files differ diff --git "a/public/static/images/\346\266\210\351\230\262\346\240\223\351\230\262\347\233\227\346\260\264\347\233\221\346\265\213\344\273\252.png" "b/public/static/images/\346\266\210\351\230\262\346\240\223\351\230\262\347\233\227\346\260\264\347\233\221\346\265\213\344\273\252.png" index 6efac42..1988fdf 100644 --- "a/public/static/images/\346\266\210\351\230\262\346\240\223\351\230\262\347\233\227\346\260\264\347\233\221\346\265\213\344\273\252.png" +++ "b/public/static/images/\346\266\210\351\230\262\346\240\223\351\230\262\347\233\227\346\260\264\347\233\221\346\265\213\344\273\252.png" Binary files differ diff --git "a/public/static/images/\347\207\203\346\260\224\350\260\203\345\216\213\347\256\261.png" "b/public/static/images/\347\207\203\346\260\224\350\260\203\345\216\213\347\256\261.png" index 8f94d81..c4f049f 100644 --- "a/public/static/images/\347\207\203\346\260\224\350\260\203\345\216\213\347\256\261.png" +++ "b/public/static/images/\347\207\203\346\260\224\350\260\203\345\216\213\347\256\261.png" Binary files differ diff --git "a/public/static/images/\347\207\203\346\260\224\350\260\203\345\216\213\347\256\2611.png" "b/public/static/images/\347\207\203\346\260\224\350\260\203\345\216\213\347\256\2611.png" new file mode 100644 index 0000000..8f94d81 --- /dev/null +++ "b/public/static/images/\347\207\203\346\260\224\350\260\203\345\216\213\347\256\2611.png" Binary files differ diff --git "a/public/static/images/\347\207\203\346\260\224\351\230\200\351\227\250\344\272\225.png" "b/public/static/images/\347\207\203\346\260\224\351\230\200\351\227\250\344\272\225.png" index 8f94d81..e02e099 100644 --- "a/public/static/images/\347\207\203\346\260\224\351\230\200\351\227\250\344\272\225.png" +++ "b/public/static/images/\347\207\203\346\260\224\351\230\200\351\227\250\344\272\225.png" Binary files differ diff --git a/public/config/mars3dConfig.json b/public/config/mars3dConfig.json index 9b96e4e..498d918 100644 --- a/public/config/mars3dConfig.json +++ b/public/config/mars3dConfig.json @@ -1,7 +1,7 @@ { "scene": { "center": { - "lat": "36.48", "lng": "117.48", "alt": 20000, "heading": 360, "pitch": -45 + "lat": "25.675", "lng": "114.875", "alt": 10000, "heading": 360, "pitch": -45 }, "requestRenderMode": true, "showSun": false, diff --git a/public/config/project.config.json b/public/config/project.config.json index 4021326..7c4ca91 100644 --- a/public/config/project.config.json +++ b/public/config/project.config.json @@ -2,8 +2,8 @@ "title": "管网运行监测系统", "subtitle": "", "theme":"blue", - "baseUrl": "http://60.208.121.150:5001/", - "wsUrl": "ws://60.208.121.150:5001/websocket/", + "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", @@ -17,5 +17,5 @@ "provinceCode":"360000", "cityCode":"361000", "areaCode":"361024", - "arcgisUrl": "http://111.198.10.15:13002/arcgis/rest/services/zq_publish/MapServer/" + "arcgisUrl": "http://111.198.10.15:13002/arcgis/rest/services/gztest/MapServer/" } diff --git "a/public/static/images/\346\266\210\351\230\262\346\240\223\351\230\262\347\233\227\346\260\264.png" "b/public/static/images/\346\266\210\351\230\262\346\240\223\351\230\262\347\233\227\346\260\264.png" deleted file mode 100644 index 1988fdf..0000000 --- "a/public/static/images/\346\266\210\351\230\262\346\240\223\351\230\262\347\233\227\346\260\264.png" +++ /dev/null Binary files differ diff --git "a/public/static/images/\346\266\210\351\230\262\346\240\223\351\230\262\347\233\227\346\260\264\347\233\221\346\265\213\344\273\252.png" "b/public/static/images/\346\266\210\351\230\262\346\240\223\351\230\262\347\233\227\346\260\264\347\233\221\346\265\213\344\273\252.png" index 6efac42..1988fdf 100644 --- "a/public/static/images/\346\266\210\351\230\262\346\240\223\351\230\262\347\233\227\346\260\264\347\233\221\346\265\213\344\273\252.png" +++ "b/public/static/images/\346\266\210\351\230\262\346\240\223\351\230\262\347\233\227\346\260\264\347\233\221\346\265\213\344\273\252.png" Binary files differ diff --git "a/public/static/images/\347\207\203\346\260\224\350\260\203\345\216\213\347\256\261.png" "b/public/static/images/\347\207\203\346\260\224\350\260\203\345\216\213\347\256\261.png" index 8f94d81..c4f049f 100644 --- "a/public/static/images/\347\207\203\346\260\224\350\260\203\345\216\213\347\256\261.png" +++ "b/public/static/images/\347\207\203\346\260\224\350\260\203\345\216\213\347\256\261.png" Binary files differ diff --git "a/public/static/images/\347\207\203\346\260\224\350\260\203\345\216\213\347\256\2611.png" "b/public/static/images/\347\207\203\346\260\224\350\260\203\345\216\213\347\256\2611.png" new file mode 100644 index 0000000..8f94d81 --- /dev/null +++ "b/public/static/images/\347\207\203\346\260\224\350\260\203\345\216\213\347\256\2611.png" Binary files differ diff --git "a/public/static/images/\347\207\203\346\260\224\351\230\200\351\227\250\344\272\225.png" "b/public/static/images/\347\207\203\346\260\224\351\230\200\351\227\250\344\272\225.png" index 8f94d81..e02e099 100644 --- "a/public/static/images/\347\207\203\346\260\224\351\230\200\351\227\250\344\272\225.png" +++ "b/public/static/images/\347\207\203\346\260\224\351\230\200\351\227\250\344\272\225.png" Binary files differ diff --git "a/public/static/images/\347\207\203\346\260\224\351\230\200\351\227\250\344\272\2251.png" "b/public/static/images/\347\207\203\346\260\224\351\230\200\351\227\250\344\272\2251.png" new file mode 100644 index 0000000..8f94d81 --- /dev/null +++ "b/public/static/images/\347\207\203\346\260\224\351\230\200\351\227\250\344\272\2251.png" Binary files differ diff --git a/public/config/mars3dConfig.json b/public/config/mars3dConfig.json index 9b96e4e..498d918 100644 --- a/public/config/mars3dConfig.json +++ b/public/config/mars3dConfig.json @@ -1,7 +1,7 @@ { "scene": { "center": { - "lat": "36.48", "lng": "117.48", "alt": 20000, "heading": 360, "pitch": -45 + "lat": "25.675", "lng": "114.875", "alt": 10000, "heading": 360, "pitch": -45 }, "requestRenderMode": true, "showSun": false, diff --git a/public/config/project.config.json b/public/config/project.config.json index 4021326..7c4ca91 100644 --- a/public/config/project.config.json +++ b/public/config/project.config.json @@ -2,8 +2,8 @@ "title": "管网运行监测系统", "subtitle": "", "theme":"blue", - "baseUrl": "http://60.208.121.150:5001/", - "wsUrl": "ws://60.208.121.150:5001/websocket/", + "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", @@ -17,5 +17,5 @@ "provinceCode":"360000", "cityCode":"361000", "areaCode":"361024", - "arcgisUrl": "http://111.198.10.15:13002/arcgis/rest/services/zq_publish/MapServer/" + "arcgisUrl": "http://111.198.10.15:13002/arcgis/rest/services/gztest/MapServer/" } diff --git "a/public/static/images/\346\266\210\351\230\262\346\240\223\351\230\262\347\233\227\346\260\264.png" "b/public/static/images/\346\266\210\351\230\262\346\240\223\351\230\262\347\233\227\346\260\264.png" deleted file mode 100644 index 1988fdf..0000000 --- "a/public/static/images/\346\266\210\351\230\262\346\240\223\351\230\262\347\233\227\346\260\264.png" +++ /dev/null Binary files differ diff --git "a/public/static/images/\346\266\210\351\230\262\346\240\223\351\230\262\347\233\227\346\260\264\347\233\221\346\265\213\344\273\252.png" "b/public/static/images/\346\266\210\351\230\262\346\240\223\351\230\262\347\233\227\346\260\264\347\233\221\346\265\213\344\273\252.png" index 6efac42..1988fdf 100644 --- "a/public/static/images/\346\266\210\351\230\262\346\240\223\351\230\262\347\233\227\346\260\264\347\233\221\346\265\213\344\273\252.png" +++ "b/public/static/images/\346\266\210\351\230\262\346\240\223\351\230\262\347\233\227\346\260\264\347\233\221\346\265\213\344\273\252.png" Binary files differ diff --git "a/public/static/images/\347\207\203\346\260\224\350\260\203\345\216\213\347\256\261.png" "b/public/static/images/\347\207\203\346\260\224\350\260\203\345\216\213\347\256\261.png" index 8f94d81..c4f049f 100644 --- "a/public/static/images/\347\207\203\346\260\224\350\260\203\345\216\213\347\256\261.png" +++ "b/public/static/images/\347\207\203\346\260\224\350\260\203\345\216\213\347\256\261.png" Binary files differ diff --git "a/public/static/images/\347\207\203\346\260\224\350\260\203\345\216\213\347\256\2611.png" "b/public/static/images/\347\207\203\346\260\224\350\260\203\345\216\213\347\256\2611.png" new file mode 100644 index 0000000..8f94d81 --- /dev/null +++ "b/public/static/images/\347\207\203\346\260\224\350\260\203\345\216\213\347\256\2611.png" Binary files differ diff --git "a/public/static/images/\347\207\203\346\260\224\351\230\200\351\227\250\344\272\225.png" "b/public/static/images/\347\207\203\346\260\224\351\230\200\351\227\250\344\272\225.png" index 8f94d81..e02e099 100644 --- "a/public/static/images/\347\207\203\346\260\224\351\230\200\351\227\250\344\272\225.png" +++ "b/public/static/images/\347\207\203\346\260\224\351\230\200\351\227\250\344\272\225.png" Binary files differ diff --git "a/public/static/images/\347\207\203\346\260\224\351\230\200\351\227\250\344\272\2251.png" "b/public/static/images/\347\207\203\346\260\224\351\230\200\351\227\250\344\272\2251.png" new file mode 100644 index 0000000..8f94d81 --- /dev/null +++ "b/public/static/images/\347\207\203\346\260\224\351\230\200\351\227\250\344\272\2251.png" Binary files differ diff --git a/src/views/overview/overview3d.vue b/src/views/overview/overview3d.vue index 12a2eea..0f2fbe5 100644 --- a/src/views/overview/overview3d.vue +++ b/src/views/overview/overview3d.vue @@ -11,7 +11,7 @@
- +
@@ -58,6 +58,7 @@ createPointLayer, createModelLayerAsync } from "@/components/Mars3D/utils/GeoJsonLayer"; import {Tetrahedron} from "@/components/Mars3D/utils/GraphicLayer"; +import item from "@/layout/components/Sidebar/Item"; const line_layer = [] const line_layer_3D = [] @@ -66,6 +67,8 @@ const wellLoc = {} let underground = null let alarm_layer = null +let search_layer = [] +const wellName = ['雨水附属物', '污水附属物', '燃气附属物', '给水附属物', '电信附属物', '电力附属物'] export default { name: 'Overview3D', components: { Mars3dMap, MapSearchComp, PopupLocation, PopupDataFilter, ToolBox, AlarmList }, @@ -75,7 +78,7 @@ initWell: false, // 是否初始化井信息 showLine: true, basemap: 1113, - colors: ['#7f0000', '#804000', '#ff7fe9', '#ff7fe9', '#00bfff', '#00ff00', '#ff0000', '#00ff00', '#ff0000'], + colors: ['#7f0000', '#804000', '#ff7fe9', '#ff0000', '#00bfff', '#00ff00', '#ff0000', '#00ff00', '#ff0000'], layerName: ['雨水管线', '污水管线', '燃气管线','路灯管线', '给水管线', '电信管线', '电力管线', '井盖状态监测仪', '燃气智能监测终端', '消防栓防盗水监测仪', '液位监测仪', '噪声记录仪'], @@ -222,7 +225,8 @@ } }, async initPoint(condition = '', isDev = false) { - const layerName = ['雨水附属物', '污水附属物', '燃气附属物', '给水附属物', '电信附属物', '电力附属物'] + const wellTypes = this.checkedLayer.filter(item => item.indexOf('line-') > -1).map(item => item.substring(5)).map(item => item.replace('管线','附属物')) + // 删原有的 if (point_layer_3D.length !== 0) { point_layer_3D.forEach(item => window.map.removeLayer(item)) @@ -236,11 +240,13 @@ // 筛选条件 const str = condition === '' ? '1<>1' : "编号 LIKE '%" + condition + "%' or 附属物名称 LIKE '%" + condition + "%' or 所属道路 LIKE '%" + condition + "%'" - const bsq = condition === '' ? '1<>1' : "编号 LIKE '%" + condition + "%' or 对象名称 LIKE '%" + condition + "%' or 所属道路 LIKE '%" + condition + "%'" for (let i = 0; i <= 5; i++) { - point_layer_3D.push(await createModelLayerAsync(i, layerName[i], '../static/model/ys.gltf', 1.5, str)) + let layer = await createModelLayerAsync(i, wellName[i], '../static/model/ys.gltf', 1.5, str) + layer.show = wellTypes.filter(item => item === wellName[i]).length !== 0 + point_layer_3D.push(layer) } // if(isDev){ + // const bsq = condition === '' ? '1<>1' : "编号 LIKE '%" + condition + "%' or 对象名称 LIKE '%" + condition + "%' or 所属道路 LIKE '%" + condition + "%'" // dev_layer.push(createPointLayer('标识器', 7, '../static/images/标识器.png', bsq)) // } this.mapReady() @@ -249,6 +255,23 @@ // that.mapReady() // }, 1000) }, + async initSearch(condition = '', isDev = false) { + // 删原有的 + if (search_layer.length !== 0) { + search_layer.forEach(item => window.map.removeLayer(item)) + } + search_layer = [] + if(condition === '') return + const wellTypes = this.checkedLayer.filter(item => item.indexOf('line-') > -1).map(item => item.substring(5)).map(item => item.replace('管线','附属物')) + // 筛选条件 + const str = condition === '' ? '1<>1' : "编号 LIKE '%" + condition + "%' or 附属物名称 LIKE '%" + condition + "%' or 所属道路 LIKE '%" + condition + "%'" + for (let i = 0; i <= 5; i++) { + if(wellTypes.filter(item => item === wellName[i]).length !== 0) + { + search_layer.push(createPointLayer(wellName[i], i, '../static/images/标识器.png' , str)) + } + } + }, async initLineLayer(name){ let i = this.layerName.indexOf(name) // 三维管线 @@ -438,7 +461,7 @@ // 数据查询 search(keywords) { if (keywords === '') { - this.initPoint('') + this.initSearch('') } else { this.resultList = this.markers.filter(item => { if (item.wellCode.includes(keywords) || item.wellName.includes(keywords) || item.position.includes(keywords)) { @@ -447,7 +470,7 @@ return false } }) - this.initPoint(keywords) + this.initSearch(keywords) } }, // 搜索结果页面变化，触发地图展示列表中所有 @@ -463,7 +486,7 @@ // 在附属物图层里查设备 searchWellLayer(wellCode){ // *********************************测试wellCode********************************* - wellCode = 'GX_YSD_4001_BJNDD_104' + // wellCode = 'GX_YSD_4001_BJNDD_104' let point = undefined for (let i = 0; i < point_layer_3D.length; i++) { diff --git a/public/config/mars3dConfig.json b/public/config/mars3dConfig.json index 9b96e4e..498d918 100644 --- a/public/config/mars3dConfig.json +++ b/public/config/mars3dConfig.json @@ -1,7 +1,7 @@ { "scene": { "center": { - "lat": "36.48", "lng": "117.48", "alt": 20000, "heading": 360, "pitch": -45 + "lat": "25.675", "lng": "114.875", "alt": 10000, "heading": 360, "pitch": -45 }, "requestRenderMode": true, "showSun": false, diff --git a/public/config/project.config.json b/public/config/project.config.json index 4021326..7c4ca91 100644 --- a/public/config/project.config.json +++ b/public/config/project.config.json @@ -2,8 +2,8 @@ "title": "管网运行监测系统", "subtitle": "", "theme":"blue", - "baseUrl": "http://60.208.121.150:5001/", - "wsUrl": "ws://60.208.121.150:5001/websocket/", + "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", @@ -17,5 +17,5 @@ "provinceCode":"360000", "cityCode":"361000", "areaCode":"361024", - "arcgisUrl": "http://111.198.10.15:13002/arcgis/rest/services/zq_publish/MapServer/" + "arcgisUrl": "http://111.198.10.15:13002/arcgis/rest/services/gztest/MapServer/" } diff --git "a/public/static/images/\346\266\210\351\230\262\346\240\223\351\230\262\347\233\227\346\260\264.png" "b/public/static/images/\346\266\210\351\230\262\346\240\223\351\230\262\347\233\227\346\260\264.png" deleted file mode 100644 index 1988fdf..0000000 --- "a/public/static/images/\346\266\210\351\230\262\346\240\223\351\230\262\347\233\227\346\260\264.png" +++ /dev/null Binary files differ diff --git "a/public/static/images/\346\266\210\351\230\262\346\240\223\351\230\262\347\233\227\346\260\264\347\233\221\346\265\213\344\273\252.png" "b/public/static/images/\346\266\210\351\230\262\346\240\223\351\230\262\347\233\227\346\260\264\347\233\221\346\265\213\344\273\252.png" index 6efac42..1988fdf 100644 --- "a/public/static/images/\346\266\210\351\230\262\346\240\223\351\230\262\347\233\227\346\260\264\347\233\221\346\265\213\344\273\252.png" +++ "b/public/static/images/\346\266\210\351\230\262\346\240\223\351\230\262\347\233\227\346\260\264\347\233\221\346\265\213\344\273\252.png" Binary files differ diff --git "a/public/static/images/\347\207\203\346\260\224\350\260\203\345\216\213\347\256\261.png" "b/public/static/images/\347\207\203\346\260\224\350\260\203\345\216\213\347\256\261.png" index 8f94d81..c4f049f 100644 --- "a/public/static/images/\347\207\203\346\260\224\350\260\203\345\216\213\347\256\261.png" +++ "b/public/static/images/\347\207\203\346\260\224\350\260\203\345\216\213\347\256\261.png" Binary files differ diff --git "a/public/static/images/\347\207\203\346\260\224\350\260\203\345\216\213\347\256\2611.png" "b/public/static/images/\347\207\203\346\260\224\350\260\203\345\216\213\347\256\2611.png" new file mode 100644 index 0000000..8f94d81 --- /dev/null +++ "b/public/static/images/\347\207\203\346\260\224\350\260\203\345\216\213\347\256\2611.png" Binary files differ diff --git "a/public/static/images/\347\207\203\346\260\224\351\230\200\351\227\250\344\272\225.png" "b/public/static/images/\347\207\203\346\260\224\351\230\200\351\227\250\344\272\225.png" index 8f94d81..e02e099 100644 --- "a/public/static/images/\347\207\203\346\260\224\351\230\200\351\227\250\344\272\225.png" +++ "b/public/static/images/\347\207\203\346\260\224\351\230\200\351\227\250\344\272\225.png" Binary files differ diff --git "a/public/static/images/\347\207\203\346\260\224\351\230\200\351\227\250\344\272\2251.png" "b/public/static/images/\347\207\203\346\260\224\351\230\200\351\227\250\344\272\2251.png" new file mode 100644 index 0000000..8f94d81 --- /dev/null +++ "b/public/static/images/\347\207\203\346\260\224\351\230\200\351\227\250\344\272\2251.png" Binary files differ diff --git a/src/views/overview/overview3d.vue b/src/views/overview/overview3d.vue index 12a2eea..0f2fbe5 100644 --- a/src/views/overview/overview3d.vue +++ b/src/views/overview/overview3d.vue @@ -11,7 +11,7 @@
- +
@@ -58,6 +58,7 @@ createPointLayer, createModelLayerAsync } from "@/components/Mars3D/utils/GeoJsonLayer"; import {Tetrahedron} from "@/components/Mars3D/utils/GraphicLayer"; +import item from "@/layout/components/Sidebar/Item"; const line_layer = [] const line_layer_3D = [] @@ -66,6 +67,8 @@ const wellLoc = {} let underground = null let alarm_layer = null +let search_layer = [] +const wellName = ['雨水附属物', '污水附属物', '燃气附属物', '给水附属物', '电信附属物', '电力附属物'] export default { name: 'Overview3D', components: { Mars3dMap, MapSearchComp, PopupLocation, PopupDataFilter, ToolBox, AlarmList }, @@ -75,7 +78,7 @@ initWell: false, // 是否初始化井信息 showLine: true, basemap: 1113, - colors: ['#7f0000', '#804000', '#ff7fe9', '#ff7fe9', '#00bfff', '#00ff00', '#ff0000', '#00ff00', '#ff0000'], + colors: ['#7f0000', '#804000', '#ff7fe9', '#ff0000', '#00bfff', '#00ff00', '#ff0000', '#00ff00', '#ff0000'], layerName: ['雨水管线', '污水管线', '燃气管线','路灯管线', '给水管线', '电信管线', '电力管线', '井盖状态监测仪', '燃气智能监测终端', '消防栓防盗水监测仪', '液位监测仪', '噪声记录仪'], @@ -222,7 +225,8 @@ } }, async initPoint(condition = '', isDev = false) { - const layerName = ['雨水附属物', '污水附属物', '燃气附属物', '给水附属物', '电信附属物', '电力附属物'] + const wellTypes = this.checkedLayer.filter(item => item.indexOf('line-') > -1).map(item => item.substring(5)).map(item => item.replace('管线','附属物')) + // 删原有的 if (point_layer_3D.length !== 0) { point_layer_3D.forEach(item => window.map.removeLayer(item)) @@ -236,11 +240,13 @@ // 筛选条件 const str = condition === '' ? '1<>1' : "编号 LIKE '%" + condition + "%' or 附属物名称 LIKE '%" + condition + "%' or 所属道路 LIKE '%" + condition + "%'" - const bsq = condition === '' ? '1<>1' : "编号 LIKE '%" + condition + "%' or 对象名称 LIKE '%" + condition + "%' or 所属道路 LIKE '%" + condition + "%'" for (let i = 0; i <= 5; i++) { - point_layer_3D.push(await createModelLayerAsync(i, layerName[i], '../static/model/ys.gltf', 1.5, str)) + let layer = await createModelLayerAsync(i, wellName[i], '../static/model/ys.gltf', 1.5, str) + layer.show = wellTypes.filter(item => item === wellName[i]).length !== 0 + point_layer_3D.push(layer) } // if(isDev){ + // const bsq = condition === '' ? '1<>1' : "编号 LIKE '%" + condition + "%' or 对象名称 LIKE '%" + condition + "%' or 所属道路 LIKE '%" + condition + "%'" // dev_layer.push(createPointLayer('标识器', 7, '../static/images/标识器.png', bsq)) // } this.mapReady() @@ -249,6 +255,23 @@ // that.mapReady() // }, 1000) }, + async initSearch(condition = '', isDev = false) { + // 删原有的 + if (search_layer.length !== 0) { + search_layer.forEach(item => window.map.removeLayer(item)) + } + search_layer = [] + if(condition === '') return + const wellTypes = this.checkedLayer.filter(item => item.indexOf('line-') > -1).map(item => item.substring(5)).map(item => item.replace('管线','附属物')) + // 筛选条件 + const str = condition === '' ? '1<>1' : "编号 LIKE '%" + condition + "%' or 附属物名称 LIKE '%" + condition + "%' or 所属道路 LIKE '%" + condition + "%'" + for (let i = 0; i <= 5; i++) { + if(wellTypes.filter(item => item === wellName[i]).length !== 0) + { + search_layer.push(createPointLayer(wellName[i], i, '../static/images/标识器.png' , str)) + } + } + }, async initLineLayer(name){ let i = this.layerName.indexOf(name) // 三维管线 @@ -438,7 +461,7 @@ // 数据查询 search(keywords) { if (keywords === '') { - this.initPoint('') + this.initSearch('') } else { this.resultList = this.markers.filter(item => { if (item.wellCode.includes(keywords) || item.wellName.includes(keywords) || item.position.includes(keywords)) { @@ -447,7 +470,7 @@ return false } }) - this.initPoint(keywords) + this.initSearch(keywords) } }, // 搜索结果页面变化，触发地图展示列表中所有 @@ -463,7 +486,7 @@ // 在附属物图层里查设备 searchWellLayer(wellCode){ // *********************************测试wellCode********************************* - wellCode = 'GX_YSD_4001_BJNDD_104' + // wellCode = 'GX_YSD_4001_BJNDD_104' let point = undefined for (let i = 0; i < point_layer_3D.length; i++) { diff --git a/src/views/overview/overview3dzq.vue b/src/views/overview/overview3dzq.vue index 8379a9e..9330aad 100644 --- a/src/views/overview/overview3dzq.vue +++ b/src/views/overview/overview3dzq.vue @@ -13,7 +13,7 @@
- +