From 36c5928aad0c876f0e0d7a23d16d589731c9db9a Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Mon, 24 Jan 2022 14:24:27 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9C=B0=E5=9B=BE=E5=8A=A0=E4=B8=8Aloading?=
 =?UTF-8?q?=E5=9B=BE=E6=A0=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../visual/basicinfo/basicInfoCommunity.vue   | 26 +++++++++++++------
 .../visual/basicinfo/basicInfoMain.vue        | 20 +++++++++++---
 2 files changed, 35 insertions(+), 11 deletions(-)

diff --git a/src/views/modules/visual/basicinfo/basicInfoCommunity.vue b/src/views/modules/visual/basicinfo/basicInfoCommunity.vue
index 26759f5b..6ebcb622 100644
--- a/src/views/modules/visual/basicinfo/basicInfoCommunity.vue
+++ b/src/views/modules/visual/basicinfo/basicInfoCommunity.vue
@@ -22,7 +22,11 @@
     </div>
     <div class="div_room_bar">
       <el-scrollbar style="height:100%">
-        <div v-if="roomLoaded"
+        <div class="info_loading"
+             v-if="roomLoaded">
+          <screen-loading>加载中</screen-loading>
+        </div>
+        <div v-if="!roomLoaded"
              class="div_room">
 
           <div v-for="(item,index) in roomArray"
@@ -80,6 +84,7 @@
 import { mapGetters } from "vuex";
 import { Loading } from 'element-ui'; //引入Loading服务
 import { requestPost } from "@/js/dai/request";
+import ScreenLoading from "@/views/modules/visual/cpts/loading";
 
 let loading;//加载动画
 
@@ -94,7 +99,7 @@ export default {
       selBuildingId: '',
       selBuildingName: '',
 
-      roomLoaded: false,
+      roomLoaded: true,
       roomArray: [],
       selHouseId: '',
       selHouseName: '',
@@ -121,7 +126,7 @@ export default {
   methods: {
     //小区id，小区名称
     async initData (neighborHoodId, neighborHoodName) {
-      this.roomLoaded = false
+
       this.neighborHoodId = neighborHoodId
       this.neighborHoodName = neighborHoodName
       //加载楼栋数据
@@ -129,7 +134,6 @@ export default {
 
       if (this.selBuildingId) {
         await this.loadRoom()
-        this.roomLoaded = true
 
       }
 
@@ -140,9 +144,9 @@ export default {
 
       this.selBuildingId = this.buildingArray[index].buildingId
       this.selBuildingName = this.buildingArray[index].buildingName
-      this.roomLoaded = false
+
       await this.loadRoom()
-      this.roomLoaded = true
+
 
       this.$emit('refreshInfoList', this.selBuildingId, 'building')
     },
@@ -226,6 +230,7 @@ export default {
 
     //加载房间数据
     async loadRoom () {
+      this.roomLoaded = true
       const url = "/gov/org/ichouse/houselist"
       // const url = "http://yapi.elinkservice.cn/mock/245/gov/org/ichouse/houselist"
       let params = {
@@ -233,7 +238,7 @@ export default {
       }
 
       const { data, code, msg } = await requestPost(url, params)
-
+      this.roomLoaded = false
       if (code === 0) {
 
         if (data.length > 0) {
@@ -268,6 +273,8 @@ export default {
             this.roomArray = [...data]
           });
 
+        } else {
+          this.roomArray = []
         }
 
 
@@ -348,7 +355,7 @@ export default {
     ...mapGetters(["clientHeight"])
 
   },
-  components: {},
+  components: { ScreenLoading },
 }
 
 </script>
@@ -360,6 +367,9 @@ export default {
 ></style>
 
 <style lang=scss scoped>
+.info_loading {
+  margin-top: 50px;
+}
 .customer_select {
   /* 未选中任何选项的时候 placeholder的样式 需要先选中父元素 增加权重 */
   /deep/ input::-webkit-input-placeholder {
diff --git a/src/views/modules/visual/basicinfo/basicInfoMain.vue b/src/views/modules/visual/basicinfo/basicInfoMain.vue
index f387de43..fd637b06 100644
--- a/src/views/modules/visual/basicinfo/basicInfoMain.vue
+++ b/src/views/modules/visual/basicinfo/basicInfoMain.vue
@@ -61,7 +61,13 @@
               <div class="tip_title">分类列表</div>
             </div>
 
-            <div class="info_list">
+            <div class="info_loading"
+                 v-if="infoLoading">
+              <screen-loading>加载中</screen-loading>
+            </div>
+
+            <div v-if="!infoLoading"
+                 class="info_list">
               <div v-for="(item,index) in listDatashow"
                    :key="index"
                    class="item">
@@ -114,6 +120,8 @@ import BasicInfoCommunity from "./basicInfoCommunity";
 import PeopleSearch from "./peopleSearch";
 import People from "./people";
 import cptCard from "@/views/modules/visual/cpts/card";
+import ScreenLoading from "@/views/modules/visual/cpts/loading";
+
 var centerPointGlobal = [120.38945519, 36.0722275]
 
 let loading;//加载动画
@@ -226,6 +234,7 @@ const vueGis = {
       searchName: "",
 
       //右侧列表
+      infoLoading: true,
       listData: [],//得到的数据
       listDatashow: [],//处理成一行两列的数据
 
@@ -270,6 +279,7 @@ const vueGis = {
 
     //获取右侧infolist数据
     async loadList () {
+      this.infoLoading = true
       const url = "/epmetuser/statsresiwarn/list"
       // const url = "http://yapi.elinkservice.cn/mock/245/epmetuser/statsresiwarn/list"
       let params = {
@@ -278,7 +288,7 @@ const vueGis = {
       }
 
       const { data, code, msg } = await requestPost(url, params)
-
+      this.infoLoading = false
       if (code === 0) {
         this.listData = data
         // this.listData = this.listData1
@@ -844,7 +854,7 @@ const vueGis = {
     ...mapGetters(["clientHeight"])
 
   },
-  components: { BasicInfoCommunity, PeopleSearch, People, cptCard },
+  components: { BasicInfoCommunity, PeopleSearch, People, cptCard, ScreenLoading },
 }
 export default vueGis;
 </script>
@@ -868,4 +878,8 @@ export default vueGis;
 .el-scrollbar__wrap {
   overflow-x: hidden !important;
 }
+
+.info_loading {
+  margin-top: 50px;
+}
 </style>   
\ No newline at end of file