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

@@ -435,13 +435,13 @@ export default {
 		height: 72px!important;
 		height: 72px!important;
 		.header-top {
 		.header-top {
 			height: 72px;
 			height: 72px;
-			border-bottom: 1px solid#EAEAEA;
+			// border-bottom: 1px solid#EAEAEA;
 			box-sizing: border-box;
 			box-sizing: border-box;
 			.top-items {
 			.top-items {
 				cursor: pointer;
 				cursor: pointer;
 				height: 72px;
 				height: 72px;
 				padding: 0 30px;
 				padding: 0 30px;
-				font-size: 18px;
+				font-size: 20px;
 				line-height: 72px;
 				line-height: 72px;
 				float: left;
 				float: left;
 				position: relative;
 				position: relative;
@@ -450,7 +450,7 @@ export default {
     			/*border-right: 1px solid #EAEAEA;*/
     			/*border-right: 1px solid #EAEAEA;*/
 				i {
 				i {
 					margin-right: 6px;
 					margin-right: 6px;
-					font-size: 18px;
+					font-size: 22px;
 					position: relative;
 					position: relative;
 					top: 1px;
 					top: 1px;
 				}
 				}

@@ -34,12 +34,15 @@
 <style scoped lang="less">
 <style scoped lang="less">
     .el-tabs{
     .el-tabs{
         height: calc(100% - 50px);
         height: calc(100% - 50px);
-    /deep/.el-tabs__content{
-        height: 100%;
-    /deep/.el-tab-pane{
-        height: 100%;
-    }
-    background: #eaedf5;
-    }
+        /deep/.el-tabs__content{
+            height: 100%;
+        /deep/.el-tab-pane{
+            height: 100%;
+        }
+        background: #eaedf5;
+        }
+        /deep/ .el-tabs__item {
+            height: 48px;
+        }
     }
     }
 </style>
 </style>
\ No newline at end of file

@@ -172,6 +172,9 @@
         }
         }
         background: #eaedf5;
         background: #eaedf5;
     }
     }
+    /deep/ .el-tabs__item {
+        height: 48px;
+    }
     .main {
     .main {
         width: 100%;
         width: 100%;
         height: 100%;
         height: 100%;

@@ -68,5 +68,8 @@ export default {
 			}
 			}
 			background: #eaedf5;
 			background: #eaedf5;
 		}
 		}
+		/deep/ .el-tabs__item {
+			height: 48px;
+		}
 	}
 	}
 </style>
 </style>

@@ -139,27 +139,33 @@
                 let path = "";
                 let path = "";
                 switch (row.dylx) {
                 switch (row.dylx) {
                     case "zd":
                     case "zd":
-                        type = "0";
+                        type = "zd";
                         name = '宗地';
                         name = '宗地';
 						path = "/zd";
 						path = "/zd";
                         break;
                         break;
                     case "zrz":
                     case "zrz":
-                        type = "1";
+                        type = "zrz";
                         name = '自然幢';
                         name = '自然幢';
                     	path = "/zrz";
                     	path = "/zrz";
                         break;
                         break;
                     case "h":
                     case "h":
                     case "h0":
                     case "h0":
                     case "h1":
                     case "h1":
-                        type = "2";
+                        type = "h";
                         name = "户"
                         name = "户"
                     	path = "/h";
                     	path = "/h";
                         break;
                         break;
                     case "dz":
                     case "dz":
-                        type = "3";
+                        type = "dz";
                         name = "多幢";
                         name = "多幢";
                     	path = "/dz";
                     	path = "/dz";
                         break;
                         break;
+                    case "gzw":
+                        type = "gzw";
+                        name = "构筑物";
+                    	path = "/gzw";
+                        break;
+
                     default:
                     default:
                         break;
                         break;
                 }
                 }
@@ -192,6 +198,11 @@
                                             this.$store.state.dzbsm = row.glbsm;
                                             this.$store.state.dzbsm = row.glbsm;
                                             this.getTreeByBsm(row.glbsm,row.dylx,'1');
                                             this.getTreeByBsm(row.glbsm,row.dylx,'1');
                                             break;
                                             break;
+                                         case "gzw":
+                                            this.$store.state.dzbsm = row.glbsm;
+                                            this.getTreeByBsm(row.glbsm,row.dylx,'1');
+                                            break;
+
                                         default:
                                         default:
                                             break;
                                             break;
                                     }
                                     }
@@ -240,6 +251,9 @@
         }
         }
         background: #eaedf5;
         background: #eaedf5;
     }
     }
+    /deep/ .el-tabs__item {
+        height: 48px;
+    }
     .main {
     .main {
         width: 100%;
         width: 100%;
         height: 100%;
         height: 100%;

@@ -197,6 +197,9 @@
         }
         }
         background: #eaedf5;
         background: #eaedf5;
     }
     }
+    /deep/ .el-tabs__item {
+        height: 48px;
+    }
     .main {
     .main {
         width: 100%;
         width: 100%;
         height: 100%;
         height: 100%;