Merge remote-tracking branch 'origin/visu_forest_0_1' into visu_forest_0_1

src/views/bigdata/chart-forestFarm.vue

@@ -103,7 +103,7 @@
 
         option = {
           tooltip: {
-            formatter: '{b} : {c}' + '人',
+            formatter: '{b} : {c}' + '片',
           },
           grid: {
             left: '3%',
@@ -183,7 +183,7 @@
                         stuNum = value.value;
                       }
                     })
-                    return stuNum + '{white| 人}';
+                    return stuNum + '{white| 片}';
                   },
                   textStyle: {
                     color: "#ffc72b",

src/views/forest.vue

@@ -277,12 +277,12 @@
                     v-model="eventSearch" @change="searchEvent(eventSearch)">
                   </el-input>
                 </div>
-                <div class="d-l-con padding-box nowrap" v-for="(item,index) in eventList"
-                     @click="dropLocation(item.latitude,item.longitude)">
+                <div  class="d-l-con padding-box nowrap" v-for="(item,index) in eventList"
+                     @click="dropLocation(item.latitude,item.longitude)" data-html2canvas-ignore>
                   <div class="bgt-img">
                     <img v-if="item.picturePath!=null&&item.picturePath!=''&& item.pictureType=='image'"
                          :src="item.picturePath"
-                         style="width: 93px;height: 64px"/>
+                         style="width: 93px;height: 64px"  loading="lazy"/>
                     <img v-else src="../assets/images/integrated/event-img-sub.png" style="width: 93px;height: 64px"/>
                   </div>
                   <div class="bgt-info">

vue.config.js

@@ -53,8 +53,7 @@ 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://117.78.49.164:3031`,
-        target: `http://36.49.108.22:3031`,
+        target: `http://117.78.49.164:3031`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''