Skip to content

任超 / js.CadastralSystem

Go to a project
Toggle navigation
Toggle navigation pinning
ffea9b89 by weimo934
Options

Merge remote-tracking branch 'origin/master'

2 parents e359f137 78d8bbff
Inline Side-by-side
Showing 9 changed files with 208 additions and 53 deletions
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
5 v-for="(items, index) in countList" 5 v-for="(items, index) in countList"
6 :key="items.id" 6 :key="items.id"
7 > 7 >
8 <el-col :span="2"> 8 <el-col :span="2" class="btnCol">
9 <el-button 9 <el-button
10 v-if="!items.isInside" 10 v-if="!items.isInside"
11 type="primary" 11 type="primary"
...@@ -20,12 +20,16 @@ ...@@ -20,12 +20,16 @@
20 @click="handleClick(items.id, index, 'minus')" 20 @click="handleClick(items.id, index, 'minus')"
21 >-</el-button 21 >-</el-button
22 > 22 >
23 <div
24 :class="items.hasNotBorder ? 'itemShow whiteItem' : 'whiteItem'"
25 v-if="items.isInside"
26 ></div>
23 </el-col> 27 </el-col>
24 <el-col :span="2"> 28 <el-col :span="2" class="btnCol">
25 <span class="qlxz">权利性质</span> 29 <span class="qlxz">权利性质</span><br>
26 <el-button 30 <el-button
27 type="primary" 31 type="primary"
28 class="changeBtn mt6" 32 class="changeBtn"
29 @click="handleInClick(items, index, 'add')" 33 @click="handleInClick(items, index, 'add')"
30 >+</el-button 34 >+</el-button
31 > 35 >
...@@ -180,6 +184,7 @@ export default { ...@@ -180,6 +184,7 @@ export default {
180 { 184 {
181 id: Math.random(), 185 id: Math.random(),
182 isInside: false, 186 isInside: false,
187 hasNotBorder: false,
183 qlxz: "", 188 qlxz: "",
184 pzyt: "", 189 pzyt: "",
185 sjyt: "", 190 sjyt: "",
...@@ -198,9 +203,10 @@ export default { ...@@ -198,9 +203,10 @@ export default {
198 //外层操作 203 //外层操作
199 handleClick(id, ind, type) { 204 handleClick(id, ind, type) {
200 if (type === "add") { 205 if (type === "add") {
201 this.countList.splice(ind + 1, 0, { 206 this.countList.push({
202 id: Math.random(), 207 id: Math.random(),
203 isInside: false, 208 isInside: false,
209 hasNotBorder: false,
204 qlxz: "", 210 qlxz: "",
205 pzyt: "", 211 pzyt: "",
206 sjyt: "", 212 sjyt: "",
...@@ -219,6 +225,7 @@ export default { ...@@ -219,6 +225,7 @@ export default {
219 } 225 }
220 }); 226 });
221 } 227 }
228 this.hasBorderOrNot();
222 }, 229 },
223 //内层操作 230 //内层操作
224 handleInClick(obj, ind, type) { 231 handleInClick(obj, ind, type) {
...@@ -227,6 +234,7 @@ export default { ...@@ -227,6 +234,7 @@ export default {
227 id: obj.id, 234 id: obj.id,
228 childId: Math.random(), 235 childId: Math.random(),
229 isInside: true, 236 isInside: true,
237 hasNotBorder: false,
230 qlxz: "", 238 qlxz: "",
231 pzyt: "", 239 pzyt: "",
232 sjyt: "", 240 sjyt: "",
...@@ -254,13 +262,24 @@ export default { ...@@ -254,13 +262,24 @@ export default {
254 tempNum++; 262 tempNum++;
255 } 263 }
256 }); 264 });
257 this.countList.splice(tempIndex,tempNum) 265 this.countList.splice(tempIndex, tempNum);
258 } 266 }
259 } 267 }
268 this.hasBorderOrNot();
269 },
270 //判断是否显示边框
271 hasBorderOrNot() {
272 this.countList.forEach((item, index) => {
273 if (index == this.countList.length - 1) {
274 item.hasNotBorder = true;
275 } else {
276 item.hasNotBorder = item.isInside && !this.countList[index + 1].isInside ? true : false;
277 }
278 });
279 },
280 getQlxzDataList() {
281 return this.countList;
260 }, 282 },
261 getQlxzDataList(){
262 return this.countList
263 }
264 }, 283 },
265 }; 284 };
266 </script> 285 </script>
...@@ -274,12 +293,10 @@ export default { ...@@ -274,12 +293,10 @@ export default {
274 .el-col { 293 .el-col {
275 height: 100%; 294 height: 100%;
276 border-right: 1px solid grey; 295 border-right: 1px solid grey;
296 position: relative;
277 .qlxz { 297 .qlxz {
278 line-height: 34px; 298 line-height: 34px;
279 } 299 }
280 .mt6 {
281 margin-top: 6px;
282 }
283 ul { 300 ul {
284 margin-top: 34px; 301 margin-top: 34px;
285 li { 302 li {
...@@ -296,6 +313,17 @@ export default { ...@@ -296,6 +313,17 @@ export default {
296 border-bottom: none; 313 border-bottom: none;
297 } 314 }
298 } 315 }
316 .whiteItem {
317 background-color: #fff;
318 position: absolute;
319 width: 100%;
320 height: 2px;
321 bottom: -1px;
322 left: 0;
323 }
324 .itemShow {
325 bottom: 2px;
326 }
299 } 327 }
300 .el-col:nth-last-child(2) { 328 .el-col:nth-last-child(2) {
301 border-right: none; 329 border-right: none;
...@@ -317,19 +345,26 @@ export default { ...@@ -317,19 +345,26 @@ export default {
317 } 345 }
318 } 346 }
319 } 347 }
348 }
349 .btnCol {
350 position: relative;
320 .changeBtn { 351 .changeBtn {
321 width: 46px; 352 width: 46px;
322 height: 46px; 353 height: 46px;
323 margin-top: 40px;
324 font-size: 30px; 354 font-size: 30px;
325 padding: 6px 4px; 355 padding: 4px 6px;
356 position: absolute;
357 top: 50%;
358 left: 50%;
359 margin-top: -38px;
360 margin-left: -23px;
326 } 361 }
327 .el-button + .el-button { 362 .el-button + .el-button {
328 margin-top: 10px; 363 margin-left: -23px;
329 margin-left: 0; 364 margin-top: 16px;
330 } 365 }
331 } 366 }
332 .qlxzModule:nth-last-child(1) { 367 .el-row:nth-last-child(1) {
333 border-bottom: none; 368 border-bottom: none;
334 } 369 }
335 } 370 }
......
...@@ -31,6 +31,14 @@ ...@@ -31,6 +31,14 @@
31 <i :class="item.icon"></i> 31 <i :class="item.icon"></i>
32 <span>{{ item.name }}</span> 32 <span>{{ item.name }}</span>
33 </div> 33 </div>
34 <div class="top-items">
35 <el-menu :default-active="activeIndex" class="el-menu-demo" mode="horizontal" @select="handleSelect" :router="true">
36 <el-submenu index="2">
37 <template slot="title">临时网页开发路由跳转</template>
38 <el-menu-item v-for="(item,index) in tempTab" :index="item.path" :key="'tempTab'+index">{{item.name}}</el-menu-item>
39 </el-submenu>
40 </el-menu>
41 </div>
34 </div> 42 </div>
35 <div class="header-bottom"> 43 <div class="header-bottom">
36 <Navigation ref="navigation"></Navigation> 44 <Navigation ref="navigation"></Navigation>
...@@ -56,6 +64,7 @@ export default { ...@@ -56,6 +64,7 @@ export default {
56 }, 64 },
57 data() { 65 data() {
58 return { 66 return {
67 activeIndex:'1',
59 navigationList: [], 68 navigationList: [],
60 isActive: false, 69 isActive: false,
61 textLogo: false, 70 textLogo: false,
...@@ -79,6 +88,20 @@ export default { ...@@ -79,6 +88,20 @@ export default {
79 select: false, 88 select: false,
80 } 89 }
81 ], 90 ],
91 tempTab:[
92 {
93 path:'/zrz',
94 name:'自然幢'
95 },
96 {
97 path:'/dz',
98 name:'多幢'
99 },
100 {
101 path:'/h',
102 name:'户'
103 },
104 ],
82 // 上导航选中id 105 // 上导航选中id
83 indId: undefined, 106 indId: undefined,
84 menuList: [], 107 menuList: [],
...@@ -265,6 +288,9 @@ export default { ...@@ -265,6 +288,9 @@ export default {
265 //树控件点击事件 288 //树控件点击事件
266 itemClick(data){ 289 itemClick(data){
267 console.log(data); 290 console.log(data);
291 },
292 handleSelect(key, keyPath) {
293 console.log(key, keyPath);
268 } 294 }
269 }, 295 },
270 }; 296 };
......
1 .zrz { 1 .dz {
2 min-height: 200px; 2 min-height: 200px;
3 width: 100%; 3 width: 80%;
4 margin-top: 10px; 4 margin-top: 10px;
5 float: left; 5 float: left;
6 6
7 .el-input__inner{ 7 /deep/.el-input__inner{
8 width: 100%; 8 width: 100%;
9 border: 0; 9 border: 0;
10 } 10 }
11 11
12 textarea{ 12 /deep/textarea{
13 width: 100%; 13 width: 100%;
14 border: 0; 14 border: 0;
15 } 15 }
...@@ -37,4 +37,8 @@ ...@@ -37,4 +37,8 @@
37 table{ 37 table{
38 font-size: 14px; 38 font-size: 14px;
39 } 39 }
40
41 .dzTable{
42 margin-top: 10px;
43 }
40 } 44 }
...\ No newline at end of file ...\ No newline at end of file
......
1 <template> 1 <template>
2 <div class="zrz content-form"> 2 <div class="dz content-form">
3 <el-form ref="form" :model="form" label-width="160px"> 3 <el-form ref="form" :model="form" label-width="160px">
4 <table border="1" width="80%" cellspacing="1" cellpadding="2"> 4 <Qlr ref="qlrxxModule"></Qlr>
5 <table border="1" width="100%" cellspacing="1" cellpadding="2" class="dzTable">
5 <tbody> 6 <tbody>
6 <tr> 7 <tr>
7 <td colspan="1"></td> 8 <td colspan="1"></td>
...@@ -144,6 +145,14 @@ ...@@ -144,6 +145,14 @@
144 </td> 145 </td>
145 </tr> 146 </tr>
146 147
148 <tr>
149 <td colspan="12" rowspan="4" align="center">
150 <Qlxz ref="qlxzModule"></Qlxz>
151 </td>
152 </tr>
153 <tr></tr>
154 <tr></tr>
155 <tr></tr>
147 156
148 157
149 <tr height="30"> 158 <tr height="30">
...@@ -205,8 +214,14 @@ ...@@ -205,8 +214,14 @@
205 </template> 214 </template>
206 215
207 <script> 216 <script>
217 import Qlr from "../../../components/formMenu/qlr";
218 import Qlxz from "../../../components/formMenu/qlxz";
208 export default { 219 export default {
209 name:'zrz', 220 name:'zrz',
221 components:{
222 Qlr,
223 Qlxz,
224 },
210 data () { 225 data () {
211 return { 226 return {
212 form:{ 227 form:{
...@@ -342,6 +357,6 @@ ...@@ -342,6 +357,6 @@
342 } 357 }
343 } 358 }
344 </script> 359 </script>
345 <style rel="stylesheet/less" lang="less"> 360 <style rel="stylesheet/less" lang="less" scoped>
346 @import 'index.less'; 361 @import 'index.less';
347 </style> 362 </style>
...\ No newline at end of file ...\ No newline at end of file
......
1 .zrz { 1 .h {
2 min-height: 200px; 2 min-height: 200px;
3 width: 100%; 3 width: 80%;
4 margin-top: 10px; 4 margin-top: 10px;
5 float: left; 5 float: left;
6 6
7 .el-input__inner{ 7 /deep/.el-input__inner{
8 width: 100%; 8 width: 100%;
9 border: 0; 9 border: 0;
10 } 10 }
11 11
12 textarea{ 12 /deep/textarea{
13 width: 100%; 13 width: 100%;
14 border: 0; 14 border: 0;
15 } 15 }
...@@ -37,4 +37,8 @@ ...@@ -37,4 +37,8 @@
37 37
38 table{ 38 table{
39 font-size: 14px; 39 font-size: 14px;
40 }
41
42 .hTable{
43 margin-top: 10px;
40 } 44 }
...\ No newline at end of file ...\ No newline at end of file
......
1 <template> 1 <template>
2 <div class="zrz content-form"> 2 <div class="h content-form">
3 <el-form ref="form" :model="form" label-width="160px"> 3 <el-form ref="form" :model="form" label-width="160px">
4 <table border="1" width="80%" cellspacing="1" cellpadding="2"> 4 <Qlr ref="qlrxxModule"></Qlr>
5 <table border="1" width="100%" cellspacing="1" cellpadding="2" class="hTable">
5 <tbody> 6 <tbody>
6 <tr> 7 <tr>
7 <td colspan="1"></td> 8 <td colspan="1"></td>
...@@ -294,6 +295,18 @@ ...@@ -294,6 +295,18 @@
294 </td> 295 </td>
295 </tr> 296 </tr>
296 297
298
299 <tr>
300 <td colspan="12" rowspan="4" align="center">
301 <Qlxz ref="qlxzModule"></Qlxz>
302 </td>
303 </tr>
304 <tr></tr>
305 <tr></tr>
306 <tr></tr>
307
308
309
297 <tr height="30"> 310 <tr height="30">
298 <td colspan="2" align="center" > 311 <td colspan="2" align="center" >
299 <span>坐落</span> 312 <span>坐落</span>
...@@ -375,8 +388,14 @@ ...@@ -375,8 +388,14 @@
375 </template> 388 </template>
376 389
377 <script> 390 <script>
391 import Qlr from "../../../components/formMenu/qlr";
392 import Qlxz from "../../../components/formMenu/qlxz";
378 export default { 393 export default {
379 name:'zrz', 394 name:'zrz',
395 components:{
396 Qlr,
397 Qlxz,
398 },
380 data () { 399 data () {
381 return { 400 return {
382 form:{ 401 form:{
...@@ -513,6 +532,6 @@ ...@@ -513,6 +532,6 @@
513 } 532 }
514 } 533 }
515 </script> 534 </script>
516 <style rel="stylesheet/less" lang="less"> 535 <style rel="stylesheet/less" lang="less" scoped>
517 @import 'index.less'; 536 @import 'index.less';
518 </style> 537 </style>
...\ No newline at end of file ...\ No newline at end of file
......
1 .zrz { 1 .zrz {
2 min-height: 200px; 2 min-height: 200px;
3 width: 100%; 3 width: 80%;
4 margin-top: 10px; 4 margin-top: 10px;
5 float: left; 5 float: left;
6 6
7 .el-input__inner{ 7 /deep/.el-input__inner{
8 width: 100%; 8 width: 100%;
9 border: 0; 9 border: 0;
10 } 10 }
11 11
12 textarea{ 12 /deep/textarea{
13 width: 100%; 13 width: 100%;
14 border: 0; 14 border: 0;
15 } 15 }
...@@ -37,4 +37,8 @@ ...@@ -37,4 +37,8 @@
37 table{ 37 table{
38 font-size: 14px; 38 font-size: 14px;
39 } 39 }
40
41 .zrzTable{
42 margin-top: 10px;
43 }
40 } 44 }
...\ No newline at end of file ...\ No newline at end of file
......
1 <template> 1 <template>
2 <div class="zrz content-form"> 2 <div class="zrz content-form">
3 <el-form ref="form" :model="form" label-width="160px"> 3 <el-form ref="form" :model="form" label-width="160px">
4 <table border="1" width="80%" cellspacing="1" cellpadding="2"> 4 <Qlr ref="qlrxxModule"></Qlr>
5 <table border="1" width="100%" cellspacing="1" cellpadding="2" class="zrzTable">
5 <tbody> 6 <tbody>
6 <tr> 7 <tr>
7 <td colspan="1"></td> 8 <td colspan="1"></td>
8 <td colspan="1"></td> 9 <td colspan="1"></td>
9 <td colspan="1"></td> 10 <td colspan="1"></td>
10 <td colspan="1"></td> 11 <td colspan="1"></td>
11 <td colspan="1"></td> 12 <td colspan="1"></td>
12 <td colspan="1"></td> 13 <td colspan="1"></td>
13 <td colspan="1"></td> 14 <td colspan="1"></td>
14 <td colspan="1"></td> 15 <td colspan="1"></td>
15 <td colspan="1"></td> 16 <td colspan="1"></td>
16 <td colspan="1"></td> 17 <td colspan="1"></td>
17 <td colspan="1"></td> 18 <td colspan="1"></td>
18 <td colspan="1"></td> 19 <td colspan="1"></td>
19 </tr> 20 </tr>
20 <tr height="30"> 21 <tr height="30">
21 <td colspan="12" align="center" ><font size="4">自然幢基本信息</font></td> 22 <td colspan="12" align="center" ><font size="4">自然幢基本信息</font></td>
22 </tr> 23 </tr>
...@@ -210,6 +211,15 @@ ...@@ -210,6 +211,15 @@
210 </td> 211 </td>
211 </tr> 212 </tr>
212 213
214 <tr>
215 <td colspan="12" rowspan="4" align="center">
216 <Qlxz ref="qlxzModule"></Qlxz>
217 </td>
218 </tr>
219 <tr></tr>
220 <tr></tr>
221 <tr></tr>
222
213 <tr height="30"> 223 <tr height="30">
214 <td colspan="2" align="center" > 224 <td colspan="2" align="center" >
215 <span>坐落</span> 225 <span>坐落</span>
...@@ -269,8 +279,14 @@ ...@@ -269,8 +279,14 @@
269 </template> 279 </template>
270 280
271 <script> 281 <script>
282 import Qlr from "../../../components/formMenu/qlr";
283 import Qlxz from "../../../components/formMenu/qlxz";
272 export default { 284 export default {
273 name:'zrz', 285 name:'zrz',
286 components:{
287 Qlr,
288 Qlxz,
289 },
274 data () { 290 data () {
275 return { 291 return {
276 form:{ 292 form:{
...@@ -393,6 +409,6 @@ ...@@ -393,6 +409,6 @@
393 } 409 }
394 } 410 }
395 </script> 411 </script>
396 <style rel="stylesheet/less" lang="less"> 412 <style rel="stylesheet/less" lang="less" scoped>
397 @import 'index.less'; 413 @import 'index.less';
398 </style> 414 </style>
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
3 <div class="formMenu"> 3 <div class="formMenu">
4 <Qlr ref="qlrxxModule"></Qlr> 4 <Qlr ref="qlrxxModule"></Qlr>
5 5
6 <el-button 6 <!-- <el-button
7 type="primary" 7 type="primary"
8 class="changeBtn" 8 class="changeBtn"
9 @click="getQlrxxData" 9 @click="getQlrxxData"
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
14 class="changeBtn" 14 class="changeBtn"
15 @click="getQlxzData" 15 @click="getQlxzData"
16 >获取权利性质组件数据</el-button 16 >获取权利性质组件数据</el-button
17 > 17 > -->
18 <table class="zdjbxxTable" cellspacing="0" cellpadding="0" border="1"> 18 <table class="zdjbxxTable" cellspacing="0" cellpadding="0" border="1">
19 <tr> 19 <tr>
20 <th colspan="12">宗地基本信息</th> 20 <th colspan="12">宗地基本信息</th>
...@@ -200,10 +200,42 @@ ...@@ -200,10 +200,42 @@
200 </td> 200 </td>
201 </tr> 201 </tr>
202 <tr> 202 <tr>
203 <td colspan="12" rowspan="4"> 203 <td colspan="12">
204 <Qlxz ref="qlxzModule"></Qlxz> 204 <Qlxz ref="qlxzModule"></Qlxz>
205 </td> 205 </td>
206 </tr> 206 </tr>
207 <tr>
208 <td colspan="2" rowspan="2">批准面积(㎡)</td>
209 <td colspan="2" rowspan="2">
210 <input type="text" class="formInput" />
211 </td>
212 <td colspan="2" rowspan="2">宗地面积(㎡)</td>
213 <td colspan="2" rowspan="2">
214 <input type="text" class="formInput" />
215 </td>
216 <td colspan="2">建筑占地宗面积</td>
217 <td colspan="2">
218 <input type="text" class="formInput" />
219 </td>
220 </tr>
221 <tr>
222 <td colspan="2">建筑面积(㎡)</td>
223 <td colspan="2">
224 <input type="text" class="formInput" />
225 </td>
226 </tr>
227 <tr>
228 <td colspan="2">共有/共用权利人情况</td>
229 <td colspan="10">
230 <input type="text" class="formInput" />
231 </td>
232 </tr>
233 <tr>
234 <td colspan="2" rowspan="2">说明</td>
235 <td colspan="10" rowspan="2">
236 <input type="text" class="formInput" />
237 </td>
238 </tr>
207 </table> 239 </table>
208 </div> 240 </div>
209 </div> 241 </div>
......