Merge branch 'yantai_dev' into dev

# Conflicts:
#	src/views/components/resiSearch.vue

src/views/components/rangeInput.vue

@@ -10,7 +10,7 @@
                   :type="inputType"
                   clearable
                   placeholder="请输入"
-                  @change="handleChange" />
+                  @change="handleChange($event,'s')" />
       </el-form-item>
       <div class="div_middle">-</div>
       <el-form-item prop="end">
@@ -20,7 +20,7 @@
                   :type="inputType"
                   clearable
                   placeholder="请输入"
-                  @change="handleChange"
+                  @change="handleChange($event,'e')"
                   @blur="handleBlur" />
       </el-form-item>
     </div>
@@ -87,10 +87,9 @@ export default {
     },
   },
   methods: {
-    handleChange (val) {
-
+    handleChange (val,type) {
       // if ()
-      this.$emit('change', { ...this.inputForm })
+      this.$emit('change', { ...this.inputForm },type)
     },
     handleBlur () {
 

src/views/modules/base/resi.vue

@@ -664,8 +664,8 @@ export default {
       this.getTableData();
     },
     handleSearch (val) {
-      console.log("searchhh--", val);
       this.currentPage = 1;
+      console.log(val);
       this.conditions = val;
       this.getTableData();
     },

src/views/modules/census/census-accountActiveList.vue

@@ -72,6 +72,15 @@
 							<el-table-column prop="accountActivityCount" label="活跃账号数" align="center" :show-overflow-tooltip="true"></el-table-column>
 							<el-table-column prop="accountCount" align="center" width="110" label="总账号数" :show-overflow-tooltip="true"></el-table-column>
 						</el-table>
+						<el-pagination
+							@size-change="handleSizeChange"
+							@current-change="handleCurrentChange"
+							:current-page.sync="pageNo"
+							:page-sizes="[10, 20, 50, 100, 200]"
+							:page-size="parseInt(pageSize)"
+							layout="sizes, prev, pager, next, total"
+							:total="total"
+						></el-pagination>
 					</div>
 				</el-col>
 				<el-col :span="12">
@@ -99,6 +108,15 @@
 							<el-table-column label="序号" fixed="left" type="index" align="center" width="50" />
 							<el-table-column prop="agencyName" align="center" label="组织名称" :show-overflow-tooltip="true"></el-table-column>
 						</el-table>
+						<el-pagination
+							@size-change="handleSizeChange2"
+							@current-change="handleCurrentChange2"
+							:current-page.sync="pageNo2"
+							:page-sizes="[10, 20, 50, 100, 200]"
+							:page-size="parseInt(pageSize2)"
+							layout="sizes, prev, pager, next, total"
+							:total="total2"
+						></el-pagination>
 					</div>
 				</el-col>
 			</el-row>
@@ -155,17 +173,21 @@ export default {
 				value: 'agencyId'
 			},
 			tableData: [],
-
+			tableData2: [],
 			formData: {
 				orgId: '',
 				startDate: '',
 				endDate: ''
 			},
+			orgId: '',
 			cateOptions: [],
 			eventTypeCheck: [],
 			pageNo: 1,
 			pageSize: window.localStorage.getItem('pageSize') || 20,
-			total: 1,
+			pageNo2: 1,
+			pageSize2: window.localStorage.getItem('pageSize2') || 20,
+			total: 0,
+			total2: 0,
 			endPickerOptions: {
 				disabledDate: endDisabledDate
 			},
@@ -177,16 +199,16 @@ export default {
 	},
 	computed: {
 		maxTableHeight() {
-			return this.$store.state.inIframe ? this.clientHeight - 400 + this.iframeHeigh : this.clientHeight - 400;
+			return this.$store.state.inIframe ? this.clientHeight - 439 + this.iframeHeigh : this.clientHeight - 439;
 		},
 
 		...mapGetters(['clientHeight', 'iframeHeight'])
 	},
 	watch: {
-		'formData.endTime': function(val) {
+		'formData.endDate': function(val) {
 			if (val && val != '') {
 				let arrayTemp = val.split(' ');
-				this.formData.endTime = arrayTemp[0] + ' 23:59:59';
+				this.formData.endDate = arrayTemp[0] + ' 23:59:59';
 			}
 		}
 	},
@@ -194,12 +216,31 @@ export default {
 		console.log(this.$store.state);
 		this.user = this.$store.state.user;
 		this.agencyId = this.user.agencyId;
+		this.orgId = this.agencyId;
 		this.getOrgTreeList();
 		this.getTableData();
 		this.getTableData2();
 		this.getCountLevel();
 	},
 	methods: {
+		handleSizeChange(val) {
+			this.pageSize = val;
+			window.localStorage.setItem('pageSize', val);
+			this.getTableData();
+		},
+		handleCurrentChange(val) {
+			this.pageNo = val;
+			this.getTableData();
+		},
+		handleSizeChange2(val) {
+			this.pageSize2 = val;
+			window.localStorage.setItem('pageSize2', val);
+			this.getTableData2();
+		},
+		handleCurrentChange2(val) {
+			this.pageNo2 = val;
+			this.getTableData2();
+		},
 		handleChangeAgency(val) {
 			let obj = this.$refs['myCascader'].getCheckedNodes()[0].data;
 			console.log(obj);
@@ -209,11 +250,13 @@ export default {
 		handleSearch(val) {
 			let tmp = this.formData.orgId;
 			if (!(tmp && typeof tmp != 'undefined' && tmp != 0 && tmp != null)) {
-				this.formData.orgId = '';
+				this.orgId = this.agencyId;
 				this.formData.level = '';
+			} else {
+				this.orgId = this.formData.orgId;
 			}
 			console.log(this.formData);
-			this.pageNo = 1;
+			this.pageNo = 1;this.pageNo2 = 1;
 			this.getTableData();
 			this.getTableData2();
 			this.getCountLevel();
@@ -240,13 +283,17 @@ export default {
 
 		async handleExport(type) {
 			const url = '/gov/org/staffLoginLog/accountActivityInfo-export';
-			const { formData } = this;
+
+			const { data, code, msg } = await requestPost(url, param);
+
 			axios({
 				url: window.SITE_CONFIG['apiURL'] + url,
 				method: 'post',
 				data: {
 					isActivity: type,
-					...formData
+					orgId: this.orgId,
+					startDate: this.formData.startDate,
+					endDate: this.formData.endDate
 				},
 				responseType: 'blob'
 			})
@@ -291,7 +338,7 @@ export default {
 		async getCountLevel() {
 			const url = '/gov/org/staffLoginLog/getActivityTotal';
 			// const url = 'http://yapi.elinkservice.cn/mock/356/gov/org/staffLoginLog/count-level';
-			let param = { ...this.formData };
+			let param = { orgId: this.orgId, startDate: this.formData.startDate, endDate: this.formData.endDate };
 			const { data, code, msg } = await requestPost(url, param);
 			console.log('getCountLeveldata', data);
 			if (code === 0) {
@@ -306,14 +353,20 @@ export default {
 
 			const url = '/gov/org/staffLoginLog/getAccountActivityInfo';
 
-			const { formData } = this;
-			const { data, code, msg } = await requestPost(url, {
+			let param = {
+				orgId: this.orgId,
+				startDate: this.formData.startDate,
+				endDate: this.formData.endDate,
 				isActivity: 1,
-				...formData
-			});
+				isPage: true,
+				pageNo: this.pageNo,
+				pageSize: this.pageSize
+			};
+			const { data, code, msg } = await requestPost(url, param);
 
 			this.tableLoading = false;
 			if (code === 0) {
+				this.total = data.total || 0;
 				this.tableData = data.list
 					? data.list.map(item => {
 							return item;
@@ -328,14 +381,21 @@ export default {
 
 			const url = '/gov/org/staffLoginLog/getAccountActivityInfo';
 
-			const { formData } = this;
-			const { data, code, msg } = await requestPost(url, {
+			let param = {
+				orgId: this.orgId,
+				startDate: this.formData.startDate,
+				endDate: this.formData.endDate,
 				isActivity: 0,
-				...formData
-			});
+				isPage: true,
+				pageNo: this.pageNo2,
+				pageSize: this.pageSize2
+			};
+			const { data, code, msg } = await requestPost(url, param);
 
 			this.tableLoading2 = false;
 			if (code === 0) {
+				this.total2 = data.total || 0;
+			console.log(this.total2)
 				this.tableData2 = data.list
 					? data.list.map(item => {
 							return item;

src/views/modules/census/census-houseList.vue

@@ -66,7 +66,7 @@
 											<div class="content">
 												<div class="name">{{ item.name }}</div>
 												<div class="num">{{ item.value }}</div>
-												<div class="unit" :style="{ color: color[index] }">{{ item.radio}}%</div>
+												<div class="unit" :style="{ color: color[index] }">{{ item.radio }}%</div>
 											</div>
 										</div>
 									</div>
@@ -98,7 +98,7 @@
 											<div class="content">
 												<div class="name">{{ item.name }}</div>
 												<div class="num">{{ item.value }}</div>
-												<div class="unit" :style="{ color: color[index] }">{{ item.radio}}%</div>
+												<div class="unit" :style="{ color: color[index] }">{{ item.radio }}%</div>
 											</div>
 										</div>
 									</div>
@@ -238,7 +238,8 @@ export default {
 			pieData2: [],
 			orgId: '',
 			purpose: '',
-			rentFlag: ''
+			rentFlag: '',
+			orgIdPath: ''
 		};
 	},
 	computed: {
@@ -249,10 +250,10 @@ export default {
 		...mapGetters(['clientHeight', 'iframeHeight'])
 	},
 	watch: {
-		'formData.endTime': function(val) {
+		'formData.endDate': function(val) {
 			if (val && val != '') {
 				let arrayTemp = val.split(' ');
-				this.formData.endTime = arrayTemp[0] + ' 23:59:59';
+				this.formData.endDate = arrayTemp[0] + ' 23:59:59';
 			}
 		}
 	},
@@ -260,19 +261,15 @@ export default {
 		console.log(this.$store.state);
 		this.user = this.$store.state.user;
 		this.agencyId = this.user.agencyId;
-		this.orgId = this.agencyId;
+
 		this.getOrgTreeList();
-		this.getTableData();
-		this.getsubData();
-		this.getsubData2();
 	},
 	methods: {
 		show(row) {
 			this.dialogVisible = true;
 			this.pageType = 'view';
 			this.detailId = row.houseId;
-			console.log('detailId', row);
-			console.log('detailId', this.detailId);
+
 			this.detailData = row;
 		},
 		handleClose() {
@@ -290,7 +287,9 @@ export default {
 			const { data, code, msg } = await requestPost(url, {
 				pageSize,
 				pageNo,
-				orgIdPath: this.orgId,
+				orgIdPath: this.orgIdPath,
+				orgId: this.orgId,
+				orgType: this.orgType,
 				timeStart: this.formData.startDate,
 				timeEnd: this.formData.endDate,
 				purpose: this.purpose,
@@ -322,9 +321,11 @@ export default {
 			this.$refs.pieChart.showLoading();
 			let url = '/gov/org/ichouse/getHousePurposeCount';
 			let param = {
-				orgIdPath: this.orgId,
+				orgIdPath: this.orgIdPath,
 				timeStart: this.formData.startDate,
-				timeEnd: this.formData.endDate
+				timeEnd: this.formData.endDate,
+				orgId: this.orgId,
+				orgType: this.orgType
 			};
 			const { data, code, msg } = await requestPost(url, param);
 			this.$refs.pieChart.hideLoading();
@@ -339,15 +340,17 @@ export default {
 			this.$refs.pieChart2.showLoading();
 			let url = '/gov/org/ichouse/getHouseStatusCount';
 			let param = {
-				orgIdPath: this.orgId,
+				orgIdPath: this.orgIdPath,
 				timeStart: this.formData.startDate,
-				timeEnd: this.formData.endDate
+				timeEnd: this.formData.endDate,
+				orgId: this.orgId,
+				orgType: this.orgType
 			};
 			const { data, code, msg } = await requestPost(url, param);
 			this.$refs.pieChart2.hideLoading();
 			if (code === 0) {
 				this.pieData2 = data;
-				console.log('this.pieData2', this.pieData2);
+
 				this.getPie2();
 			} else {
 				this.$message.error(msg);
@@ -398,11 +401,9 @@ export default {
 				};
 			});
 
-			console.log('chartData', this.chartData);
 			this.iniPieChart(this.chartData);
 		},
 		setPieData2() {
-			console.log(this.pieData2)
 			let data = [...this.pieData2.list];
 			let type = {
 				1: '出租',
@@ -420,7 +421,6 @@ export default {
 				};
 			});
 
-			console.log('chartData', this.chartData2);
 			this.iniPieChart2(this.chartData2);
 		},
 		// 获取饼状图
@@ -660,11 +660,13 @@ export default {
 				data: {
 					pageSize,
 					pageNo,
-					orgIdPath: this.orgId,
+					orgIdPath: this.orgIdPath,
 					timeStart: this.formData.startDate,
 					timeEnd: this.formData.endDate,
 					purpose: this.purpose,
-					rentFlag: this.rentFlag
+					rentFlag: this.rentFlag,
+					orgId: this.orgId,
+					orgType: this.orgType
 				},
 				responseType: 'blob'
 			})
@@ -695,12 +697,19 @@ export default {
 					if (res.code !== 0) {
 						return this.$message.error(res.msg);
 					} else {
-						console.log('获取组织树成功', res.data);
-						// let { agencyList, subAgencyList } = res.data;
+						let data = res.data;
+						console.log('获取组织树成功', data);
+						// let { agencyList, subAgencyList } = data;
 						// const _arr = [{ ...agencyList, subAgencyList: [...subAgencyList] }];
 						// this.orgOptions = this.deepTree(_arr);
 						this.orgOptions = [];
-						this.orgOptions.push(res.data);
+						this.orgOptions.push(data);
+						this.orgId = data.agencyId;
+						this.orgIdPath = data.orgIdPath;
+						this.orgType = data.level;
+						this.getTableData();
+						this.getsubData();
+						this.getsubData2();
 					}
 				})
 				.catch(() => {
@@ -716,16 +725,18 @@ export default {
 			this.getsubData2();
 		},
 		handleChangeAgency(val) {
-			// let obj = this.$refs['myCascader'].getCheckedNodes()[0].data;
+			let obj = this.$refs['myCascader'].getCheckedNodes()[0].data;
 			let tmp = this.formData.orgId;
 
 			if (tmp && typeof tmp != 'undefined' && tmp != 0 && tmp != null) {
 				this.orgId = this.formData.orgId;
+				this.orgIdPath = obj.orgIdPath;
+				this.orgType = obj.level;
 			} else {
-				console.log('ww');
-				this.orgId = this.agencyId;
+				this.orgId = this.orgOptions.agencyId;
+				this.orgIdPath = this.orgOptions.orgIdPath;
+				this.orgType = this.orgOptions.level;
 			}
-			console.log('this.orgId', this.orgId);
 		},
 
 		deepTree(arr) {

src/views/modules/census/census-residentList.vue

@@ -605,24 +605,24 @@ export default {
 		},
 		handelClickMyPei(param) {
 			this.code = param.data.code;
-			this.codeType = 'education';
+			this.codeType = 'age';
 			this.getTableData();
 		},
 
 		handelClickMyPei2(param) {
 			this.code = param.data.code;
-			this.codeType = 'age';
+			this.codeType = 'education';
 			this.getTableData();
 		},
 		handleClickItem(item) {
 			this.code = item.code;
-			this.codeType = 'education';
+			this.codeType = 'age';
 
 			this.getTableData();
 		},
 		handleClickItem2(item) {
 			this.code = item.code;
-			this.codeType = 'age';
+			this.codeType = 'education';
 			this.getTableData();
 		},
 		async handleExport() {