Skip to content

任超 / js.CadastralSystem

Go to a project
Toggle navigation
Toggle navigation pinning
5264cb68 by zhaoqian
Options

Merge remote-tracking branch 'origin/master'

2 parents 4f6f3235 ef92b346
Inline Side-by-side
Showing 10 changed files with 242 additions and 68 deletions
...@@ -105,9 +105,10 @@ ...@@ -105,9 +105,10 @@
105 :disabled="formData.qszt!='0'" 105 :disabled="formData.qszt!='0'"
106 v-model="childItem.tdsyqssj" 106 v-model="childItem.tdsyqssj"
107 type="date" 107 type="date"
108 108 :picker-options="childItem.pickerStart"
109 value-format="yyyy-MM-dd" 109 value-format="yyyy-MM-dd"
110 placeholder="选择日期" 110 placeholder="选择日期"
111 @input="startTime(index,childIndex)"
111 > 112 >
112 </el-date-picker> 113 </el-date-picker>
113 </li> 114 </li>
...@@ -150,7 +151,7 @@ ...@@ -150,7 +151,7 @@
150 <li> 151 <li>
151 <input 152 <input
152 type="text" 153 type="text"
153 154
154 :disabled="formData.qszt!='0'" 155 :disabled="formData.qszt!='0'"
155 v-model="childItem.syqx" 156 v-model="childItem.syqx"
156 class="formInput" 157 class="formInput"
...@@ -211,7 +212,8 @@ ...@@ -211,7 +212,8 @@
211 :disabled="formData.qszt!='0'" 212 :disabled="formData.qszt!='0'"
212 v-model="childItem.tdsyjssj" 213 v-model="childItem.tdsyjssj"
213 type="date" 214 type="date"
214 215 :picker-options="childItem.pickerEnd"
216 @input="endTime(index,childIndex)"
215 value-format="yyyy-MM-dd" 217 value-format="yyyy-MM-dd"
216 placeholder="选择日期" 218 placeholder="选择日期"
217 > 219 >
...@@ -290,6 +292,8 @@ export default { ...@@ -290,6 +292,8 @@ export default {
290 sjytmj: 0, 292 sjytmj: 0,
291 syqx: "", 293 syqx: "",
292 tdsyjssj: "", 294 tdsyjssj: "",
295 pickerStart:{},
296 pickerEnd:{},
293 tdsyqssj: "", 297 tdsyqssj: "",
294 tdzh: "", 298 tdzh: "",
295 }, 299 },
...@@ -304,6 +308,42 @@ export default { ...@@ -304,6 +308,42 @@ export default {
304 console.log(this.formData,'formData'); 308 console.log(this.formData,'formData');
305 }, 309 },
306 methods: { 310 methods: {
311 startTime(index,childIndex){
312 let startTime= this.countList[index].list[childIndex].tdsyqssj;
313 let endTime=this.countList[index].list[childIndex].tdsyjssj;
314 this.countList[index].list[childIndex].pickerEnd={
315 disabledDate: (time) => {
316 if (Object.keys(startTime).length>0) {
317 return new Date(startTime).getTime()>time.getTime();
318 }else {
319 return time.getTime()< Date.now();
320 }
321 }
322 }
323 if (Object.keys(startTime).length > 0 && Object.keys(endTime).length > 0) {
324 let startYear= new Date(startTime).getFullYear();
325 let endYear=new Date(endTime).getFullYear();
326 this.countList[index].list[childIndex].syqx=endYear-startYear;
327 }
328 },
329 endTime(index,childIndex){
330 let startTime = this.countList[index].list[childIndex].tdsyqssj;
331 let endTime = this.countList[index].list[childIndex].tdsyjssj;
332 this.countList[index].list[childIndex].pickerStart={
333 disabledDate: (time) => {
334 if (Object.keys(endTime).length>0) {
335 return new Date(endTime).getTime()<time.getTime();
336 }else {
337 return time.getTime() > Date.now();
338 }
339 }
340 }
341 if (Object.keys(startTime).length > 0 && Object.keys(endTime).length > 0) {
342 let startYear= new Date(startTime).getFullYear();
343 let endYear=new Date(endTime).getFullYear();
344 this.countList[index].list[childIndex].syqx=endYear-startYear;
345 }
346 },
307 //外层操作 347 //外层操作
308 handleClick(ind, type) { 348 handleClick(ind, type) {
309 let outsideObj = { 349 let outsideObj = {
...@@ -325,6 +365,8 @@ export default { ...@@ -325,6 +365,8 @@ export default {
325 sjdjbsm: "", 365 sjdjbsm: "",
326 sjdjmc: "", 366 sjdjmc: "",
327 sjytdm: "", 367 sjytdm: "",
368 pickerStart:{},
369 pickerEnd:{},
328 sjytmc: "", 370 sjytmc: "",
329 sjytmj: 0, 371 sjytmj: 0,
330 syqx: "", 372 syqx: "",
...@@ -360,6 +402,8 @@ export default { ...@@ -360,6 +402,8 @@ export default {
360 sjytdm: "", 402 sjytdm: "",
361 sjytmc: "", 403 sjytmc: "",
362 sjytmj: 0, 404 sjytmj: 0,
405 pickerStart:{},
406 pickerEnd:{},
363 syqx: "", 407 syqx: "",
364 tdsyjssj: "", 408 tdsyjssj: "",
365 tdsyqssj: "", 409 tdsyqssj: "",
...@@ -402,7 +446,7 @@ export default { ...@@ -402,7 +446,7 @@ export default {
402 border-bottom: 1px solid #E6E6E6; 446 border-bottom: 1px solid #E6E6E6;
403 .el-col { 447 .el-col {
404 // height: 100%; 448 // height: 100%;
405 border-right: 1px solid grey; 449 border-right: 1px solid #E6E6E6;
406 position: relative; 450 position: relative;
407 .qlxz { 451 .qlxz {
408 line-height: 34px; 452 line-height: 34px;
...@@ -448,7 +492,7 @@ export default { ...@@ -448,7 +492,7 @@ export default {
448 } 492 }
449 .childYT { 493 .childYT {
450 height: 114px; 494 height: 114px;
451 border-top: 1px solid grey; 495 border-top: 1px solid #E6E6E6;
452 ul { 496 ul {
453 margin-top: 0; 497 margin-top: 0;
454 li { 498 li {
...@@ -478,7 +522,7 @@ export default { ...@@ -478,7 +522,7 @@ export default {
478 height: 34px; 522 height: 34px;
479 line-height: 34px; 523 line-height: 34px;
480 background-color: #fff; 524 background-color: #fff;
481 border-bottom: 1px solid grey; 525 border-bottom: 1px solid #E6E6E6;
482 position: absolute; 526 position: absolute;
483 right: 0; 527 right: 0;
484 top: 0; 528 top: 0;
...@@ -516,7 +560,9 @@ export default { ...@@ -516,7 +560,9 @@ export default {
516 /deep/.el-select-tree{ 560 /deep/.el-select-tree{
517 width: 100%; 561 width: 100%;
518 .el-input__inner{ 562 .el-input__inner{
519 height: 30px !important; 563 height: 34px !important;
564 position: relative;
565 top: -1px;
520 } 566 }
521 } 567 }
522 } 568 }
......
...@@ -329,7 +329,7 @@ export default { ...@@ -329,7 +329,7 @@ export default {
329 border-bottom: 1px solid #e6e6e6; 329 border-bottom: 1px solid #e6e6e6;
330 .el-col { 330 .el-col {
331 // height: 100%; 331 // height: 100%;
332 border-right: 1px solid grey; 332 border-right: 1px solid #E6E6E6;
333 position: relative; 333 position: relative;
334 .qlxz { 334 .qlxz {
335 line-height: 34px; 335 line-height: 34px;
...@@ -375,7 +375,7 @@ export default { ...@@ -375,7 +375,7 @@ export default {
375 } 375 }
376 .childYT { 376 .childYT {
377 height: 114px; 377 height: 114px;
378 border-top: 1px solid grey; 378 border-top: 1px solid #E6E6E6;
379 ul { 379 ul {
380 margin-top: 0; 380 margin-top: 0;
381 li { 381 li {
...@@ -405,7 +405,7 @@ export default { ...@@ -405,7 +405,7 @@ export default {
405 height: 34px; 405 height: 34px;
406 line-height: 34px; 406 line-height: 34px;
407 background-color: #fff; 407 background-color: #fff;
408 border-bottom: 1px solid grey; 408 border-bottom: 1px solid #E6E6E6;
409 position: absolute; 409 position: absolute;
410 right: 0; 410 right: 0;
411 top: 0; 411 top: 0;
......
...@@ -163,7 +163,7 @@ ...@@ -163,7 +163,7 @@
163 box-sizing: border-box; 163 box-sizing: border-box;
164 padding: 18px; 164 padding: 18px;
165 height: auto; 165 height: auto;
166 width: 80%; 166 width: 100%;
167 } 167 }
168 168
169 table { 169 table {
......
...@@ -2,12 +2,12 @@ ...@@ -2,12 +2,12 @@
2 <div class="content_box"> 2 <div class="content_box">
3 <el-tabs v-model="activeName" class="tabs" @tab-click="handleClick"> 3 <el-tabs v-model="activeName" class="tabs" @tab-click="handleClick">
4 <el-tab-pane label="地籍调查表" name="djdcb"><zddcb></zddcb></el-tab-pane> 4 <el-tab-pane label="地籍调查表" name="djdcb"><zddcb></zddcb></el-tab-pane>
5 <el-tab-pane label="面积分摊表" name="mjftb"><mjftb></mjftb></el-tab-pane> 5 <el-tab-pane label="面积分摊表" name="mjftb"><mjftb v-if="mjftbVisible"></mjftb></el-tab-pane>
6 <el-tab-pane label="界址点" name="jzd"><jzd></jzd></el-tab-pane> 6 <el-tab-pane label="界址点" name="jzd"><jzd v-if="jzdVisible"></jzd></el-tab-pane>
7 <el-tab-pane label="界址线" name="jzx"><jzx></jzx></el-tab-pane> 7 <el-tab-pane label="界址线" name="jzx"><jzx v-if="jzxVisible"></jzx></el-tab-pane>
8 <el-tab-pane label="登记簿" name="djb"><djb></djb></el-tab-pane> 8 <el-tab-pane label="登记簿" name="djb"><djb v-if="djbVisible"></djb></el-tab-pane>
9 <el-tab-pane label="历史回溯" name="lshs"><lshs v-if="lshsVisible"></lshs></el-tab-pane> 9 <el-tab-pane label="历史回溯" name="lshs"><lshs v-if="lshsVisible"></lshs></el-tab-pane>
10 <el-tab-pane label="附件材料" name="fjcl"><fjcl></fjcl></el-tab-pane> 10 <el-tab-pane label="附件材料" name="fjcl"><fjcl v-if="fjclVisible"></fjcl></el-tab-pane>
11 </el-tabs> 11 </el-tabs>
12 </div> 12 </div>
13 </template> 13 </template>
...@@ -29,14 +29,39 @@ export default { ...@@ -29,14 +29,39 @@ export default {
29 data() { 29 data() {
30 return { 30 return {
31 activeName: "djdcb", 31 activeName: "djdcb",
32 mjftbVisible:false,
33 jzdVisible:false,
34 jzxVisible:false,
35 djbVisible:false,
32 lshsVisible:false, 36 lshsVisible:false,
37 fjclVisible:false,
33 }; 38 };
34 }, 39 },
35 methods: { 40 methods: {
36 handleClick(tab, event) { 41 handleClick(tab, event) {
37 // console.log(tab, event); 42 // console.log(tab, event);
38 if (tab.name == 'lshs') { 43 switch (tab.name) {
39 this.lshsVisible = true; 44 case 'mjftb':
45 this.mjftbVisible = true;
46 break;
47 case 'jzd':
48 this.jzdVisible = true;
49 break;
50 case 'jzx':
51 this.jzxVisible = true;
52 break;
53 case 'djb':
54 this.djbVisible = true;
55 break;
56 case 'lshs':
57 this.lshsVisible = true;
58 break;
59 case 'fjcl':
60 this.fjclVisible = true;
61 break;
62
63 default:
64 break;
40 } 65 }
41 }, 66 },
42 }, 67 },
......
...@@ -87,6 +87,14 @@ ...@@ -87,6 +87,14 @@
87 </span> 87 </span>
88 </el-dialog> 88 </el-dialog>
89 </div> 89 </div>
90 <!--
91 <div class="header-button" :style="{width:mainBoxWidth+'px'}">
92
93 <el-button type="primary" @click="oneExit">编辑</el-button>
94 <el-button type="primary" @click="save">保存</el-button>
95 <el-button type="primary" @click="batchExit">批量修改</el-button>
96 <el-button type="primary" class="saveBtn" @click="save">保存</el-button>
97 </div> -->
90 </div> 98 </div>
91 </template> 99 </template>
92 100
...@@ -276,7 +284,25 @@ ...@@ -276,7 +284,25 @@
276 box-sizing: border-box; 284 box-sizing: border-box;
277 padding: 18px; 285 padding: 18px;
278 height: auto; 286 height: auto;
279 width: 80%; 287 width: 100%;
288 .header-button {
289 height: 50px;
290 position: fixed;
291 bottom: 0;
292 right: ;
293 text-align: center;
294 background-color: #ffffff;
295 .saveBtn {
296 background-color: #00CACD;
297 border-color: #00CACD;
298 padding: 10px 30px;
299 margin-top: 8px;
300 }
301 .saveBtn:hover {
302 background-color: rgba(0, 202, 205, .8);
303 border-color: rgba(0, 202, 205, .8);
304 }
305 }
280 table { 306 table {
281 margin-top: 10px; 307 margin-top: 10px;
282 background-color: #fff; 308 background-color: #fff;
......
...@@ -344,7 +344,7 @@ ...@@ -344,7 +344,7 @@
344 box-sizing: border-box; 344 box-sizing: border-box;
345 padding: 18px; 345 padding: 18px;
346 height: auto; 346 height: auto;
347 width: 80%; 347 width: 100%;
348 table { 348 table {
349 margin-top: 10px; 349 margin-top: 10px;
350 background-color: #fff; 350 background-color: #fff;
......
1 <template> 1 <template>
2 <div class="main"> 2 <div class="main" ref="mainBox">
3 <table border="1"> 3 <table border="1">
4 <tr> 4 <tr>
5 <td colspan="2">土地坐落</td> 5 <td colspan="2">土地坐落</td>
...@@ -67,8 +67,12 @@ ...@@ -67,8 +67,12 @@
67 <td class="fttjmj">{{sumFttdmj}}</td> 67 <td class="fttjmj">{{sumFttdmj}}</td>
68 </tr> 68 </tr>
69 </table> 69 </table>
70 <div class="pers"> 70 <!-- <div class="pers">
71 <el-button @click="save" type="primary">保存</el-button> 71 <el-button @click="save" type="primary">保存</el-button>
72 </div> -->
73
74 <div class="header-button" :style="{width:mainBoxWidth+'px'}">
75 <el-button type="primary" class="saveBtn" @click="save">保存</el-button>
72 </div> 76 </div>
73 </div> 77 </div>
74 </template> 78 </template>
...@@ -100,7 +104,8 @@ ...@@ -100,7 +104,8 @@
100 tdsyqsyqmj: '' // 土地所有权/使用权面积 104 tdsyqsyqmj: '' // 土地所有权/使用权面积
101 } 105 }
102 ] 106 ]
103 } 107 },
108 mainBoxWidth:0
104 } 109 }
105 }, 110 },
106 111
...@@ -198,7 +203,6 @@ ...@@ -198,7 +203,6 @@
198 console.log("create init...") 203 console.log("create init...")
199 }, 204 },
200 mounted() { 205 mounted() {
201 console.log("mounted init...")
202 this.mjftData.zdbsm = this.$store.state.zdbsm 206 this.mjftData.zdbsm = this.$store.state.zdbsm
203 this.zdmj = this.$store.state.zdmj 207 this.zdmj = this.$store.state.zdmj
204 this.tdzl = this.$store.state.zdzl 208 this.tdzl = this.$store.state.zdzl
...@@ -206,6 +210,9 @@ ...@@ -206,6 +210,9 @@
206 if (this.mjftData.zdbsm) { 210 if (this.mjftData.zdbsm) {
207 this.getData(this.mjftData.zdbsm) 211 this.getData(this.mjftData.zdbsm)
208 } 212 }
213 this.$nextTick(() => {
214 this.mainBoxWidth = this.$refs.mainBox.clientWidth;
215 })
209 }, 216 },
210 watch: { 217 watch: {
211 "$store.state.zdbsm": function (bsm) { 218 "$store.state.zdbsm": function (bsm) {
...@@ -229,33 +236,49 @@ ...@@ -229,33 +236,49 @@
229 box-sizing: border-box; 236 box-sizing: border-box;
230 padding: 18px; 237 padding: 18px;
231 height: auto; 238 height: auto;
232 width: 80%;
233 }
234
235 table {
236 margin-top: 10px;
237 background-color: #fff;
238 font-size: 14px;
239 width: 100%; 239 width: 100%;
240 cursor: pointer; 240
241 td { 241 table {
242 margin-top: 10px;
243 background-color: #fff;
244 font-size: 14px;
245 width: 100%;
246 cursor: pointer;
247 .formInput {
248 margin: 0;
249 height: 36px;
250 outline: none;
251 border: none;
252 color: #606764;
253 overflow: visible;
254 text-align: center;
255 cursor: text;
256 }
257 td {
258 text-align: center;
259 height: 36px;
260 min-width: 50px;
261 }
262 }
263 .header-button {
264 height: 50px;
265 position: fixed;
266 bottom: 0;
267 right: 0;
242 text-align: center; 268 text-align: center;
243 height: 36px; 269 background-color: #ffffff;
244 min-width: 50px; 270 .saveBtn {
271 background-color: #00CACD;
272 border-color: #00CACD;
273 padding: 10px 30px;
274 margin-top: 8px;
275 }
276 .saveBtn:hover {
277 background-color: rgba(0, 202, 205, .8);
278 border-color: rgba(0, 202, 205, .8);
279 }
245 } 280 }
246 } 281 }
247
248 table .formInput {
249 margin: 0;
250 height: 36px;
251 outline: none;
252 border: none;
253 color: #606764;
254 overflow: visible;
255 text-align: center;
256 cursor: text;
257 }
258
259 .pers { 282 .pers {
260 text-align: center; 283 text-align: center;
261 margin-top: 10px; 284 margin-top: 10px;
......
1 <template> 1 <template>
2 <div class="main"> 2 <div class="main" ref="mainBox">
3 <div class="formMenu"> 3 <div class="formMenu">
4 <Qlr ref="qlrxxModule" :bsm="curZdbsm" :qszt="formData.qszt"></Qlr> 4 <Qlr ref="qlrxxModule" :bsm="curZdbsm" :qszt="formData.qszt"></Qlr>
5 <!-- <el-button 5 <!-- <el-button
...@@ -338,10 +338,18 @@ ...@@ -338,10 +338,18 @@
338 </tr> 338 </tr>
339 </table> 339 </table>
340 340
341 <div style="min-height: 40px;text-align: center;margin-top: 10px"> 341 <!-- <div style="min-height: 40px;text-align: center;margin-top: 10px">
342 <el-button type="success" @click="updateZDxx">保存</el-button> 342 <el-button type="success" class="saveBtn" @click="updateZDxx">保存</el-button>
343 <el-button type="primary" @click="submitZDxx">提交</el-button> 343 <el-button type="primary" @click="submitZDxx">提交</el-button>
344 <el-button type="primary" @click="registerCall">登记调用</el-button> 344 <el-button type="primary" @click="registerCall">登记调用</el-button>
345 </div> -->
346
347 <div class="header-button" :style="{width:mainBoxWidth+'px'}">
348
349 <el-button type="primary" class="saveBtn" @click="updateZDxx">保存</el-button>
350 <el-button type="primary" @click="submitZDxx">提交</el-button>
351 <el-button type="primary" @click="registerCall">登记调用</el-button>
352 <!-- <el-button type="primary" class="saveBtn" @click="save">保存</el-button> -->
345 </div> 353 </div>
346 </div> 354 </div>
347 </div> 355 </div>
...@@ -414,6 +422,7 @@ export default { ...@@ -414,6 +422,7 @@ export default {
414 formData: {}, 422 formData: {},
415 dpdm:'', //宗地底盘代码 423 dpdm:'', //宗地底盘代码
416 curZdbsm:'', 424 curZdbsm:'',
425 mainBoxWidth:0,
417 geoAttributes:{ 426 geoAttributes:{
418 OBJECTID:"", 427 OBJECTID:"",
419 BSM:"", 428 BSM:"",
...@@ -467,6 +476,9 @@ export default { ...@@ -467,6 +476,9 @@ export default {
467 }, 476 },
468 mounted() { 477 mounted() {
469 this.getZdjbxxData(this.$store.state.zdbsm); 478 this.getZdjbxxData(this.$store.state.zdbsm);
479 this.$nextTick(() => {
480 this.mainBoxWidth = this.$refs.mainBox.clientWidth;
481 })
470 }, 482 },
471 methods: { 483 methods: {
472 registerCall(){ 484 registerCall(){
...@@ -830,6 +842,7 @@ export default { ...@@ -830,6 +842,7 @@ export default {
830 td { 842 td {
831 text-align: center; 843 text-align: center;
832 height: 36px; 844 height: 36px;
845 border-color: #E6E6E6;
833 } 846 }
834 /deep/ .el-input__inner { 847 /deep/ .el-input__inner {
835 margin: 0; 848 margin: 0;
...@@ -867,5 +880,26 @@ export default { ...@@ -867,5 +880,26 @@ export default {
867 width: 100%; 880 width: 100%;
868 } 881 }
869 } 882 }
883
884 .header-button {
885 height: 50px;
886 position: fixed;
887 bottom: 0;
888 right: 6px;
889 text-align: center;
890 background-color: #ffffff;
891 .el-button{
892 padding: 10px 30px;
893 margin-top: 8px;
894 }
895 .saveBtn {
896 background-color: #00CACD;
897 border-color: #00CACD;
898 }
899 .saveBtn:hover {
900 background-color: rgba(0, 202, 205, .8);
901 border-color: rgba(0, 202, 205, .8);
902 }
903 }
870 } 904 }
871 </style> 905 </style>
......
...@@ -488,13 +488,15 @@ export default { ...@@ -488,13 +488,15 @@ export default {
488 //清空已选中层户 488 //清空已选中层户
489 this.cbsmList = []; 489 this.cbsmList = [];
490 this.bsms = []; 490 this.bsms = [];
491 console.log(this.$refs.lpbContent.$refs.cBsm,'this.$refs.lpbContent.$refs.cBsm');
492 this.$nextTick(()=>{ 491 this.$nextTick(()=>{
492 //户
493 this.$refs.lpbContent.$refs.hBsm.forEach(item=>{ 493 this.$refs.lpbContent.$refs.hBsm.forEach(item=>{
494 item.style.borderColor = 'rgb(230, 230, 230)';
494 if (item.className == "tdSelect") { 495 if (item.className == "tdSelect") {
495 item.className = ""; 496 item.className = "";
496 } 497 }
497 }); 498 });
499 //层
498 this.$refs.lpbContent.$refs.cBsm.forEach(item=>{ 500 this.$refs.lpbContent.$refs.cBsm.forEach(item=>{
499 console.log(item.className,'item.className'); 501 console.log(item.className,'item.className');
500 item.className = "floor"; 502 item.className = "floor";
...@@ -579,12 +581,10 @@ export default { ...@@ -579,12 +581,10 @@ export default {
579 } else { 581 } else {
580 //单击 TO DO 582 //单击 TO DO
581 } 583 }
582 console.log(this.bsms);
583 }, 584 },
584 //获取选中层bsmlist 585 //获取选中层bsmlist
585 getCbsm(data){ 586 getCbsm(data){
586 this.cbsmList = data; 587 this.cbsmList = data;
587 console.log(this.cbsmList);
588 }, 588 },
589 //不动产单元号输入框事件 589 //不动产单元号输入框事件
590 inputFocus() { 590 inputFocus() {
......
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
21 ref="ljz" 21 ref="ljz"
22 v-for="(ljzs, ljzIndex) in lpbData.ljzs" 22 v-for="(ljzs, ljzIndex) in lpbData.ljzs"
23 :key="ljzIndex" 23 :key="ljzIndex"
24 :style="{'marginTop':ljzs.zdys.length > 0 ? '-30px':0}"
24 > 25 >
25 <!-- <div class="ljz-zdy-wrap" :style="{'min-height':ljzzdyHeight+40+'px'}"> --> 26 <!-- <div class="ljz-zdy-wrap" :style="{'min-height':ljzzdyHeight+40+'px'}"> -->
26 <!-- 循环逻辑幢下的幢单元 --> 27 <!-- 循环逻辑幢下的幢单元 -->
...@@ -65,9 +66,9 @@ ...@@ -65,9 +66,9 @@
65 @contextmenu.prevent="openMenu($event, hs, 'h')" 66 @contextmenu.prevent="openMenu($event, hs, 'h')"
66 > 67 >
67 {{ hs.shbw }} 68 {{ hs.shbw }}
68 <span class="hqszt lin" v-show="hs.qszt == '0'">临</span> 69 <span @click.stop="qsztClick" class="hqszt lin" v-show="hs.qszt == '0'">临</span>
69 <span class="hqszt zheng" v-show="hs.qszt == '1'">正</span> 70 <span @click.stop="qsztClick" class="hqszt zheng" v-show="hs.qszt == '1'">正</span>
70 <span class="hqszt xian" v-show="hs.qszt == '2'">现</span> 71 <span @click.stop="qsztClick" class="hqszt xian" v-show="hs.qszt == '2'" >现</span>
71 </td> 72 </td>
72 </tr> 73 </tr>
73 </table> 74 </table>
...@@ -119,9 +120,9 @@ ...@@ -119,9 +120,9 @@
119 @contextmenu.prevent="openMenu($event, hs, 'h')" 120 @contextmenu.prevent="openMenu($event, hs, 'h')"
120 > 121 >
121 {{ hs.shbw }} 122 {{ hs.shbw }}
122 <span class="hqszt lin" v-show="hs.qszt == '0'">临</span> 123 <span @click.stop="qsztClick" class="hqszt lin" v-show="hs.qszt == '0'">临</span>
123 <span class="hqszt zheng" v-show="hs.qszt == '1'">正</span> 124 <span @click.stop="qsztClick" class="hqszt zheng" v-show="hs.qszt == '1'">正</span>
124 <span class="hqszt xian" v-show="hs.qszt == '2'">现</span> 125 <span @click.stop="qsztClick" class="hqszt xian" v-show="hs.qszt == '2'" >现</span>
125 </td> 126 </td>
126 </tr> 127 </tr>
127 </table> 128 </table>
...@@ -178,9 +179,9 @@ ...@@ -178,9 +179,9 @@
178 @contextmenu.prevent="openMenu($event, hs, 'h')" 179 @contextmenu.prevent="openMenu($event, hs, 'h')"
179 > 180 >
180 {{ hs.shbw }} 181 {{ hs.shbw }}
181 <span class="hqszt lin" v-show="hs.qszt == '0'">临</span> 182 <span @click.stop="qsztClick" class="hqszt lin" v-show="hs.qszt == '0'">临</span>
182 <span class="hqszt zheng" v-show="hs.qszt == '1'">正</span> 183 <span @click.stop="qsztClick" class="hqszt zheng" v-show="hs.qszt == '1'">正</span>
183 <span class="hqszt xian" v-show="hs.qszt == '2'">现</span> 184 <span @click.stop="qsztClick" class="hqszt xian" v-show="hs.qszt == '2'" >现</span>
184 </td> 185 </td>
185 </tr> 186 </tr>
186 </table> 187 </table>
...@@ -222,9 +223,9 @@ ...@@ -222,9 +223,9 @@
222 @contextmenu.prevent="openMenu($event, hs, 'h')" 223 @contextmenu.prevent="openMenu($event, hs, 'h')"
223 > 224 >
224 {{ hs.shbw }} 225 {{ hs.shbw }}
225 <span class="hqszt lin" v-show="hs.qszt == '0'">临</span> 226 <span @click.stop="qsztClick" class="hqszt lin" v-show="hs.qszt == '0'">临</span>
226 <span class="hqszt zheng" v-show="hs.qszt == '1'">正</span> 227 <span @click.stop="qsztClick" class="hqszt zheng" v-show="hs.qszt == '1'">正</span>
227 <span class="hqszt xian" v-show="hs.qszt == '2'">现</span> 228 <span @click.stop="qsztClick" class="hqszt xian" v-show="hs.qszt == '2'" >现</span>
228 </td> 229 </td>
229 </tr> 230 </tr>
230 </table> 231 </table>
...@@ -339,11 +340,14 @@ export default { ...@@ -339,11 +340,14 @@ export default {
339 sjc: "", //当前的层的SJC +1 340 sjc: "", //当前的层的SJC +1
340 }, 341 },
341 formLabelWidth: "120px", 342 formLabelWidth: "120px",
343 yclpbData:{},
344 sclpbData:{}
342 }; 345 };
343 }, 346 },
344 created() {}, 347 created() {},
345 mounted() { 348 mounted() {
346 this.getLpb(this.$store.state.zrzbsm, this.$parent.scyclx); 349 this.getLpb(this.$store.state.zrzbsm, "0");
350 this.getLpb(this.$store.state.zrzbsm, "1");
347 setTimeout(() => { 351 setTimeout(() => {
348 //tab-content宽度 - 右侧图例宽度 - lp-overview滚动条宽度 - lpbContent的pandingRight 352 //tab-content宽度 - 右侧图例宽度 - lp-overview滚动条宽度 - lpbContent的pandingRight
349 this.lpbContentWidth = this.$store.state.contentWidth - 34 - 20; 353 this.lpbContentWidth = this.$store.state.contentWidth - 34 - 20;
...@@ -366,7 +370,14 @@ export default { ...@@ -366,7 +370,14 @@ export default {
366 res.result.ljzs = res.result.ljzs 370 res.result.ljzs = res.result.ljzs
367 .sort(this.compare("place")) 371 .sort(this.compare("place"))
368 .reverse(); 372 .reverse();
369 this.lpbData = res.result == null ? this.lpbData : res.result; 373 // this.lpbData = res.result == null ? this.lpbData : res.result;
374 //给实预测楼盘表对象赋值，默认加载预测楼盘表数据
375 if(scyclx == 0){
376 this.yclpbData = res.result == null ? this.yclpbData : res.result;
377 this.lpbData = this.yclpbData;
378 }else{
379 this.sclpbData = res.result == null ? this.sclpbData : res.result;
380 }
370 this.$nextTick(() => { 381 this.$nextTick(() => {
371 //渲染楼盘表 382 //渲染楼盘表
372 this.dataChange(); 383 this.dataChange();
...@@ -438,6 +449,7 @@ export default { ...@@ -438,6 +449,7 @@ export default {
438 } 449 }
439 450
440 //计算逻辑幢下的幢单元和层户的高度 451 //计算逻辑幢下的幢单元和层户的高度
452 this.ljzzdyHeight = 1;
441 if (this.$refs.ljzzdy != undefined && this.$refs.ljzzdy.length > 0) { 453 if (this.$refs.ljzzdy != undefined && this.$refs.ljzzdy.length > 0) {
442 //判断自然幢下有没有比层户高的幢单元 454 //判断自然幢下有没有比层户高的幢单元
443 let higher = true; 455 let higher = true;
...@@ -617,6 +629,9 @@ export default { ...@@ -617,6 +629,9 @@ export default {
617 }); 629 });
618 }, 630 },
619 //end 631 //end
632 qsztClick(){
633
634 },
620 }, 635 },
621 computed: { 636 computed: {
622 createFlagChange() { 637 createFlagChange() {
...@@ -631,7 +646,12 @@ export default { ...@@ -631,7 +646,12 @@ export default {
631 }, 646 },
632 watch: { 647 watch: {
633 scyclx(n) { 648 scyclx(n) {
634 this.getLpb(this.$store.state.zrzbsm, n); 649 // this.getLpb(this.$store.state.zrzbsm, n);
650 if(n == '0'){
651 this.lpbData = this.yclpbData;
652 }else{
653 this.lpbData = this.sclpbData;
654 }
635 }, 655 },
636 createFlagChange: function(val) { 656 createFlagChange: function(val) {
637 setTimeout(() => { 657 setTimeout(() => {
......