Merge remote-tracking branch 'origin/master'

@@ -110,7 +110,7 @@ ol, ul { list-style:none; }
     >.is-top{
         position: -webkit-fixed;
         position: fixed;
-        top: 66px;
+        top: 70px;
         z-index: 999;
         width: 100%;
         margin-bottom: 0;

@@ -64,7 +64,7 @@
                             <br/>
                             样例3：11<span>(1层01室)</span>([层号])
                             <br/>
-                            样例4：1-101<span>(1单元-01层01室)</span>([单元号][分隔符A][层号]，勾选“层号之前增加分隔符”)
+                            样例4：1-011<span>(1单元-01层01室)</span>([单元号][分隔符A][层号]，勾选“层号之前增加分隔符”)
                              <br/>
                             样例5：1-13-1<span>(1单元13层01室)</span>([单元号][分隔符A][层号][分隔符B])
                             <br/>

@@ -9,21 +9,26 @@ const errorPage = [
 	{ path: "*", redirect: "/404", hidden: true },
 ];
 
-const frameOut = [
+/*const frameOut = [
 	{
 		path: "/",
 		name: "login",
 		component: login,
 	},
-];
+];*/
 const constantRoutes = [
 	{
-		path: "/panel",
-		code: "panel",
+		path: "/",
 		component: () => import("@/views/Home"),
-		redirect: "/panel",
+		redirect: "/",
 		children: [
 			{
+				path: "/",
+				name: "首页",
+				code: "0-1",
+				component: () => import("@/views/panel/index"),
+			},
+            {
                 path: "/panel",
                 name: "首页",
                 code: "0-1",
@@ -105,4 +110,4 @@ const constantRoutes = [
 ];
 // 在这里面动态引入路由文件 达成权限处理得问题
 // 重新组织后导出
-export default [...errorPage, ...frameOut, ...constantRoutes];
+export default [...errorPage, ...constantRoutes];

@@ -9,7 +9,8 @@
 						alt=""
 						@click="toHome"
 					/>
-					<span class="logo-text" v-show="!textLogo">不动产权籍调查系统</span>
+					<img class="logo-word" src="@/assets/images/logo-word.png" alt="">
+					<!-- <span class="logo-text" v-show="!textLogo">不动产权籍调查系统</span> -->
 				</div>
 
 				<div class="wrap">
@@ -271,7 +272,7 @@ export default {
 			})
 		}
 		this.$nextTick(()=>{
-            this.treeHeight = this.$el.clientHeight - 132;
+            this.treeHeight = this.$el.clientHeight - 136;
 		});
 	},
 	methods: {
@@ -470,10 +471,10 @@ export default {
 	.el-header {
 		background-color: #fff;
 		padding: 0 !important;
-		height: 66px!important;
+		height: 70px!important;
 		position: relative;
 		.header-top {
-			height: 66px;
+			height: 70px;
 			// border-bottom: 1px solid#EAEAEA;
 			box-sizing: border-box;
 			// background-image: url('../assets/images/banner.png');
@@ -485,10 +486,10 @@ export default {
 			// align-items: center;
 			.top-items {
 				cursor: pointer;
-				height: 66px;
+				height: 70px;
 				padding: 0 30px;
 				font-size: 18px;
-				line-height: 66px;
+				line-height: 70px;
 				float: left;
 				position: relative;
 				color: #ffffff;
@@ -546,25 +547,31 @@ export default {
     	z-index: 1000;
 		.logo-box {
 			width: 100%;
-			height: 66px;
+			height: 70px;
 			border-bottom: 1px solid rgba(255, 255, 255, 0.2);
 			box-sizing: border-box;
-			padding: 10px 20px;
+			padding: 10px 18px;
 			transition: width 0.3s;
 			background-color: #006CFF;
 			.logo-img {
-				width: 44px;
+				width: 30px;
+				padding-top: 10px;
 				float: left;
 			}
-			.logo-text {
-				padding-left: 10px;
-				color: #ffffff;
-				line-height: 44px;
-				font-size: 20px;
+			.logo-word{
+				padding-left: 8px;
+				padding-top: 15px;
+				height: 20px;
 			}
+			// .logo-text {
+			// 	padding-left: 10px;
+			// 	color: #ffffff;
+			// 	line-height: 44px;
+			// 	font-size: 20px;
+			// }
 		}
 		.wrap{
-			height: calc(100% - 66px);
+			height: calc(100% - 70px);
 			overflow-x: hidden;
 			.search-box{
 				height: 65px;
@@ -589,6 +596,9 @@ export default {
 		}
 		.logo-box-show {
 			width: 64px;
+			.logo-word{
+				width: 0;
+			}
 		}
 		.el-menu {
 			border-right: 0;

@@ -64,7 +64,7 @@
 				></i>
 				<span class="remake_txt" @click="selectRemeber">记住账号密码</span>
 			</div>
-			<div class="login-btn" @click="goHome">登录</div>
+			<div id="loginBtn" class="login-btn" @click="goHome">登录</div>
 		</div>
 		<div class="reserved-con">
 			<div class="reserved-words">版权所有：2020©某某市自然资源和规划</div>

@@ -912,7 +912,7 @@
             /deep/ .el-tabs__header {
                 position: -webkit-fixed;
                 position: fixed;
-                top: 114px;
+                top: 117px;
                 z-index: 999;
                 width: 100%;
                 margin-bottom: 0;

@@ -80,7 +80,7 @@ export default {
 			/deep/ .el-tabs__header {
 				position: -webkit-fixed;
 				position: fixed;
-				top: 114px;
+				top: 117px;
 				z-index: 999;
 				width: 100%;
 				margin-bottom: 0;

@@ -584,7 +584,7 @@
             /deep/ .el-tabs__header {
                 position: -webkit-fixed;
                 position: fixed;
-                top: 114px;
+                top: 117px;
                 z-index: 999;
                 width: 100%;
                 margin-bottom: 0;

@@ -251,7 +251,7 @@ export default {
 .main {
 	display: flex;
 	flex-direction: column;
-	overflow: scroll;
+	// overflow: scroll;
 	height: 100%;
 	.clearfix {
 		span {