Skip to content

任超 / js.CadastralSystem

Go to a project
Toggle navigation
Toggle navigation pinning
20d9701f by 杨威
Options

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

2 parents 92474a4e 8e704487
Inline Side-by-side
Showing 2 changed files with 104 additions and 90 deletions
...@@ -8,25 +8,37 @@ ...@@ -8,25 +8,37 @@
8 <div class="table"> 8 <div class="table">
9 <table border="1"> 9 <table border="1">
10 <tr> 10 <tr>
11 <td class="cz"><input type="checkbox" @click="allcheck" v-model="isCheckAll"/></td> 11 <th class="cz">
12 <td class="jzdh">界址点号</td> 12 <el-checkbox @change="allcheck" v-model="isCheckAll"></el-checkbox>
13 <td class="sxh">顺序号</td> 13 </th>
14 <td class="xzbz">X坐标值</td> 14 <th class="">界址点号</th>
15 <td class="yzbz">Y坐标值</td> 15 <th class="">顺序号</th>
16 <td class="jblx">界标类型</td> 16 <th class="">X坐标值</th>
17 <td class="jzdlx">界址点类型</td> 17 <th class="">Y坐标值</th>
18 <th class="">界标类型</th>
19 <th class="">界址点类型</th>
18 </tr> 20 </tr>
19 <tr v-if="jzdlist.length==0"> 21 <tr v-if="jzdlist.length==0">
20 <td colspan="7"><span class="nodata">暂无数据</span></td> 22 <td colspan="7"><span class="nodata">暂无数据</span></td>
21 </tr> 23 </tr>
22 <tr v-for="(item,index) in jzdlist" :key="index" v-else> 24 <tr v-for="(item,index) in jzdlist" :key="index" v-else>
23 <td class="cz"><input type="checkbox" v-model="item.isCheck" @change="changeAll"/></td> 25 <td class="cz">
24 <td class="jzdh"><input type="text" class="formInput" v-model="item.jzdh" readonly="readonly"/></td> 26 <el-checkbox v-model="item.isCheck" @change="changeAll"></el-checkbox>
25 <td class="sxh"><input type="text" class="formInput" v-model="item.sxh" readonly="readonly"/></td> 27 </td>
26 <td class="xzbz"><input type="text" class="formInput" v-model="item.xzbz" :readonly="item.iszb" 28 <td class="jzdh">
27 @keydown="oninput"/></td> 29 <el-input v-model="item.jzdh" readonly></el-input>
28 <td class="yzbz"><input tepe="text" class="formInput" v-model="item.yzbz" :readonly="item.iszb" 30 </td>
29 @keydown="oninput"/></td> 31 <td class="sxh">
32 <el-input class="" v-model="item.sxh" readonly></el-input>
33 </td>
34 <td class="xzbz">
35 <el-input class="" v-model="item.xzbz" :readonly="item.iszb" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null"
36 @keydown="oninput"></el-input>
37 </td>
38 <td class="yzbz">
39 <el-input class="" v-model="item.yzbz" :readonly="item.iszb" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null"
40 @keydown="oninput"></el-input>
41 </td>
30 <td class="jblx"> 42 <td class="jblx">
31 <el-select v-model="item.jblx" :disabled="item.jzdisdisabled"> 43 <el-select v-model="item.jblx" :disabled="item.jzdisdisabled">
32 <el-option 44 <el-option
...@@ -52,9 +64,9 @@ ...@@ -52,9 +64,9 @@
52 </div> 64 </div>
53 <div> 65 <div>
54 <el-dialog v-dialogDrag :close-on-click-modal="false" 66 <el-dialog v-dialogDrag :close-on-click-modal="false"
55 title="批量修改" 67 title="批量修改"
56 :visible.sync="centerDialogVisible" 68 :visible.sync="centerDialogVisible"
57 width="30%" 69 width="30%"
58 > 70 >
59 <div class="plxg"> 71 <div class="plxg">
60 <table> 72 <table>
...@@ -191,7 +203,7 @@ ...@@ -191,7 +203,7 @@
191 }) 203 })
192 }, 204 },
193 save() { 205 save() {
194 if(this.jzdlist.length === 0){ 206 if (this.jzdlist.length === 0) {
195 Message.info("至少填写一条界址点信息") 207 Message.info("至少填写一条界址点信息")
196 return 208 return
197 } 209 }
...@@ -215,7 +227,7 @@ ...@@ -215,7 +227,7 @@
215 e.target.value = (e.target.value.match(/^\d*(\.?\d{0,4})/g)[0]) || null 227 e.target.value = (e.target.value.match(/^\d*(\.?\d{0,4})/g)[0]) || null
216 }, 228 },
217 changeAll(e) { 229 changeAll(e) {
218 if (!e.target.checked) { 230 if (!e) {
219 this.isCheckAll = false; 231 this.isCheckAll = false;
220 return 232 return
221 } 233 }
...@@ -229,7 +241,7 @@ ...@@ -229,7 +241,7 @@
229 }, 241 },
230 allcheck(value) { 242 allcheck(value) {
231 for (let item of this.jzdlist) { 243 for (let item of this.jzdlist) {
232 item.isCheck = value.target.checked; 244 item.isCheck = value;
233 } 245 }
234 }, 246 },
235 oneExit() { 247 oneExit() {
...@@ -316,18 +328,10 @@ ...@@ -316,18 +328,10 @@
316 background-color: #fff; 328 background-color: #fff;
317 font-size: 14px; 329 font-size: 14px;
318 width: 100%; 330 width: 100%;
319 .formInput {
320 margin: 0;
321 height: 36px;
322 outline: none;
323 border: none;
324 color: #606764;
325 overflow: visible;
326 text-align: center;
327 cursor: text;
328 }
329 } 331 }
330 332 th{
333 height: 36px;
334 }
331 td { 335 td {
332 text-align: center; 336 text-align: center;
333 height: 36px; 337 height: 36px;
...@@ -337,9 +341,9 @@ ...@@ -337,9 +341,9 @@
337 cursor: pointer; 341 cursor: pointer;
338 } 342 }
339 .plxg { 343 .plxg {
340 .el-select{ 344 .el-select {
341 float: left; 345 float: left;
342 } 346 }
343 } 347 }
344 .batchlx { 348 .batchlx {
345 text-align: center; 349 text-align: center;
...@@ -349,11 +353,12 @@ ...@@ -349,11 +353,12 @@
349 color: #b2b2b2; 353 color: #b2b2b2;
350 } 354 }
351 } 355 }
352
353 .cz { 356 .cz {
354 width: 50px; 357 width: 50px;
355 } 358 }
356 359
360 /*
361
357 .jzdh { 362 .jzdh {
358 width: 120px; 363 width: 120px;
359 } 364 }
...@@ -376,7 +381,7 @@ ...@@ -376,7 +381,7 @@
376 381
377 .jzdlx { 382 .jzdlx {
378 width: 180px 383 width: 180px
379 } 384 }*/
380 385
381 .dialog-footer { 386 .dialog-footer {
382 text-align: center; 387 text-align: center;
......
...@@ -8,25 +8,35 @@ ...@@ -8,25 +8,35 @@
8 <div class="table"> 8 <div class="table">
9 <table border="1"> 9 <table border="1">
10 <tr> 10 <tr>
11 <td class="cz"><input type="checkbox" @click="allcheck" v-model="isCheckAll"/></td> 11 <th class="cz">
12 <td class="qdh">起始点号</td> 12 <el-checkbox @change="allcheck" v-model="isCheckAll"></el-checkbox>
13 <td class="zdh">终止点号</td> 13 </th>
14 <td class="jzjj">界址间距(m)</td> 14 <th class="">起始点号</th>
15 <td class="jzxlx">界址线类型</td> 15 <th class="">终止点号</th>
16 <td class="jzxwz">界址线位置</td> 16 <th class="">界址间距(m)</th>
17 <td class="jxxz">界限性质</td> 17 <th class="">界址线类型</th>
18 <td class="sm">说明</td> 18 <th class="">界址线位置</th>
19 <th class="">界限性质</th>
20 <th class="">说明</th>
19 </tr> 21 </tr>
20 <tr v-if="jzxlist.length==0"> 22 <tr v-if="jzxlist.length==0">
21 <td colspan="8"><span class="nodata">暂无数据</span></td> 23 <td colspan="8"><span class="nodata">暂无数据</span></td>
22 </tr> 24 </tr>
23 <tr v-for="(item,index) in jzxlist" :key="index" v-else> 25 <tr v-for="(item,index) in jzxlist" :key="index" v-else>
24 <td class="cz"><input type="checkbox" v-model="item.isCheck" @change="changeAll"/></td> 26 <td class="">
25 <td class="qsd"><input type="text" class="formInput" v-model="item.qdh" readonly="readonly"/></td> 27 <el-checkbox v-model="item.isCheck" @change="changeAll"></el-checkbox>
26 <td class="zzd"><input type="text" class="formInput" v-model="item.zdh" readonly="readonly"/></td> 28 </td>
27 <td class="jzdj"><input type="text" class="formInput" v-model="item.jzjj" 29 <td class="">
28 :readonly="item.jjisdisabled"/></td> 30 <el-input v-model="item.qdh" readonly="readonly"></el-input>
29 <td class="jzxlx"> 31 </td>
32 <td class="">
33 <el-input v-model="item.zdh" readonly="readonly"></el-input>
34 </td>
35 <td class="">
36 <el-input v-model="item.jzjj" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null"
37 :readonly="item.jjisdisabled"></el-input>
38 </td>
39 <td class="">
30 <el-select v-model="item.jzxlb" :disabled="item.jzxisdisabled"> 40 <el-select v-model="item.jzxlb" :disabled="item.jzxisdisabled">
31 <el-option 41 <el-option
32 v-for="i in jzxlx" 42 v-for="i in jzxlx"
...@@ -36,7 +46,7 @@ ...@@ -36,7 +46,7 @@
36 ></el-option> 46 ></el-option>
37 </el-select> 47 </el-select>
38 </td> 48 </td>
39 <td class="jzxwz"> 49 <td class="">
40 <el-select v-model="item.jzxwz" :disabled="item.jzxisdisabled"> 50 <el-select v-model="item.jzxwz" :disabled="item.jzxisdisabled">
41 <el-option 51 <el-option
42 v-for="i in jzxwz" 52 v-for="i in jzxwz"
...@@ -46,7 +56,7 @@ ...@@ -46,7 +56,7 @@
46 ></el-option> 56 ></el-option>
47 </el-select> 57 </el-select>
48 </td> 58 </td>
49 <td class="jxxz"> 59 <td class="">
50 <el-select v-model="item.jxxz" :disabled="item.jzxisdisabled"> 60 <el-select v-model="item.jxxz" :disabled="item.jzxisdisabled">
51 <el-option 61 <el-option
52 v-for="i in jxxz" 62 v-for="i in jxxz"
...@@ -56,17 +66,17 @@ ...@@ -56,17 +66,17 @@
56 ></el-option> 66 ></el-option>
57 </el-select> 67 </el-select>
58 </td> 68 </td>
59 <td class="sm"> 69 <td class="">
60 <input type="text" class="formInput" v-model="item.sm" readonly="readonly"/> 70 <el-input v-model="item.sm" readonly="readonly"></el-input>
61 </td> 71 </td>
62 </tr> 72 </tr>
63 </table> 73 </table>
64 </div> 74 </div>
65 <div> 75 <div>
66 <el-dialog v-dialogDrag :close-on-click-modal="false" 76 <el-dialog v-dialogDrag :close-on-click-modal="false"
67 title="批量修改" 77 title="批量修改"
68 :visible.sync="centerDialogVisible" 78 :visible.sync="centerDialogVisible"
69 width="30%" 79 width="30%"
70 > 80 >
71 <div class="plxg"> 81 <div class="plxg">
72 <table> 82 <table>
...@@ -261,7 +271,7 @@ ...@@ -261,7 +271,7 @@
261 }) 271 })
262 }, 272 },
263 save() { 273 save() {
264 if(this.jzxlist.length === 0){ 274 if (this.jzxlist.length === 0) {
265 Message.info("至少填写一条界址线信息") 275 Message.info("至少填写一条界址线信息")
266 return 276 return
267 } 277 }
...@@ -284,7 +294,8 @@ ...@@ -284,7 +294,8 @@
284 e.target.value = (e.target.value.match(/^\d*(\.?\d{0,4})/g)[0]) || null 294 e.target.value = (e.target.value.match(/^\d*(\.?\d{0,4})/g)[0]) || null
285 }, 295 },
286 changeAll(e) { 296 changeAll(e) {
287 if (!e.target.checked) { 297 console.log(e,"单选")
298 if (!e) {
288 this.isCheckAll = false; 299 this.isCheckAll = false;
289 return 300 return
290 } 301 }
...@@ -297,8 +308,10 @@ ...@@ -297,8 +308,10 @@
297 this.isCheckAll = true; 308 this.isCheckAll = true;
298 }, 309 },
299 allcheck(value) { 310 allcheck(value) {
311 debugger
312 console.log(value,'全选')
300 for (let item of this.jzxlist) { 313 for (let item of this.jzxlist) {
301 item.isCheck = value.target.checked; 314 item.isCheck = value;
302 } 315 }
303 }, 316 },
304 oneExit() { 317 oneExit() {
...@@ -368,20 +381,13 @@ ...@@ -368,20 +381,13 @@
368 background-color: #fff; 381 background-color: #fff;
369 font-size: 14px; 382 font-size: 14px;
370 width: 100%; 383 width: 100%;
371 .formInput {
372 margin: 0;
373 height: 36px;
374 outline: none;
375 border: none;
376 color: #606764;
377 overflow: visible;
378 text-align: center;
379 cursor: text;
380 }
381 } 384 }
382 table:hover { 385 table:hover {
383 cursor: pointer; 386 cursor: pointer;
384 } 387 }
388 th {
389 height: 36px;
390 }
385 td { 391 td {
386 text-align: center; 392 text-align: center;
387 height: 36px; 393 height: 36px;
...@@ -401,29 +407,31 @@ ...@@ -401,29 +407,31 @@
401 width: 50px; 407 width: 50px;
402 } 408 }
403 409
404 .qsd { 410 /*
405 width: 150px;
406 }
407 411
408 .zzd { 412 .qsd {
409 width: 150px; 413 width: 150px;
410 } 414 }
411 415
412 .jzdj { 416 .zzd {
413 width: 150px; 417 width: 150px;
414 } 418 }
415 419
416 .jzxlx { 420 .jzdj {
417 width: 180px; 421 width: 150px;
418 } 422 }
419 423
420 .jzxwz { 424 .jzxlx {
421 width: 150px; 425 width: 180px;
422 } 426 }
423 427
424 .jxxz { 428 .jzxwz {
425 width: 150px; 429 width: 150px;
426 } 430 }
431
432 .jxxz {
433 width: 150px;
434 }*/
427 435
428 .sm { 436 .sm {
429 width: 150px; 437 width: 150px;
...@@ -433,8 +441,9 @@ ...@@ -433,8 +441,9 @@
433 text-align: center; 441 text-align: center;
434 margin-top: 20px; 442 margin-top: 20px;
435 } 443 }
436 .plxg{ 444
437 .el-select{ 445 .plxg {
446 .el-select {
438 float: left; 447 float: left;
439 } 448 }
440 } 449 }
......