bug

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

@@ -155,12 +155,13 @@ export default {
 				value: 'agencyId'
 			},
 			tableData: [],
-
+			tableData2: [],
 			formData: {
 				orgId: '',
 				startDate: '',
 				endDate: ''
 			},
+			orgId: '',
 			cateOptions: [],
 			eventTypeCheck: [],
 			pageNo: 1,
@@ -183,10 +184,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';
 			}
 		}
 	},
@@ -194,6 +195,7 @@ 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();
@@ -209,8 +211,10 @@ 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;
@@ -240,13 +244,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 +299,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,11 +314,8 @@ export default {
 
 			const url = '/gov/org/staffLoginLog/getAccountActivityInfo';
 
-			const { formData } = this;
-			const { data, code, msg } = await requestPost(url, {
-				isActivity: 1,
-				...formData
-			});
+			let param = { orgId: this.orgId, isActivity: 1, startDate: this.formData.startDate, endDate: this.formData.endDate };
+			const { data, code, msg } = await requestPost(url, param);
 
 			this.tableLoading = false;
 			if (code === 0) {
@@ -328,11 +333,8 @@ export default {
 
 			const url = '/gov/org/staffLoginLog/getAccountActivityInfo';
 
-			const { formData } = this;
-			const { data, code, msg } = await requestPost(url, {
-				isActivity: 0,
-				...formData
-			});
+			let param = { orgId: this.orgId, isActivity: 0, startDate: this.formData.startDate, endDate: this.formData.endDate };
+			const { data, code, msg } = await requestPost(url, param);
 
 			this.tableLoading2 = false;
 			if (code === 0) {

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

@@ -238,7 +238,8 @@ export default {
 			pieData2: [],
 			orgId: '',
 			purpose: '',
-			rentFlag: ''
+			rentFlag: '',
+			orgIdPath: ''
 		};
 	},
 	computed: {
@@ -271,8 +272,7 @@ export default {
 			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 +290,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 +324,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 +343,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 +404,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 +424,6 @@ export default {
 				};
 			});
 
-			console.log('chartData', this.chartData2);
 			this.iniPieChart2(this.chartData2);
 		},
 		// 获取饼状图
@@ -660,11 +663,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'
 			})
@@ -716,16 +721,17 @@ 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;
+				console.log(this.orgId, this.orgIdPath, this.orgType);
 			} else {
-				console.log('ww');
 				this.orgId = this.agencyId;
 			}
-			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() {