Merge remote-tracking branch 'origin/master'

@@ -37,7 +37,7 @@
 table{
     border-width: 0;
 }
-table,td,tr,.el-col,.title{
+table,tr,.el-col,.title{
     border-color: #E6E6E6 !important;
 }
 .el-table th{

@@ -537,7 +537,6 @@
 		if(this.$store.state.gyfsList.length>0){
 			this.gyfs=this.$store.state.gyfsList[0].bsm;
 		}
-
 	},
 };
 </script>

@@ -265,7 +265,12 @@ export default {
 								this.$store.state.zdbsm = res.result;
 								//todo 跳转到宗地基本信息内容表页面  (预留)
 								this.close();
-								this.$router.push("/zd");
+								this.$router.push({
+									path: '/zd', query:{
+										source: 2,
+										bsm:res.result
+									}
+								});
 							} else {
 								this.$message.error(res.message);
 							}

 <template>
 	<div class="main">
 		<div class="formMenu">
-			<Qlr ref="qlrxxModule" :bsm="$store.state.zdbsm"  :qszt="formData.qszt"></Qlr>
+			<Qlr ref="qlrxxModule" :bsm="curZdbsm"  :qszt="formData.qszt"></Qlr>
 			<!-- <el-button
                     type="primary"
                     class="changeBtn"
@@ -407,12 +407,12 @@ export default {
 				{ label: "-", value: "-" },
 			],
 			formData: {},
-
 			dpdm:'', //宗地底盘代码
+			curZdbsm:'',
 		};
 	},
 	created() {		
-		
+		this.curZdbsm = this.$route.query.bsm;
 	},
 	mounted() {
 		this.getZdjbxxData(this.$store.state.zdbsm);
@@ -453,8 +453,44 @@ export default {
 									"tdzh": ""
 								})
 							}
+							this.$nextTick(()=>{
 								//权利性质数据传给子组件
 								this.$refs.qlxzModule.countList = res.result.list;
+							})
+						}else{
+							this.$nextTick(()=>{
+								//权利性质数据传给子组件
+								this.$refs.qlxzModule.countList = [
+									{
+										id: Math.random(),
+										isInside: false,
+										hasNotBorder: false,
+										bsm: "", //权利性质标识码
+										glbsm: "", //宗地BSM、自然幢BSM、户BSM、多幢BSM、宗海BSM
+										qlxzdm: "",
+										zhqlxzlx: "", //除宗海数据外，默认都是空；0:用海类型权利性质;2:海岛用途权利性质
+										list: [
+											{
+												pzdjbsm: "",
+												pzdjmc: "",
+												pzytdm: "",
+												pzytmc: "",
+												pzytmj: 0,
+												qlxzbsm: "",
+												sjdjbsm: "",
+												sjdjmc: "",
+												sjytdm: "",
+												sjytmc: "",
+												sjytmj: 0,
+												syqx: "",
+												tdsyjssj: "",
+												tdsyqssj: "",
+												tdzh: "",
+											},
+										],
+									},
+								];
+							})
 						}
 					}
 				})
@@ -678,6 +714,7 @@ export default {
 		},
 		zdbsm:function (val) {
 			this.getZdjbxxData(val)		
+			this.curZdbsm = this.$route.query.bsm;
 		}
 	},
 };

@@ -138,7 +138,7 @@
 							v-for="(item, index) in dyztList"
 							:key="index"
 							class="cp"
-							@click="handleChoosedH(item.bsms)"
+							@click="handleChoosedH(item.bsms,item.color)"
 						>
 							<td>
 								<i class="fa fa-circle" :style="{ color: item.color }"></i
@@ -165,7 +165,7 @@
 							v-for="(item, index) in fwxzList"
 							:key="index"
 							class="cp"
-							@click="handleChoosedH(item.bsms)"
+							@click="handleChoosedH(item.bsms,item.color)"
 						>
 							<td>
 								<i class="fa fa-circle" :style="{ color: item.color }"></i
@@ -195,7 +195,7 @@
 							v-for="(item, index) in fwytList"
 							:key="index"
 							class="cp"
-							@click="handleChoosedH(item.bsms)"
+							@click="handleChoosedH(item.bsms,item.color)"
 						>
 							<td>
 								<i class="fa fa-circle" :style="{ color: item.color }"></i
@@ -596,14 +596,23 @@ export default {
 				}
 			});
 		},
-		//选中房屋状态
-		handleChoosedH(bsms) {
-			console.log(bsms,'bsms');
+		//切换房屋状态
+		handleChoosedH(bsms,color) {
+			//每次切换房屋状态，将之前高亮的户边框颜色重置为默认
+			this.$refs.lpbContent.choosedList = [];
+			this.$refs.lpbContent.$refs.hBsm.forEach((item) => {
+				item.style.borderColor = '#E6E6E6';
+			});
+			// console.log(bsms,'bsms');
+			// console.log(color,'color');
 			// Dyzt:{list:[],mj:''}
 			//清除选中户
-			this.$refs.lpbContent.clearChoosedH();
+			// this.$refs.lpbContent.clearChoosedH();
+			this.$nextTick(()=>{
 				//给hBsmList传值
 				this.$refs.lpbContent.choosedList = bsms;
+				this.$refs.lpbContent.borderColor = color;
+			})
 		},
 		//批量添加不动产单元号
 		addBdcdyh() {