联调

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

@@ -132,7 +132,6 @@
 				</template>
 				<template v-if="orgType == 'street'">
 					<el-table-column label="序号" fixed="left" type="index" align="center" width="50" />
-
 					<el-table-column prop="streetName" label="镇街名称" align="center" :show-overflow-tooltip="true" />
 					<el-table-column prop="districtName" label="所属区县" align="center" :show-overflow-tooltip="true"></el-table-column>
 					<el-table-column prop="count" align="center" width="110" label="登录次数" :show-overflow-tooltip="true"></el-table-column>
@@ -153,7 +152,7 @@
 				@size-change="handleSizeChange"
 				@current-change="handleCurrentChange"
 				:current-page.sync="pageNo"
-				:page-sizes="[20, 50, 100, 200]"
+				:page-sizes="[10,20, 50, 100, 200]"
 				:page-size="parseInt(pageSize)"
 				layout="sizes, prev, pager, next, total"
 				:total="total"
@@ -240,7 +239,10 @@ export default {
 			selVoiceUrl: '',
 
 			multipleSelection: [],
-			TableHeight: ''
+			TableHeight: '',
+			level: '', //点击柱状图，要出这个参数，跟其他三个不同
+			orgId: '' ,//点击柱状图，要出这个参数，跟其他三个不同
+			orgName:"",//点击柱状图，要出这个参数，跟其他三个不同
 		};
 	},
 	components: {
@@ -276,6 +278,7 @@ export default {
 			switch (type) {
 				case 1:
 					this.orgType = 'district';
+
 					break;
 				case 2:
 					this.orgType = 'street';
@@ -302,27 +305,58 @@ export default {
 			// 1 是区县 2是镇街 3是社区  4是下级
 			switch (this.orgType) {
 				case 'district':
+					this.title = '区县级账号登录情况';
 					url = '/gov/org/staffLoginLog/district-count';
+					param = {
+						orgId: this.formData.orgId,
+						level: this.orgType,
+						startDate: this.formData.startDate,
+						endDate: this.formData.endDate,
+						isPage: true,
+						pageNo: this.pageNo,
+						pageSize: this.pageSize
+					};
 					break;
 				case 'street':
+					this.title = '镇街级账号登录情况';
 					url = '/gov/org/staffLoginLog/street-count';
+					param = {
+						orgId: this.formData.orgId,
+						level: this.orgType,
+						startDate: this.formData.startDate,
+						endDate: this.formData.endDate,
+						isPage: true,
+						pageNo: this.pageNo,
+						pageSize: this.pageSize
+					};
 					break;
 				case 'community':
+					this.title = '社区级账号登录情况';
 					url = '/gov/org/staffLoginLog/community-count';
+					param = {
+						orgId: this.formData.orgId,
+						level: this.orgType,
+						startDate: this.formData.startDate,
+						endDate: this.formData.endDate,
+						isPage: true,
+						pageNo: this.pageNo,
+						pageSize: this.pageSize
+					};
 					break;
 				case 'sub':
+					this.title = this.orgName+'账号登录情况';
 					url = '/gov/org/staffLoginLog/sub-count';
+					param = {
+						orgId: this.orgId,
+						level: this.level,
+						startDate: this.formData.startDate,
+						endDate: this.formData.endDate,
+						isPage: true,
+						pageNo: this.pageNo,
+						pageSize: this.pageSize
+					};
 					break;
 			}
-			param = {
-				orgId: this.formData.orgId,
-				level: this.orgType,
-				startDate: this.formData.startDate,
-				endDate: this.formData.endDate,
-				isPage: true,
-				pageNo: this.pageNo,
-				pageSize: this.pageSize
-			};
 
 			this.tableLoading2 = true;
 
@@ -464,7 +498,7 @@ export default {
 			let PieData = {};
 			PieData.name = data.map(item => item.agencyName);
 			PieData.data = data.map(item => {
-				return { value: item.count, id: item.agencyId, level: item.agencyLevel };
+				return { value: item.count, id: item.agencyId, level: item.agencyLevel,name:item.agencyName };
 			});
 			console.log(PieData);
 			this.iniPieChart(PieData);
@@ -494,7 +528,10 @@ export default {
 			this.$refs.pieChart.setOption(this.pieOption);
 		},
 		handelClickMyPei(param) {
-			// this.
+			this.show(4);
+			this.level = param.level;
+			this.orgId = param.id;
+			this.orgName=param.name
 		}
 	}
 };