Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/views/panel/change/fg/index.vue
#	src/views/zrz/lpb/bjlp/index.vue

@@ -44,13 +44,13 @@ export function insertChInfo (data) {
 /**
  * 查询楼盘表数据
  */
-export function getLpb (data) {
+export function getLpb (data,lx) {
     return request({
         url: 'fw/lpb/getLpb',
         method: 'get',
         params: {
             zrzbsm:data,
-            syclx:0,
+            syclx:lx,
         },
     })
 }

@@ -3,7 +3,7 @@
 		<div class="tab-header">
 			<el-row class="searchContent">
 				<el-col :span="8">
-					<el-radio-group v-model="tabPosition">
+					<el-radio-group v-model="syclx">
 						<el-radio-button label="1">实测</el-radio-button>
 						<el-radio-button label="0">预测</el-radio-button>
 					</el-radio-group>
@@ -41,7 +41,7 @@
 							class="radioBtn"
 							label="4"
 							border
-							@click="openPlC"
+							@click="plcVisible"
 							>批量层</el-button
 						>
 						<el-button
@@ -238,7 +238,7 @@
 		<!-- 批量操作弹出框 -->
 		<pl-h :plh-visible="plhVisible" :bsms="bsms" @close="plhClose" @lodding="lodding"></pl-h>
 		<pl-zl :pl-zl-visible="plzlVisible" :bsms="bsms" @close="plZlClose" @lodding="lodding"></pl-zl>
-		<pl-c :plc-visible="plcVisible" :bsms="cbsmList" @close="plcClose" @lodding="lodding"></pl-c>
+		<pl-c :plc-visible="plcVisible" :bsms="bsms" @close="plcClose" @lodding="lodding"></pl-c>
 		<pl-sh :plShVisible="plShVisible" :bsms="bsms" @close="plshClose" @lodding="lodding"></pl-sh>
 		<h-cxlz
 			:h-cxlz-visble="hcxlzVisible"
@@ -299,7 +299,7 @@ export default {
 			plzlVisible: false,
 			hbjVisible: false,
 			hcxlzVisible:false,
-			tabPosition: "1", //1是实测  0是预测
+			syclx: "1", //1是实测  0是预测
 			radio1: "",
 			radio2: "",
 			createFlag: false,
@@ -420,7 +420,7 @@ export default {
             }
         },
 	    lodding(){
-	      this.$refs.lpbContent;
+            this.getlpbData();
 		},
 		hcxlzClose() {
 			this.hcxlzVisible = false;

@@ -132,7 +132,7 @@ export default {
 	},
 	created() {},
 	mounted() {
-		this.getLpb(this.$store.state.zrzbsm);
+		this.getLpb(this.$store.state.zrzbsm,this.$parent.syclx);
 		setTimeout(() => {
 			//tab-content宽度 - 右侧图例宽度 - lp-overview滚动条宽度 - lpbContent的pandingRight
 			this.lpbContentWidth = this.$store.state.contentWidth - 34 - 20;
@@ -145,15 +145,15 @@ export default {
 	},
 	methods: {
 		//获取楼盘表数据
-		getLpb(zrzbsm) {
-			getLpb(zrzbsm).then((res) => {
+		getLpb(zrzbsm,syclx) {
+			getLpb(zrzbsm,syclx).then((res) => {
 				if (res.code == 200) {
 					this.loading = false;
 					this.lpbData = res.result == null ? this.lpbData : res.result;
-					setTimeout(() => {
+					this.$nextTick(()=>{
 						//渲染楼盘表
 						this.dataChange();
-					}, 200);
+					})
 				} else {
 					this.$message({
 						message: res.message,
@@ -172,12 +172,13 @@ export default {
 		//自然幢下元素高度宽度计算
 		dataChange() {
 			//计算逻辑幢宽度  20为marginRight值
-			this.ljzWidth -= 9980;
+			this.ljzWidth = 20;
 			if (this.$refs.ljz != undefined) {
 				this.$refs.ljz.forEach((item) => {
 					this.ljzWidth += item.offsetWidth + 20;
 				});
 			} else {
+
 			}
 			//计算独立幢单元和独立层户宽度
 			//考虑this.$refs.zdy的length为0的情况，即自然幢下没有独立幢单元
@@ -186,7 +187,7 @@ export default {
 				let higher = true;
 				//记录最高的幢单元高度 默认为第一个幢单元高度
 				let highest = this.$refs.zdy[0].offsetHeight;
-				this.zdyWidth -= 980;
+				this.zdyWidth = 20;
 				this.$refs.zdy.forEach((item) => {
 					this.zdyWidth += item.offsetWidth + 21;
 					this.cHeight =
@@ -335,8 +336,14 @@ export default {
 		legendToggleFlagChange() {
 			return this.$parent.legendToggleFlag;
 		},
+		syclx(){
+			return this.$parent.syclx
+		}
 	},
 	watch: {
+		syclx(n){
+			this.getLpb(this.$store.state.zrzbsm,n)
+		},
 		createFlagChange: function(val) {
 			setTimeout(() => {
 				this.lpbContentWidth = this.$refs.lpbContent.offsetWidth - 6;