Merge branch 'dev20230707' of http://192.168.60.201/root/dsk-operate-sys into dev20230707

dsk-operate-ui/src/views/macro/nationalEconomies/component/tdjy.vue

@@ -11,7 +11,7 @@
             </el-select>
           </div>
         </div>
-        <div class="content_box" v-if="gyflState">
+        <div class="content_box" v-if="gyfsList.length > 0 && !isSkeleton">
           <div class="box-left">
             <div id="echarts1" style="height: 280px"></div>
           </div>
@@ -36,12 +36,12 @@
             </el-table>
           </div>
         </div>
-        <div class="empty" v-if="!gyflState">
+        <div class="empty" v-if="gyfsList.length === 0 && !isSkeleton">
           <img class="img" src="@/assets/images/project/empty.png">
           <div class="p1">抱歉，暂无数据展示</div>
         </div>
       </div>
-      <div v-if="!isSkeleton" class="td_content">
+      <div v-if="!tdytState" class="td_content">
         <div class="flex-box query-box">
           <div class="flex-box query-params">
             <span class="common-title">全国土地交易项目土地用途</span>
@@ -50,7 +50,7 @@
             </el-select>
           </div>
         </div>
-        <div class="content_box" v-if="tdytState">
+        <div class="content_box" v-if="tdytList.length > 0 && !tdytState">
           <div class="box-left">
             <div id="echarts2" style="height: 280px"></div>
           </div>
@@ -75,12 +75,12 @@
             </el-table>
           </div>
         </div>
-        <div class="empty" v-if="!tdytState">
+        <div class="empty" v-if="tdytList.length === 0 && !tdytState">
           <img class="img" src="@/assets/images/project/empty.png">
           <div class="p1">抱歉，暂无数据展示</div>
         </div>
       </div>
-      <div v-if="!isSkeleton" class="td_content">
+      <div v-if="!topState" class="td_content">
         <div class="flex-box query-box">
           <div class="flex-box query-params">
             <span class="common-title">全国土地交易项目地区Top10</span>
@@ -92,7 +92,7 @@
             </el-select>
           </div>
         </div>
-        <div class="content_box" v-if="topList.length > 0 && !isSkeleton">
+        <div class="content_box" v-if="topList.length > 0 && !topState">
           <div class="box-left" style="width: 60%;">
             <div id="echarts3" style="height: 300px"></div>
           </div>
@@ -117,18 +117,18 @@
             </el-table>
           </div>
         </div>
-        <div class="empty" v-if="topList.length === 0 && !isSkeleton">
+        <div class="empty" v-if="topList.length === 0 && !topState">
           <img class="img" src="@/assets/images/project/empty.png">
           <div class="p1">抱歉，暂无数据展示</div>
         </div>
       </div>
-      <div v-if="!isSkeleton" class="td_content">
+      <div v-if="!nftjState" class="td_content">
         <div class="flex-box query-box">
           <div class="flex-box query-params">
             <span class="common-title">全国土地交易项目年份统计</span>
           </div>
         </div>
-        <div class="content_box">
+        <div class="content_box" v-if="nftjList.length > 0 && !nftjState">
           <div class="box-left" style="width: 60%;">
             <div id="echarts4" style="height: 300px"></div>
           </div>
@@ -187,6 +187,7 @@ export default {
       gyflState:true,
       tdytState:true,
       topState:true,
+      nftjState:true,
       // typeName:['住宅用地','工业用地','城镇住宅用地','其他商服用地','公共设施用地','公路用地','城镇村道路用地','公园与绿地',
       //   '工矿仓储用地','零售商业用地','科研用地','街巷用地','机关团体用地','商服用地','商务金融用地']
     }
@@ -194,15 +195,16 @@ export default {
   created() {
     this.dataRegion()
     this.yearsData()
-    setTimeout(() => {
+
+  },
+  mounted() {
+    this.$nextTick(()=>{
       this.getCountLandMarketByType()
       this.getCountLandMarketByTypeTd()
       this.getCountLandMarketByProvince()
       this.getCountLandMarketByYear()
-      this.isSkeleton=false;
-    }, 1500);
-  },
-  mounted() {
+    })
+
   },
   beforeDestroy(){
 
@@ -211,7 +213,8 @@ export default {
     getCountLandMarketByType(){
       // this.isSkeleton = true
       countLandMarketByType({type:'供应方式',yearStr:this.years.join(",")}).then(res => {
-        // this.isSkeleton = false
+        this.isSkeleton = false
+        this.gyflState = false
         this.gyfsList=res.data.provinceDate;
         var list=[];
         for(var i=0;i<res.data.provinceDate.length;i++){
@@ -222,12 +225,9 @@ export default {
           list.push(obj)
         }
         if(list.length > 0){
-          this.gyflState=true
           this.$nextTick(() => {
             this.initChart1(list)
           })
-        }else {
-          this.gyflState=false;
         }
       })
     },
@@ -235,9 +235,9 @@ export default {
       // this.isSkeleton = true
       countLandMarketByType({type:'土地用途',yearStr:this.years1.join(",")}).then(res => {
         // this.isSkeleton = false
+        this.tdytState=false;
         this.tdytList=res.data.provinceDate;
         if(res.data.provinceDate.length > 0){
-          this.tdytState=true
           var list=[];
           for(var i=0;i<10;i++){
             var obj={};
@@ -251,10 +251,7 @@ export default {
               this.initChart2(list)
             })
           }
-        }else {
-          this.tdytState=false;
         }
-
       })
     },
     getCountLandMarketByProvince(){
@@ -264,9 +261,8 @@ export default {
       if(this.address.length > 0){
         params.provinceId=this.address.join(",")
       }
-      // this.isSkeleton = true
       countLandMarketByProvince(params).then(res => {
-        // this.isSkeleton = false
+        this.topState = false
         this.topList=res.data.provinceDate;
         var list=[];
         if(res.data.provinceDate){
@@ -288,10 +284,10 @@ export default {
     },
     getCountLandMarketByYear(){
       countLandMarketByYear().then(res => {
+        this.nftjState=false;
         this.nftjList=res.data.yearDate;
         var list=[];
         if(res.data.yearDate){
-          this.topState=true
           for(var i=0;i<res.data.yearDate.length;i++){
             var obj={};
             obj.type=res.data.yearDate[i].type;
@@ -300,11 +296,11 @@ export default {
             obj.typeList=res.data.yearDate[i].typeList
             list.push(obj)
           }
-          this.$nextTick(() => {
-            this.initChart4(list)
-          })
-        }else {
-          this.topState=false;
+          if(list.length > 0){
+            this.$nextTick(() => {
+              this.initChart4(list)
+            })
+          }
         }
       })
     },