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

@@ -6,6 +6,69 @@
   "description": "",
   "glyphs": [
     {
+      "icon_id": "19791411",
+      "name": "首页",
+      "font_class": "shouye",
+      "unicode": "e7b2",
+      "unicode_decimal": 59314
+    },
+    {
+      "icon_id": "19791412",
+      "name": "更正",
+      "font_class": "gengzheng",
+      "unicode": "e7b3",
+      "unicode_decimal": 59315
+    },
+    {
+      "icon_id": "19791413",
+      "name": "变更",
+      "font_class": "biangeng",
+      "unicode": "e7b4",
+      "unicode_decimal": 59316
+    },
+    {
+      "icon_id": "19791414",
+      "name": "添加",
+      "font_class": "tianjia",
+      "unicode": "e7b5",
+      "unicode_decimal": 59317
+    },
+    {
+      "icon_id": "19791415",
+      "name": "综合查询",
+      "font_class": "zonghechaxun",
+      "unicode": "e7b6",
+      "unicode_decimal": 59318
+    },
+    {
+      "icon_id": "19791416",
+      "name": "系统管理",
+      "font_class": "xitongguanli",
+      "unicode": "e7b7",
+      "unicode_decimal": 59319
+    },
+    {
+      "icon_id": "19791417",
+      "name": "新建",
+      "font_class": "xinjian",
+      "unicode": "e7b8",
+      "unicode_decimal": 59320
+    },
+    {
+      "icon_id": "19728415",
+      "name": "上传",
+      "font_class": "shangchuan1",
+      "unicode": "e7b0",
+      "unicode_decimal": 59312
+    },
+    {
+      "icon_id": "19728416",
+      "name": "删除",
+      "font_class": "shanchu1",
+      "unicode": "e7b1",
+      "unicode_decimal": 59313
+    },
+    {
       "icon_id": "19479731",
       "name": "打印",
       "font_class": "dayin",
@@ -356,13 +419,6 @@
       "unicode_decimal": 59267
     },
     {
-      "icon_id": "19005628",
-      "name": "系统管理",
-      "font_class": "xitongguanli",
-      "unicode": "e782",
-      "unicode_decimal": 59266
-    },
-    {
       "icon_id": "15090431",
       "name": "下拉",
       "font_class": "xiala",
@@ -503,13 +559,6 @@
       "unicode_decimal": 59251
     },
     {
-      "icon_id": "18618397",
-      "name": "添加",
-      "font_class": "tianjia",
-      "unicode": "e771",
-      "unicode_decimal": 59249
-    },
-    {
       "icon_id": "18605314",
       "name": "测距",
       "font_class": "ceju",
@@ -608,13 +657,6 @@
       "unicode_decimal": 59235
     },
     {
-      "icon_id": "18593370",
-      "name": "首页",
-      "font_class": "shouye",
-      "unicode": "e75c",
-      "unicode_decimal": 59228
-    },
-    {
       "icon_id": "18590441",
       "name": "办理",
       "font_class": "banli",
@@ -636,13 +678,6 @@
       "unicode_decimal": 59219
     },
     {
-      "icon_id": "18587823",
-      "name": "变更",
-      "font_class": "biangeng",
-      "unicode": "e754",
-      "unicode_decimal": 59220
-    },
-    {
       "icon_id": "18587824",
       "name": "缩进",
       "font_class": "suojin",
@@ -655,27 +690,6 @@
       "font_class": "zhankai",
       "unicode": "e756",
       "unicode_decimal": 59222
-    },
-    {
-      "icon_id": "18587826",
-      "name": "更正",
-      "font_class": "gengzheng",
-      "unicode": "e757",
-      "unicode_decimal": 59223
-    },
-    {
-      "icon_id": "18587827",
-      "name": "新建",
-      "font_class": "xinjian",
-      "unicode": "e758",
-      "unicode_decimal": 59224
-    },
-    {
-      "icon_id": "18587828",
-      "name": "综合查询",
-      "font_class": "zonghechaxun",
-      "unicode": "e759",
-      "unicode_decimal": 59225
     }
   ]
 }

@@ -509,9 +509,9 @@ export default {
     			/*border-right: 1px solid #EAEAEA;*/
 				i {
 					margin-right: 6px;
-					font-size: 18px;
+					font-size: 24px;
 					position: relative;
-					top: 1px;
+					top: 2px;
 				}
 				.hamburger {
 					font-size: 16px;

 <template>
 	<el-tabs v-model="activeName" class="tabs">
-		<el-tab-pane label="林海调查表" name="lhdcb"><Lhdcb></Lhdcb></el-tab-pane>
+		<el-tab-pane label="林权调查表" name="lhdcb"><Lhdcb></Lhdcb></el-tab-pane>
 	</el-tabs>
 </template>
 

@@ -927,7 +927,7 @@
             /deep/ .el-tabs__header {
                 position: -webkit-fixed;
                 position: fixed;
-                top: 117px;
+                top: 115px;
                 z-index: 999;
                 width: 100%;
                 margin-bottom: 0;
@@ -962,8 +962,8 @@
 
         /deep/ .el-card__header{
             padding: 16px 20px;
-            background-color: #FAFAFA;
-            border-bottom: 1px solid #E6E6E6;
+            background-color: #FAFCFF;
+            border-bottom: 1px solid #E4EBF4;
             -webkit-box-sizing: border-box;
             box-sizing: border-box;
         }
@@ -983,7 +983,7 @@
             width: 40%;
         }
         .el-card {
-            border: 1px solid #E6E6E6;
+            border: 1px solid #E4EBF4;
             background-color: white;
             overflow: auto;
             .clearfix{
@@ -1133,7 +1133,7 @@
                     height: 44px;
                 }
                 th{
-                    background: #FAFAFA;
+                    background: #FAFCFF;
                 }
             }
 

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

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