Merge branch 'master' of http://yun.pashanhoo.com:9090/renchao/CadastralSystem

@@ -98,7 +98,7 @@ ol, ul { list-style:none; }
 .tabs{
 .tabs{
     >.el-tabs__content{
     >.el-tabs__content{
         position: unset;
         position: unset;
-        margin-top: 50px;
+        margin-top: 40px;
     }
     }
     >.is-top{
     >.is-top{
         position: -webkit-fixed;
         position: -webkit-fixed;

@@ -52,6 +52,11 @@
                 </el-table-column>
                 </el-table-column>
             </el-table>
             </el-table>
         </div>
         </div>
+        <div class="pagination">
+            <el-pagination background layout="prev, pager, next,total" :total="total"
+                           :current-page="pageNo"       :page-size="pageSize"    @current-change="handleCurrentChange">
+            </el-pagination>
+        </div>
     </div>
     </div>
 </template>
 </template>
 
 
@@ -65,6 +70,10 @@
                 errorLog:[],
                 errorLog:[],
                 concreteLog:'',
                 concreteLog:'',
 
 
+                total: 0,
+                pageNo: 1,
+                pageSize: 50,
+
                 outerVisible: false,
                 outerVisible: false,
                 innerVisible: false,
                 innerVisible: false,
 
 
@@ -98,15 +107,21 @@
         methods:{
         methods:{
             getData(){
             getData(){
                 let data={
                 let data={
-                        "startTime": "",
-                        "pageNo": 1,
-                        "pageSize": 50
+                        "startTime": this.startValue,
+                        "endTime": this.endValue,
+                        "pageNo": this.pageNo,
+                        "pageSize": this.pageSize
                     };
                     };
                 getLogData(data).then((res)=>{
                 getLogData(data).then((res)=>{
                     console.log(res.result);
                     console.log(res.result);
                     this.tableData = res.result.records;
                     this.tableData = res.result.records;
+                    this.total = res.result.total
                 })
                 })
             },
             },
+            handleCurrentChange(val) {
+                this.pageNo = val;
+                this.getData();
+            },
             query(){
             query(){
                 let data={
                 let data={
                     "startTime": this.startValue,
                     "startTime": this.startValue,
@@ -175,5 +190,8 @@
         margin:10px;
         margin:10px;
     }
     }
 
 
+    .pagination {
+        padding: 18px 0;
+    }
 
 
 </style>
 </style>
\ No newline at end of file

@@ -343,8 +343,8 @@ export default {
 		this.$nextTick(() => {
 		this.$nextTick(() => {
 			this.tableHeight =
 			this.tableHeight =
 				(document.documentElement.clientHeight ||
 				(document.documentElement.clientHeight ||
-					document.body.clientHeight) - 396;
-          	this.lpbContentHeight = (document.documentElement.clientHeight || document.body.clientHeight) - 208;
+					document.body.clientHeight) - 352;
+          	this.lpbContentHeight = (document.documentElement.clientHeight || document.body.clientHeight) - 220;
 			this.lpbContentwidth = this.$refs.lpbContentWrap.clientWidth - 34 - 6;
 			this.lpbContentwidth = this.$refs.lpbContentWrap.clientWidth - 34 - 6;
 		});
 		});
 	},
 	},

@@ -312,8 +312,8 @@ export default {
 		this.$nextTick(() => {
 		this.$nextTick(() => {
 			this.tableHeight =
 			this.tableHeight =
 				(document.documentElement.clientHeight || document.body.clientHeight) -
 				(document.documentElement.clientHeight || document.body.clientHeight) -
-				392;
-          	this.lpbContentHeight = (document.documentElement.clientHeight || document.body.clientHeight) - 208;
+				352;
+          	this.lpbContentHeight = (document.documentElement.clientHeight || document.body.clientHeight) - 222;
 			this.lpbContentwidth = this.$refs.lpbContentWrap.clientWidth - 34 - 6;
 			this.lpbContentwidth = this.$refs.lpbContentWrap.clientWidth - 34 - 6;
 		});
 		});
 	},
 	},

@@ -731,7 +731,7 @@
                 }
                 }
             }
             }
             .zxx {
             .zxx {
-                width: calc(60% - 40px);
+                width: calc(60% - 24px);
                 margin-left: 20px;
                 margin-left: 20px;
                 display: flex;
                 display: flex;
                 flex-direction: column;
                 flex-direction: column;

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

@@ -584,6 +584,8 @@ export default {
 					this.$message.success("实预测转换成功");
 					this.$message.success("实预测转换成功");
 					this.$refs.lpbContent.loadingData(this.$store.state.zrzbsm,'1');
 					this.$refs.lpbContent.loadingData(this.$store.state.zrzbsm,'1');
 					this.$refs.lpbContent.loadingData(this.$store.state.zrzbsm,'0');
 					this.$refs.lpbContent.loadingData(this.$store.state.zrzbsm,'0');
+				}else if(res.code === 500) {
+					this.$message.warning(res.message);
 				}
 				}
 			});
 			});
 		},
 		},

@@ -279,7 +279,7 @@
 			</div>
 			</div>
 			<!-- <div class="ch-wrap">层户</div> -->
 			<!-- <div class="ch-wrap">层户</div> -->
 			<div class="zrz" :style="{ width: lpbContentWidth + 'px' }">
 			<div class="zrz" :style="{ width: lpbContentWidth + 'px' }">
-				{{ lpbData.xmmc }}
+				<el-checkbox v-model="zrzChecked" @change='lpbSelectAll'>{{ lpbData.xmmc }}</el-checkbox>
 			</div>
 			</div>
 		</div>
 		</div>
 		<ul
 		<ul
@@ -455,7 +455,8 @@ export default {
 				fghs:"",
 				fghs:"",
 				oldbsm:'',
 				oldbsm:'',
 				fgfx:0
 				fgfx:0
-			}
+			},
+			zrzChecked:false, //自然幢全选
 		};
 		};
 	},
 	},
 	created() {},
 	created() {},
@@ -954,6 +955,20 @@ export default {
               this.hbsmList.push(this.chData);
               this.hbsmList.push(this.chData);
             }
             }
             this.hcxlzVisible = true
             this.hcxlzVisible = true
+		},
+		//楼盘表户全选
+		lpbSelectAll(value){
+			if(value){
+				this.$refs.hBsm.forEach((item) => {
+					item.className = "tdSelect";
+					this.hbsmList.push(item.dataset.bsm); // 将户bsm放进hbsmList
+				});
+			}else{
+				this.$refs.hBsm.forEach((item) => {
+					item.className = "";
+					this.hbsmList = [];
+				});
+			}
 		}
 		}
 	},
 	},
 	computed: {
 	computed: {
@@ -1235,5 +1250,24 @@ export default {
 		margin: 20px auto 0;
 		margin: 20px auto 0;
 		width: 150px;
 		width: 150px;
 	}
 	}
+	.el-checkbox{
+		font-size: 16px;
+		/deep/.el-checkbox__label{
+			font-size: 16px;
+		}
+		/deep/ .el-checkbox__inner{
+			width: 16px;
+    		height: 16px;
+		}
+		/deep/ .el-checkbox__inner::after{
+			height: 9px;
+			left: 4px;
+			top: 0px;
+			width: 5px;
+		}
+		/deep/ .el-checkbox__input{
+			top: 1px;
+		}
+	}
 }
 }
 </style>
 </style>