Merge remote-tracking branch 'origin/master'

@@ -109,6 +109,18 @@ export function getLpbFwytAndQlxz (data) {
     })
     })
 }
 }
 /**
 /**
+ * 楼盘表 获取楼盘表缺失项统计
+ * zrzbsm 自然幢标识码 ,
+ * scyclx 实测预测类型   0预测，1实测
+ */
+export function getLpbQsxtj (data) {
+    return request({
+        url: 'fw/lpb/getLpbQsxtj?zrzbsm='+data.zrzbsm+'&scyclx='+data.scyclx,
+        method: 'get',
+        data:data
+    })
+}
+/**
  * 楼盘表 添加层
  * 楼盘表 添加层
 // "cbsm": "63147d2d9766db01ead0cd53f23de908",//层标识码
 // "cbsm": "63147d2d9766db01ead0cd53f23de908",//层标识码
 // "hcount": 3,//添加户数
 // "hcount": 3,//添加户数

@@ -257,7 +257,7 @@
 							<th>套数</th>
 							<th>套数</th>
 						</tr>
 						</tr>
 						<tr
 						<tr
-							v-for="(item, index) in fwytList"
+							v-for="(item, index) in qsxList"
 							:key="index"
 							:key="index"
 							class="cp"
 							class="cp"
 							@click="handleChoosedH(item.bsms,item.color)"
 							@click="handleChoosedH(item.bsms,item.color)"
@@ -268,9 +268,7 @@
 							</td>
 							</td>
 							<td>{{ item.ts }}</td>
 							<td>{{ item.ts }}</td>
 						</tr>
 						</tr>
-						<tr v-show="fwytList.length < 1">
-							<td colspan="3" class="tac">暂无数据</td>
-						</tr>
+
 					</table>
 					</table>
 				</div>
 				</div>
 			</div>
 			</div>
@@ -353,7 +351,7 @@ import addZdy from "./zdy/index";
 import addCh from "./ch/index";
 import addCh from "./ch/index";
 import editCinfo from "./c/index";
 import editCinfo from "./c/index";
 import lpbContent from "./lpbContent/index";
 import lpbContent from "./lpbContent/index";
-import { getLpbMenuTree, batchScYcChange, getLpbTj,batchGeneratorBdcdyh,getLpbFwytAndQlxz ,batchCommit,batchDelete} from "@api/lpb";
+import { getLpbMenuTree, batchScYcChange, getLpbTj,batchGeneratorBdcdyh,getLpbFwytAndQlxz,getLpbQsxtj,batchCommit,batchDelete} from "@api/lpb";
 import xxxx from '../xxxx/index'
 import xxxx from '../xxxx/index'
 
 
 export default {
 export default {
@@ -449,6 +447,7 @@ export default {
 			],
 			],
 			fwxzList: [],
 			fwxzList: [],
 			fwytList: [],
 			fwytList: [],
+			qsxList:[],
 			legendToggleFlag: false,
 			legendToggleFlag: false,
 			lpbContentHight: "",
 			lpbContentHight: "",
 			lpbContentwidth: "",
 			lpbContentwidth: "",
@@ -478,6 +477,7 @@ export default {
 		this.getDyztBsmList();
 		this.getDyztBsmList();
 		//获取房屋用途统计数据
 		//获取房屋用途统计数据
 		this.getLpbFwytAndQlxz();
 		this.getLpbFwytAndQlxz();
+		this.getLpbQsxtj();
 		// 楼盘表绘制区域宽度计算：楼盘表区域宽度-图例宽度34-滚动条宽度6
 		// 楼盘表绘制区域宽度计算：楼盘表区域宽度-图例宽度34-滚动条宽度6
 		setTimeout(() => {
 		setTimeout(() => {
 			this.lpbContentwidth = this.$store.state.contentWidth - 34 - 6;
 			this.lpbContentwidth = this.$store.state.contentWidth - 34 - 6;
@@ -638,6 +638,7 @@ export default {
 			//获取图例数据
 			//获取图例数据
 			this.getDyztBsmList();
 			this.getDyztBsmList();
 			this.getLpbFwytAndQlxz();
 			this.getLpbFwytAndQlxz();
+			this.getLpbQsxtj();	
 			//重新渲染楼盘表
 			//重新渲染楼盘表
 			this.$refs.lpbContent.dataChange();
 			this.$refs.lpbContent.dataChange();
 		},
 		},
@@ -763,6 +764,7 @@ export default {
 			this.$refs.lpbContent.loadingData(this.$store.state.zrzbsm,this.scyclx);
 			this.$refs.lpbContent.loadingData(this.$store.state.zrzbsm,this.scyclx);
 			this.getDyztBsmList();
 			this.getDyztBsmList();
 			this.getLpbFwytAndQlxz();
 			this.getLpbFwytAndQlxz();
+			this.getLpbQsxtj();
 			//改变楼盘表子组件的key值，重新渲染
 			//改变楼盘表子组件的key值，重新渲染
 			// this.time = new Date().getTime();
 			// this.time = new Date().getTime();
 		},
 		},
@@ -935,7 +937,33 @@ export default {
 					}
 					}
 				}
 				}
 			});
 			});
+		},
+		//获取楼盘表缺失项统计
+		getLpbQsxtj(){
+				let data = {
+				zrzbsm: this.$store.state.zrzbsm,
+				scyclx: this.scyclx,
+			};
+			getLpbQsxtj(data).then((res) => {
+				if (res.code === 200) {
+					this.qsxList = res.result;
+					// this.fwxzList = res.result.qlxz;
+					if(this.qsxList.length>0){
+						this.qsxList.forEach(item=>{
+							item.color = "#2591FD";
+							item.ts = item.hcount;
+						})
 					}
 					}
+					// if(this.fwxzList.length>0){
+					// 	this.fwxzList.forEach(item=>{
+					// 		item.color = "#2591FD";
+					// 		item.ts = item.bsms.length
+					// 	})
+					// }
+				}
+			});
+		}
+
 	},
 	},
 	computed: {},
 	computed: {},
 	destroyed() {
 	destroyed() {
@@ -977,7 +1005,7 @@ export default {
 		box-sizing: border-box;
 		box-sizing: border-box;
 		padding: 20px 0;
 		padding: 20px 0;
 		background-color: #ffffff;
 		background-color: #ffffff;
-		margin-bottom: 15px;
+		margin-bottom: 10px;
 		position: relative;
 		position: relative;
 		.searchContent {
 		.searchContent {
 			margin-left: 62px;
 			margin-left: 62px;