diff --git a/config/dev.env.js b/config/dev.env.js index 9e51854..4869bf2 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -10,5 +10,5 @@ // BASE_API: '"http://119.254.103.80:14537"' // BASE_API: '"http://192.168.0.225:14537"' // BASE_API: '"http://localhost:8080/api/"' - BASE_API: '"http://124.42.118.61:8093"' + BASE_API: '"http://139.198.16.38:8093"' }) diff --git a/config/dev.env.js b/config/dev.env.js index 9e51854..4869bf2 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -10,5 +10,5 @@ // BASE_API: '"http://119.254.103.80:14537"' // BASE_API: '"http://192.168.0.225:14537"' // BASE_API: '"http://localhost:8080/api/"' - BASE_API: '"http://124.42.118.61:8093"' + BASE_API: '"http://139.198.16.38:8093"' }) diff --git a/config/prod.env.js b/config/prod.env.js index 9836354..cc59c91 100644 --- a/config/prod.env.js +++ b/config/prod.env.js @@ -1,5 +1,5 @@ 'use strict' module.exports = { NODE_ENV: '"production"', - BASE_API: '"http://124.42.118.61:8093"', + BASE_API: '"http://139.198.16.38:8093"', } diff --git a/config/dev.env.js b/config/dev.env.js index 9e51854..4869bf2 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -10,5 +10,5 @@ // BASE_API: '"http://119.254.103.80:14537"' // BASE_API: '"http://192.168.0.225:14537"' // BASE_API: '"http://localhost:8080/api/"' - BASE_API: '"http://124.42.118.61:8093"' + BASE_API: '"http://139.198.16.38:8093"' }) diff --git a/config/prod.env.js b/config/prod.env.js index 9836354..cc59c91 100644 --- a/config/prod.env.js +++ b/config/prod.env.js @@ -1,5 +1,5 @@ 'use strict' module.exports = { NODE_ENV: '"production"', - BASE_API: '"http://124.42.118.61:8093"', + BASE_API: '"http://139.198.16.38:8093"', } diff --git a/src/components/Map/arcgisMap.vue b/src/components/Map/arcgisMap.vue index 9bcf43f..ba8aeb4 100644 --- a/src/components/Map/arcgisMap.vue +++ b/src/components/Map/arcgisMap.vue @@ -307,7 +307,7 @@ that.view.popup.open({ title: name, content: address, - location: event.mapPoint + location: graphic.geometry }) } }) diff --git a/config/dev.env.js b/config/dev.env.js index 9e51854..4869bf2 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -10,5 +10,5 @@ // BASE_API: '"http://119.254.103.80:14537"' // BASE_API: '"http://192.168.0.225:14537"' // BASE_API: '"http://localhost:8080/api/"' - BASE_API: '"http://124.42.118.61:8093"' + BASE_API: '"http://139.198.16.38:8093"' }) diff --git a/config/prod.env.js b/config/prod.env.js index 9836354..cc59c91 100644 --- a/config/prod.env.js +++ b/config/prod.env.js @@ -1,5 +1,5 @@ 'use strict' module.exports = { NODE_ENV: '"production"', - BASE_API: '"http://124.42.118.61:8093"', + BASE_API: '"http://139.198.16.38:8093"', } diff --git a/src/components/Map/arcgisMap.vue b/src/components/Map/arcgisMap.vue index 9bcf43f..ba8aeb4 100644 --- a/src/components/Map/arcgisMap.vue +++ b/src/components/Map/arcgisMap.vue @@ -307,7 +307,7 @@ that.view.popup.open({ title: name, content: address, - location: event.mapPoint + location: graphic.geometry }) } }) diff --git a/src/views/baseSource/baseSource.vue b/src/views/baseSource/baseSource.vue index be2855c..9bc5878 100644 --- a/src/views/baseSource/baseSource.vue +++ b/src/views/baseSource/baseSource.vue @@ -1,6 +1,6 @@ diff --git a/config/dev.env.js b/config/dev.env.js index 9e51854..4869bf2 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -10,5 +10,5 @@ // BASE_API: '"http://119.254.103.80:14537"' // BASE_API: '"http://192.168.0.225:14537"' // BASE_API: '"http://localhost:8080/api/"' - BASE_API: '"http://124.42.118.61:8093"' + BASE_API: '"http://139.198.16.38:8093"' }) diff --git a/config/prod.env.js b/config/prod.env.js index 9836354..cc59c91 100644 --- a/config/prod.env.js +++ b/config/prod.env.js @@ -1,5 +1,5 @@ 'use strict' module.exports = { NODE_ENV: '"production"', - BASE_API: '"http://124.42.118.61:8093"', + BASE_API: '"http://139.198.16.38:8093"', } diff --git a/src/components/Map/arcgisMap.vue b/src/components/Map/arcgisMap.vue index 9bcf43f..ba8aeb4 100644 --- a/src/components/Map/arcgisMap.vue +++ b/src/components/Map/arcgisMap.vue @@ -307,7 +307,7 @@ that.view.popup.open({ title: name, content: address, - location: event.mapPoint + location: graphic.geometry }) } }) diff --git a/src/views/baseSource/baseSource.vue b/src/views/baseSource/baseSource.vue index be2855c..9bc5878 100644 --- a/src/views/baseSource/baseSource.vue +++ b/src/views/baseSource/baseSource.vue @@ -1,6 +1,6 @@ diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue index 5808f59..7e9a92d 100644 --- a/src/views/dashboard/index.vue +++ b/src/views/dashboard/index.vue @@ -2,7 +2,7 @@
智慧城管平台
-
+
@@ -20,12 +20,12 @@
-
- -
+ + + + + +
@@ -106,7 +106,7 @@ } .dashboard { width: 1280px; - height: 700px; + max-height: 700px; position: absolute; text-align: center; left: 50%; diff --git a/config/dev.env.js b/config/dev.env.js index 9e51854..4869bf2 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -10,5 +10,5 @@ // BASE_API: '"http://119.254.103.80:14537"' // BASE_API: '"http://192.168.0.225:14537"' // BASE_API: '"http://localhost:8080/api/"' - BASE_API: '"http://124.42.118.61:8093"' + BASE_API: '"http://139.198.16.38:8093"' }) diff --git a/config/prod.env.js b/config/prod.env.js index 9836354..cc59c91 100644 --- a/config/prod.env.js +++ b/config/prod.env.js @@ -1,5 +1,5 @@ 'use strict' module.exports = { NODE_ENV: '"production"', - BASE_API: '"http://124.42.118.61:8093"', + BASE_API: '"http://139.198.16.38:8093"', } diff --git a/src/components/Map/arcgisMap.vue b/src/components/Map/arcgisMap.vue index 9bcf43f..ba8aeb4 100644 --- a/src/components/Map/arcgisMap.vue +++ b/src/components/Map/arcgisMap.vue @@ -307,7 +307,7 @@ that.view.popup.open({ title: name, content: address, - location: event.mapPoint + location: graphic.geometry }) } }) diff --git a/src/views/baseSource/baseSource.vue b/src/views/baseSource/baseSource.vue index be2855c..9bc5878 100644 --- a/src/views/baseSource/baseSource.vue +++ b/src/views/baseSource/baseSource.vue @@ -1,6 +1,6 @@ diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue index 5808f59..7e9a92d 100644 --- a/src/views/dashboard/index.vue +++ b/src/views/dashboard/index.vue @@ -2,7 +2,7 @@
智慧城管平台
-
+
@@ -20,12 +20,12 @@
-
- -
+ + + + + +
@@ -106,7 +106,7 @@ } .dashboard { width: 1280px; - height: 700px; + max-height: 700px; position: absolute; text-align: center; left: 50%; diff --git a/src/views/supControl/supControl.vue b/src/views/supControl/supControl.vue index e09c09a..c4f1d9a 100644 --- a/src/views/supControl/supControl.vue +++ b/src/views/supControl/supControl.vue @@ -629,8 +629,7 @@ if (response.features.length > 0) { const results = response.features - let content = '' - content = '部件编号：' + results[0].attributes.OBJID + + const content = '部件编号：' + results[0].attributes.OBJID + '

万米网格：' + results[0].attributes.BGID + '

部件类型：' + results[0].attributes.OBJNAME + '

权属部门：' + results[0].attributes.DEPTNAME1 + @@ -641,7 +640,7 @@ that.view.popup.open({ title: results[0].attributes.OBJNAME, content: content, - location: event.mapPoint + location: results[0].geometry }) // 查询所在社区和单元网格 @@ -689,7 +688,7 @@ that.view.popup.open({ title: feature.attributes.name, content: content, - location: event.mapPoint + location: feature.geometry }) }) } else if (that.queryEventSwitch === '0') { @@ -742,7 +741,7 @@ that.view.popup.open({ title: caseDetail.caseid, content: detailTableHtml, - location: event.mapPoint + location: feature.geometry }) } })