获取房屋用途和房屋性质统计数据

@@ -93,4 +93,17 @@ export function batchGeneratorBdcdyh (dpdm,zrzbsm) {
             dpdm:dpdm,
         },
     })
+}
+
+/**
+ * 楼盘表 获取房屋用途和房屋性质统计数据
+ * zrzbsm 自然幢标识码 ,
+ * scyclx 实测预测类型   0预测，1实测
+ */
+export function getLpbFwytAndQlxz (data) {
+    return request({
+        url: 'fw/lpb/getLpbFwytAndQlxz?zrzbsm='+data.zrzbsm+'&syclx='+data.syclx,
+        method: 'get',
+        data:data
+    })
 }
\ No newline at end of file

@@ -137,7 +137,7 @@
 							v-for="(item, index) in dyztList"
 							:key="index"
 							class="cp"
-							@click="handleChoosedH(item.name)"
+							@click="handleChoosedH(item.bsms)"
 						>
 							<td>
 								<i class="el-icon-star-on" :style="{ color: item.color }"></i
@@ -164,7 +164,7 @@
 							v-for="(item, index) in fwxzList"
 							:key="index"
 							class="cp"
-							@click="handleChoosedH(item.name)"
+							@click="handleChoosedH(item.bsms)"
 						>
 							<td>
 								<i class="el-icon-star-on" :style="{ color: item.color }"></i
@@ -194,7 +194,7 @@
 							v-for="(item, index) in fwytList"
 							:key="index"
 							class="cp"
-							@click="handleChoosedH(item.name)"
+							@click="handleChoosedH(item.bsms)"
 						>
 							<td>
 								<i class="el-icon-star-on" :style="{ color: item.color }"></i
@@ -269,7 +269,7 @@ import addZdy from "./zdy/index";
 import addCh from "./ch/index";
 import hbj from "./hbj/index";
 import lpbContent from "./lpbContent/index";
-import { getLpbMenuTree, batchScYcChange, getLpbTj,batchGeneratorBdcdyh } from "../../../../api/lpb";
+import { getLpbMenuTree, batchScYcChange, getLpbTj,batchGeneratorBdcdyh,getLpbFwytAndQlxz } from "../../../../api/lpb";
 
 export default {
 	name: "",
@@ -383,6 +383,8 @@ export default {
 		this.getLpbMenuTree(this.$store.state.zrzbsm);
 		//获取各项单元状态的户bsm
 		this.getDyztBsmList();
+		//获取房屋用途统计数据
+		this.getLpbFwytAndQlxz();
 		// 楼盘表绘制区域宽度计算：楼盘表区域宽度-图例宽度34-滚动条宽度6
 		setTimeout(() => {
 			this.lpbContentwidth = this.$store.state.contentWidth - 34 - 6;
@@ -491,7 +493,7 @@ export default {
 		},
 		inputChange() {
 			if (this.bdcdyh != "") {
-				console.log("查询" + this.bdcdyh);
+				// console.log("查询" + this.bdcdyh);
 				this.$refs.lpbContent.lpbDataMap(this.bdcdyh);
 			} else {
 				this.$message({
@@ -527,45 +529,13 @@ export default {
 			});
 		},
 		//选中房屋状态
-		handleChoosedH(name) {
-			console.log(name, "选中房屋状态");
+		handleChoosedH(bsms) {
+			console.log(bsms,'bsms');
 			// Dyzt:{list:[],mj:''}
 			//清除选中户
 			this.$refs.lpbContent.clearChoosedH();
 			//给hBsmList传值
-			switch (name) {
-				case "未确权":
-					this.$refs.lpbContent.choosedList = this.dyztBsmList.Wqqzt.bsms;
-					break;
-				case "已确权":
-					this.$refs.lpbContent.choosedList = this.dyztBsmList.Qqzt.bsms;
-					break;
-				case "已备案":
-					this.$refs.lpbContent.choosedList = this.dyztBsmList.Bazt.bsms;
-					break;
-				case "预抵押":
-					this.$refs.lpbContent.choosedList = this.dyztBsmList.Ydyzt.bsms;
-					break;
-				case "在建抵押":
-					this.$refs.lpbContent.choosedList = this.dyztBsmList.Zjgcdyzt.bsms;
-					break;
-				case "抵押":
-					this.$refs.lpbContent.choosedList = this.dyztBsmList.Dyzt.bsms;
-					break;
-				case "查封":
-					this.$refs.lpbContent.choosedList = this.dyztBsmList.Cfzt.bsms;
-					break;
-				case "异议":
-					this.$refs.lpbContent.choosedList = this.dyztBsmList.Yyzt.bsms;
-					break;
-				case "限制":
-					this.$refs.lpbContent.choosedList = this.dyztBsmList.Xzzt.bsms;
-					break;
-
-				default:
-					break;
-			}
-			// 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"]
+			this.$refs.lpbContent.choosedList = bsms;
 		},
 		//批量添加不动产单元号
 		addBdcdyh() {
@@ -580,7 +550,7 @@ export default {
 				}
 			);
 		},
-		//获取各项单元状态的户bsm
+		//获取各项单元状态统计数据
 		getDyztBsmList() {
 			let data = {
 				zrzbsm: this.$store.state.zrzbsm,
@@ -588,29 +558,73 @@ export default {
 			};
 			getLpbTj(data).then((res) => {
 				if (res.code === 200) {
-					this.dyztBsmList = res.result;
-					//给单元状态图例数据dyztList赋值
-					this.dyztList[0].mj = res.result.Wqqzt.mj;
-					this.dyztList[0].ts = res.result.Wqqzt.bsms.length;
-					this.dyztList[1].mj = res.result.Qqzt.mj;
-					this.dyztList[1].ts = res.result.Qqzt.bsms.length;
-					this.dyztList[2].mj = res.result.Bazt.mj;
-					this.dyztList[2].ts = res.result.Bazt.bsms.length;
-					this.dyztList[3].mj = res.result.Ydyzt.mj;
-					this.dyztList[3].ts = res.result.Ydyzt.bsms.length;
-					this.dyztList[4].mj = res.result.Zjgcdyzt.mj;
-					this.dyztList[4].ts = res.result.Zjgcdyzt.bsms.length;
-					this.dyztList[5].mj = res.result.Dyzt.mj;
-					this.dyztList[5].ts = res.result.Dyzt.bsms.length;
-					this.dyztList[6].mj = res.result.Cfzt.mj;
-					this.dyztList[6].ts = res.result.Cfzt.bsms.length;
-					this.dyztList[7].mj = res.result.Yyzt.mj;
-					this.dyztList[7].ts = res.result.Yyzt.bsms.length;
-					this.dyztList[8].mj = res.result.Xzzt.mj;
-					this.dyztList[8].ts = res.result.Xzzt.bsms.length;
+					this.dyztList = res.result;
+					this.dyztList.splice(1,0,this.dyztList[8]);
+					this.dyztList.pop();
+					this.dyztList.forEach(item=>{
+						item.color = "#2591FD";
+						item.ts = item.bsms.length;
+							switch (item.name) {
+								case 'Qqzt':
+									item.name = "已确权"
+									break;
+								case 'Wqqzt':
+									item.name = "未确权"
+									break;
+								case 'Bazt':
+									item.name = "已备案"
+									break;
+								case 'Ydyzt':
+									item.name = "预抵押"
+									break;
+								case 'Zjgcdyzt':
+									item.name = "在建抵押"
+									break;
+								case 'Dyzt':
+									item.name = "抵押"
+									break;
+								case 'Cfzt':
+									item.name = "查封"
+									break;
+								case 'Yyzt':
+									item.name = "异议"
+									break;
+								case 'Xzzt':
+									item.name = "限制"
+									break;
+								default:
+									break;
+							}
+					})
 				}
 			});
 		},
+		// 获取房屋用途和房屋性质统计数据
+		getLpbFwytAndQlxz(){
+			let data = {
+				zrzbsm: this.$store.state.zrzbsm,
+				syclx: "0",
+			};
+			getLpbFwytAndQlxz(data).then((res) => {
+				if (res.code === 200) {
+					// this.fwytList = res.result
+					this.fwytList = res.result.fwyt;
+					this.fwxzList = res.result.qlxz;
+					if(this.fwytList.length>0){
+						this.fwytList.forEach(item=>{
+							item.color = "#2591FD";
+							item.ts = item.bsms.length
+						})
+					}
+					if(this.fwxzList.length>0){
+						this.fwxzList.forEach(item=>{
+							item.color = "#2591FD";
+							item.ts = item.bsms.length
+						})
+					}
+				}
+			});
+		}
 	},
 	computed: {},
 	destroyed() {

@@ -145,8 +145,10 @@ export default {
 		},
 		//按照bdcdyh或shbw筛选户
 		lpbDataMap(sh){
-			// console.log('查询'+sh);
+			//清除之前选中户
+			this.clearChoosedH();
 			this.searchNum = sh;
+			console.log('查询searchNum'+searchNum);
 		},
 		//自然幢下元素高度宽度计算
 		dataChange(){
@@ -275,8 +277,6 @@ export default {
 		},
 		//监听有无通过输入框查询选择到的户,如果有，将其bsm放入hbsmList
 		searchNum(n){
-			//清除之前选中户
-			this.clearChoosedH();
 			// 渲染查询到的户
 			this.$nextTick(()=>{
 				this.$refs.hBsm.forEach(item=>{