Merge remote-tracking branch 'origin/master'

zhaoqian
Showing 3 changed files with 141 additions and 11 deletions
src/views/panel/change/hfghb/index.vue
src/views/zrz/lpb/bjlp/index.vue
src/views/zrz/lpb/bjlp/lpbContent/index.vue
--- a/src/views/panel/change/hfghb/index.vue
View file @0c51ea2
+++ b/src/views/panel/change/hfghb/index.vue
View file @0c51ea2
@@ -84,7 +84,7 @@
        <div class="lpb-content" ref="lpbContentWrap" :style="{ height: lpbContentHeight + 'px' }">
          <!-- 楼盘表主体 -->
          <div class="lp-overview" :style="{ width: lpbContentwidth + 'px' }">
-            <lpbContent ref="lpbContent"></lpbContent>
+            <lpbContent ref="lpbContent" :zrzbsm='zrzbsm' :isHbfg = true></lpbContent>
          </div>
          <!-- 右侧图例 -->
          <div class="lp-legend">
@@ -211,6 +211,7 @@
 <script>
 import lpbContent from "../../../zrz/lpb/bjlp/lpbContent/index";
+import { getLpbMenuTree, batchScYcChange, getLpbTj,batchGeneratorBdcdyh,getLpbFwytAndQlxz ,batchCommit} from "@api/lpb";
 export default {
  name:"",
  components:{lpbContent},
@@ -312,6 +313,7 @@ export default {
          xmmc:'测试自然幢',
          bdcqzh:'A12111111111111111',
          dylx:'zrz',
+          zrzbsm:'18cea8b4438ebf838ac86f4ceff90a6b'
        }
      ]
    },
@@ -329,6 +331,7 @@ export default {
    //办理
    handleClick(row){
      this.isSearch = false;
+      this.zrzbsm = row.zrzbsm;
    },
    //分页
    handleCurrentChange(val) {
@@ -363,6 +366,89 @@ export default {
 		legendToggle() {
 			this.legendToggleFlag = !this.legendToggleFlag;
 		},
+		//获取各项单元状态统计数据
+		getDyztBsmList() {
+			let data = {
+				zrzbsm: this.$store.state.zrzbsm,
+				scyclx: this.scyclx,
+			};
+			getLpbTj(data).then((res) => {
+				if (res.code === 200) {
+					this.dyztList = res.result;
+					this.dyztList.splice(1,0,this.dyztList[8]);
+					this.dyztList.pop();
+					this.dyztList.forEach(item=>{
+						item.ts = item.bsms.length;
+							switch (item.name) {
+								case 'Qqzt':
+									item.color = "#6EDEE1";
+									item.name = "已确权"
+									break;
+								case 'Wqqzt':
+									item.color = "#83AAFE";
+									item.name = "未确权"
+									break;
+								case 'Bazt':
+									item.color = "#8ADC88";
+									item.name = "已备案"
+									break;
+								case 'Ydyzt':
+									item.color = "#F2AD67";
+									item.name = "预抵押"
+									break;
+								case 'Zjgcdyzt':
+									item.color = "#F191C8";
+									item.name = "在建抵押"
+									break;
+								case 'Dyzt':
+									item.color = "#FF8282";
+									item.name = "抵押"
+									break;
+								case 'Cfzt':
+									item.color = "#D7CECF";
+									item.name = "查封"
+									break;
+								case 'Yyzt':
+									item.color = "#D4A3EB";
+									item.name = "异议"
+									break;
+								case 'Xzzt':
+									item.color = "#A5A3FB";
+									item.name = "限制"
+									break;
+								default:
+									break;
+							}
+					})
+				}
+			});
+		},
+		// 获取房屋用途和房屋性质统计数据
+		getLpbFwytAndQlxz(){
+			let data = {
+				zrzbsm: this.$store.state.zrzbsm,
+				scyclx: this.scyclx,
+			};
+			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: {},
  watch: {
@@ -374,6 +460,17 @@ export default {
 				this.lpbContentwidth += 204;
 			}
    },
+    //选择自然幢展示楼盘表后，查询右侧图例数据
+    isSearch(n){
+      if (!n) {
+        this.getDyztBsmList();
+        this.getLpbFwytAndQlxz();
+      }
+    },
+    //改变syclx，更新楼盘表数据
+    scyclx(n){
+		  this.$refs.lpbContent.lpbData = n == 0 ? this.$refs.lpbContent.yclpbData : this.$refs.lpbContent.sclpbData
+    }
  },
 }
 </script>
--- a/src/views/zrz/lpb/bjlp/index.vue
View file @0c51ea2
+++ b/src/views/zrz/lpb/bjlp/index.vue
View file @0c51ea2
@@ -97,7 +97,7 @@
 			</div>
 			<!-- 楼盘表主体 -->
 			<div class="lp-overview" :style="{ width: lpbContentwidth + 'px' }">
-				<lpbContent ref="lpbContent" :key="time"></lpbContent>
+				<lpbContent ref="lpbContent" :zrzbsm="$route.query.bsm" :key="time"></lpbContent>
 			</div>
 			<!-- 右侧图例 -->
 			<div class="lp-legend">
--- a/src/views/zrz/lpb/bjlp/lpbContent/index.vue
View file @0c51ea2
+++ b/src/views/zrz/lpb/bjlp/lpbContent/index.vue
View file @0c51ea2
@@ -133,7 +133,9 @@
 					<!-- 逻辑幢名称 -->
 					<div class="ljz-name name">
+						<p>
 							{{ ljzs.ljzmc }}
+						</p>
 					</div>
 				</div>
 			</div>
@@ -303,7 +305,16 @@ import { getLpb, insertUpDownC, deleteCByBsm } from "../../../../../api/lpb";
 export default {
 	name: "",
 	components: { moveH },
-	props: {},
+	props: {
+		isHbfg:{
+			type:Boolean,
+			default:false
+		},
+		zrzbsm:{
+			type:String,
+			default:''
+		}
+	},
 	data() {
 		return {
 			moveHvisible: false,
@@ -344,13 +355,13 @@ export default {
 			},
 			formLabelWidth: "120px",
 			yclpbData:{},
-			sclpbData:{}
+			sclpbData:{},
 		};
 	},
 	created() {},
 	mounted() {
-		this.getLpb(this.$store.state.zrzbsm, "0");
+		this.getLpb(this.zrzbsm, "0");
-		this.getLpb(this.$store.state.zrzbsm, "1");
+		this.getLpb(this.zrzbsm, "1");
 		setTimeout(() => {
 			//tab-content宽度 - 右侧图例宽度 - lp-overview滚动条宽度 - lpbContent的pandingRight
 			this.lpbContentWidth = this.$store.state.contentWidth - 34 - 20;
@@ -510,8 +521,12 @@ export default {
 		//户双击事件
 		dbclick(bsm) {
 			clearTimeout(this.time);
+			if (this.isHbfg) {
+			}else{
 				// this.hbsmList.push(bsm); // 将户bsm放进hbsmList
 				this.$parent.getHbsm(bsm, true);
+			}
 		},
 		//删除多重数组中的某一项
 		deleteArrOption(arr, item) {
@@ -536,15 +551,23 @@ export default {
 		},
 		//户右键点击事件
 		openMenu(e, item, type) {
+			if (this.isHbfg) {
+			}else{
 				console.log(e, "e");
 				this.lpbChLeft = e.pageX;
 				this.lpbChTop = e.pageY;
 				this.chData = item;
 				this.rightClickFlag = type;
 				this.lpbChVisible = true;
+			}
 		},
 		// 层选中事件
 		handleClickC(e, item) {
+			if (this.isHbfg) {
+			}else{
 				//判断点击的层是否选中
 				if (e.target.className.indexOf("tdSelect") == -1) {
 					//未选中→选中
@@ -556,6 +579,7 @@ export default {
 					this.deleteArrOption(this.cbsmList, item.bsm);
 				}
 				this.$parent.getCbsm(this.cbsmList);
+			}
 		},
 		//关闭右键菜单
 		closeMenu() {
@@ -741,7 +765,8 @@ export default {
 						bottom: 0;
 						position: absolute;
 						height: 40px;
-						background-color: rosybrown;
+						// background-color: rosybrown;
+						border:1px solid #E6E6E6
 					}
 					// .chTable-wrap{
 					// 	position: absolute;
@@ -765,7 +790,12 @@ export default {
 				.ljz-name {
 					width: calc(100% - 32px);
 					height: 40px;
-					background-color: darkorange;
+					// background-color: darkorange;
+					p{
+						width: 100%;
+						height: 100%;
+						border:1px solid #E6E6E6
+					}
 				}
 			}
 			div:last-child {
@@ -791,7 +821,8 @@ export default {
 						display: inline-table;
 						.zdy-name {
 							bottom: 0;
-							background-color: blanchedalmond;
+							// background-color: blanchedalmond;
+							border:1px solid #E6E6E6
 						}
 					}
 					.zdy-zdy:last-child {
@@ -801,7 +832,8 @@ export default {
 				.zdy-name {
 					width: calc;
 					height: 40px;
-					background-color: rosybrown;
+					// background-color: rosybrown;
+					border:1px solid #E6E6E6
 				}
 			}
 			.column-reverse {
@@ -876,7 +908,8 @@ export default {
 	.zrz {
 		height: 60px;
 		line-height: 60px;
-		background-color: darkgoldenrod;
+		background-color: #ffffff;
+		border:1px solid #E6E6E6;
 		position: relative;
 		bottom: 66px;
 		text-align: center;