Merge branch 'master' of http://114.244.114.158:8802/siwei/real3d-portalsite

src/views/LandConsolidation/components/organize.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="OrganizeCon" v-loading="loading">
+  <div class="OrganizeCon">
     <div class="tdTitle">试点目标</div>
     <div class="echars">
       <pie
@@ -143,7 +143,7 @@ export default {
   props: {},
   data() {
     return {
-      loading: false,
+      // loading: false, 
       tab: 0,
       imgs: {
         loc: require("../../../../static/images/overview/icon_yrkkg.png"),
@@ -189,7 +189,7 @@ export default {
       this.getData();
     },
     getData() {
-      this.loading = true;
+      // this.loading = true;
       this.Getzzlx();
       this.GetOverview();
       this.GetjxydList();
@@ -218,7 +218,7 @@ export default {
         id: this.region,
       }).then((res) => {
         this.sdata = res.data.length ? res.data[0] : {};
-        this.loading = false;
+        // this.loading = false;
       });
     },
     Getjxyd() {
@@ -227,7 +227,7 @@ export default {
         id: this.region,
       }).then((res) => {
         this.jxyddata = res.data || {};
-        this.loading = false;
+        // this.loading = false;
       });
     },
     GetjxydList() {
@@ -245,7 +245,7 @@ export default {
           unit: "公顷",
           data: res.data,
         });
-        this.loading = false;
+        // this.loading = false;
       });
     },
     changeCharts(e) {},

src/views/LandConsolidation/components/qhdb.vue

@@ -47,7 +47,7 @@ export default {
   props: {},
   data() {
     return {
-      loading: false,
+      // loading: false,
       jdData: {
         legend_data: ["整治前", "整治后", "变化率"],
         x_data: [],
@@ -86,7 +86,7 @@ export default {
       this.getData();
     },
     getData() {
-      this.loading = true;
+      // this.loading = true;
       // this.$emit("updateParent", "loading", true);
       if (this.tab1 == 0) {
         this.Getqhdb();
@@ -106,7 +106,7 @@ export default {
           this.jdData.result[2].push(jdData.bhl.toFixed(2));
         });
         this.setEchart(this.jdData, 1);
-        this.loading = false;
+        // this.loading = false;
       });
     },
     Getlinks() {
@@ -131,7 +131,7 @@ export default {
         });
 
         this.setEchart(data, 2, links);
-        this.loading = false;
+        // this.loading = false;
       });
     },
     changeCharts(e) {},