Skip to content

任超 / js.CadastralSystem

Go to a project
Toggle navigation
Toggle navigation pinning
f277cc38 by zhaoqian
Options

Merge remote-tracking branch 'origin/master'

2 parents 1b3a658f 1296579d
Inline Side-by-side
Showing 5 changed files with 31 additions and 29 deletions
...@@ -30,12 +30,6 @@ const constantRoutes = [ ...@@ -30,12 +30,6 @@ const constantRoutes = [
30 component: () => import("@/views/panel/index"), 30 component: () => import("@/views/panel/index"),
31 }, 31 },
32 { 32 {
33 path: "/create",
34 name: "新建",
35 code: "0-2",
36 component: () => import("@/views/panel/create/index"),
37 },
38 {
39 path: "/add", 33 path: "/add",
40 name: "添加", 34 name: "添加",
41 code: "0-6", 35 code: "0-6",
...@@ -77,12 +71,6 @@ const constantRoutes = [ ...@@ -77,12 +71,6 @@ const constantRoutes = [
77 code: "1-5", 71 code: "1-5",
78 component: () => import("@/views/zd/index"), 72 component: () => import("@/views/zd/index"),
79 }, 73 },
80 {
81 path: "/c",
82 name: "层",
83 code: "1-7",
84 component: () => import("@/views/zrz/c/index"),
85 },
86 ], 74 ],
87 }, 75 },
88 ]; 76 ];
......
...@@ -204,7 +204,24 @@ export default { ...@@ -204,7 +204,24 @@ export default {
204 // this.sortNavigation(this.navigationList, indId); 204 // this.sortNavigation(this.navigationList, indId);
205 // } 205 // }
206 this.getDic(); 206 this.getDic();
207 this.getTreeList(); 207 //刷新页面后根据不同路由获取不同树结构数据
208 if(this.$route.path == '/zrz'){
209 this.getRightTreeByZrzbsm(this.$store.state.zrzbsm)
210 }else if(this.$route.path == '/zd'){
211 this.getRightTree(this.$store.state.zdbsm)
212 }else{
213 this.getTreeList();
214 }
215 //刷新页面后根据不同路由高亮相对应的导航
216 if(this.$route.path == '/zrz' || this.$route.path == '/zd' || this.$route.path == '/dz'){
217
218 }else{
219 this.headTop.forEach(item=>{
220 if (item.path == this.$route.path) {
221 item.select = true;
222 }
223 })
224 }
208 this.$nextTick(()=>{ 225 this.$nextTick(()=>{
209 this.treeHeight = this.$el.clientHeight - 120; 226 this.treeHeight = this.$el.clientHeight - 120;
210 }); 227 });
......
...@@ -93,8 +93,8 @@ ...@@ -93,8 +93,8 @@
93 <el-button type="info" size="mini" style="" @click="deleteYtInfo(index)" circle>删除</el-button> 93 <el-button type="info" size="mini" style="" @click="deleteYtInfo(index)" circle>删除</el-button>
94 规划用途 94 规划用途
95 </td> 95 </td>
96 <td colspan="4" align="center" > 96 <td colspan="3" align="center" >
97 <el-select-tree class="formInput" 97 <el-select-tree style="width:100%"
98 v-if="show" 98 v-if="show"
99 :default-expand-all="defaultExpandAll" 99 :default-expand-all="defaultExpandAll"
100 :multiple="multiple" 100 :multiple="multiple"
...@@ -107,9 +107,9 @@ ...@@ -107,9 +107,9 @@
107 v-model="item1.fwytzdbsm" 107 v-model="item1.fwytzdbsm"
108 ></el-select-tree> 108 ></el-select-tree>
109 </td> 109 </td>
110 <td colspan="1" align="center" >用途</td> 110 <td colspan="2" align="center" >用途</td>
111 <td colspan="4" align="center" > 111 <td colspan="4">
112 <el-select-tree class="formInput" 112 <el-select-tree style="width:100%"
113 v-if="show" 113 v-if="show"
114 :default-expand-all="defaultExpandAll" 114 :default-expand-all="defaultExpandAll"
115 :multiple="multiple" 115 :multiple="multiple"
...@@ -189,7 +189,7 @@ ...@@ -189,7 +189,7 @@
189 <span>审查日期</span> 189 <span>审查日期</span>
190 </td> 190 </td>
191 <td colspan="2" > 191 <td colspan="2" >
192 <el-date-picker 192 <el-date-picker style="width:100%"
193 v-model="form.date" 193 v-model="form.date"
194 type="date" 194 type="date"
195 placeholder="选择日期"> 195 placeholder="选择日期">
...@@ -478,12 +478,9 @@ ...@@ -478,12 +478,9 @@
478 </script> 478 </script>
479 <style rel="stylesheet/less" lang="less" scoped> 479 <style rel="stylesheet/less" lang="less" scoped>
480 .dz { 480 .dz {
481 min-height: 200px; 481 box-sizing: border-box;
482 width: 80%; 482 padding: 18px;
483 margin-top: 10px; 483 padding-bottom: 0;
484 margin-left: 10%;
485 float: left;
486
487 /deep/.el-input__inner{ 484 /deep/.el-input__inner{
488 width: 100%; 485 width: 100%;
489 border: 0; 486 border: 0;
......
1 <template> 1 <template>
2 <div class="content_box"> 2 <div class="content_box">
3 <el-tabs v-model="activeName" @tab-click="handleClick"> 3 <el-tabs v-model="activeName" class="tabs" @tab-click="handleClick">
4 <el-tab-pane label="多幢基本信息" name="dzxx"><dzxx></dzxx></el-tab-pane> 4 <el-tab-pane label="多幢基本信息" name="dzxx"><dzxx></dzxx></el-tab-pane>
5 </el-tabs> 5 </el-tabs>
6 </div> 6 </div>
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
14 </td> 14 </td>
15 <td colspan="2" >自然幢号<i class="requisite">*</i></td> 15 <td colspan="2" >自然幢号<i class="requisite">*</i></td>
16 <td colspan="4" > 16 <td colspan="4" >
17 <input class="formInput" :disabled="form.qszt!='0'" v-model="form.zrzh" style="width: 70%"> 17 <input class="formInput" :disabled="form.qszt!='0'" v-model="form.zrzh">
18 </td> 18 </td>
19 </tr> 19 </tr>
20 <tr> 20 <tr>
...@@ -154,7 +154,7 @@ ...@@ -154,7 +154,7 @@
154 规划用途 154 规划用途
155 </td> 155 </td>
156 <td colspan="3" > 156 <td colspan="3" >
157 <el-select-tree 157 <el-select-tree style="width:100%"
158 v-if="show" 158 v-if="show"
159 :default-expand-all="defaultExpandAll" 159 :default-expand-all="defaultExpandAll"
160 :multiple="multiple" 160 :multiple="multiple"
...@@ -169,7 +169,7 @@ ...@@ -169,7 +169,7 @@
169 </td> 169 </td>
170 <td colspan="2" >用途</td> 170 <td colspan="2" >用途</td>
171 <td colspan="4" > 171 <td colspan="4" >
172 <el-select-tree 172 <el-select-tree style="width:100%"
173 v-if="show" 173 v-if="show"
174 :default-expand-all="defaultExpandAll" 174 :default-expand-all="defaultExpandAll"
175 :multiple="multiple" 175 :multiple="multiple"
......