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

@@ -116,7 +116,7 @@ ol, ul { list-style:none; }
                 >.el-tabs__item{
                     border: 1px solid #DEDEDE;
                     height: 30px;
-                    line-height: 30px;
+                    line-height: 28px;
                     padding: 0 20px;
                     margin: 9px 10px 9px 0;
                 }
@@ -128,6 +128,9 @@ ol, ul { list-style:none; }
         }
     }
 }
+.el-tabs__item{
+    font-size: 16px;
+}
 //弹框遮罩层样式
 .v-modal{
     opacity: .2;

@@ -24,8 +24,8 @@
 					v-if="item.children"
 					class="reTree_icon"
 					:style="{
-						height: (size || 14 * 1.2) + 'px',
-						width: (size || 14 * 1.2) + 'px',
+						height: (size || 16 * 1.2) + 'px',
+						width: (size || 16 * 1.2) + 'px',
 					}"
 					:class="{
 						reTree_default_icon: item.children.length === 0,
@@ -37,8 +37,8 @@
 					v-if="item.children==null"
 					class="reTree_icon reTree_expand_icon"
 					:style="{
-						height: (size || 14 * 1.2) + 'px',
-						width: (size || 14 * 1.2) + 'px',
+						height: (size || 16 * 1.2) + 'px',
+						width: (size || 16 * 1.2) + 'px',
 					}"
 				></div>
 				<div
@@ -83,7 +83,7 @@ export default {
 		},
 		size: {
 			type: Number,
-			default: 14,
+			default: 16,
 		},
 		visible: {
 			type: Boolean,
@@ -174,7 +174,7 @@ export default {
 			}
 		},
 		// 左键双击事件
-		dbclick(item) {
+		dbclick(item,) {
 			clearTimeout(this.time);
 			//此处不要将$router移到if的外面，因为可能是双击行政区，就不知道去哪儿了
 			if (item.type == 'zd') {
@@ -342,8 +342,8 @@ export default {
 	content: "";
 	position: absolute;
 	/* 为了触顶 */
-	top: -14px;
-	height: calc(100% + 14px);
+	top: -16px;
+	height: calc(100% + 16px);
 	width: 1px;
 	left: 7px;
 	opacity: .5;
@@ -355,7 +355,7 @@ export default {
 	content: "";
 	position: absolute;
 	height: 23px;
-	top: -14px;
+	top: -16px;
 	width: 1px;
 	left: 7px;
 	opacity: .5;
@@ -401,7 +401,7 @@ export default {
 	background-size: contain;
 }
 .qsztImg{
-	width: 14px;
+	width: 16px;
 	position: relative;
     top: 1px;
 }

 <template>
 	<div
 		class="content column-start-center reTree_box"
-		:style="{ fontSize: (size || 14) + 'px', lineHeight: (size || 14) + 'px', width: (islpb ? '200':'374') + 'px' }"
+		:style="{ fontSize: (size || 16) + 'px', lineHeight: (size || 16) + 'px', width: (islpb ? '200':'374') + 'px' }"
 	>
 		<div
 			class="column-start-center basic_layer"
@@ -19,8 +19,8 @@
 				<div
 					class="reTree_icon"
 					:style="{
-						height: (size || 14 * 1.2) + 'px',
-						width: (size || 14 * 1.2) + 'px',
+						height: (size || 16 * 1.2) + 'px',
+						width: (size || 16 * 1.2) + 'px',
 					}"
 					:class="{
 						reTree_default_icon: item.children.length === 0,
@@ -129,7 +129,7 @@ export default {
 		pd: {},
 		size: {
 			type: Number,
-			default: 14,
+			default: 16,
 		},
 		islpb:{
 			type: Boolean,
@@ -730,8 +730,8 @@ export default {
 	content: "";
 	position: absolute;
 	/* 为了触顶 */
-	top: -14px;
-	height: calc(100% + 14px);
+	top: -16px;
+	height: calc(100% + 16px);
 	width: 1px;
 	left: 9px;
 	background: #c3c5c8;
@@ -741,7 +741,7 @@ export default {
 	content: "";
 	position: absolute;
 	height: 23px;
-	top: -14px;
+	top: -16px;
 	width: 1px;
 	left: 9px;
 	background: #c3c5c8;

@@ -468,7 +468,7 @@ export default {
 				cursor: pointer;
 				height: 60px;
 				padding: 0 30px;
-				font-size: 16px;
+				font-size: 18px;
 				line-height: 60px;
 				float: left;
 				position: relative;

@@ -900,7 +900,7 @@
                         > .el-tabs__item {
                             border: 1px solid #DEDEDE;
                             height: 36px;
-                            line-height: 36px;
+                            line-height: 32px;
                             padding: 0 20px;
                             margin: 9px 10px 9px 0;
                             background-color: #ffffff;

@@ -496,7 +496,7 @@
                         > .el-tabs__item {
                             border: 1px solid #DEDEDE;
                             height: 36px;
-                            line-height: 36px;
+                            line-height: 32px;
                             padding: 0 20px;
                             margin: 9px 10px 9px 0;
                             background-color: #ffffff;