Merge remote-tracking branch 'origin/master'

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

@@ -65,7 +65,7 @@ export default {
 	},
 	},
 	created() {},
 	created() {},
 	mounted() {
 	mounted() {
-		this.$store.state.contentWidth = this.$refs.lpb.offsetWidth - 44;
+		// this.$store.state.contentWidth = this.$refs.lpb.offsetWidth - 44;
 	},
 	},
 	computed: {},
 	computed: {},
 	watch: {},
 	watch: {},

@@ -255,6 +255,7 @@
 						<tr>
 						<tr>
 							<th>数据缺失项</th>
 							<th>数据缺失项</th>
 							<th>套数</th>
 							<th>套数</th>
+							<th>面积</th>
 						</tr>
 						</tr>
 						<tr
 						<tr
 							v-for="(item, index) in qsxList"
 							v-for="(item, index) in qsxList"
@@ -267,8 +268,11 @@
 								>{{ item.name }}
 								>{{ item.name }}
 							</td>
 							</td>
 							<td>{{ item.ts }}</td>
 							<td>{{ item.ts }}</td>
+							<td>0</td>
+						</tr>
+						<tr v-show="qsxList.length < 1">
+							<td colspan="3" class="tac">暂无数据</td>
 						</tr>
 						</tr>
-
 					</table>
 					</table>
 				</div>
 				</div>
 			</div>
 			</div>
@@ -351,7 +355,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,getLpbQsxtj,batchCommit,batchDelete} from "@api/lpb";
+import { getLpbMenuTree, batchScYcChange, getLpbTj,batchGeneratorBdcdyh,getLpbFwytAndQlxz ,batchCommit,batchDelete,getLpbQsxtj} from "@api/lpb";
 import xxxx from '../xxxx/index'
 import xxxx from '../xxxx/index'
 
 
 export default {
 export default {
@@ -912,7 +916,7 @@ export default {
 				}
 				}
 			});
 			});
 		},
 		},
-		// 获取房屋用途和房屋性质统计数据
+		// 获取房屋用途和房屋性质及缺失项统计数据
 		getLpbFwytAndQlxz(){
 		getLpbFwytAndQlxz(){
 			let data = {
 			let data = {
 				zrzbsm: this.$store.state.zrzbsm,
 				zrzbsm: this.$store.state.zrzbsm,
@@ -937,29 +941,28 @@ export default {
 					}
 					}
 				}
 				}
 			});
 			});
-		},
-		//获取楼盘表缺失项统计
-		getLpbQsxtj(){
-				let data = {
-				zrzbsm: this.$store.state.zrzbsm,
-				scyclx: this.scyclx,
-			};
 			getLpbQsxtj(data).then((res) => {
 			getLpbQsxtj(data).then((res) => {
 				if (res.code === 200) {
 				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;
-						})
+					this.qsxList = [
+						{
+							name:'坐落',
+							bsms:res.result.zl.bsms,
+							color:'#2591FD',
+							ts:res.result.zl.bsms.length
+						},
+						{
+							name:'分层分户图',
+							bsms:res.result.fcfht.bsms,
+							color:'#2591FD',
+							ts:res.result.fcfht.bsms.length
+						},
+						{
+							name:'室号',
+							bsms:res.result.shbw.bsms,
+							color:'#2591FD',
+							ts:res.result.shbw.bsms.length
 						}
 						}
-					// if(this.fwxzList.length>0){
-					// 	this.fwxzList.forEach(item=>{
-					// 		item.color = "#2591FD";
-					// 		item.ts = item.bsms.length
-					// 	})
-					// }
+					]
 				}
 				}
 			});
 			});
 		}
 		}