Skip to content

任超 / js.CadastralSystem

Go to a project
Toggle navigation
Toggle navigation pinning
cb553b24 by 焦泽平
Options

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

2 parents d01c4a23 54e1db13
Inline Side-by-side
Showing 8 changed files with 154 additions and 132 deletions
...@@ -252,7 +252,7 @@ export function ZdHb(data) { ...@@ -252,7 +252,7 @@ export function ZdHb(data) {
252 /** 252 /**
253 * 多幢合并 253 * 多幢合并
254 */ 254 */
255 export function dzHb(data) { 255 export function DzHb(data) {
256 return request({ 256 return request({
257 url:"/bg/dzSplitMerge/dzHb", 257 url:"/bg/dzSplitMerge/dzHb",
258 method:'post', 258 method:'post',
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
8 :data="dzhbqData" 8 :data="dzhbqData"
9 border 9 border
10 style="width: 100%" 10 style="width: 100%"
11 height="200px" 11 :height="tableHeight"
12 :header-cell-style="{'text-align':'center'}" 12 :header-cell-style="{'text-align':'center'}"
13 :cell-style="{'text-align':'center'}"> 13 :cell-style="{'text-align':'center'}">
14 <el-table-column 14 <el-table-column
...@@ -57,10 +57,9 @@ ...@@ -57,10 +57,9 @@
57 </el-table-column> 57 </el-table-column>
58 </el-table> 58 </el-table>
59 </div> 59 </div>
60
61 </div> 60 </div>
62 <div class="hbh dzhbh"> 61 <span class="tips">合并后多幢信息</span>
63 <span class="tips" style="width:100%;display:block;margin-left:0;">合并后多幢信息</span> 62 <div class="hbh">
64 <el-card class="data"> 63 <el-card class="data">
65 <div slot="header" class="clearfix"> 64 <div slot="header" class="clearfix">
66 <span>多幢基本信息</span> 65 <span>多幢基本信息</span>
...@@ -163,9 +162,9 @@ ...@@ -163,9 +162,9 @@
163 </el-card> 162 </el-card>
164 </div> 163 </div>
165 </div> 164 </div>
166 <div class="header-button"> 165 <!-- <div class="header-button">
167 <el-button type="primary" class="saveBtn" @click="save">保存</el-button> 166 <el-button type="primary" class="saveBtn" @click="save">保存</el-button>
168 </div> 167 </div> -->
169 <el-dialog v-dialogDrag :close-on-click-modal="false" 168 <el-dialog v-dialogDrag :close-on-click-modal="false"
170 title="新增多幢" 169 title="新增多幢"
171 :visible.sync="dzIsVisible" 170 :visible.sync="dzIsVisible"
...@@ -413,10 +412,14 @@ ...@@ -413,10 +412,14 @@
413 value: "Z", 412 value: "Z",
414 } 413 }
415 ], 414 ],
415 tableHeight:0,
416 } 416 }
417 }, 417 },
418 mounted() { 418 mounted() {
419 this.getXzqList(); 419 this.getXzqList();
420 this.$nextTick(()=>{
421 this.tableHeight = (document.documentElement.clientHeight || document.body.clientHeight) - 610
422 })
420 }, 423 },
421 methods: { 424 methods: {
422 getZdData(id) { 425 getZdData(id) {
...@@ -460,25 +463,7 @@ ...@@ -460,25 +463,7 @@
460 } 463 }
461 }, 464 },
462 save() { 465 save() {
463 let data = { 466
464 fwlist: this.dzhbqData,
465 newdzxmmc: this.dzhbhData.xmmc,
466 zdbsm: this.zdbsm
467 }
468
469 dzHb(data).then(res => {
470 if (res.success) {
471 console.log(res)
472 this.$message.success("多幢合并成功")
473 this.$router.push({
474 path: '/dz',
475 query: {
476 source: 1,
477 bsm: res.result
478 }
479 })
480 }
481 })
482 }, 467 },
483 dzClose() { 468 dzClose() {
484 this.dzIsVisible = false; 469 this.dzIsVisible = false;
...@@ -637,59 +622,12 @@ ...@@ -637,59 +622,12 @@
637 </script> 622 </script>
638 623
639 <style scoped lang="less"> 624 <style scoped lang="less">
640 .hb { 625
641 .menu {
642 /deep/ .el-tabs__content {
643 position: unset;
644 margin-top: 62px;
645 overflow: visible;
646 }
647 /deep/ .el-tabs__header {
648 position: -webkit-fixed;
649 position: fixed;
650 top: 120px;
651 z-index: 999;
652 width: 100%;
653 margin-bottom: 0;
654 border: 0;
655 /deep/ .el-tabs__nav-scroll {
656 height: 50px;
657 box-sizing: border-box;
658 padding-left: 20px;
659 .el-tabs__active-bar {
660 display: none;
661 }
662 > .el-tabs__nav {
663 border: 0;
664 > .el-tabs__item {
665 border: 1px solid #DEDEDE;
666 height: 36px;
667 line-height: 32px;
668 padding: 0 20px;
669 margin: 9px 10px 9px 0;
670 background-color: #ffffff;
671 }
672 .is-active {
673 color: #006CFF;
674 border: 1px solid #006CFF;
675 }
676 }
677 }
678 /deep/ .el-tabs__nav-wrap::after {
679 width: 0;
680 }
681 }
682 }
683 }
684
685 .psn { 626 .psn {
686 position: unset !important; 627 position: unset !important;
687 } 628 }
688 629
689 .hb-tabs { 630 .hb-tabs {
690 height: auto;
691 width: 100%;
692 position: relative;
693 631
694 .addBtn { 632 .addBtn {
695 position: absolute; 633 position: absolute;
...@@ -785,12 +723,6 @@ ...@@ -785,12 +723,6 @@
785 .hbq { 723 .hbq {
786 margin: 14px 20px 20px 20px; 724 margin: 14px 20px 20px 20px;
787 } 725 }
788 .dzhbh {
789 box-sizing: border-box !important;
790 padding: 0 18px 0 0 !important;
791 margin-top: 10px !important;
792 display: block !important;
793 }
794 .hbh { 726 .hbh {
795 margin-left: 20px; 727 margin-left: 20px;
796 margin-top: 14px; 728 margin-top: 14px;
...@@ -852,7 +784,7 @@ ...@@ -852,7 +784,7 @@
852 } 784 }
853 } 785 }
854 .zxx { 786 .zxx {
855 width: calc(60% - 24px); 787 width: calc(60% - 44px);
856 margin-left: 20px; 788 margin-left: 20px;
857 display: flex; 789 display: flex;
858 flex-direction: column; 790 flex-direction: column;
...@@ -864,7 +796,7 @@ ...@@ -864,7 +796,7 @@
864 padding: 5px 0; 796 padding: 5px 0;
865 } 797 }
866 /deep/ .el-card__body { 798 /deep/ .el-card__body {
867 height: 220px; 799 height: 200px;
868 overflow-y: scroll; 800 overflow-y: scroll;
869 position: relative; 801 position: relative;
870 } 802 }
......
...@@ -246,6 +246,7 @@ ...@@ -246,6 +246,7 @@
246 <script> 246 <script>
247 import { cxlzZrzList } from "@api/zrz"; 247 import { cxlzZrzList } from "@api/zrz";
248 import lpbContent from "../../../zrz/lpb/bjlp/lpbContent/index"; 248 import lpbContent from "../../../zrz/lpb/bjlp/lpbContent/index";
249 import { getLpbMenuTree, batchScYcChange, getLpbTj,batchGeneratorBdcdyh,getLpbFwytAndQlxz ,batchCommit} from "@api/lpb";
249 250
250 export default { 251 export default {
251 name: "", 252 name: "",
...@@ -345,7 +346,6 @@ export default { ...@@ -345,7 +346,6 @@ export default {
345 (document.documentElement.clientHeight || 346 (document.documentElement.clientHeight ||
346 document.body.clientHeight) - 352; 347 document.body.clientHeight) - 352;
347 this.lpbContentHeight = (document.documentElement.clientHeight || document.body.clientHeight) - 220; 348 this.lpbContentHeight = (document.documentElement.clientHeight || document.body.clientHeight) - 220;
348 this.lpbContentwidth = this.$refs.lpbContentWrap.clientWidth - 34 - 6;
349 }); 349 });
350 }, 350 },
351 methods: { 351 methods: {
...@@ -503,7 +503,27 @@ export default { ...@@ -503,7 +503,27 @@ export default {
503 } 503 }
504 } 504 }
505 }); 505 });
506 } 506 },
507 //切换房屋状态
508 handleChoosedH(bsms,color) {
509 debugger
510 //每次切换房屋状态，将之前高亮的户边框颜色重置为默认
511 this.$refs.lpbContent.choosedList = [];
512 this.$refs.lpbContent.$refs.hBsm.forEach((item) => {
513 item.style.border = '';
514 });
515 // console.log(bsms,'bsms');
516 // console.log(color,'color');
517 // Dyzt:{list:[],mj:''}
518 //清除选中户
519 // this.$refs.lpbContent.clearChoosedH();
520 this.$nextTick(()=>{
521 //给hBsmList传值
522 // console.log(bsms,'bsms');
523 this.$refs.lpbContent.choosedList = bsms;
524 this.$refs.lpbContent.borderColor = color;
525 })
526 },
507 }, 527 },
508 computed: {}, 528 computed: {},
509 watch: { 529 watch: {
...@@ -516,11 +536,14 @@ export default { ...@@ -516,11 +536,14 @@ export default {
516 } 536 }
517 }, 537 },
518 //选择自然幢展示楼盘表后，查询右侧图例数据 538 //选择自然幢展示楼盘表后，查询右侧图例数据
519 isSearch(n){ 539 isCxlz(n){
520 if (!n) { 540 if (!n) {
521 this.getDyztBsmList(); 541 this.getDyztBsmList();
522 this.getLpbFwytAndQlxz(); 542 this.getLpbFwytAndQlxz();
523 } 543 this.$nextTick(()=>{
544 this.lpbContentwidth = this.$refs.lpbContentWrap.clientWidth - 34 - 6;
545 })
546 }
524 }, 547 },
525 //改变syclx，更新楼盘表数据 548 //改变syclx，更新楼盘表数据
526 scyclx(n){ 549 scyclx(n){
......
...@@ -1218,8 +1218,6 @@ ...@@ -1218,8 +1218,6 @@
1218 .xzq, .djq, .djzq { 1218 .xzq, .djq, .djzq {
1219 width: 150px; 1219 width: 150px;
1220 } 1220 }
1221
1222
1223 .search { 1221 .search {
1224 color: #BBB !important; 1222 color: #BBB !important;
1225 } 1223 }
......
...@@ -86,7 +86,7 @@ ...@@ -86,7 +86,7 @@
86 ></el-input> 86 ></el-input>
87 <el-link type="primary" style="margin-left:20px" @click="isFwsxbg=true">重新选择户</el-link> 87 <el-link type="primary" style="margin-left:20px" @click="isFwsxbg=true">重新选择户</el-link>
88 </div> 88 </div>
89 <div class="lpb-content" ref="lpbContentWrap" :style="{ height: lpbContentHeight + 'px' }"> 89 <div class="lpb-content" ref="lpbContentWrap" :style="{ height: lpbContentHeight + 'px' }" v-loading="lpbloading">
90 <!-- 楼盘表主体 --> 90 <!-- 楼盘表主体 -->
91 <div class="lp-overview" :style="{ width: lpbContentwidth + 'px' }"> 91 <div class="lp-overview" :style="{ width: lpbContentwidth + 'px' }">
92 <lpbContent ref="lpbContent" class="" :zrzbsm='zrzbsm' lpbParent = 'isFwsxbg'></lpbContent> 92 <lpbContent ref="lpbContent" class="" :zrzbsm='zrzbsm' lpbParent = 'isFwsxbg'></lpbContent>
...@@ -220,6 +220,7 @@ import { getSearchList } from "@api/search"; ...@@ -220,6 +220,7 @@ import { getSearchList } from "@api/search";
220 import { fwsxbgbl } from "@api/common"; 220 import { fwsxbgbl } from "@api/common";
221 import {getQjHDetailByBsm} from "@api/h"; 221 import {getQjHDetailByBsm} from "@api/h";
222 import lpbContent from "../../../zrz/lpb/bjlp/lpbContent/index"; 222 import lpbContent from "../../../zrz/lpb/bjlp/lpbContent/index";
223 import { getLpbMenuTree, batchScYcChange, getLpbTj,batchGeneratorBdcdyh,getLpbFwytAndQlxz ,batchCommit} from "@api/lpb";
223 224
224 export default { 225 export default {
225 name: "", 226 name: "",
...@@ -303,6 +304,7 @@ export default { ...@@ -303,6 +304,7 @@ export default {
303 fwytList: [], 304 fwytList: [],
304 lpbContentHeight: 0, 305 lpbContentHeight: 0,
305 lpbContentwidth: 0, 306 lpbContentwidth: 0,
307 lpbloading:true,
306 }; 308 };
307 }, 309 },
308 created() {}, 310 created() {},
...@@ -314,7 +316,6 @@ export default { ...@@ -314,7 +316,6 @@ export default {
314 (document.documentElement.clientHeight || document.body.clientHeight) - 316 (document.documentElement.clientHeight || document.body.clientHeight) -
315 352; 317 352;
316 this.lpbContentHeight = (document.documentElement.clientHeight || document.body.clientHeight) - 222; 318 this.lpbContentHeight = (document.documentElement.clientHeight || document.body.clientHeight) - 222;
317 this.lpbContentwidth = this.$refs.lpbContentWrap.clientWidth - 34 - 6;
318 }); 319 });
319 }, 320 },
320 methods: { 321 methods: {
...@@ -539,7 +540,26 @@ export default { ...@@ -539,7 +540,26 @@ export default {
539 } 540 }
540 } 541 }
541 }); 542 });
542 } 543 },
544 //切换房屋状态
545 handleChoosedH(bsms,color) {
546 //每次切换房屋状态，将之前高亮的户边框颜色重置为默认
547 this.$refs.lpbContent.choosedList = [];
548 this.$refs.lpbContent.$refs.hBsm.forEach((item) => {
549 item.style.border = '';
550 });
551 // console.log(bsms,'bsms');
552 // console.log(color,'color');
553 // Dyzt:{list:[],mj:''}
554 //清除选中户
555 // this.$refs.lpbContent.clearChoosedH();
556 this.$nextTick(()=>{
557 //给hBsmList传值
558 // console.log(bsms,'bsms');
559 this.$refs.lpbContent.choosedList = bsms;
560 this.$refs.lpbContent.borderColor = color;
561 })
562 },
543 }, 563 },
544 computed: {}, 564 computed: {},
545 watch: { 565 watch: {
...@@ -552,11 +572,14 @@ export default { ...@@ -552,11 +572,14 @@ export default {
552 } 572 }
553 }, 573 },
554 //选择自然幢展示楼盘表后，查询右侧图例数据 574 //选择自然幢展示楼盘表后，查询右侧图例数据
555 isSearch(n){ 575 isFwsxbg(n){
556 if (!n) { 576 if (!n) {
557 this.getDyztBsmList(); 577 this.getDyztBsmList();
558 this.getLpbFwytAndQlxz(); 578 this.getLpbFwytAndQlxz();
559 } 579 this.$nextTick(()=>{
580 this.lpbContentwidth = this.$refs.lpbContentWrap.clientWidth - 34 - 6;
581 })
582 }
560 }, 583 },
561 //改变syclx，更新楼盘表数据 584 //改变syclx，更新楼盘表数据
562 scyclx(n){ 585 scyclx(n){
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
2 <div class="hb" ref="hbBox"> 2 <div class="hb" ref="hbBox">
3 <el-tabs v-model="tabName" class="menu" @tab-click="handleClick"> 3 <el-tabs v-model="tabName" class="menu" @tab-click="handleClick">
4 <el-tab-pane label="宗地合并" name="zd"> 4 <el-tab-pane label="宗地合并" name="zd">
5 <div class="hb-tabs top20"> 5 <div class="hb-tabs top20" style="margin-top:14px">
6 <span class="tips">合并前宗地信息(已选择宗地{{zdhbqData.length}}个)</span> 6 <span class="tips">合并前宗地信息(已选择宗地{{zdhbqData.length}}个)</span>
7 <div class="hbq"> 7 <div class="hbq">
8 8
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
10 :data="zdhbqData" 10 :data="zdhbqData"
11 border 11 border
12 style="width: 100%" 12 style="width: 100%"
13 height="200px" 13 :height="tableHeight"
14 :header-cell-style="{'text-align':'center'}" 14 :header-cell-style="{'text-align':'center'}"
15 :cell-style="{'text-align':'center'}"> 15 :cell-style="{'text-align':'center'}">
16 <el-table-column> 16 <el-table-column>
...@@ -181,7 +181,10 @@ ...@@ -181,7 +181,10 @@
181 </div> 181 </div>
182 </el-tab-pane> 182 </el-tab-pane>
183 <el-tab-pane label="多幢合并" name="dz"> 183 <el-tab-pane label="多幢合并" name="dz">
184 <dz-hb></dz-hb> 184 <dz-hb ref="dzhb"></dz-hb>
185 <div class="header-button" :style="{width:fgBoxWidth+'px'}">
186 <el-button type="primary" class="saveBtn" @click="save">保存</el-button>
187 </div>
185 </el-tab-pane> 188 </el-tab-pane>
186 <el-tab-pane label="户合并" name="h"> 189 <el-tab-pane label="户合并" name="h">
187 <div class="hb-tabs psn" v-if="hhbtabs"> 190 <div class="hb-tabs psn" v-if="hhbtabs">
...@@ -199,7 +202,7 @@ ...@@ -199,7 +202,7 @@
199 getListByPbsm, 202 getListByPbsm,
200 getDdicByMC 203 getDdicByMC
201 } from "@api/common"; 204 } from "@api/common";
202 import {ZdHb,getQjZdjbxxDetailById} from "@api/zd" 205 import {ZdHb,getQjZdjbxxDetailById,DzHb} from "@api/zd"
203 import {saveDzHb, ZdfggetZxx} from "@api/dz" 206 import {saveDzHb, ZdfggetZxx} from "@api/dz"
204 import QueryData from '@components/queryData/queryData' 207 import QueryData from '@components/queryData/queryData'
205 import zdQueryData from '@components/zdQueryData/zdQueryData' 208 import zdQueryData from '@components/zdQueryData/zdQueryData'
...@@ -244,6 +247,7 @@ ...@@ -244,6 +247,7 @@
244 hhbtabs: false, 247 hhbtabs: false,
245 zdDzList: [], 248 zdDzList: [],
246 zdZrzList: [], 249 zdZrzList: [],
250 tableHeight:0,
247 } 251 }
248 }, 252 },
249 created() { 253 created() {
...@@ -252,7 +256,8 @@ ...@@ -252,7 +256,8 @@
252 this.getXzqList(); 256 this.getXzqList();
253 this.$nextTick(() => { 257 this.$nextTick(() => {
254 this.fgBoxWidth = this.$refs.hbBox.clientWidth; 258 this.fgBoxWidth = this.$refs.hbBox.clientWidth;
255 }) 259 this.tableHeight = (document.documentElement.clientHeight || document.body.clientHeight) - 610
260 });
256 }, 261 },
257 methods: { 262 methods: {
258 263
...@@ -277,6 +282,9 @@ ...@@ -277,6 +282,9 @@
277 case "zd": 282 case "zd":
278 this.zdHb(); 283 this.zdHb();
279 break 284 break
285 case "dz":
286 this.dzHb();
287 break
280 case "h": 288 case "h":
281 break; 289 break;
282 default: 290 default:
...@@ -317,7 +325,25 @@ ...@@ -317,7 +325,25 @@
317 }) 325 })
318 }, 326 },
319 dzHb() { 327 dzHb() {
328 let data = {
329 fwlist: this.$refs.dzhb.dzhbqData,
330 newdzxmmc: this.$refs.dzhb.dzhbhData.xmmc,
331 zdbsm: this.$refs.dzhb.zdbsm
332 }
320 333
334 DzHb(data).then(res => {
335 if (res.success) {
336 console.log(res)
337 this.$message.success("多幢合并成功")
338 this.$router.push({
339 path: '/dz',
340 query: {
341 source: 1,
342 bsm: res.result
343 }
344 })
345 }
346 })
321 }, 347 },
322 hHb() { 348 hHb() {
323 349
...@@ -532,13 +558,20 @@ ...@@ -532,13 +558,20 @@
532 watch: { 558 watch: {
533 zdbsm: function (bsm) { 559 zdbsm: function (bsm) {
534 this.getZdData(bsm) 560 this.getZdData(bsm)
561 },
562 tabName(n){
563 if (n == 'h') {
564 this.hhbtabs = true
565 }
535 } 566 }
536 }, 567 },
537 } 568 }
538 </script> 569 </script>
539 <style scoped lang="less"> 570 <style scoped lang="less">
540 .hb { 571 .hb {
572 height: 100%;
541 .menu { 573 .menu {
574 height: 100%;
542 /deep/ .el-tabs__content { 575 /deep/ .el-tabs__content {
543 position: unset; 576 position: unset;
544 margin-top: 40px; 577 margin-top: 40px;
...@@ -613,13 +646,6 @@ ...@@ -613,13 +646,6 @@
613 } 646 }
614 } 647 }
615 648
616 .header-button {
617 height: 50px;
618 position: fixed;
619 bottom: 0;
620 text-align: center;
621 background-color: #ffffff;
622 }
623 table { 649 table {
624 margin-top: 10px; 650 margin-top: 10px;
625 background-color: #fff; 651 background-color: #fff;
...@@ -660,16 +686,6 @@ ...@@ -660,16 +686,6 @@
660 .noData { 686 .noData {
661 color: #b2b2b2; 687 color: #b2b2b2;
662 } 688 }
663 .saveBtn {
664 background-color: #00CACD;
665 border-color: #00CACD;
666 padding: 10px 30px;
667 margin-top: 8px;
668 }
669 .saveBtn:hover {
670 background-color: rgba(0, 202, 205, .8);
671 border-color: rgba(0, 202, 205, .8);
672 }
673 .xh { 689 .xh {
674 width: 100px; 690 width: 100px;
675 } 691 }
...@@ -682,13 +698,6 @@ ...@@ -682,13 +698,6 @@
682 } 698 }
683 .hbq { 699 .hbq {
684 margin: 14px 20px 20px 20px; 700 margin: 14px 20px 20px 20px;
685 height: 200px;
686 }
687 .dzhbh {
688 box-sizing: border-box !important;
689 padding: 0 18px 0 0 !important;
690 margin-top: 10px !important;
691 display: block !important;
692 } 701 }
693 .hbh { 702 .hbh {
694 margin-left: 20px; 703 margin-left: 20px;
...@@ -815,6 +824,23 @@ ...@@ -815,6 +824,23 @@
815 } 824 }
816 } 825 }
817 826
827 .header-button {
828 height: 50px;
829 position: fixed;
830 bottom: 0;
831 text-align: center;
832 background-color: #ffffff;
833 }
834 .saveBtn {
835 background-color: #00CACD;
836 border-color: #00CACD;
837 padding: 10px 30px;
838 margin-top: 8px;
839 }
840 .saveBtn:hover {
841 background-color: rgba(0, 202, 205, .8);
842 border-color: rgba(0, 202, 205, .8);
843 }
818 .cz { 844 .cz {
819 color: blue; 845 color: blue;
820 } 846 }
......
...@@ -314,7 +314,6 @@ export default { ...@@ -314,7 +314,6 @@ export default {
314 this.$nextTick(()=>{ 314 this.$nextTick(()=>{
315 this.tableHeight = (document.documentElement.clientHeight || document.body.clientHeight) - 320; 315 this.tableHeight = (document.documentElement.clientHeight || document.body.clientHeight) - 320;
316 this.lpbContentHeight = (document.documentElement.clientHeight || document.body.clientHeight) - 270; 316 this.lpbContentHeight = (document.documentElement.clientHeight || document.body.clientHeight) - 270;
317 this.lpbContentwidth = this.$refs.lpbContentWrap.clientWidth - 34 - 6;
318 }) 317 })
319 this.search(); 318 this.search();
320 }, 319 },
...@@ -487,7 +486,26 @@ export default { ...@@ -487,7 +486,26 @@ export default {
487 } 486 }
488 } 487 }
489 }); 488 });
490 } 489 },
490 //切换房屋状态
491 handleChoosedH(bsms,color) {
492 //每次切换房屋状态，将之前高亮的户边框颜色重置为默认
493 this.$refs.lpbContent.choosedList = [];
494 this.$refs.lpbContent.$refs.hBsm.forEach((item) => {
495 item.style.border = '';
496 });
497 // console.log(bsms,'bsms');
498 // console.log(color,'color');
499 // Dyzt:{list:[],mj:''}
500 //清除选中户
501 // this.$refs.lpbContent.clearChoosedH();
502 this.$nextTick(()=>{
503 //给hBsmList传值
504 // console.log(bsms,'bsms');
505 this.$refs.lpbContent.choosedList = bsms;
506 this.$refs.lpbContent.borderColor = color;
507 })
508 },
491 }, 509 },
492 computed: {}, 510 computed: {},
493 watch: { 511 watch: {
...@@ -504,6 +522,9 @@ export default { ...@@ -504,6 +522,9 @@ export default {
504 if (!n) { 522 if (!n) {
505 this.getDyztBsmList(); 523 this.getDyztBsmList();
506 this.getLpbFwytAndQlxz(); 524 this.getLpbFwytAndQlxz();
525 this.$nextTick(()=>{
526 this.lpbContentwidth = this.$refs.lpbContentWrap.clientWidth - 34 - 6;
527 })
507 } 528 }
508 }, 529 },
509 //改变syclx，更新楼盘表数据 530 //改变syclx，更新楼盘表数据
......
...@@ -74,8 +74,7 @@ export default { ...@@ -74,8 +74,7 @@ export default {
74 /deep/.el-tabs__content{ 74 /deep/.el-tabs__content{
75 height: 100%; 75 height: 100%;
76 /deep/.el-tab-pane{ 76 /deep/.el-tab-pane{
77 height: 100%; 77 height: calc(100% - 40px);
78 overflow-y: scroll;
79 } 78 }
80 background: #eaedf5; 79 background: #eaedf5;
81 padding: 0; 80 padding: 0;
......