From 60acd1b659b017e7c42880f99d241650f2e826d1 Mon Sep 17 00:00:00 2001
From: tianq <tianq>
Date: Tue, 18 Apr 2023 16:24:50 +0800
Subject: [PATCH] jumper

---
 .../census/census-accountActiveList.vue       |  4 ++--
 .../modules/census/census-accountList.vue     | 19 ++++++++++---------
 src/views/modules/census/census-houseList.vue |  4 ++--
 src/views/modules/census/census-nineList.vue  |  6 +++---
 .../modules/census/census-orgStatusList.vue   |  2 +-
 .../modules/census/census-residentList.vue    |  4 ++--
 .../modules/communityParty/dyhx/party.vue     |  4 ++--
 7 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/src/views/modules/census/census-accountActiveList.vue b/src/views/modules/census/census-accountActiveList.vue
index 9a265a0e7..8b6824d77 100644
--- a/src/views/modules/census/census-accountActiveList.vue
+++ b/src/views/modules/census/census-accountActiveList.vue
@@ -78,7 +78,7 @@
 							:current-page.sync="pageNo"
 							:page-sizes="[10, 20, 50, 100, 200]"
 							:page-size="parseInt(pageSize)"
-							layout="sizes, prev, pager, next, total"
+							layout="sizes, prev, pager, next, total,jumper"
 							:total="total"
 						></el-pagination>
 					</div>
@@ -114,7 +114,7 @@
 							:current-page.sync="pageNo2"
 							:page-sizes="[10, 20, 50, 100, 200]"
 							:page-size="parseInt(pageSize2)"
-							layout="sizes, prev, pager, next, total"
+							layout="sizes, prev, pager, next, total,jumper"
 							:total="total2"
 						></el-pagination>
 					</div>
diff --git a/src/views/modules/census/census-accountList.vue b/src/views/modules/census/census-accountList.vue
index e09471031..e3def8b78 100644
--- a/src/views/modules/census/census-accountList.vue
+++ b/src/views/modules/census/census-accountList.vue
@@ -99,9 +99,9 @@
 						>
 							<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-column prop="streetName" label="所属街道" min-width="140" align="center" :show-overflow-tooltip="true" />
+							<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>
+							<el-table-column prop="count" align="center"  label="登录次数" :show-overflow-tooltip="true"></el-table-column>
 						</el-table>
 					</div>
 				</el-col>
@@ -120,25 +120,25 @@
 				</el-col>
 			</el-row>
 		</div>
-		<el-dialog :title="title" :visible.sync="dialogVisible" v-if="dialogVisible" width="30%" :before-close="handleClose">
+		<el-dialog :title="title" :visible.sync="dialogVisible" v-if="dialogVisible" width="500px" :before-close="handleClose">
 			<el-table :data="tableDataView" border v-loading="tableLoading2" :header-cell-style="{ background: '#2195FE', color: '#FFFFFF' }" class="table" style="width: 100%">
 				<template v-if="orgType == 'community'">
 					<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-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>
+					<el-table-column prop="count" align="center"  label="登录次数" :show-overflow-tooltip="true"></el-table-column>
 				</template>
 				<template v-if="orgType == 'street'">
 					<el-table-column label="序号" fixed="left" type="index" align="center" width="50" />
 					<el-table-column prop="agencyName" 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>
+					<el-table-column prop="count" align="center"  label="登录次数" :show-overflow-tooltip="true"></el-table-column>
 				</template>
 				<template v-if="orgType == 'district'">
 					<el-table-column label="序号" fixed="left" type="index" align="center" width="50" />
 					<el-table-column prop="agencyName" 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>
+					<el-table-column prop="count" align="center"  label="登录次数" :show-overflow-tooltip="true"></el-table-column>
 				</template>
 			</el-table>
 
@@ -148,7 +148,7 @@
 				:current-page.sync="pageNo"
 				:page-sizes="[10, 20, 50, 100, 200]"
 				:page-size="parseInt(pageSize)"
-				layout="sizes, prev, pager, next, total"
+				layout="sizes, prev, pager, next, total,jumper"
 				:total="total"
 			></el-pagination>
 		</el-dialog>
@@ -394,7 +394,7 @@ export default {
 
 		async getCountLevel() {
 			const url = '/gov/org/staffLoginLog/count-level';
-			// const url = 'http://yapi.elinkservice.cn/mock/356/gov/org/staffLoginLog/count-level';
+			
 			let param = { ...this.formData };
 			const { data, code, msg } = await requestPost(url, param);
 			console.log('getCountLeveldata', data);
@@ -408,13 +408,14 @@ export default {
 			this.tableLoading = true;
 
 			const url = '/gov/org/staffLoginLog/community-count';
-			// const url = 'http://yapi.elinkservice.cn/mock/356/gov/org/staffLoginLog/community-count';
+			
 
 			const { pageSize, pageNo, formData } = this;
 			const { data, code, msg } = await requestPost(url, {
 				pageSize,
 				pageNo,
 				isPage: true,
+				dataRange:"exclude_zero",
 				...formData
 			});
 
diff --git a/src/views/modules/census/census-houseList.vue b/src/views/modules/census/census-houseList.vue
index 5fa1d1027..ed995c358 100644
--- a/src/views/modules/census/census-houseList.vue
+++ b/src/views/modules/census/census-houseList.vue
@@ -143,7 +143,7 @@
 							:current-page.sync="pageNo"
 							:page-sizes="[10, 20, 50, 100, 200]"
 							:page-size="parseInt(pageSize)"
-							layout="sizes, prev, pager, next, total"
+							layout="sizes, prev, pager, next, total,jumper"
 							:total="total"
 						></el-pagination>
 					</el-col>
@@ -291,7 +291,7 @@ export default {
 		},
 		async getTableData() {
 			this.tableLoading = true;
-			// const url = '/gov/org/staffLoginLog/community-count';
+			
 			const url = '/gov/org/ichouse/getHousePictureList';
 
 			const { pageSize, pageNo, formData } = this;
diff --git a/src/views/modules/census/census-nineList.vue b/src/views/modules/census/census-nineList.vue
index 4d9bf832d..a91044925 100644
--- a/src/views/modules/census/census-nineList.vue
+++ b/src/views/modules/census/census-nineList.vue
@@ -27,7 +27,7 @@
 					<el-col :span="24">
 						<div class="div_table_title">九小场所分析</div>
 						<el-row>
-							<el-col :span="12">
+							<el-col :span="6">
 								<div style="height:220px;margin-top:20px">
 									<screen-echarts-frame
 										@handelClickMyPei="handelClickMyPei"
@@ -87,7 +87,7 @@
 							:current-page.sync="pageNo"
 							:page-sizes="[10, 20, 50, 100, 200]"
 							:page-size="parseInt(pageSize)"
-							layout="sizes, prev, pager, next, total"
+							layout="sizes, prev, pager, next, total,jumper"
 							:total="total"
 						></el-pagination>
 					</el-col>
@@ -244,7 +244,7 @@ export default {
 		async getTableData() {
 			this.tableLoading = true;
 			const url = '/gov/org/enterprise/list';
-			// const url = 'http://yapi.elinkservice.cn/mock/356/gov/org/staffLoginLog/community-count';
+			
 
 			const { pageSize, pageNo, formData } = this;
 			const { data, code, msg } = await requestPost(url, {
diff --git a/src/views/modules/census/census-orgStatusList.vue b/src/views/modules/census/census-orgStatusList.vue
index 302860480..2d5e37e62 100644
--- a/src/views/modules/census/census-orgStatusList.vue
+++ b/src/views/modules/census/census-orgStatusList.vue
@@ -128,7 +128,7 @@
 				:current-page.sync="pageNo"
 				:page-sizes="[10, 20, 50, 100, 200]"
 				:page-size="parseInt(pageSize)"
-				layout="sizes, prev, pager, next, total"
+				layout="sizes, prev, pager, next, total,jumper"
 				:total="total"
 			></el-pagination>
 		</el-dialog>
diff --git a/src/views/modules/census/census-residentList.vue b/src/views/modules/census/census-residentList.vue
index 5a6d3d2b9..b78323ccf 100644
--- a/src/views/modules/census/census-residentList.vue
+++ b/src/views/modules/census/census-residentList.vue
@@ -117,7 +117,7 @@
 							:current-page.sync="pageNo"
 							:page-sizes="[10, 20, 50, 100, 200]"
 							:page-size="parseInt(pageSize)"
-							layout="sizes, prev, pager, next, total"
+							layout="sizes, prev, pager, next, total,jumper"
 							:total="total"
 						></el-pagination>
 					</el-col>
@@ -268,7 +268,7 @@ export default {
 		},
 		async getTableData() {
 			this.tableLoading = true;
-			// const url = '/gov/org/staffLoginLog/community-count';
+			
 			const url = '/epmetuser/icresiuser/portrayal-list';
 
 			const { pageSize, pageNo, formData } = this;
diff --git a/src/views/modules/communityParty/dyhx/party.vue b/src/views/modules/communityParty/dyhx/party.vue
index 144c89093..022a6b75d 100644
--- a/src/views/modules/communityParty/dyhx/party.vue
+++ b/src/views/modules/communityParty/dyhx/party.vue
@@ -92,7 +92,7 @@
 								:current-page.sync="agePageNo"
 								:page-sizes="[10, 20, 50, 100, 200]"
 								:page-size="agePageSize"
-								layout="sizes, prev, pager, next, total"
+								layout="sizes, prev, pager, next, total,jumper"
 								:total="ageTotal"
 							></el-pagination>
 						</el-col>
@@ -168,7 +168,7 @@
 								:current-page.sync="pageNo"
 								:page-sizes="[10, 20, 50, 100, 200]"
 								:page-size="pageSize"
-								layout="sizes, prev, pager, next, total"
+								layout="sizes, prev, pager, next, total,jumper"
 								:total="total"
 							></el-pagination>
 						</el-col>