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

@@ -11,7 +11,7 @@ audio, video {
 }
 body {
     line-height:1;
-    font-family: Verdana, Arial, Helvetica, sans-serif;
+    font-family: "Microsoft YaHei","微软雅黑", Arial, Helvetica, sans-serif;
 }
 a{
     margin:0;

@@ -647,6 +647,7 @@
 		table-layout: fixed;
 		.qlrBtn{
 			border: 0;
+			font-size: 14px;
 		}
 		.qlrBtn:hover{
 			background-color: none!important;

@@ -63,6 +63,7 @@ export default {
 			height: 100%;
 			/deep/.el-tab-pane{
 				height: 100%;
+				overflow-y: scroll;
 			}
 			background: #eaedf5;
 			padding: 0;

 <template>
-  <div class="">登记簿</div>
+  <div class="main">登记簿</div>
 </template>
 
 <script>

 <template>
 	<div ref="lpb" class="content_box">
-		<el-tabs v-model="activeName" class="tabs" @tab-click="handleClick">
+		<el-tabs v-model="activeName" class="tabs" @tab-click="handleClick" type="card" >
 			<el-tab-pane label="自然幢信息" name="zrzxx"><zrzxx></zrzxx></el-tab-pane>
 			<el-tab-pane label="业主共有" name="yzgy"><yzgy v-if="yzgyLoad"></yzgy></el-tab-pane>
 			<el-tab-pane label="登记簿" name="djb"><djb></djb></el-tab-pane>
@@ -51,7 +51,7 @@ export default {
 </script>
 <style scoped lang="less">
 .content_box{
-	padding: 0 0 16px;
+	padding: 0 0 6px;
 //     padding: 0 20px;
 // 	.el-tabs{
 // 		width: 100%;
@@ -69,5 +69,23 @@ export default {
 // 		width: 100%;
 // 		height: 100%;
 // 	}
+
+	.el-tabs{
+		height: calc(100% - 50px);
+		/deep/ .el-tabs__content{
+			//height: 100%;
+			 /deep/.el-tab-pane{
+			 	height: 100%;
+			 }
+			background: #eaedf5;
+			padding: 0;
+		}
+		/deep/ .el-tabs__item {
+			height: 48px;
+		}
+		/deep/ .el-tabs__header{
+			background-color: #ffffff;
+		}
+	}
 }
 </style>