Merge remote-tracking branch 'origin/master'

@@ -81,7 +81,7 @@
 					></el-input>
 					></el-input>
           <el-link type="primary" style="margin-left:20px" @click="isSearch=true">重新选择自然幢</el-link>
           <el-link type="primary" style="margin-left:20px" @click="isSearch=true">重新选择自然幢</el-link>
         </div>
         </div>
-        <div class="lpb-content" ref="lpbContentWrap" :style="{ height: lpbContentHeight + 'px' }">
+        <div class="lpb-content" ref="lpbContentWrap" :style="{ height: lpbContentHeight + 'px' }" v-loading="lpbloading">
           <!-- 楼盘表主体 -->
           <!-- 楼盘表主体 -->
           <div class="lp-overview" :style="{ width: lpbContentwidth + 'px' }">
           <div class="lp-overview" :style="{ width: lpbContentwidth + 'px' }">
             <lpbContent ref="lpbContent" :zrzbsm='zrzbsm' lpbParent = 'isHbfg' :isHb="isHb"></lpbContent>
             <lpbContent ref="lpbContent" :zrzbsm='zrzbsm' lpbParent = 'isHbfg' :isHb="isHb"></lpbContent>
@@ -305,7 +305,8 @@ export default {
 			fwxzList: [],
 			fwxzList: [],
 			fwytList: [],
 			fwytList: [],
 			lpbContentHeight: 0,
 			lpbContentHeight: 0,
-			lpbContentwidth: 0,
+      lpbContentwidth: 0,
+      lpbloading:true,
     }
     }
   },
   },
   created(){},
   created(){},

@@ -87,6 +87,7 @@
 			class="tab-content"
 			class="tab-content"
 			ref="tabContent"
 			ref="tabContent"
 			:style="{ height: lpbContentHight + 'px' }"
 			:style="{ height: lpbContentHight + 'px' }"
+			v-loading="lpbloading"
 		>
 		>
 			<!-- 左侧树结构 -->
 			<!-- 左侧树结构 -->
 			<div class="lp-tree" :class="createFlag ? 'w260' : 'w0'">
 			<div class="lp-tree" :class="createFlag ? 'w260' : 'w0'">
@@ -365,6 +366,7 @@ export default {
 			time: "",
 			time: "",
 			dyztBsmList: {}, //单元状态bsmList
 			dyztBsmList: {}, //单元状态bsmList
 			cbsmList:[], // 层bsmlist
 			cbsmList:[], // 层bsmlist
+			lpbloading:true,
 		};
 		};
 	},
 	},
 	created() {
 	created() {

@@ -3,7 +3,6 @@
 		<div
 		<div
 			class="lpbContent"
 			class="lpbContent"
 			ref="lpbContent"
 			ref="lpbContent"
-			v-loading="loading"
 		>
 		>
 			<div
 			<div
 				:class="
 				:class="
@@ -481,7 +480,7 @@ export default {
 		getLpb(zrzbsm, scyclx,actual) {
 		getLpb(zrzbsm, scyclx,actual) {
 			getLpb(zrzbsm, scyclx).then((res) => {
 			getLpb(zrzbsm, scyclx).then((res) => {
 				if (res.code == 200) {
 				if (res.code == 200) {
-					this.loading = false;
+					this.$parent.lpbloading = false;
 					res.result.ljzs = res.result.ljzs
 					res.result.ljzs = res.result.ljzs
 						.sort(this.compare("place"))
 						.sort(this.compare("place"))
 						.reverse();
 						.reverse();