Skip to content

任超 / js.CadastralSystem

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

Merge remote-tracking branch 'origin/master'

2 parents 06b33ed5 e9466810
Inline Side-by-side
Showing 4 changed files with 94 additions and 59 deletions
...@@ -170,16 +170,13 @@ ...@@ -170,16 +170,13 @@
170 this.getData(this.queryData) 170 this.getData(this.queryData)
171 }, 171 },
172 addData: function (val) { 172 addData: function (val) {
173 let flag; 173 this.$emit("getData",val)
174 this.$emit("getData", 174 // if (this.isZdClose) {
175 val 175 // this.close();
176 , i => { 176 // }
177 flag = i 177 },
178 }) 178 isClose(flag){
179 console.log(flag,"返回值") 179
180 if (flag&&this.isZdClose) {
181 this.close();
182 }
183 }, 180 },
184 close: function () { 181 close: function () {
185 this.$emit('close') 182 this.$emit('close')
......
...@@ -453,6 +453,7 @@ ...@@ -453,6 +453,7 @@
453 }, 453 },
454 addZdData(data) { 454 addZdData(data) {
455 this.zdhbqData.push(data); 455 this.zdhbqData.push(data);
456 this.centerDialogVisible = false;
456 ZdfggetZxx(data.zdbsm).then(res => { 457 ZdfggetZxx(data.zdbsm).then(res => {
457 if (res.success) { 458 if (res.success) {
458 res.result.zrzList.forEach(item => { 459 res.result.zrzList.forEach(item => {
...@@ -474,35 +475,30 @@ ...@@ -474,35 +475,30 @@
474 } 475 }
475 }) 476 })
476 }, 477 },
477 async getData(data, callback) { 478 getData(data) {
478 console.log(data, '选择宗地数据') 479 console.log(data, '选择宗地数据')
479 let flat = true;
480 switch (this.tabName) { 480 switch (this.tabName) {
481 case "zd": 481 case "zd":
482 let arr = []; 482 let arr = this.zdhbqData.filter(i => i.zdbsm === data.zdbsm);
483 arr = this.zdhbqData.filter(i => i.zdbsm === data.zdbsm);
484 if (arr.length > 0) { 483 if (arr.length > 0) {
485 this.$message.info("当前宗地已选择,请重新选择") 484 this.$message.info("当前宗地已选择,请重新选择")
486 callback(false)
487 break 485 break
488 } 486 }
489 arr = this.zdhbqData.filter(i => i.xzqbsm !== data.xzqbsm || i.djqbsm !== data.djqbsm || i.djzqbsm !== data.djzqbsm); 487 let arr1 = this.zdhbqData.filter(i => i.xzqbsm !== data.xzqbsm || i.djqbsm !== data.djqbsm || i.djzqbsm !== data.djzqbsm);
490 if (arr.length > 0) { 488 if (arr1.length > 0) {
491 this.$confirm('当前宗地不在同一地籍子区下,请确认？') 489 this.$confirm('当前宗地不在同一地籍子区下,是否继续选择？')
492 .then(_ => { 490 .then(_ => {
493 this.addZdData(data) 491 this.addZdData(data);
494 }) 492 })
495 .catch(_ => { 493 .catch(_ => {
496 flat = false;
497 }); 494 });
498 callback(flat)
499 } else { 495 } else {
500 this.addZdData(data) 496 this.addZdData(data)
501 } 497 }
502 break 498 break
503 case "dz": 499 case "dz":
504 arr = this.dzhbqData.filter(i => i.glbsm === data.glbsm); 500 let arr3 = this.dzhbqData.filter(i => i.glbsm === data.glbsm);
505 if (arr.length > 0) { 501 if (arr3.length > 0) {
506 break 502 break
507 } 503 }
508 if (this.dzhbqData.includes(data)) { 504 if (this.dzhbqData.includes(data)) {
......
...@@ -28,8 +28,11 @@ ...@@ -28,8 +28,11 @@
28 <el-button class="radioBtn" label="1" border @click="create" 28 <el-button class="radioBtn" label="1" border @click="create"
29 ><i class="iconfont iconchuangjianloupan"></i>创建楼盘</el-button 29 ><i class="iconfont iconchuangjianloupan"></i>创建楼盘</el-button
30 > 30 >
31 <el-button class="radioBtn" label="2" border @click="plScYcChange" 31 <el-button class="radioBtn" v-show='this.scyclx=="0"' label="2" border @click="plScYcChange"
32 ><i class="iconfont iconshiyucezhuanhuan"></i>实预测转换</el-button 32 ><i class="iconfont iconshiyucezhuanhuan"></i>预测转实测</el-button
33 >
34 <el-button class="radioBtn" v-show='this.scyclx=="1"' label="2" border @click="plScYcChange"
35 ><i class="iconfont iconshiyucezhuanhuan"></i>实测转预测</el-button
33 > 36 >
34 <el-button 37 <el-button
35 class="radioBtn" 38 class="radioBtn"
......
...@@ -22,13 +22,14 @@ ...@@ -22,13 +22,14 @@
22 ref="ljz" 22 ref="ljz"
23 v-for="(ljzs, ljzIndex) in lpbData.ljzs" 23 v-for="(ljzs, ljzIndex) in lpbData.ljzs"
24 :key="ljzIndex" 24 :key="ljzIndex"
25 :style="{'marginTop':ljzs.zdys.length>0?'0':'30px'}" 25 :style="{'marginTop':'30px'}"
26 > 26 >
27 <!-- :style="{'marginTop':ljzs.zdys.length>0?'0':'30px'}" -->
27 <!-- <div class="ljz-zdy-wrap" :style="{'min-height':ljzzdyHeight+40+'px'}"> --> 28 <!-- <div class="ljz-zdy-wrap" :style="{'min-height':ljzzdyHeight+40+'px'}"> -->
28 <!-- 循环逻辑幢下的幢单元 --> 29 <!-- 循环逻辑幢下的幢单元 -->
29 <div 30 <div
30 class="ljz-zdy" 31 class="ljz-zdy"
31 :style="{ 'min-height': ljzzdyHeight + 40 + 'px','marginRight':zdyIndex<(ljzs.zdys.length-1)?'20px':'0'}" 32 :style="{ 'min-height': ljzzdyHeight + 'px','marginRight':zdyIndex<(ljzs.zdys.length-1)?'20px':'0'}"
32 ref="ljzzdy" 33 ref="ljzzdy"
33 v-show="ljzs.zdys.length > 0" 34 v-show="ljzs.zdys.length > 0"
34 v-for="(zdys, zdyIndex) in ljzs.zdys" 35 v-for="(zdys, zdyIndex) in ljzs.zdys"
...@@ -38,7 +39,7 @@ ...@@ -38,7 +39,7 @@
38 <!-- <div class="chTable-wrap"> --> 39 <!-- <div class="chTable-wrap"> -->
39 <table 40 <table
40 class="chTable psr" 41 class="chTable psr"
41 :style="{ top: ljzzdyHeight - 1 - zdys.cs.length * 65 + 'px' }" 42 :style="{ top: (ljzzdyHeight - zdys.cs.length * 65) - 80 + 'px' }"
42 border="1" 43 border="1"
43 cellspacing="0" 44 cellspacing="0"
44 cellpadding="0" 45 cellpadding="0"
...@@ -78,7 +79,9 @@ ...@@ -78,7 +79,9 @@
78 <!-- </div> --> 79 <!-- </div> -->
79 <!-- 幢单元名称 --> 80 <!-- 幢单元名称 -->
80 <div class="zdy-name name"> 81 <div class="zdy-name name">
81 {{ zdys.zdymc }} 82 <p>
83 {{ zdys.zdymc }}
84 </p>
82 </div> 85 </div>
83 </div> 86 </div>
84 <!-- 循环逻辑幢下的层户 --> 87 <!-- 循环逻辑幢下的层户 -->
...@@ -89,12 +92,12 @@ ...@@ -89,12 +92,12 @@
89 v-if="ljzs.cs.length > 0" 92 v-if="ljzs.cs.length > 0"
90 > 93 >
91 <table 94 <table
92 class="chTable" 95 class="chTable prs"
93 :style="{ 96 :style="{
94 top: 97 top:
95 ljzzdyHeight + 40 - 1 - ljzs.cs.length * 65 < 0 98 ljzzdyHeight + 40 - ljzs.cs.length * 65 < 0
96 ? 0 99 ? 0
97 : ljzzdyHeight + 40 - 1 - ljzs.cs.length * 65 + 'px', 100 : ljzzdyHeight + 40 - ljzs.cs.length * 65 + 'px',
98 }" 101 }"
99 border="1" 102 border="1"
100 cellspacing="0" 103 cellspacing="0"
...@@ -152,7 +155,9 @@ ...@@ -152,7 +155,9 @@
152 > 155 >
153 <!-- 幢单元名称 --> 156 <!-- 幢单元名称 -->
154 <div class="zdy-name name"> 157 <div class="zdy-name name">
155 {{ zdys.zdymc }} 158 <p>
159 {{ zdys.zdymc }}
160 </p>
156 </div> 161 </div>
157 <!-- 循环幢单元下的层户 --> 162 <!-- 循环幢单元下的层户 -->
158 <table 163 <table
...@@ -235,6 +240,14 @@ ...@@ -235,6 +240,14 @@
235 <span @click.stop="qsztClick" class="hqszt lin" v-show="hs.qszt == '0'">临</span> 240 <span @click.stop="qsztClick" class="hqszt lin" v-show="hs.qszt == '0'">临</span>
236 <span @click.stop="qsztClick" class="hqszt zheng" v-show="hs.qszt == '1'">正</span> 241 <span @click.stop="qsztClick" class="hqszt zheng" v-show="hs.qszt == '1'">正</span>
237 <span @click.stop="qsztClick" class="hqszt xian" v-show="hs.qszt == '2'" >现</span> 242 <span @click.stop="qsztClick" class="hqszt xian" v-show="hs.qszt == '2'" >现</span>
243 <ul class="dyzt">
244 <li style="background-color:#6EDEE1">确</li>
245 <li style="background-color:#8ADC88">备</li>
246 <li style="background-color:#FF8282">抵</li>
247 <li style="background-color:#D7CECF">查</li>
248 <li style="background-color:#D4A3EB">异</li>
249 <li style="background-color:#A5A3FB">限</li>
250 </ul>
238 </td> 251 </td>
239 </tr> 252 </tr>
240 </table> 253 </table>
...@@ -242,9 +255,9 @@ ...@@ -242,9 +255,9 @@
242 <!-- </template> --> 255 <!-- </template> -->
243 </div> 256 </div>
244 <!-- <div class="ch-wrap">层户</div> --> 257 <!-- <div class="ch-wrap">层户</div> -->
245 </div> 258 <div class="zrz" :style="{ width: lpbContentWidth + 'px' }">
246 <div class="zrz" :style="{ width: lpbContentWidth + 'px' }"> 259 {{ lpbData.xmmc }}
247 {{ lpbData.xmmc }} 260 </div>
248 </div> 261 </div>
249 <ul 262 <ul
250 v-show="lpbChVisible" 263 v-show="lpbChVisible"
...@@ -463,7 +476,7 @@ export default { ...@@ -463,7 +476,7 @@ export default {
463 //清除之前选中户 476 //清除之前选中户
464 this.clearChoosedH(); 477 this.clearChoosedH();
465 this.searchNum = sh; 478 this.searchNum = sh;
466 console.log("查询searchNum" + searchNum); 479 // console.log("查询searchNum" + searchNum);
467 }, 480 },
468 //自然幢下元素高度宽度计算 481 //自然幢下元素高度宽度计算
469 dataChange() { 482 dataChange() {
...@@ -511,9 +524,8 @@ export default { ...@@ -511,9 +524,8 @@ export default {
511 this.zdyWidth = this.$refs.zrzDlch.offsetWidth+20; 524 this.zdyWidth = this.$refs.zrzDlch.offsetWidth+20;
512 } 525 }
513 } 526 }
514
515 //计算逻辑幢下的幢单元和层户的高度 527 //计算逻辑幢下的幢单元和层户的高度
516 this.ljzzdyHeight = 1; 528 this.ljzzdyHeight = 0;
517 if (this.$refs.ljzzdy != undefined && this.$refs.ljzzdy.length > 0) { 529 if (this.$refs.ljzzdy != undefined && this.$refs.ljzzdy.length > 0) {
518 //判断自然幢下有没有比层户高的幢单元 530 //判断自然幢下有没有比层户高的幢单元
519 let higher = true; 531 let higher = true;
...@@ -531,9 +543,7 @@ export default { ...@@ -531,9 +543,7 @@ export default {
531 //计算自然幢下的幢单元高度，如果有比层户高的幢单元，则幢单元高度设为最高的幢单元高度，如果没有，则设为层户高度 543 //计算自然幢下的幢单元高度，如果有比层户高的幢单元，则幢单元高度设为最高的幢单元高度，如果没有，则设为层户高度
532 higher = highest > this.$refs.ljzch.offsetHeight ? true : false; 544 higher = highest > this.$refs.ljzch.offsetHeight ? true : false;
533 this.$nextTick(() => { 545 this.$nextTick(() => {
534 this.ljzzdyHeight = higher 546 this.ljzzdyHeight = higher? highest : this.$refs.ljzch.offsetHeight;
535 ? highest
536 : this.$refs.ljzch.offsetHeight;
537 highest = 0; 547 highest = 0;
538 }); 548 });
539 } else { 549 } else {
...@@ -582,12 +592,12 @@ export default { ...@@ -582,12 +592,12 @@ export default {
582 //户双击事件 592 //户双击事件
583 dbclick(bsm) { 593 dbclick(bsm) {
584 clearTimeout(this.time); 594 clearTimeout(this.time);
585 if (this.isHbfg) { 595 // if (this.isHbfg) {
586 596
587 }else{ 597 // }else{
588 // this.hbsmList.push(bsm); // 将户bsm放进hbsmList 598 // this.hbsmList.push(bsm); // 将户bsm放进hbsmList
589 this.$parent.getHbsm(bsm, true); 599 this.$parent.getHbsm(bsm, true);
590 } 600 // }
591 }, 601 },
592 //删除多重数组中的某一项 602 //删除多重数组中的某一项
593 deleteArrOption(arr, item) { 603 deleteArrOption(arr, item) {
...@@ -854,6 +864,11 @@ export default { ...@@ -854,6 +864,11 @@ export default {
854 this.$nextTick(() => { 864 this.$nextTick(() => {
855 this.$refs.hBsm.forEach((item) => { 865 this.$refs.hBsm.forEach((item) => {
856 if (item.className == "tdSelect") { 866 if (item.className == "tdSelect") {
867 // console.log(item.offsetLeft,'offsetLeft');
868 // console.log(item.offsetTop,'offsetHeight');
869 //定位到最后一个户所在位置
870 this.$refs.lpbContent.scrollTop = item.offsetTop;
871 this.$refs.lpbContent.scrollLeft = item.offsetLeft;
857 console.log(item.dataset.bsm, "item.dataset.bsm"); 872 console.log(item.dataset.bsm, "item.dataset.bsm");
858 // 判断hbsmList中是否已经存在 873 // 判断hbsmList中是否已经存在
859 if (this.hbsmList.indexOf(item.dataset.bsm) == -1) { 874 if (this.hbsmList.indexOf(item.dataset.bsm) == -1) {
...@@ -868,6 +883,9 @@ export default { ...@@ -868,6 +883,9 @@ export default {
868 this.$refs.hBsm.forEach((item) => { 883 this.$refs.hBsm.forEach((item) => {
869 this.choosedList.forEach((i) => { 884 this.choosedList.forEach((i) => {
870 if (item.dataset.bsm == i) { 885 if (item.dataset.bsm == i) {
886 //定位到最后一个户所在位置
887 this.$refs.lpbContent.scrollTop = item.offsetTop;
888 this.$refs.lpbContent.scrollLeft = item.offsetLeft;
871 item.style.border = '1px solid '+this.borderColor; 889 item.style.border = '1px solid '+this.borderColor;
872 } 890 }
873 }); 891 });
...@@ -917,7 +935,7 @@ export default { ...@@ -917,7 +935,7 @@ export default {
917 position: absolute; 935 position: absolute;
918 height: 40px; 936 height: 40px;
919 // background-color: rosybrown; 937 // background-color: rosybrown;
920 border:1px solid #E6E6E6 938 // border:1px solid #E6E6E6
921 } 939 }
922 // .chTable-wrap{ 940 // .chTable-wrap{
923 // position: absolute; 941 // position: absolute;
...@@ -942,11 +960,7 @@ export default { ...@@ -942,11 +960,7 @@ export default {
942 width: calc(100% - 32px); 960 width: calc(100% - 32px);
943 height: 40px; 961 height: 40px;
944 // background-color: darkorange; 962 // background-color: darkorange;
945 p{ 963
946 width: 100%;
947 height: 100%;
948 border:1px solid #E6E6E6
949 }
950 } 964 }
951 } 965 }
952 div:last-child { 966 div:last-child {
...@@ -959,7 +973,6 @@ export default { ...@@ -959,7 +973,6 @@ export default {
959 .zdy-wrap { 973 .zdy-wrap {
960 height: auto; 974 height: auto;
961 overflow: hidden; 975 overflow: hidden;
962 margin-bottom: 60px;
963 margin-top: 30px; 976 margin-top: 30px;
964 .zdy { 977 .zdy {
965 float: left; 978 float: left;
...@@ -973,7 +986,7 @@ export default { ...@@ -973,7 +986,7 @@ export default {
973 .zdy-name { 986 .zdy-name {
974 bottom: 0; 987 bottom: 0;
975 // background-color: blanchedalmond; 988 // background-color: blanchedalmond;
976 border:1px solid #E6E6E6 989 // border:1px solid #E6E6E6
977 } 990 }
978 } 991 }
979 .zdy-zdy:last-child { 992 .zdy-zdy:last-child {
...@@ -998,12 +1011,12 @@ export default { ...@@ -998,12 +1011,12 @@ export default {
998 // position: relative; 1011 // position: relative;
999 tr { 1012 tr {
1000 .floor { 1013 .floor {
1001 background-color: blanchedalmond; 1014 background-color: #fff;
1002 } 1015 }
1003 td { 1016 td {
1004 min-width: 124px; 1017 min-width: 138px;
1005 height: 64px; 1018 height: 72px;
1006 line-height: 64px; 1019 line-height: 72px;
1007 text-align: center; 1020 text-align: center;
1008 cursor: pointer; 1021 cursor: pointer;
1009 position: relative; 1022 position: relative;
...@@ -1031,6 +1044,26 @@ export default { ...@@ -1031,6 +1044,26 @@ export default {
1031 color: #45AEFD; 1044 color: #45AEFD;
1032 border-color: #45AEFD; 1045 border-color: #45AEFD;
1033 } 1046 }
1047 .dyzt{
1048 user-select: none;
1049 width: 138px;
1050 height: 18px;
1051 position: absolute;
1052 // background: orange;
1053 bottom: 32px;
1054 box-sizing: border-box;
1055 padding: 0 6px;
1056 li{
1057 display: inline-block;
1058 width: 18px;
1059 height: 18px;
1060 font-size: 12px;
1061 line-height: 18px;
1062 color: #ffffff;
1063 border: 1px solid;
1064 border-radius: 9px;
1065 }
1066 }
1034 } 1067 }
1035 .tdSelect { 1068 .tdSelect {
1036 border: 1px solid #006cff !important; 1069 border: 1px solid #006cff !important;
...@@ -1049,6 +1082,12 @@ export default { ...@@ -1049,6 +1082,12 @@ export default {
1049 line-height: 40px; 1082 line-height: 40px;
1050 text-align: center; 1083 text-align: center;
1051 display: table-footer-group; 1084 display: table-footer-group;
1085 p{
1086 width: calc(100% - 2px);
1087 height: 100%;
1088 border:1px solid #E6E6E6;
1089 border-top:0;
1090 }
1052 } 1091 }
1053 // end 1092 // end
1054 } 1093 }
...@@ -1061,8 +1100,8 @@ export default { ...@@ -1061,8 +1100,8 @@ export default {
1061 line-height: 60px; 1100 line-height: 60px;
1062 background-color: #ffffff; 1101 background-color: #ffffff;
1063 border:1px solid #E6E6E6; 1102 border:1px solid #E6E6E6;
1064 position: relative; 1103 // position: relative;
1065 bottom: 66px; 1104 // bottom: 66px;
1066 text-align: center; 1105 text-align: center;
1067 transition: 0.5s; 1106 transition: 0.5s;
1068 } 1107 }
......