Browse Source

重点区域代码修改,统计分析样式微调

qinhouyu 1 year ago
parent
commit
d5ec6c8a79

+ 1 - 1
src/api/monitor.js

@@ -26,7 +26,7 @@ export function selectKeyAreaList() {
 // 获取重点区域
 export function getRegionalFlag(id) {
   return request({
-    url: '/center-resources/VisuForestCloudMapController/getRegionalFlag/'+id,
+    url: '/center-data/importarea/getRegionalFlagFeign/' + id,
     method: 'get',
   })
 }

+ 2 - 2
src/views/bigdata/bigdata.vue

@@ -87,13 +87,13 @@
           <chartEventTrend></chartEventTrend>
           <strong></strong>
         </div>
-        <div class="b-con mg-b-20 b-49">
+        <div class="b-con mg-b-20 b-49" style="margin-top: 14px;">
           <div class="b-tit"><img src="@/assets/images/integrated/bigdata-tit-icon.png">
             <span>土地资源管理信息</span>
           </div>
           <chartFireBrigade></chartFireBrigade>
         </div>
-        <div class="b-con mg-b-20 b-49">
+        <div class="b-con mg-b-20 b-49" style="margin-top: 14px;">
           <div class="b-tit"><img src="@/assets/images/integrated/bigdata-tit-icon.png">
             <span>网格分布</span>
           </div>

+ 1 - 1
src/views/bigdata/chart-gridDistribution.vue

@@ -57,7 +57,7 @@
           series: [
             {
               type: 'pie',
-              radius: ['60%', '80%'],
+              radius: ['55%', '70%'],
               center: ['50%', '50%'],
               data: echartData,
               hoverAnimation: false,

+ 5 - 4
src/views/monitor.vue

@@ -991,10 +991,11 @@
         getRegionalFlag(id).then(res => {
           that.graphicsList = []
           //地图标记
-          if (res.data != null && res.data.length > 0) {
-            for (let i = 0; i < res.data.length; i++) {
-              that.graphicsList.push(res.data[i].lng)
-              that.graphicsList.push(res.data[i].lat)
+          let latLngs = JSON.parse(res.data.data.latLngs!=null?res.data.data.latLngs:'[]')
+          if (latLngs.length > 0) {
+            for (let i = 0; i < latLngs.length; i++) {
+              that.graphicsList.push(latLngs[i].lng);
+              that.graphicsList.push(latLngs[i].lat);
             }
             setTimeout(() => {
               that.$refs.supermap.clearG()

+ 4 - 3
vue.config.js

@@ -53,9 +53,10 @@ module.exports = {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
         // target: `http://127.0.0.1:3031`,
-        // target: `http://192.168.2.118:3031`,
-        target: `http://121.36.228.66:3031`,
-        // target: `http://172.28.20.101:3031`,
+        // target: `https://2961rt3561.oicp.vip`,
+        // target: `https://29613561xe.eicp.vip`,
+        // target: `http://121.36.228.66:3031`,
+        target: `http://192.168.31.134:3031`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''