优化楼盘表渲染,户权属状态图标click冒泡处理

@@ -488,13 +488,15 @@ export default {
 			//清空已选中层户
 			this.cbsmList = [];
 			this.bsms = [];
-			console.log(this.$refs.lpbContent.$refs.cBsm,'this.$refs.lpbContent.$refs.cBsm');
 			this.$nextTick(()=>{
+				//户
 				this.$refs.lpbContent.$refs.hBsm.forEach(item=>{
+					item.style.borderColor = 'rgb(230, 230, 230)';
 					if (item.className == "tdSelect") {
 						item.className = "";
 					}
 				});
+				//层
 				this.$refs.lpbContent.$refs.cBsm.forEach(item=>{
 					console.log(item.className,'item.className');
 					item.className = "floor";
@@ -579,12 +581,10 @@ export default {
 			} else {
 				//单击 TO DO
 			}
-			console.log(this.bsms);
 		},
 		//获取选中层bsmlist
 		getCbsm(data){
 			this.cbsmList = data;
-			console.log(this.cbsmList);
 		},
 		//不动产单元号输入框事件
 		inputFocus() {

@@ -21,6 +21,7 @@
 					ref="ljz"
 					v-for="(ljzs, ljzIndex) in lpbData.ljzs"
 					:key="ljzIndex"
+					:style="{'marginTop':ljzs.zdys.length > 0 ? '-30px':0}"
 				>
 					<!-- <div  class="ljz-zdy-wrap" :style="{'min-height':ljzzdyHeight+40+'px'}"> -->
 					<!-- 循环逻辑幢下的幢单元 -->
@@ -65,9 +66,9 @@
 									@contextmenu.prevent="openMenu($event, hs, 'h')"
 								>
 									{{ hs.shbw }}
-									<span class="hqszt lin" v-show="hs.qszt == '0'">临</span>
-									<span class="hqszt zheng" v-show="hs.qszt == '1'">正</span>
-									<span class="hqszt xian" v-show="hs.qszt == '2'">现</span>
+									<span @click.stop="qsztClick" class="hqszt lin" v-show="hs.qszt == '0'">临</span>
+									<span @click.stop="qsztClick" class="hqszt zheng" v-show="hs.qszt == '1'">正</span>
+									<span @click.stop="qsztClick" class="hqszt xian" v-show="hs.qszt == '2'"  >现</span>
 								</td>
 							</tr>
 						</table>
@@ -119,9 +120,9 @@
 									@contextmenu.prevent="openMenu($event, hs, 'h')"
 								>
 									{{ hs.shbw }}
-									<span class="hqszt lin" v-show="hs.qszt == '0'">临</span>
-									<span class="hqszt zheng" v-show="hs.qszt == '1'">正</span>
-									<span class="hqszt xian" v-show="hs.qszt == '2'">现</span>
+									<span @click.stop="qsztClick" class="hqszt lin" v-show="hs.qszt == '0'">临</span>
+									<span @click.stop="qsztClick" class="hqszt zheng" v-show="hs.qszt == '1'">正</span>
+									<span @click.stop="qsztClick" class="hqszt xian" v-show="hs.qszt == '2'"  >现</span>
 								</td>
 							</tr>
 						</table>
@@ -178,9 +179,9 @@
 								@contextmenu.prevent="openMenu($event, hs, 'h')"
 							>
 								{{ hs.shbw }}
-									<span class="hqszt lin" v-show="hs.qszt == '0'">临</span>
-									<span class="hqszt zheng" v-show="hs.qszt == '1'">正</span>
-									<span class="hqszt xian" v-show="hs.qszt == '2'">现</span>
+									<span @click.stop="qsztClick" class="hqszt lin" v-show="hs.qszt == '0'">临</span>
+									<span @click.stop="qsztClick" class="hqszt zheng" v-show="hs.qszt == '1'">正</span>
+									<span @click.stop="qsztClick" class="hqszt xian" v-show="hs.qszt == '2'"  >现</span>
 							</td>
 						</tr>
 					</table>
@@ -222,9 +223,9 @@
 								@contextmenu.prevent="openMenu($event, hs, 'h')"
 							>
 								{{ hs.shbw }}
-									<span class="hqszt lin" v-show="hs.qszt == '0'">临</span>
-									<span class="hqszt zheng" v-show="hs.qszt == '1'">正</span>
-									<span class="hqszt xian" v-show="hs.qszt == '2'">现</span>
+									<span @click.stop="qsztClick" class="hqszt lin" v-show="hs.qszt == '0'">临</span>
+									<span @click.stop="qsztClick" class="hqszt zheng" v-show="hs.qszt == '1'">正</span>
+									<span @click.stop="qsztClick" class="hqszt xian" v-show="hs.qszt == '2'"  >现</span>
 							</td>
 						</tr>
 					</table>
@@ -339,11 +340,14 @@ export default {
 				sjc: "", //当前的层的SJC +1
 			},
 			formLabelWidth: "120px",
+			yclpbData:{},
+			sclpbData:{}
 		};
 	},
 	created() {},
 	mounted() {
-		this.getLpb(this.$store.state.zrzbsm, this.$parent.scyclx);
+		this.getLpb(this.$store.state.zrzbsm, "0");
+		this.getLpb(this.$store.state.zrzbsm, "1");
 		setTimeout(() => {
 			//tab-content宽度 - 右侧图例宽度 - lp-overview滚动条宽度 - lpbContent的pandingRight
 			this.lpbContentWidth = this.$store.state.contentWidth - 34 - 20;
@@ -366,7 +370,14 @@ export default {
 					res.result.ljzs = res.result.ljzs
 						.sort(this.compare("place"))
 						.reverse();
-					this.lpbData = res.result == null ? this.lpbData : res.result;
+					// this.lpbData = res.result == null ? this.lpbData : res.result;
+					//给实预测楼盘表对象赋值，默认加载预测楼盘表数据
+					if(scyclx == 0){
+						this.yclpbData = res.result == null ? this.yclpbData : res.result;
+						this.lpbData = this.yclpbData;
+					}else{
+						this.sclpbData = res.result == null ? this.sclpbData : res.result;
+					}
 					this.$nextTick(() => {
 						//渲染楼盘表
 						this.dataChange();
@@ -438,6 +449,7 @@ export default {
 			}
 
 			//计算逻辑幢下的幢单元和层户的高度
+			this.ljzzdyHeight = 1;
 			if (this.$refs.ljzzdy != undefined && this.$refs.ljzzdy.length > 0) {
 				//判断自然幢下有没有比层户高的幢单元
 				let higher = true;
@@ -617,6 +629,9 @@ export default {
 			});
 		},
 		//end
+		qsztClick(){
+
+		},
 	},
 	computed: {
 		createFlagChange() {
@@ -631,7 +646,12 @@ export default {
 	},
 	watch: {
 		scyclx(n) {
-			this.getLpb(this.$store.state.zrzbsm, n);
+			// this.getLpb(this.$store.state.zrzbsm, n);
+			if(n == '0'){
+				this.lpbData = this.yclpbData;
+			}else{
+				this.lpbData = this.sclpbData;
+			}
 		},
 		createFlagChange: function(val) {
 			setTimeout(() => {