Merge remote-tracking branch 'origin/master'
Showing
4 changed files
with
91 additions
and
64 deletions
| ... | @@ -93,4 +93,17 @@ export function batchGeneratorBdcdyh (dpdm,zrzbsm) { | ... | @@ -93,4 +93,17 @@ export function batchGeneratorBdcdyh (dpdm,zrzbsm) { |
| 93 | dpdm:dpdm, | 93 | dpdm:dpdm, |
| 94 | }, | 94 | }, |
| 95 | }) | 95 | }) |
| 96 | } | ||
| 97 | |||
| 98 | /** | ||
| 99 | * 楼盘表 获取房屋用途和房屋性质统计数据 | ||
| 100 | * zrzbsm 自然幢标识码 , | ||
| 101 | * scyclx 实测预测类型 0预测,1实测 | ||
| 102 | */ | ||
| 103 | export function getLpbFwytAndQlxz (data) { | ||
| 104 | return request({ | ||
| 105 | url: 'fw/lpb/getLpbFwytAndQlxz?zrzbsm='+data.zrzbsm+'&syclx='+data.syclx, | ||
| 106 | method: 'get', | ||
| 107 | data:data | ||
| 108 | }) | ||
| 96 | } | 109 | } |
| ... | \ No newline at end of file | ... | \ No newline at end of file | ... | ... |
This diff is collapsed.
Click to expand it.
| ... | @@ -137,7 +137,7 @@ | ... | @@ -137,7 +137,7 @@ |
| 137 | v-for="(item, index) in dyztList" | 137 | v-for="(item, index) in dyztList" |
| 138 | :key="index" | 138 | :key="index" |
| 139 | class="cp" | 139 | class="cp" |
| 140 | @click="handleChoosedH(item.name)" | 140 | @click="handleChoosedH(item.bsms)" |
| 141 | > | 141 | > |
| 142 | <td> | 142 | <td> |
| 143 | <i class="el-icon-star-on" :style="{ color: item.color }"></i | 143 | <i class="el-icon-star-on" :style="{ color: item.color }"></i |
| ... | @@ -164,7 +164,7 @@ | ... | @@ -164,7 +164,7 @@ |
| 164 | v-for="(item, index) in fwxzList" | 164 | v-for="(item, index) in fwxzList" |
| 165 | :key="index" | 165 | :key="index" |
| 166 | class="cp" | 166 | class="cp" |
| 167 | @click="handleChoosedH(item.name)" | 167 | @click="handleChoosedH(item.bsms)" |
| 168 | > | 168 | > |
| 169 | <td> | 169 | <td> |
| 170 | <i class="el-icon-star-on" :style="{ color: item.color }"></i | 170 | <i class="el-icon-star-on" :style="{ color: item.color }"></i |
| ... | @@ -194,7 +194,7 @@ | ... | @@ -194,7 +194,7 @@ |
| 194 | v-for="(item, index) in fwytList" | 194 | v-for="(item, index) in fwytList" |
| 195 | :key="index" | 195 | :key="index" |
| 196 | class="cp" | 196 | class="cp" |
| 197 | @click="handleChoosedH(item.name)" | 197 | @click="handleChoosedH(item.bsms)" |
| 198 | > | 198 | > |
| 199 | <td> | 199 | <td> |
| 200 | <i class="el-icon-star-on" :style="{ color: item.color }"></i | 200 | <i class="el-icon-star-on" :style="{ color: item.color }"></i |
| ... | @@ -269,7 +269,7 @@ import addZdy from "./zdy/index"; | ... | @@ -269,7 +269,7 @@ import addZdy from "./zdy/index"; |
| 269 | import addCh from "./ch/index"; | 269 | import addCh from "./ch/index"; |
| 270 | import hbj from "./hbj/index"; | 270 | import hbj from "./hbj/index"; |
| 271 | import lpbContent from "./lpbContent/index"; | 271 | import lpbContent from "./lpbContent/index"; |
| 272 | import { getLpbMenuTree, batchScYcChange, getLpbTj,batchGeneratorBdcdyh } from "../../../../api/lpb"; | 272 | import { getLpbMenuTree, batchScYcChange, getLpbTj,batchGeneratorBdcdyh,getLpbFwytAndQlxz } from "../../../../api/lpb"; |
| 273 | 273 | ||
| 274 | export default { | 274 | export default { |
| 275 | name: "", | 275 | name: "", |
| ... | @@ -383,6 +383,8 @@ export default { | ... | @@ -383,6 +383,8 @@ export default { |
| 383 | this.getLpbMenuTree(this.$store.state.zrzbsm); | 383 | this.getLpbMenuTree(this.$store.state.zrzbsm); |
| 384 | //获取各项单元状态的户bsm | 384 | //获取各项单元状态的户bsm |
| 385 | this.getDyztBsmList(); | 385 | this.getDyztBsmList(); |
| 386 | //获取房屋用途统计数据 | ||
| 387 | this.getLpbFwytAndQlxz(); | ||
| 386 | // 楼盘表绘制区域宽度计算:楼盘表区域宽度-图例宽度34-滚动条宽度6 | 388 | // 楼盘表绘制区域宽度计算:楼盘表区域宽度-图例宽度34-滚动条宽度6 |
| 387 | setTimeout(() => { | 389 | setTimeout(() => { |
| 388 | this.lpbContentwidth = this.$store.state.contentWidth - 34 - 6; | 390 | this.lpbContentwidth = this.$store.state.contentWidth - 34 - 6; |
| ... | @@ -491,7 +493,7 @@ export default { | ... | @@ -491,7 +493,7 @@ export default { |
| 491 | }, | 493 | }, |
| 492 | inputChange() { | 494 | inputChange() { |
| 493 | if (this.bdcdyh != "") { | 495 | if (this.bdcdyh != "") { |
| 494 | console.log("查询" + this.bdcdyh); | 496 | // console.log("查询" + this.bdcdyh); |
| 495 | this.$refs.lpbContent.lpbDataMap(this.bdcdyh); | 497 | this.$refs.lpbContent.lpbDataMap(this.bdcdyh); |
| 496 | } else { | 498 | } else { |
| 497 | this.$message({ | 499 | this.$message({ |
| ... | @@ -527,45 +529,13 @@ export default { | ... | @@ -527,45 +529,13 @@ export default { |
| 527 | }); | 529 | }); |
| 528 | }, | 530 | }, |
| 529 | //选中房屋状态 | 531 | //选中房屋状态 |
| 530 | handleChoosedH(name) { | 532 | handleChoosedH(bsms) { |
| 531 | console.log(name, "选中房屋状态"); | 533 | console.log(bsms,'bsms'); |
| 532 | // Dyzt:{list:[],mj:''} | 534 | // Dyzt:{list:[],mj:''} |
| 533 | //清除选中户 | 535 | //清除选中户 |
| 534 | this.$refs.lpbContent.clearChoosedH(); | 536 | this.$refs.lpbContent.clearChoosedH(); |
| 535 | //给hBsmList传值 | 537 | //给hBsmList传值 |
| 536 | switch (name) { | 538 | this.$refs.lpbContent.choosedList = bsms; |
| 537 | case "未确权": | ||
| 538 | this.$refs.lpbContent.choosedList = this.dyztBsmList.Wqqzt.bsms; | ||
| 539 | break; | ||
| 540 | case "已确权": | ||
| 541 | this.$refs.lpbContent.choosedList = this.dyztBsmList.Qqzt.bsms; | ||
| 542 | break; | ||
| 543 | case "已备案": | ||
| 544 | this.$refs.lpbContent.choosedList = this.dyztBsmList.Bazt.bsms; | ||
| 545 | break; | ||
| 546 | case "预抵押": | ||
| 547 | this.$refs.lpbContent.choosedList = this.dyztBsmList.Ydyzt.bsms; | ||
| 548 | break; | ||
| 549 | case "在建抵押": | ||
| 550 | this.$refs.lpbContent.choosedList = this.dyztBsmList.Zjgcdyzt.bsms; | ||
| 551 | break; | ||
| 552 | case "抵押": | ||
| 553 | this.$refs.lpbContent.choosedList = this.dyztBsmList.Dyzt.bsms; | ||
| 554 | break; | ||
| 555 | case "查封": | ||
| 556 | this.$refs.lpbContent.choosedList = this.dyztBsmList.Cfzt.bsms; | ||
| 557 | break; | ||
| 558 | case "异议": | ||
| 559 | this.$refs.lpbContent.choosedList = this.dyztBsmList.Yyzt.bsms; | ||
| 560 | break; | ||
| 561 | case "限制": | ||
| 562 | this.$refs.lpbContent.choosedList = this.dyztBsmList.Xzzt.bsms; | ||
| 563 | break; | ||
| 564 | |||
| 565 | default: | ||
| 566 | break; | ||
| 567 | } | ||
| 568 | // this.$refs.lpbContent.choosedList=["0a66bc775dcec26385f9124cc0fd8656", "58cafdbee129bb412527f674ef9267ae", "4bbca678fa56d5ab97b8a62c7cb54898", "ecfd72e9a31a03ba0ab4e46faba2b51b", "049033ea9d244b4b5ea75521b6862239", "013352d8a001a1d5f790296b6843627b", "ed8e3f0e2b2682cf76b4d58b9a74e49c", "37cc53acaf2c3bb92be4b9adf06d94c9", "f5a5e14ce08c26056aca5861f56e5cf6", "11eeaaa5c9f5f1231c69d3b958d05568", "421978023a36d4920dbb86300cc52dc9", "e97f2af2588cc0e41ffb6b203df617c9", "7210987d94350472dca10d4ad71fffc5", "6eb1b50edce538a4c63574e9e28fedce", "43c5fecd7623ceabc37844e8a4722603", "c361ccfcd3da9f7288110c6fa202cb96", "2321512f6f8d0ec9f570c6eec9a892fe", "ea08fb234cd908c89a0d21c085dadb2f", "be71f7f0ec926e1850d3baec8817cdbd", "6f695d6b7ecb97f7ff17f22dbe86b93c", "4ee1604b2629e6797d3096c20229223b"] | ||
| 569 | }, | 539 | }, |
| 570 | //批量添加不动产单元号 | 540 | //批量添加不动产单元号 |
| 571 | addBdcdyh() { | 541 | addBdcdyh() { |
| ... | @@ -580,7 +550,7 @@ export default { | ... | @@ -580,7 +550,7 @@ export default { |
| 580 | } | 550 | } |
| 581 | ); | 551 | ); |
| 582 | }, | 552 | }, |
| 583 | //获取各项单元状态的户bsm | 553 | //获取各项单元状态统计数据 |
| 584 | getDyztBsmList() { | 554 | getDyztBsmList() { |
| 585 | let data = { | 555 | let data = { |
| 586 | zrzbsm: this.$store.state.zrzbsm, | 556 | zrzbsm: this.$store.state.zrzbsm, |
| ... | @@ -588,29 +558,73 @@ export default { | ... | @@ -588,29 +558,73 @@ export default { |
| 588 | }; | 558 | }; |
| 589 | getLpbTj(data).then((res) => { | 559 | getLpbTj(data).then((res) => { |
| 590 | if (res.code === 200) { | 560 | if (res.code === 200) { |
| 591 | this.dyztBsmList = res.result; | 561 | this.dyztList = res.result; |
| 592 | //给单元状态图例数据dyztList赋值 | 562 | this.dyztList.splice(1,0,this.dyztList[8]); |
| 593 | this.dyztList[0].mj = res.result.Wqqzt.mj; | 563 | this.dyztList.pop(); |
| 594 | this.dyztList[0].ts = res.result.Wqqzt.bsms.length; | 564 | this.dyztList.forEach(item=>{ |
| 595 | this.dyztList[1].mj = res.result.Qqzt.mj; | 565 | item.color = "#2591FD"; |
| 596 | this.dyztList[1].ts = res.result.Qqzt.bsms.length; | 566 | item.ts = item.bsms.length; |
| 597 | this.dyztList[2].mj = res.result.Bazt.mj; | 567 | switch (item.name) { |
| 598 | this.dyztList[2].ts = res.result.Bazt.bsms.length; | 568 | case 'Qqzt': |
| 599 | this.dyztList[3].mj = res.result.Ydyzt.mj; | 569 | item.name = "已确权" |
| 600 | this.dyztList[3].ts = res.result.Ydyzt.bsms.length; | 570 | break; |
| 601 | this.dyztList[4].mj = res.result.Zjgcdyzt.mj; | 571 | case 'Wqqzt': |
| 602 | this.dyztList[4].ts = res.result.Zjgcdyzt.bsms.length; | 572 | item.name = "未确权" |
| 603 | this.dyztList[5].mj = res.result.Dyzt.mj; | 573 | break; |
| 604 | this.dyztList[5].ts = res.result.Dyzt.bsms.length; | 574 | case 'Bazt': |
| 605 | this.dyztList[6].mj = res.result.Cfzt.mj; | 575 | item.name = "已备案" |
| 606 | this.dyztList[6].ts = res.result.Cfzt.bsms.length; | 576 | break; |
| 607 | this.dyztList[7].mj = res.result.Yyzt.mj; | 577 | case 'Ydyzt': |
| 608 | this.dyztList[7].ts = res.result.Yyzt.bsms.length; | 578 | item.name = "预抵押" |
| 609 | this.dyztList[8].mj = res.result.Xzzt.mj; | 579 | break; |
| 610 | this.dyztList[8].ts = res.result.Xzzt.bsms.length; | 580 | case 'Zjgcdyzt': |
| 581 | item.name = "在建抵押" | ||
| 582 | break; | ||
| 583 | case 'Dyzt': | ||
| 584 | item.name = "抵押" | ||
| 585 | break; | ||
| 586 | case 'Cfzt': | ||
| 587 | item.name = "查封" | ||
| 588 | break; | ||
| 589 | case 'Yyzt': | ||
| 590 | item.name = "异议" | ||
| 591 | break; | ||
| 592 | case 'Xzzt': | ||
| 593 | item.name = "限制" | ||
| 594 | break; | ||
| 595 | default: | ||
| 596 | break; | ||
| 597 | } | ||
| 598 | }) | ||
| 611 | } | 599 | } |
| 612 | }); | 600 | }); |
| 613 | }, | 601 | }, |
| 602 | // 获取房屋用途和房屋性质统计数据 | ||
| 603 | getLpbFwytAndQlxz(){ | ||
| 604 | let data = { | ||
| 605 | zrzbsm: this.$store.state.zrzbsm, | ||
| 606 | syclx: "0", | ||
| 607 | }; | ||
| 608 | getLpbFwytAndQlxz(data).then((res) => { | ||
| 609 | if (res.code === 200) { | ||
| 610 | // this.fwytList = res.result | ||
| 611 | this.fwytList = res.result.fwyt; | ||
| 612 | this.fwxzList = res.result.qlxz; | ||
| 613 | if(this.fwytList.length>0){ | ||
| 614 | this.fwytList.forEach(item=>{ | ||
| 615 | item.color = "#2591FD"; | ||
| 616 | item.ts = item.bsms.length | ||
| 617 | }) | ||
| 618 | } | ||
| 619 | if(this.fwxzList.length>0){ | ||
| 620 | this.fwxzList.forEach(item=>{ | ||
| 621 | item.color = "#2591FD"; | ||
| 622 | item.ts = item.bsms.length | ||
| 623 | }) | ||
| 624 | } | ||
| 625 | } | ||
| 626 | }); | ||
| 627 | } | ||
| 614 | }, | 628 | }, |
| 615 | computed: {}, | 629 | computed: {}, |
| 616 | destroyed() { | 630 | destroyed() { | ... | ... |
| ... | @@ -145,8 +145,10 @@ export default { | ... | @@ -145,8 +145,10 @@ export default { |
| 145 | }, | 145 | }, |
| 146 | //按照bdcdyh或shbw筛选户 | 146 | //按照bdcdyh或shbw筛选户 |
| 147 | lpbDataMap(sh){ | 147 | lpbDataMap(sh){ |
| 148 | // console.log('查询'+sh); | 148 | //清除之前选中户 |
| 149 | this.clearChoosedH(); | ||
| 149 | this.searchNum = sh; | 150 | this.searchNum = sh; |
| 151 | console.log('查询searchNum'+searchNum); | ||
| 150 | }, | 152 | }, |
| 151 | //自然幢下元素高度宽度计算 | 153 | //自然幢下元素高度宽度计算 |
| 152 | dataChange(){ | 154 | dataChange(){ |
| ... | @@ -275,8 +277,6 @@ export default { | ... | @@ -275,8 +277,6 @@ export default { |
| 275 | }, | 277 | }, |
| 276 | //监听有无通过输入框查询选择到的户,如果有,将其bsm放入hbsmList | 278 | //监听有无通过输入框查询选择到的户,如果有,将其bsm放入hbsmList |
| 277 | searchNum(n){ | 279 | searchNum(n){ |
| 278 | //清除之前选中户 | ||
| 279 | this.clearChoosedH(); | ||
| 280 | // 渲染查询到的户 | 280 | // 渲染查询到的户 |
| 281 | this.$nextTick(()=>{ | 281 | this.$nextTick(()=>{ |
| 282 | this.$refs.hBsm.forEach(item=>{ | 282 | this.$refs.hBsm.forEach(item=>{ | ... | ... |
-
Please register or sign in to post a comment