修改获取楼盘表数据接口，实预测类型转换时改变楼盘表数据源

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

@@ -3,7 +3,7 @@
 		<div class="tab-header">
 		<div class="tab-header">
 			<el-row class="searchContent">
 			<el-row class="searchContent">
 				<el-col :span="8">
 				<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="1">实测</el-radio-button>
 						<el-radio-button label="0">预测</el-radio-button>
 						<el-radio-button label="0">预测</el-radio-button>
 					</el-radio-group>
 					</el-radio-group>
@@ -299,7 +299,7 @@ export default {
 			plzlVisible: false,
 			plzlVisible: false,
 			hbjVisible: false,
 			hbjVisible: false,
 			hcxlzVisible:false,
 			hcxlzVisible:false,
-			tabPosition: "1", //1是实测  0是预测
+			syclx: "1", //1是实测  0是预测
 			radio1: "",
 			radio1: "",
 			radio2: "",
 			radio2: "",
 			createFlag: false,
 			createFlag: false,
@@ -414,7 +414,7 @@ export default {
         },
         },
 	    lodding(){
 	    lodding(){
           let zrzbsm=this.$store.state.zrzbsm;
           let zrzbsm=this.$store.state.zrzbsm;
-	      this.$refs.lpbContent.getLpb(zrzbsm);
+	      this.$refs.lpbContent.getLpb(zrzbsm,this.syclx);
 		},
 		},
 		hcxlzClose() {
 		hcxlzClose() {
 			this.hcxlzVisible = false;
 			this.hcxlzVisible = false;
@@ -534,7 +534,7 @@ export default {
 		},
 		},
 		//户保存
 		//户保存
 		hbjSaveInfo() {
 		hbjSaveInfo() {
-			this.$refs.hbj.onSave(this.bsms[this.bsms.length - 1], this.tabPosition);
+			this.$refs.hbj.onSave(this.bsms[this.bsms.length - 1], this.syclx);
 		},
 		},
 		//户编辑表单重置
 		//户编辑表单重置
 		hbjResetInfo() {
 		hbjResetInfo() {
@@ -542,7 +542,7 @@ export default {
 		},
 		},
 		//调用楼盘表信息查询接口
 		//调用楼盘表信息查询接口
 		getlpbData() {
 		getlpbData() {
-			this.$refs.lpbContent.getLpb(this.$store.state.zrzbsm);
+			this.$refs.lpbContent.getLpb(this.$store.state.zrzbsm,this.syclx);
 			//改变楼盘表子组件的key值，重新渲染
 			//改变楼盘表子组件的key值，重新渲染
 			this.time = new Date().getTime();
 			this.time = new Date().getTime();
 		},
 		},

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