Merge remote-tracking branch 'origin/master'

@@ -30,12 +30,6 @@ const constantRoutes = [
 				component: () => import("@/views/panel/index"),
 			},
 			{
-				path: "/create",
-				name: "新建",
-				code: "0-2",
-				component: () => import("@/views/panel/create/index"),
-			},
-			{
 				path: "/add",
 				name: "添加",
 				code: "0-6",
@@ -77,12 +71,6 @@ const constantRoutes = [
 				code: "1-5",
 				component: () => import("@/views/zd/index"),
 			},
-			{
-				path: "/c",
-				name: "层",
-				code: "1-7",
-				component: () => import("@/views/zrz/c/index"),
-			},
 		],
 	},
 ];

@@ -204,7 +204,24 @@ export default {
 		// 	this.sortNavigation(this.navigationList, indId);
 		// }
 		this.getDic();
-		this.getTreeList();
+		//刷新页面后根据不同路由获取不同树结构数据
+		if(this.$route.path == '/zrz'){
+			this.getRightTreeByZrzbsm(this.$store.state.zrzbsm)
+		}else if(this.$route.path == '/zd'){
+			this.getRightTree(this.$store.state.zdbsm)
+		}else{
+			this.getTreeList();
+		}
+		//刷新页面后根据不同路由高亮相对应的导航
+		if(this.$route.path == '/zrz' || this.$route.path == '/zd' || this.$route.path == '/dz'){
+			
+		}else{
+			this.headTop.forEach(item=>{
+				if (item.path == this.$route.path) {
+					item.select = true;
+				}
+			})
+		}
 		this.$nextTick(()=>{
             this.treeHeight = this.$el.clientHeight - 120;
 		});

@@ -93,8 +93,8 @@
                         <el-button type="info" size="mini" style="" @click="deleteYtInfo(index)" circle>删除</el-button>
                         规划用途
                     </td>
-                    <td  colspan="4" align="center"  >
-                        <el-select-tree class="formInput"
+                    <td  colspan="3" align="center"  >
+                        <el-select-tree style="width:100%"
                                         v-if="show"
                                         :default-expand-all="defaultExpandAll"
                                         :multiple="multiple"
@@ -107,9 +107,9 @@
                                         v-model="item1.fwytzdbsm"
                         ></el-select-tree>
                     </td>
-                    <td  colspan="1" align="center"  >用途</td>
-                    <td  colspan="4" align="center"  >
-                        <el-select-tree class="formInput"
+                    <td  colspan="2" align="center"  >用途</td>
+                    <td  colspan="4">
+                        <el-select-tree style="width:100%"
                                         v-if="show"
                                         :default-expand-all="defaultExpandAll"
                                         :multiple="multiple"
@@ -189,7 +189,7 @@
                         <span>审查日期</span>
                     </td>
                     <td   colspan="2"  >
-                        <el-date-picker
+                        <el-date-picker  style="width:100%"
                                 v-model="form.date"
                                 type="date"
                                 placeholder="选择日期">
@@ -478,12 +478,9 @@
 </script>
 <style rel="stylesheet/less" lang="less" scoped>
     .dz {
-        min-height: 200px;
-        width: 80%;
-        margin-top: 10px;
-        margin-left: 10%;
-        float: left;
-
+        box-sizing: border-box;
+        padding: 18px;
+        padding-bottom: 0;
         /deep/.el-input__inner{
             width: 100%;
             border: 0;

 <template>
     <div class="content_box">
-        <el-tabs v-model="activeName" @tab-click="handleClick">
+        <el-tabs v-model="activeName" class="tabs" @tab-click="handleClick">
             <el-tab-pane label="多幢基本信息" name="dzxx"><dzxx></dzxx></el-tab-pane>
         </el-tabs>
     </div>

@@ -14,7 +14,7 @@
                     </td>
                     <td colspan="2" >自然幢号<i class="requisite">*</i></td>
                     <td colspan="4"  >
-                        <input class="formInput" :disabled="form.qszt!='0'" v-model="form.zrzh" style="width: 70%">
+                        <input class="formInput" :disabled="form.qszt!='0'" v-model="form.zrzh">
                     </td>
                 </tr>
                 <tr>
@@ -154,7 +154,7 @@
                         规划用途
                     </td>
                     <td colspan="3" >
-                        <el-select-tree 
+                        <el-select-tree  style="width:100%"
                                 v-if="show"
                                 :default-expand-all="defaultExpandAll"
                                 :multiple="multiple"
@@ -169,7 +169,7 @@
                     </td>
                     <td colspan="2" >用途</td>
                     <td colspan="4" >
-                        <el-select-tree 
+                        <el-select-tree  style="width:100%"
                                 v-if="show"
                                 :default-expand-all="defaultExpandAll"
                                 :multiple="multiple"