diff --git "a/public/static/images/\345\214\272\345\237\237\350\260\203\345\216\213\347\253\231.png" "b/public/static/images/\345\214\272\345\237\237\350\260\203\345\216\213\347\253\231.png" new file mode 100644 index 0000000..2a7c66d --- /dev/null +++ "b/public/static/images/\345\214\272\345\237\237\350\260\203\345\216\213\347\253\231.png" Binary files differ diff --git "a/public/static/images/\345\214\272\345\237\237\350\260\203\345\216\213\347\253\231.png" "b/public/static/images/\345\214\272\345\237\237\350\260\203\345\216\213\347\253\231.png" new file mode 100644 index 0000000..2a7c66d --- /dev/null +++ "b/public/static/images/\345\214\272\345\237\237\350\260\203\345\216\213\347\253\231.png" Binary files differ diff --git "a/public/static/images/\345\234\243\344\272\225\347\207\203\346\260\224.png" "b/public/static/images/\345\234\243\344\272\225\347\207\203\346\260\224.png" new file mode 100644 index 0000000..d88e6a2 --- /dev/null +++ "b/public/static/images/\345\234\243\344\272\225\347\207\203\346\260\224.png" Binary files differ diff --git "a/public/static/images/\345\214\272\345\237\237\350\260\203\345\216\213\347\253\231.png" "b/public/static/images/\345\214\272\345\237\237\350\260\203\345\216\213\347\253\231.png" new file mode 100644 index 0000000..2a7c66d --- /dev/null +++ "b/public/static/images/\345\214\272\345\237\237\350\260\203\345\216\213\347\253\231.png" Binary files differ diff --git "a/public/static/images/\345\234\243\344\272\225\347\207\203\346\260\224.png" "b/public/static/images/\345\234\243\344\272\225\347\207\203\346\260\224.png" new file mode 100644 index 0000000..d88e6a2 --- /dev/null +++ "b/public/static/images/\345\234\243\344\272\225\347\207\203\346\260\224.png" Binary files differ diff --git "a/public/static/images/\346\240\207\350\257\206\345\231\250.png" "b/public/static/images/\346\240\207\350\257\206\345\231\250.png" index 2bc24ce..b5f36b5 100644 --- "a/public/static/images/\346\240\207\350\257\206\345\231\250.png" +++ "b/public/static/images/\346\240\207\350\257\206\345\231\250.png" Binary files differ diff --git "a/public/static/images/\345\214\272\345\237\237\350\260\203\345\216\213\347\253\231.png" "b/public/static/images/\345\214\272\345\237\237\350\260\203\345\216\213\347\253\231.png" new file mode 100644 index 0000000..2a7c66d --- /dev/null +++ "b/public/static/images/\345\214\272\345\237\237\350\260\203\345\216\213\347\253\231.png" Binary files differ diff --git "a/public/static/images/\345\234\243\344\272\225\347\207\203\346\260\224.png" "b/public/static/images/\345\234\243\344\272\225\347\207\203\346\260\224.png" new file mode 100644 index 0000000..d88e6a2 --- /dev/null +++ "b/public/static/images/\345\234\243\344\272\225\347\207\203\346\260\224.png" Binary files differ diff --git "a/public/static/images/\346\240\207\350\257\206\345\231\250.png" "b/public/static/images/\346\240\207\350\257\206\345\231\250.png" index 2bc24ce..b5f36b5 100644 --- "a/public/static/images/\346\240\207\350\257\206\345\231\250.png" +++ "b/public/static/images/\346\240\207\350\257\206\345\231\250.png" Binary files differ diff --git "a/public/static/images/\346\240\207\350\257\206\345\231\2501.png" "b/public/static/images/\346\240\207\350\257\206\345\231\2501.png" new file mode 100644 index 0000000..2bc24ce --- /dev/null +++ "b/public/static/images/\346\240\207\350\257\206\345\231\2501.png" Binary files differ diff --git "a/public/static/images/\345\214\272\345\237\237\350\260\203\345\216\213\347\253\231.png" "b/public/static/images/\345\214\272\345\237\237\350\260\203\345\216\213\347\253\231.png" new file mode 100644 index 0000000..2a7c66d --- /dev/null +++ "b/public/static/images/\345\214\272\345\237\237\350\260\203\345\216\213\347\253\231.png" Binary files differ diff --git "a/public/static/images/\345\234\243\344\272\225\347\207\203\346\260\224.png" "b/public/static/images/\345\234\243\344\272\225\347\207\203\346\260\224.png" new file mode 100644 index 0000000..d88e6a2 --- /dev/null +++ "b/public/static/images/\345\234\243\344\272\225\347\207\203\346\260\224.png" Binary files differ diff --git "a/public/static/images/\346\240\207\350\257\206\345\231\250.png" "b/public/static/images/\346\240\207\350\257\206\345\231\250.png" index 2bc24ce..b5f36b5 100644 --- "a/public/static/images/\346\240\207\350\257\206\345\231\250.png" +++ "b/public/static/images/\346\240\207\350\257\206\345\231\250.png" Binary files differ diff --git "a/public/static/images/\346\240\207\350\257\206\345\231\2501.png" "b/public/static/images/\346\240\207\350\257\206\345\231\2501.png" new file mode 100644 index 0000000..2bc24ce --- /dev/null +++ "b/public/static/images/\346\240\207\350\257\206\345\231\2501.png" Binary files differ diff --git "a/public/static/images/\346\255\243\345\222\214\345\212\240\346\260\224\347\253\231.png" "b/public/static/images/\346\255\243\345\222\214\345\212\240\346\260\224\347\253\231.png" new file mode 100644 index 0000000..79cfb2c --- /dev/null +++ "b/public/static/images/\346\255\243\345\222\214\345\212\240\346\260\224\347\253\231.png" Binary files differ diff --git "a/public/static/images/\345\214\272\345\237\237\350\260\203\345\216\213\347\253\231.png" "b/public/static/images/\345\214\272\345\237\237\350\260\203\345\216\213\347\253\231.png" new file mode 100644 index 0000000..2a7c66d --- /dev/null +++ "b/public/static/images/\345\214\272\345\237\237\350\260\203\345\216\213\347\253\231.png" Binary files differ diff --git "a/public/static/images/\345\234\243\344\272\225\347\207\203\346\260\224.png" "b/public/static/images/\345\234\243\344\272\225\347\207\203\346\260\224.png" new file mode 100644 index 0000000..d88e6a2 --- /dev/null +++ "b/public/static/images/\345\234\243\344\272\225\347\207\203\346\260\224.png" Binary files differ diff --git "a/public/static/images/\346\240\207\350\257\206\345\231\250.png" "b/public/static/images/\346\240\207\350\257\206\345\231\250.png" index 2bc24ce..b5f36b5 100644 --- "a/public/static/images/\346\240\207\350\257\206\345\231\250.png" +++ "b/public/static/images/\346\240\207\350\257\206\345\231\250.png" Binary files differ diff --git "a/public/static/images/\346\240\207\350\257\206\345\231\2501.png" "b/public/static/images/\346\240\207\350\257\206\345\231\2501.png" new file mode 100644 index 0000000..2bc24ce --- /dev/null +++ "b/public/static/images/\346\240\207\350\257\206\345\231\2501.png" Binary files differ diff --git "a/public/static/images/\346\255\243\345\222\214\345\212\240\346\260\224\347\253\231.png" "b/public/static/images/\346\255\243\345\222\214\345\212\240\346\260\224\347\253\231.png" new file mode 100644 index 0000000..79cfb2c --- /dev/null +++ "b/public/static/images/\346\255\243\345\222\214\345\212\240\346\260\224\347\253\231.png" Binary files differ diff --git "a/public/static/images/\351\227\250\347\253\231.png" "b/public/static/images/\351\227\250\347\253\231.png" new file mode 100644 index 0000000..544ac6c --- /dev/null +++ "b/public/static/images/\351\227\250\347\253\231.png" Binary files differ diff --git "a/public/static/images/\345\214\272\345\237\237\350\260\203\345\216\213\347\253\231.png" "b/public/static/images/\345\214\272\345\237\237\350\260\203\345\216\213\347\253\231.png" new file mode 100644 index 0000000..2a7c66d --- /dev/null +++ "b/public/static/images/\345\214\272\345\237\237\350\260\203\345\216\213\347\253\231.png" Binary files differ diff --git "a/public/static/images/\345\234\243\344\272\225\347\207\203\346\260\224.png" "b/public/static/images/\345\234\243\344\272\225\347\207\203\346\260\224.png" new file mode 100644 index 0000000..d88e6a2 --- /dev/null +++ "b/public/static/images/\345\234\243\344\272\225\347\207\203\346\260\224.png" Binary files differ diff --git "a/public/static/images/\346\240\207\350\257\206\345\231\250.png" "b/public/static/images/\346\240\207\350\257\206\345\231\250.png" index 2bc24ce..b5f36b5 100644 --- "a/public/static/images/\346\240\207\350\257\206\345\231\250.png" +++ "b/public/static/images/\346\240\207\350\257\206\345\231\250.png" Binary files differ diff --git "a/public/static/images/\346\240\207\350\257\206\345\231\2501.png" "b/public/static/images/\346\240\207\350\257\206\345\231\2501.png" new file mode 100644 index 0000000..2bc24ce --- /dev/null +++ "b/public/static/images/\346\240\207\350\257\206\345\231\2501.png" Binary files differ diff --git "a/public/static/images/\346\255\243\345\222\214\345\212\240\346\260\224\347\253\231.png" "b/public/static/images/\346\255\243\345\222\214\345\212\240\346\260\224\347\253\231.png" new file mode 100644 index 0000000..79cfb2c --- /dev/null +++ "b/public/static/images/\346\255\243\345\222\214\345\212\240\346\260\224\347\253\231.png" Binary files differ diff --git "a/public/static/images/\351\227\250\347\253\231.png" "b/public/static/images/\351\227\250\347\253\231.png" new file mode 100644 index 0000000..544ac6c --- /dev/null +++ "b/public/static/images/\351\227\250\347\253\231.png" Binary files differ diff --git a/src/api/overview/wellOverview.js b/src/api/overview/wellOverview.js index 2e62e69..b7984d0 100644 --- a/src/api/overview/wellOverview.js +++ b/src/api/overview/wellOverview.js @@ -5,6 +5,7 @@ // 井查询 export function getWellList(params) { return request({ + baseURL: '/5002', url: 'overview/wellList', method: 'get', params @@ -23,6 +24,7 @@ // 获取报警列表 export function getAlarmsNow(params) { return request({ + baseURL: '/5002', url: 'overview/alarmNow', method: 'get', params diff --git "a/public/static/images/\345\214\272\345\237\237\350\260\203\345\216\213\347\253\231.png" "b/public/static/images/\345\214\272\345\237\237\350\260\203\345\216\213\347\253\231.png" new file mode 100644 index 0000000..2a7c66d --- /dev/null +++ "b/public/static/images/\345\214\272\345\237\237\350\260\203\345\216\213\347\253\231.png" Binary files differ diff --git "a/public/static/images/\345\234\243\344\272\225\347\207\203\346\260\224.png" "b/public/static/images/\345\234\243\344\272\225\347\207\203\346\260\224.png" new file mode 100644 index 0000000..d88e6a2 --- /dev/null +++ "b/public/static/images/\345\234\243\344\272\225\347\207\203\346\260\224.png" Binary files differ diff --git "a/public/static/images/\346\240\207\350\257\206\345\231\250.png" "b/public/static/images/\346\240\207\350\257\206\345\231\250.png" index 2bc24ce..b5f36b5 100644 --- "a/public/static/images/\346\240\207\350\257\206\345\231\250.png" +++ "b/public/static/images/\346\240\207\350\257\206\345\231\250.png" Binary files differ diff --git "a/public/static/images/\346\240\207\350\257\206\345\231\2501.png" "b/public/static/images/\346\240\207\350\257\206\345\231\2501.png" new file mode 100644 index 0000000..2bc24ce --- /dev/null +++ "b/public/static/images/\346\240\207\350\257\206\345\231\2501.png" Binary files differ diff --git "a/public/static/images/\346\255\243\345\222\214\345\212\240\346\260\224\347\253\231.png" "b/public/static/images/\346\255\243\345\222\214\345\212\240\346\260\224\347\253\231.png" new file mode 100644 index 0000000..79cfb2c --- /dev/null +++ "b/public/static/images/\346\255\243\345\222\214\345\212\240\346\260\224\347\253\231.png" Binary files differ diff --git "a/public/static/images/\351\227\250\347\253\231.png" "b/public/static/images/\351\227\250\347\253\231.png" new file mode 100644 index 0000000..544ac6c --- /dev/null +++ "b/public/static/images/\351\227\250\347\253\231.png" Binary files differ diff --git a/src/api/overview/wellOverview.js b/src/api/overview/wellOverview.js index 2e62e69..b7984d0 100644 --- a/src/api/overview/wellOverview.js +++ b/src/api/overview/wellOverview.js @@ -5,6 +5,7 @@ // 井查询 export function getWellList(params) { return request({ + baseURL: '/5002', url: 'overview/wellList', method: 'get', params @@ -23,6 +24,7 @@ // 获取报警列表 export function getAlarmsNow(params) { return request({ + baseURL: '/5002', url: 'overview/alarmNow', method: 'get', params diff --git a/src/components/Mars3D/Mars3dMap.vue b/src/components/Mars3D/Mars3dMap.vue new file mode 100644 index 0000000..67592b1 --- /dev/null +++ b/src/components/Mars3D/Mars3dMap.vue @@ -0,0 +1,122 @@ + + + + diff --git "a/public/static/images/\345\214\272\345\237\237\350\260\203\345\216\213\347\253\231.png" "b/public/static/images/\345\214\272\345\237\237\350\260\203\345\216\213\347\253\231.png" new file mode 100644 index 0000000..2a7c66d --- /dev/null +++ "b/public/static/images/\345\214\272\345\237\237\350\260\203\345\216\213\347\253\231.png" Binary files differ diff --git "a/public/static/images/\345\234\243\344\272\225\347\207\203\346\260\224.png" "b/public/static/images/\345\234\243\344\272\225\347\207\203\346\260\224.png" new file mode 100644 index 0000000..d88e6a2 --- /dev/null +++ "b/public/static/images/\345\234\243\344\272\225\347\207\203\346\260\224.png" Binary files differ diff --git "a/public/static/images/\346\240\207\350\257\206\345\231\250.png" "b/public/static/images/\346\240\207\350\257\206\345\231\250.png" index 2bc24ce..b5f36b5 100644 --- "a/public/static/images/\346\240\207\350\257\206\345\231\250.png" +++ "b/public/static/images/\346\240\207\350\257\206\345\231\250.png" Binary files differ diff --git "a/public/static/images/\346\240\207\350\257\206\345\231\2501.png" "b/public/static/images/\346\240\207\350\257\206\345\231\2501.png" new file mode 100644 index 0000000..2bc24ce --- /dev/null +++ "b/public/static/images/\346\240\207\350\257\206\345\231\2501.png" Binary files differ diff --git "a/public/static/images/\346\255\243\345\222\214\345\212\240\346\260\224\347\253\231.png" "b/public/static/images/\346\255\243\345\222\214\345\212\240\346\260\224\347\253\231.png" new file mode 100644 index 0000000..79cfb2c --- /dev/null +++ "b/public/static/images/\346\255\243\345\222\214\345\212\240\346\260\224\347\253\231.png" Binary files differ diff --git "a/public/static/images/\351\227\250\347\253\231.png" "b/public/static/images/\351\227\250\347\253\231.png" new file mode 100644 index 0000000..544ac6c --- /dev/null +++ "b/public/static/images/\351\227\250\347\253\231.png" Binary files differ diff --git a/src/api/overview/wellOverview.js b/src/api/overview/wellOverview.js index 2e62e69..b7984d0 100644 --- a/src/api/overview/wellOverview.js +++ b/src/api/overview/wellOverview.js @@ -5,6 +5,7 @@ // 井查询 export function getWellList(params) { return request({ + baseURL: '/5002', url: 'overview/wellList', method: 'get', params @@ -23,6 +24,7 @@ // 获取报警列表 export function getAlarmsNow(params) { return request({ + baseURL: '/5002', url: 'overview/alarmNow', method: 'get', params diff --git a/src/components/Mars3D/Mars3dMap.vue b/src/components/Mars3D/Mars3dMap.vue new file mode 100644 index 0000000..67592b1 --- /dev/null +++ b/src/components/Mars3D/Mars3dMap.vue @@ -0,0 +1,122 @@ + + + + diff --git a/src/components/Mars3D/utils/ArcGisWfsLayer.js b/src/components/Mars3D/utils/ArcGisWfsLayer.js new file mode 100644 index 0000000..3b6d51a --- /dev/null +++ b/src/components/Mars3D/utils/ArcGisWfsLayer.js @@ -0,0 +1,64 @@ +import * as mars3d from 'mars3d' +import Vue from 'vue' + +/** + * + * @param index gis图层编号 + * @param color 管线颜色 + * @param name 图层名称 + * @param radius 管径 + * @returns {ArcGisWfsLayer} + */ +export function polylineVolumeP(index, color, name, radius) { + const wfsLayer3D = new mars3d.layer.ArcGisWfsLayer({ + enablePickFeatures: false, + name: name, + url: Vue.prototype.baseConfig.arcgisUrl + index, + minimumLevel: 19, + symbol: { + type: 'polylineVolumeP', + styleOptions: { + color: color, + shape: 'pipeline', + radius: radius + }, + callback: function(attr, styleOpt) { + var val = { attr }.attr + const height = -(Number(val.起始埋深) + Number(val.终止埋深)) / 2 + return { setHeight: height, height } + } + }, + popup: 'all' + }) + window.map.addLayer(wfsLayer3D) + return wfsLayer3D +} + +/** + * + * @param index gis图层编号 + * @param color 管线颜色 + * @param name 图层名称 + * @param width 宽度 + * @returns {ArcGisWfsLayer} + */ + +export function polylineC(index, color, name, width) { + const wfsLayer = new mars3d.layer.ArcGisWfsLayer({ + enablePickFeatures: false, + name: name, + url: Vue.prototype.baseConfig.arcgisUrl + index, + // maximumLevel: 19, + symbol: { + type: 'polylineC', + styleOptions: { + color: color, + width: width, + hasShadows: false + } + }, + popup: 'all' + }) + window.map.addLayer(wfsLayer) + return wfsLayer +} diff --git "a/public/static/images/\345\214\272\345\237\237\350\260\203\345\216\213\347\253\231.png" "b/public/static/images/\345\214\272\345\237\237\350\260\203\345\216\213\347\253\231.png" new file mode 100644 index 0000000..2a7c66d --- /dev/null +++ "b/public/static/images/\345\214\272\345\237\237\350\260\203\345\216\213\347\253\231.png" Binary files differ diff --git "a/public/static/images/\345\234\243\344\272\225\347\207\203\346\260\224.png" "b/public/static/images/\345\234\243\344\272\225\347\207\203\346\260\224.png" new file mode 100644 index 0000000..d88e6a2 --- /dev/null +++ "b/public/static/images/\345\234\243\344\272\225\347\207\203\346\260\224.png" Binary files differ diff --git "a/public/static/images/\346\240\207\350\257\206\345\231\250.png" "b/public/static/images/\346\240\207\350\257\206\345\231\250.png" index 2bc24ce..b5f36b5 100644 --- "a/public/static/images/\346\240\207\350\257\206\345\231\250.png" +++ "b/public/static/images/\346\240\207\350\257\206\345\231\250.png" Binary files differ diff --git "a/public/static/images/\346\240\207\350\257\206\345\231\2501.png" "b/public/static/images/\346\240\207\350\257\206\345\231\2501.png" new file mode 100644 index 0000000..2bc24ce --- /dev/null +++ "b/public/static/images/\346\240\207\350\257\206\345\231\2501.png" Binary files differ diff --git "a/public/static/images/\346\255\243\345\222\214\345\212\240\346\260\224\347\253\231.png" "b/public/static/images/\346\255\243\345\222\214\345\212\240\346\260\224\347\253\231.png" new file mode 100644 index 0000000..79cfb2c --- /dev/null +++ "b/public/static/images/\346\255\243\345\222\214\345\212\240\346\260\224\347\253\231.png" Binary files differ diff --git "a/public/static/images/\351\227\250\347\253\231.png" "b/public/static/images/\351\227\250\347\253\231.png" new file mode 100644 index 0000000..544ac6c --- /dev/null +++ "b/public/static/images/\351\227\250\347\253\231.png" Binary files differ diff --git a/src/api/overview/wellOverview.js b/src/api/overview/wellOverview.js index 2e62e69..b7984d0 100644 --- a/src/api/overview/wellOverview.js +++ b/src/api/overview/wellOverview.js @@ -5,6 +5,7 @@ // 井查询 export function getWellList(params) { return request({ + baseURL: '/5002', url: 'overview/wellList', method: 'get', params @@ -23,6 +24,7 @@ // 获取报警列表 export function getAlarmsNow(params) { return request({ + baseURL: '/5002', url: 'overview/alarmNow', method: 'get', params diff --git a/src/components/Mars3D/Mars3dMap.vue b/src/components/Mars3D/Mars3dMap.vue new file mode 100644 index 0000000..67592b1 --- /dev/null +++ b/src/components/Mars3D/Mars3dMap.vue @@ -0,0 +1,122 @@ + + + + diff --git a/src/components/Mars3D/utils/ArcGisWfsLayer.js b/src/components/Mars3D/utils/ArcGisWfsLayer.js new file mode 100644 index 0000000..3b6d51a --- /dev/null +++ b/src/components/Mars3D/utils/ArcGisWfsLayer.js @@ -0,0 +1,64 @@ +import * as mars3d from 'mars3d' +import Vue from 'vue' + +/** + * + * @param index gis图层编号 + * @param color 管线颜色 + * @param name 图层名称 + * @param radius 管径 + * @returns {ArcGisWfsLayer} + */ +export function polylineVolumeP(index, color, name, radius) { + const wfsLayer3D = new mars3d.layer.ArcGisWfsLayer({ + enablePickFeatures: false, + name: name, + url: Vue.prototype.baseConfig.arcgisUrl + index, + minimumLevel: 19, + symbol: { + type: 'polylineVolumeP', + styleOptions: { + color: color, + shape: 'pipeline', + radius: radius + }, + callback: function(attr, styleOpt) { + var val = { attr }.attr + const height = -(Number(val.起始埋深) + Number(val.终止埋深)) / 2 + return { setHeight: height, height } + } + }, + popup: 'all' + }) + window.map.addLayer(wfsLayer3D) + return wfsLayer3D +} + +/** + * + * @param index gis图层编号 + * @param color 管线颜色 + * @param name 图层名称 + * @param width 宽度 + * @returns {ArcGisWfsLayer} + */ + +export function polylineC(index, color, name, width) { + const wfsLayer = new mars3d.layer.ArcGisWfsLayer({ + enablePickFeatures: false, + name: name, + url: Vue.prototype.baseConfig.arcgisUrl + index, + // maximumLevel: 19, + symbol: { + type: 'polylineC', + styleOptions: { + color: color, + width: width, + hasShadows: false + } + }, + popup: 'all' + }) + window.map.addLayer(wfsLayer) + return wfsLayer +} diff --git a/src/components/Mars3D/utils/GeoJsonLayer.js b/src/components/Mars3D/utils/GeoJsonLayer.js new file mode 100644 index 0000000..8738528 --- /dev/null +++ b/src/components/Mars3D/utils/GeoJsonLayer.js @@ -0,0 +1,174 @@ +import * as mars3d from 'mars3d' +import Vue from 'vue' + +/** + * BillboardP + ModelC + * @param index 图层序号 + * @param name 图层名称 + * @param image 图片 + * @param model 模型 + * @param condition 搜索条件 + * @returns {{"3D": string, "2D": BaseClass}} + */ + +export function createPointModelLayer(index, name, image, model = '', condition) { + const queryServer = new mars3d.query.QueryArcServer({ + url: Vue.prototype.baseConfig.arcgisUrl + index, + popup: 'all', + pageSize: 5000 + }) + const layer = new mars3d.layer.GeoJsonLayer({ + name: name, + onCreateGraphic: function(options) { + const points = options.position // 坐标 + const attr = options.attr // 属性信息 + const primitive = new mars3d.graphic.BillboardPrimitive({ + allowDrillPick: true, + attr: attr, + id: attr.编号, + position: points, + style: { + image: image, + scale: 0.6, + hasPixelOffset: true, + pixelOffsetY: -10, + scaleByDistance: true, + scaleByDistance_far: 30000, + scaleByDistance_farValue: 0.6, + scaleByDistance_near: 0, + scaleByDistance_nearValue: 1.4, + clampToGround: true, + highlight: { type: 'click', image: '../static/images/high-marker.png' } + } + }) + layer.addGraphic(primitive) + }, + popup: 'all' + }).bindPopup(function(event) { + return mars3d.Util.getTemplateHtml({ template: 'all', attr: event.graphic.attr || {}}) + }).on(mars3d.EventType.click, function(event) { + if (window.map.camera.positionCartographic.height > 5000) { + window.map.flyToPoint(event.graphic.position, { + radius: 5000, // 距离目标点的距离 + duration: 1 + }) + } + }) + window.map.addLayer(layer) + let layer3D = '' + queryServer.query({ + where: condition, + success: (result) => { + if (result.count === 0) { + console.log('未查询到相关记录!') + } + layer.load({ data: result.geojson }) + if (model !== '') { + layer3D = new mars3d.layer.GraphicLayer({ + name: name + }).bindPopup(function(event) { + const attr = event.graphic.attr || {} + return mars3d.Util.getTemplateHtml({ template: 'all', attr: attr }) + }) + layer3D.show = false + window.map.addLayer(layer3D) + const points = [] + result.geojson.features.forEach(item => { + points.push({ + position: [item.geometry.coordinates[0], item.geometry.coordinates[1], 0], + style: { + scale: 1.5 + }, + attr: item.properties + }) + }) + const modelCombine = new mars3d.graphic.ModelCombine({ + url: model, + instances: points + }) + layer3D.addGraphic(modelCombine) + } + }, + error: (error, msg) => { + console.log('服务访问错误,' + error) + } + }) + return { + '3D': layer3D, + '2D': layer + } +} + +/** + * BillboardP + * @param layer 图层 + * @param index gis图层编号 + * @param image 图片 + * @param condition 条件 + * @returns {BaseClass} + */ +export function createPointLayer(layer, index, image, condition) { + if (layer !== null) window.map.removeLayer(layer) + const queryServer = new mars3d.query.QueryArcServer({ + url: Vue.prototype.baseConfig.arcgisUrl + index, + popup: 'all', + pageSize: 5000 + }) + layer = new mars3d.layer.GeoJsonLayer({ + onCreateGraphic: function(options) { + const points = options.position // 坐标 + const attr = options.attr // 属性信息 + const primitive = new mars3d.graphic.BillboardPrimitive({ + allowDrillPick: true, + attr: attr, + id: attr.编号, + position: points, + style: { + image: image, + scale: 0.6, + hasPixelOffset: true, + pixelOffsetY: -10, + scaleByDistance: true, + scaleByDistance_far: 20000, + scaleByDistance_farValue: 0.6, + scaleByDistance_near: 0, + scaleByDistance_nearValue: 1.4, + clampToGround: true, + highlight: { type: 'click', image: '../static/images/high-marker.png' } + } + }) + layer.addGraphic(primitive) + }, + popup: 'all' + }).bindPopup(function(event) { + return mars3d.Util.getTemplateHtml({ template: 'all', attr: event.graphic.attr || {}}) + }).on(mars3d.EventType.click, function(event) { + if (window.map.camera.positionCartographic.height > 5000) { + window.map.flyToPoint(event.graphic.position, { + radius: 5000, // 距离目标点的距离 + duration: 1 + }) + } + }).on(mars3d.EventType.show, function(event) { + console.log(index, ' show时间(s):', new Date().getSeconds()) + }).on(mars3d.EventType.load, function(event) { + console.log(index, ' load时间(s):', new Date().getSeconds()) + }).on(mars3d.EventType.postRender, function(event) { + console.log(index, ' postRender时间(s):', new Date().getSeconds()) + }) + window.map.addLayer(layer) + queryServer.query({ + where: condition, + success: (result) => { + console.log(index, '总数:', result.count, ' data时间(s):', new Date().getSeconds()) + if (result.count === 0) { + console.log('未查询到相关记录!') + } + layer.load({ data: result.geojson }) + }, + error: (error, msg) => { + console.log('服务访问错误,' + error) + } + }) + return layer +} diff --git "a/public/static/images/\345\214\272\345\237\237\350\260\203\345\216\213\347\253\231.png" "b/public/static/images/\345\214\272\345\237\237\350\260\203\345\216\213\347\253\231.png" new file mode 100644 index 0000000..2a7c66d --- /dev/null +++ "b/public/static/images/\345\214\272\345\237\237\350\260\203\345\216\213\347\253\231.png" Binary files differ diff --git "a/public/static/images/\345\234\243\344\272\225\347\207\203\346\260\224.png" "b/public/static/images/\345\234\243\344\272\225\347\207\203\346\260\224.png" new file mode 100644 index 0000000..d88e6a2 --- /dev/null +++ "b/public/static/images/\345\234\243\344\272\225\347\207\203\346\260\224.png" Binary files differ diff --git "a/public/static/images/\346\240\207\350\257\206\345\231\250.png" "b/public/static/images/\346\240\207\350\257\206\345\231\250.png" index 2bc24ce..b5f36b5 100644 --- "a/public/static/images/\346\240\207\350\257\206\345\231\250.png" +++ "b/public/static/images/\346\240\207\350\257\206\345\231\250.png" Binary files differ diff --git "a/public/static/images/\346\240\207\350\257\206\345\231\2501.png" "b/public/static/images/\346\240\207\350\257\206\345\231\2501.png" new file mode 100644 index 0000000..2bc24ce --- /dev/null +++ "b/public/static/images/\346\240\207\350\257\206\345\231\2501.png" Binary files differ diff --git "a/public/static/images/\346\255\243\345\222\214\345\212\240\346\260\224\347\253\231.png" "b/public/static/images/\346\255\243\345\222\214\345\212\240\346\260\224\347\253\231.png" new file mode 100644 index 0000000..79cfb2c --- /dev/null +++ "b/public/static/images/\346\255\243\345\222\214\345\212\240\346\260\224\347\253\231.png" Binary files differ diff --git "a/public/static/images/\351\227\250\347\253\231.png" "b/public/static/images/\351\227\250\347\253\231.png" new file mode 100644 index 0000000..544ac6c --- /dev/null +++ "b/public/static/images/\351\227\250\347\253\231.png" Binary files differ diff --git a/src/api/overview/wellOverview.js b/src/api/overview/wellOverview.js index 2e62e69..b7984d0 100644 --- a/src/api/overview/wellOverview.js +++ b/src/api/overview/wellOverview.js @@ -5,6 +5,7 @@ // 井查询 export function getWellList(params) { return request({ + baseURL: '/5002', url: 'overview/wellList', method: 'get', params @@ -23,6 +24,7 @@ // 获取报警列表 export function getAlarmsNow(params) { return request({ + baseURL: '/5002', url: 'overview/alarmNow', method: 'get', params diff --git a/src/components/Mars3D/Mars3dMap.vue b/src/components/Mars3D/Mars3dMap.vue new file mode 100644 index 0000000..67592b1 --- /dev/null +++ b/src/components/Mars3D/Mars3dMap.vue @@ -0,0 +1,122 @@ + + + + diff --git a/src/components/Mars3D/utils/ArcGisWfsLayer.js b/src/components/Mars3D/utils/ArcGisWfsLayer.js new file mode 100644 index 0000000..3b6d51a --- /dev/null +++ b/src/components/Mars3D/utils/ArcGisWfsLayer.js @@ -0,0 +1,64 @@ +import * as mars3d from 'mars3d' +import Vue from 'vue' + +/** + * + * @param index gis图层编号 + * @param color 管线颜色 + * @param name 图层名称 + * @param radius 管径 + * @returns {ArcGisWfsLayer} + */ +export function polylineVolumeP(index, color, name, radius) { + const wfsLayer3D = new mars3d.layer.ArcGisWfsLayer({ + enablePickFeatures: false, + name: name, + url: Vue.prototype.baseConfig.arcgisUrl + index, + minimumLevel: 19, + symbol: { + type: 'polylineVolumeP', + styleOptions: { + color: color, + shape: 'pipeline', + radius: radius + }, + callback: function(attr, styleOpt) { + var val = { attr }.attr + const height = -(Number(val.起始埋深) + Number(val.终止埋深)) / 2 + return { setHeight: height, height } + } + }, + popup: 'all' + }) + window.map.addLayer(wfsLayer3D) + return wfsLayer3D +} + +/** + * + * @param index gis图层编号 + * @param color 管线颜色 + * @param name 图层名称 + * @param width 宽度 + * @returns {ArcGisWfsLayer} + */ + +export function polylineC(index, color, name, width) { + const wfsLayer = new mars3d.layer.ArcGisWfsLayer({ + enablePickFeatures: false, + name: name, + url: Vue.prototype.baseConfig.arcgisUrl + index, + // maximumLevel: 19, + symbol: { + type: 'polylineC', + styleOptions: { + color: color, + width: width, + hasShadows: false + } + }, + popup: 'all' + }) + window.map.addLayer(wfsLayer) + return wfsLayer +} diff --git a/src/components/Mars3D/utils/GeoJsonLayer.js b/src/components/Mars3D/utils/GeoJsonLayer.js new file mode 100644 index 0000000..8738528 --- /dev/null +++ b/src/components/Mars3D/utils/GeoJsonLayer.js @@ -0,0 +1,174 @@ +import * as mars3d from 'mars3d' +import Vue from 'vue' + +/** + * BillboardP + ModelC + * @param index 图层序号 + * @param name 图层名称 + * @param image 图片 + * @param model 模型 + * @param condition 搜索条件 + * @returns {{"3D": string, "2D": BaseClass}} + */ + +export function createPointModelLayer(index, name, image, model = '', condition) { + const queryServer = new mars3d.query.QueryArcServer({ + url: Vue.prototype.baseConfig.arcgisUrl + index, + popup: 'all', + pageSize: 5000 + }) + const layer = new mars3d.layer.GeoJsonLayer({ + name: name, + onCreateGraphic: function(options) { + const points = options.position // 坐标 + const attr = options.attr // 属性信息 + const primitive = new mars3d.graphic.BillboardPrimitive({ + allowDrillPick: true, + attr: attr, + id: attr.编号, + position: points, + style: { + image: image, + scale: 0.6, + hasPixelOffset: true, + pixelOffsetY: -10, + scaleByDistance: true, + scaleByDistance_far: 30000, + scaleByDistance_farValue: 0.6, + scaleByDistance_near: 0, + scaleByDistance_nearValue: 1.4, + clampToGround: true, + highlight: { type: 'click', image: '../static/images/high-marker.png' } + } + }) + layer.addGraphic(primitive) + }, + popup: 'all' + }).bindPopup(function(event) { + return mars3d.Util.getTemplateHtml({ template: 'all', attr: event.graphic.attr || {}}) + }).on(mars3d.EventType.click, function(event) { + if (window.map.camera.positionCartographic.height > 5000) { + window.map.flyToPoint(event.graphic.position, { + radius: 5000, // 距离目标点的距离 + duration: 1 + }) + } + }) + window.map.addLayer(layer) + let layer3D = '' + queryServer.query({ + where: condition, + success: (result) => { + if (result.count === 0) { + console.log('未查询到相关记录!') + } + layer.load({ data: result.geojson }) + if (model !== '') { + layer3D = new mars3d.layer.GraphicLayer({ + name: name + }).bindPopup(function(event) { + const attr = event.graphic.attr || {} + return mars3d.Util.getTemplateHtml({ template: 'all', attr: attr }) + }) + layer3D.show = false + window.map.addLayer(layer3D) + const points = [] + result.geojson.features.forEach(item => { + points.push({ + position: [item.geometry.coordinates[0], item.geometry.coordinates[1], 0], + style: { + scale: 1.5 + }, + attr: item.properties + }) + }) + const modelCombine = new mars3d.graphic.ModelCombine({ + url: model, + instances: points + }) + layer3D.addGraphic(modelCombine) + } + }, + error: (error, msg) => { + console.log('服务访问错误,' + error) + } + }) + return { + '3D': layer3D, + '2D': layer + } +} + +/** + * BillboardP + * @param layer 图层 + * @param index gis图层编号 + * @param image 图片 + * @param condition 条件 + * @returns {BaseClass} + */ +export function createPointLayer(layer, index, image, condition) { + if (layer !== null) window.map.removeLayer(layer) + const queryServer = new mars3d.query.QueryArcServer({ + url: Vue.prototype.baseConfig.arcgisUrl + index, + popup: 'all', + pageSize: 5000 + }) + layer = new mars3d.layer.GeoJsonLayer({ + onCreateGraphic: function(options) { + const points = options.position // 坐标 + const attr = options.attr // 属性信息 + const primitive = new mars3d.graphic.BillboardPrimitive({ + allowDrillPick: true, + attr: attr, + id: attr.编号, + position: points, + style: { + image: image, + scale: 0.6, + hasPixelOffset: true, + pixelOffsetY: -10, + scaleByDistance: true, + scaleByDistance_far: 20000, + scaleByDistance_farValue: 0.6, + scaleByDistance_near: 0, + scaleByDistance_nearValue: 1.4, + clampToGround: true, + highlight: { type: 'click', image: '../static/images/high-marker.png' } + } + }) + layer.addGraphic(primitive) + }, + popup: 'all' + }).bindPopup(function(event) { + return mars3d.Util.getTemplateHtml({ template: 'all', attr: event.graphic.attr || {}}) + }).on(mars3d.EventType.click, function(event) { + if (window.map.camera.positionCartographic.height > 5000) { + window.map.flyToPoint(event.graphic.position, { + radius: 5000, // 距离目标点的距离 + duration: 1 + }) + } + }).on(mars3d.EventType.show, function(event) { + console.log(index, ' show时间(s):', new Date().getSeconds()) + }).on(mars3d.EventType.load, function(event) { + console.log(index, ' load时间(s):', new Date().getSeconds()) + }).on(mars3d.EventType.postRender, function(event) { + console.log(index, ' postRender时间(s):', new Date().getSeconds()) + }) + window.map.addLayer(layer) + queryServer.query({ + where: condition, + success: (result) => { + console.log(index, '总数:', result.count, ' data时间(s):', new Date().getSeconds()) + if (result.count === 0) { + console.log('未查询到相关记录!') + } + layer.load({ data: result.geojson }) + }, + error: (error, msg) => { + console.log('服务访问错误,' + error) + } + }) + return layer +} diff --git a/src/styles/index.scss b/src/styles/index.scss index 49d6763..565bff8 100644 --- a/src/styles/index.scss +++ b/src/styles/index.scss @@ -183,7 +183,7 @@ background-color: #00000000 !important; background: url("../assets/images/info-bg.png") no-repeat !important; background-size: 100% 100% !important; - border-radius: 20px; + border-radius: 20px !important; } .mars3d-popup-close-button{ top: 10px !important; diff --git "a/public/static/images/\345\214\272\345\237\237\350\260\203\345\216\213\347\253\231.png" "b/public/static/images/\345\214\272\345\237\237\350\260\203\345\216\213\347\253\231.png" new file mode 100644 index 0000000..2a7c66d --- /dev/null +++ "b/public/static/images/\345\214\272\345\237\237\350\260\203\345\216\213\347\253\231.png" Binary files differ diff --git "a/public/static/images/\345\234\243\344\272\225\347\207\203\346\260\224.png" "b/public/static/images/\345\234\243\344\272\225\347\207\203\346\260\224.png" new file mode 100644 index 0000000..d88e6a2 --- /dev/null +++ "b/public/static/images/\345\234\243\344\272\225\347\207\203\346\260\224.png" Binary files differ diff --git "a/public/static/images/\346\240\207\350\257\206\345\231\250.png" "b/public/static/images/\346\240\207\350\257\206\345\231\250.png" index 2bc24ce..b5f36b5 100644 --- "a/public/static/images/\346\240\207\350\257\206\345\231\250.png" +++ "b/public/static/images/\346\240\207\350\257\206\345\231\250.png" Binary files differ diff --git "a/public/static/images/\346\240\207\350\257\206\345\231\2501.png" "b/public/static/images/\346\240\207\350\257\206\345\231\2501.png" new file mode 100644 index 0000000..2bc24ce --- /dev/null +++ "b/public/static/images/\346\240\207\350\257\206\345\231\2501.png" Binary files differ diff --git "a/public/static/images/\346\255\243\345\222\214\345\212\240\346\260\224\347\253\231.png" "b/public/static/images/\346\255\243\345\222\214\345\212\240\346\260\224\347\253\231.png" new file mode 100644 index 0000000..79cfb2c --- /dev/null +++ "b/public/static/images/\346\255\243\345\222\214\345\212\240\346\260\224\347\253\231.png" Binary files differ diff --git "a/public/static/images/\351\227\250\347\253\231.png" "b/public/static/images/\351\227\250\347\253\231.png" new file mode 100644 index 0000000..544ac6c --- /dev/null +++ "b/public/static/images/\351\227\250\347\253\231.png" Binary files differ diff --git a/src/api/overview/wellOverview.js b/src/api/overview/wellOverview.js index 2e62e69..b7984d0 100644 --- a/src/api/overview/wellOverview.js +++ b/src/api/overview/wellOverview.js @@ -5,6 +5,7 @@ // 井查询 export function getWellList(params) { return request({ + baseURL: '/5002', url: 'overview/wellList', method: 'get', params @@ -23,6 +24,7 @@ // 获取报警列表 export function getAlarmsNow(params) { return request({ + baseURL: '/5002', url: 'overview/alarmNow', method: 'get', params diff --git a/src/components/Mars3D/Mars3dMap.vue b/src/components/Mars3D/Mars3dMap.vue new file mode 100644 index 0000000..67592b1 --- /dev/null +++ b/src/components/Mars3D/Mars3dMap.vue @@ -0,0 +1,122 @@ + + + + diff --git a/src/components/Mars3D/utils/ArcGisWfsLayer.js b/src/components/Mars3D/utils/ArcGisWfsLayer.js new file mode 100644 index 0000000..3b6d51a --- /dev/null +++ b/src/components/Mars3D/utils/ArcGisWfsLayer.js @@ -0,0 +1,64 @@ +import * as mars3d from 'mars3d' +import Vue from 'vue' + +/** + * + * @param index gis图层编号 + * @param color 管线颜色 + * @param name 图层名称 + * @param radius 管径 + * @returns {ArcGisWfsLayer} + */ +export function polylineVolumeP(index, color, name, radius) { + const wfsLayer3D = new mars3d.layer.ArcGisWfsLayer({ + enablePickFeatures: false, + name: name, + url: Vue.prototype.baseConfig.arcgisUrl + index, + minimumLevel: 19, + symbol: { + type: 'polylineVolumeP', + styleOptions: { + color: color, + shape: 'pipeline', + radius: radius + }, + callback: function(attr, styleOpt) { + var val = { attr }.attr + const height = -(Number(val.起始埋深) + Number(val.终止埋深)) / 2 + return { setHeight: height, height } + } + }, + popup: 'all' + }) + window.map.addLayer(wfsLayer3D) + return wfsLayer3D +} + +/** + * + * @param index gis图层编号 + * @param color 管线颜色 + * @param name 图层名称 + * @param width 宽度 + * @returns {ArcGisWfsLayer} + */ + +export function polylineC(index, color, name, width) { + const wfsLayer = new mars3d.layer.ArcGisWfsLayer({ + enablePickFeatures: false, + name: name, + url: Vue.prototype.baseConfig.arcgisUrl + index, + // maximumLevel: 19, + symbol: { + type: 'polylineC', + styleOptions: { + color: color, + width: width, + hasShadows: false + } + }, + popup: 'all' + }) + window.map.addLayer(wfsLayer) + return wfsLayer +} diff --git a/src/components/Mars3D/utils/GeoJsonLayer.js b/src/components/Mars3D/utils/GeoJsonLayer.js new file mode 100644 index 0000000..8738528 --- /dev/null +++ b/src/components/Mars3D/utils/GeoJsonLayer.js @@ -0,0 +1,174 @@ +import * as mars3d from 'mars3d' +import Vue from 'vue' + +/** + * BillboardP + ModelC + * @param index 图层序号 + * @param name 图层名称 + * @param image 图片 + * @param model 模型 + * @param condition 搜索条件 + * @returns {{"3D": string, "2D": BaseClass}} + */ + +export function createPointModelLayer(index, name, image, model = '', condition) { + const queryServer = new mars3d.query.QueryArcServer({ + url: Vue.prototype.baseConfig.arcgisUrl + index, + popup: 'all', + pageSize: 5000 + }) + const layer = new mars3d.layer.GeoJsonLayer({ + name: name, + onCreateGraphic: function(options) { + const points = options.position // 坐标 + const attr = options.attr // 属性信息 + const primitive = new mars3d.graphic.BillboardPrimitive({ + allowDrillPick: true, + attr: attr, + id: attr.编号, + position: points, + style: { + image: image, + scale: 0.6, + hasPixelOffset: true, + pixelOffsetY: -10, + scaleByDistance: true, + scaleByDistance_far: 30000, + scaleByDistance_farValue: 0.6, + scaleByDistance_near: 0, + scaleByDistance_nearValue: 1.4, + clampToGround: true, + highlight: { type: 'click', image: '../static/images/high-marker.png' } + } + }) + layer.addGraphic(primitive) + }, + popup: 'all' + }).bindPopup(function(event) { + return mars3d.Util.getTemplateHtml({ template: 'all', attr: event.graphic.attr || {}}) + }).on(mars3d.EventType.click, function(event) { + if (window.map.camera.positionCartographic.height > 5000) { + window.map.flyToPoint(event.graphic.position, { + radius: 5000, // 距离目标点的距离 + duration: 1 + }) + } + }) + window.map.addLayer(layer) + let layer3D = '' + queryServer.query({ + where: condition, + success: (result) => { + if (result.count === 0) { + console.log('未查询到相关记录!') + } + layer.load({ data: result.geojson }) + if (model !== '') { + layer3D = new mars3d.layer.GraphicLayer({ + name: name + }).bindPopup(function(event) { + const attr = event.graphic.attr || {} + return mars3d.Util.getTemplateHtml({ template: 'all', attr: attr }) + }) + layer3D.show = false + window.map.addLayer(layer3D) + const points = [] + result.geojson.features.forEach(item => { + points.push({ + position: [item.geometry.coordinates[0], item.geometry.coordinates[1], 0], + style: { + scale: 1.5 + }, + attr: item.properties + }) + }) + const modelCombine = new mars3d.graphic.ModelCombine({ + url: model, + instances: points + }) + layer3D.addGraphic(modelCombine) + } + }, + error: (error, msg) => { + console.log('服务访问错误,' + error) + } + }) + return { + '3D': layer3D, + '2D': layer + } +} + +/** + * BillboardP + * @param layer 图层 + * @param index gis图层编号 + * @param image 图片 + * @param condition 条件 + * @returns {BaseClass} + */ +export function createPointLayer(layer, index, image, condition) { + if (layer !== null) window.map.removeLayer(layer) + const queryServer = new mars3d.query.QueryArcServer({ + url: Vue.prototype.baseConfig.arcgisUrl + index, + popup: 'all', + pageSize: 5000 + }) + layer = new mars3d.layer.GeoJsonLayer({ + onCreateGraphic: function(options) { + const points = options.position // 坐标 + const attr = options.attr // 属性信息 + const primitive = new mars3d.graphic.BillboardPrimitive({ + allowDrillPick: true, + attr: attr, + id: attr.编号, + position: points, + style: { + image: image, + scale: 0.6, + hasPixelOffset: true, + pixelOffsetY: -10, + scaleByDistance: true, + scaleByDistance_far: 20000, + scaleByDistance_farValue: 0.6, + scaleByDistance_near: 0, + scaleByDistance_nearValue: 1.4, + clampToGround: true, + highlight: { type: 'click', image: '../static/images/high-marker.png' } + } + }) + layer.addGraphic(primitive) + }, + popup: 'all' + }).bindPopup(function(event) { + return mars3d.Util.getTemplateHtml({ template: 'all', attr: event.graphic.attr || {}}) + }).on(mars3d.EventType.click, function(event) { + if (window.map.camera.positionCartographic.height > 5000) { + window.map.flyToPoint(event.graphic.position, { + radius: 5000, // 距离目标点的距离 + duration: 1 + }) + } + }).on(mars3d.EventType.show, function(event) { + console.log(index, ' show时间(s):', new Date().getSeconds()) + }).on(mars3d.EventType.load, function(event) { + console.log(index, ' load时间(s):', new Date().getSeconds()) + }).on(mars3d.EventType.postRender, function(event) { + console.log(index, ' postRender时间(s):', new Date().getSeconds()) + }) + window.map.addLayer(layer) + queryServer.query({ + where: condition, + success: (result) => { + console.log(index, '总数:', result.count, ' data时间(s):', new Date().getSeconds()) + if (result.count === 0) { + console.log('未查询到相关记录!') + } + layer.load({ data: result.geojson }) + }, + error: (error, msg) => { + console.log('服务访问错误,' + error) + } + }) + return layer +} diff --git a/src/styles/index.scss b/src/styles/index.scss index 49d6763..565bff8 100644 --- a/src/styles/index.scss +++ b/src/styles/index.scss @@ -183,7 +183,7 @@ background-color: #00000000 !important; background: url("../assets/images/info-bg.png") no-repeat !important; background-size: 100% 100% !important; - border-radius: 20px; + border-radius: 20px !important; } .mars3d-popup-close-button{ top: 10px !important; diff --git a/src/views/overview/overview3dzq.vue b/src/views/overview/overview3dzq.vue index 2ea1713..7dda3b6 100644 --- a/src/views/overview/overview3dzq.vue +++ b/src/views/overview/overview3dzq.vue @@ -1,7 +1,7 @@