Merge branch 'master' of http://yun.pashanhoo.com:9090/renchao/CadastralSystem

@@ -15,7 +15,7 @@
 						@blur="inputBlur"
 						@change="inputChange"
 						class="searchInput"
-						placeholder="输入不动产单元号"
+						placeholder="输入不动产单元号或室号"
 						><i
 							slot="suffix"
 							class="el-input__icon el-icon-search"

 <template>
 	<div class="lpbContent-wrap"  ref="lpbContentWrap">
 		<div :class="lpbData.ljzs.length == 0 ? 'column-reverse lpbContent':'lpbContent'" ref="lpbContent" v-loading='loading'>
-			<div :class="(lpbData.cs.length == 0 && lpbData.zdys.length == 0) ? 'bottom40 ljz-wrap':'ljz-wrap'"  :style="{'width':ljzWidth+'px'}" v-show="lpbData.ljzs.length>0">
+			<div :class="(lpbData.cs.length == 0 && lpbData.zdys.length == 0) ? 'bottom40 ljz-wrap':'ljz-wrap'"  v-show="lpbData.ljzs.length>0">
 				<!-- 循环逻辑幢数据 -->
 				<div class="ljz" ref="ljz" v-for="(ljzs,ljzIndex) in lpbData.ljzs" :key="ljzIndex">
-					<div  class="ljz-zdy-wrap" :style="{'min-height':ljzzdyHeight+40+'px'}">
+					<!-- <div  class="ljz-zdy-wrap" :style="{'min-height':ljzzdyHeight+40+'px'}"> -->
 						<!-- 循环逻辑幢下的幢单元 -->
   						<div class="ljz-zdy"  :style="{'min-height':ljzzdyHeight+40+'px'}" ref="ljzzdy" v-show="ljzs.zdys.length>0" v-for="(zdys,zdyIndex) in ljzs.zdys" :key="zdyIndex" >
 							<!-- 循环幢单元下的层户 -->
 							<!-- <div class="chTable-wrap"> -->
-								<table  class="chTable" :style="{'top':(ljzzdyHeight-1-zdys.cs.length*65)+'px'}"  border="1" cellspacing="0" cellpadding="0" v-show="zdys.cs.length>0">
+								<table  class="chTable psr" :style="{'top':(ljzzdyHeight-1-zdys.cs.length*65)+'px'}"  border="1" cellspacing="0" cellpadding="0" v-show="zdys.cs.length>0">
 									<tr v-for="(cs,csIndex) in zdys.cs" :key="csIndex">
 										<!-- 显示层数 -->
 										<td class="floor" ref="cBsm" @contextmenu.prevent="openMenu($event, cs,'c')" @click="handleClickC($event,cs)">{{cs.sjc}}层</td>
@@ -24,7 +24,7 @@
 							</div>
 						</div>
 						<!-- 循环逻辑幢下的层户 -->
-						<div class="ljz-ch" :style="{'min-height':ljzzdyHeight+40+'px'}"  v-if="ljzs.cs.length>0">
+						<div class="ljz-ch" :style="{'height':'auto'}"  v-if="ljzs.cs.length>0">
 							<table  class="chTable" :style="{'top':(ljzzdyHeight+40-1-ljzs.cs.length*65)<0? 0:(ljzzdyHeight+40-1-ljzs.cs.length*65) +'px'}"  border="1" cellspacing="0" cellpadding="0">
 								<tr v-for="(cs) in ljzs.cs" :key="cs.bsm">
 									<!-- 显示层数 -->
@@ -34,7 +34,7 @@
 								</tr>
 							</table>
 						</div>
-					</div>
+					<!-- </div> -->
 
 					<!-- 逻辑幢名称 -->
 					<div class="ljz-name name">
@@ -184,6 +184,7 @@ export default {
 			getLpb(zrzbsm,scyclx).then((res) => {
 				if (res.code == 200) {
 					this.loading = false;
+					res.result.ljzs = res.result.ljzs.sort(this.compare('place')).reverse();
 					this.lpbData = res.result == null ? this.lpbData : res.result;
 					this.$nextTick(()=>{
 						//渲染楼盘表
@@ -197,6 +198,13 @@ export default {
 				}
 			});
 		},
+		compare(property){
+			return function(a,b){
+				var value1 = a[property];
+				var value2 = b[property];
+				return value1 - value2;
+			}
+		},
 		//按照bdcdyh或shbw筛选户
 		lpbDataMap(sh) {
 			//清除之前选中户
@@ -512,12 +520,13 @@ export default {
 		.ljz-wrap {
 			height: auto;
 			overflow: hidden;
-			margin-bottom: 20px;
 			.ljz {
-				float: left;
-				margin-right: 20px;
+				margin-bottom: 20px;
+				display: table;
 				// position: relative;
-				.ljz-zdy-wrap {
+				// .ljz-zdy-wrap {
+				// 	width: auto;
+    			// 	display: table;
 					.ljz-zdy {
 						height: auto;
 						margin-right: 20px;
@@ -535,6 +544,9 @@ export default {
 						// 	bottom: 40px;
 						// }
 					}
+					div:last-child{
+						margin-right: 0;
+					}
 					.ljz-ch {
 						float: left;
 					}
@@ -545,9 +557,9 @@ export default {
 						display: flex;
 						flex-direction: column-reverse;
 					}
-				}
+				// }
 				.ljz-name {
-					width: 100%;
+					width: calc(100% - 32px);
 					height: 40px;
 					background-color: darkorange;
 				}
@@ -583,7 +595,7 @@ export default {
 					}
 				}
 				.zdy-name {
-					width: 100%;
+					width: calc;
 					height: 40px;
 					background-color: rosybrown;
 				}
@@ -596,7 +608,7 @@ export default {
 
 		// 公共部分样式 start
 		.chTable {
-			position: relative;
+			// position: relative;
 			tr {
 				.floor {
 					background-color: blanchedalmond;
@@ -620,7 +632,7 @@ export default {
 		.name {
 			line-height: 40px;
 			text-align: center;
-			display: inline-block;
+			display: table-footer-group;
 		}
 		// end
 	}