Jelajahi Sumber

激活统计相关修改

wgl 4 tahun lalu
induk
melakukan
e415428162

+ 20 - 0
src/projects/business/apis/Control/statistic.js

@@ -0,0 +1,20 @@
+import request from '@/utils/request'
+import Qs from 'qs';
+
+//疫情专员统计数据
+export function companySuperviseAllData(data) {
+	return request({
+		url: '/mobile/companySuperviseApi/companySuperviseAllData',
+		data: Qs.stringify(data),
+		method: 'post',
+	})
+}
+
+//疫情专员列表数据
+export function companySuperviseListData(data) {
+	return request({
+		url: '/mobile/companySuperviseApi/companySuperviseListData',
+		data: Qs.stringify(data),
+		method: 'post',
+	})
+}

+ 10 - 0
src/projects/business/apis/Master/company.js

@@ -107,3 +107,13 @@ export function setCompanyPersonStatus(params) {
 		method: 'get',
 	})
 }
+
+
+//获取未激活列表
+export function activationListData(params) {
+	return request({
+		url: '/mobile/personInfoApi/activationListData',
+		data: Qs.stringify(params),
+		method: 'post',
+	})
+}

+ 4 - 4
src/projects/business/router/master.js

@@ -1380,7 +1380,7 @@ const routesMaster = [
 							title: '组织架构之个人资料',
 						}
 					},
-					//注册统计
+					//激活统计
 					{
 						path: 'registerStatistics',
 						name: 'MasterCompanyRegisterStatistics',
@@ -1388,11 +1388,11 @@ const routesMaster = [
 						meta: {
 							requireAuth: true,
 							role: [],
-							title: '注册统计',
+							title: '激活统计',
 							mode: true
 						}
 					},
-					//注册统计人员详情
+					//激活统计人员详情
 					{
 						path: 'registerStatisticsInfo',
 						name: 'MasterCompanyRegisterStatisticsInfo',
@@ -1400,7 +1400,7 @@ const routesMaster = [
 						meta: {
 							requireAuth: true,
 							role: [],
-							title: '注册统计人员详情',
+							title: '激活统计人员详情',
 							mode: true
 						}
 					},

+ 96 - 31
src/projects/business/views/Control/Home.vue

@@ -14,7 +14,7 @@
 						<p v-text="person_popedom?(person_popedom.job?person_popedom.job:person_popedom.personRoleName):''"></p>
 					</div>
 				</div>
-				<a class="signOut" @click="loginOut">
+				<a class="signOut" @click="doLoginOut">
 					退出
 					<i class="iconfont icon-tuichu"></i>
 				</a>
@@ -22,30 +22,30 @@
 			<div class="mui-card icon_number">
 				<div class="mui-card-header">
 					开发区健康统计
-					<a class="mui-navigate-right iconfont icon-riqi" @click="selectDate" v-text="listForm.queryDate"></a>
+					<a class="mui-navigate-right iconfont icon-riqi" @click="selectDate" v-text="listForm.date"></a>
 				</div>
 				<div class="mui-card-content">
 					<div class="mui-col-xs-6">
-						<a href="#">
-							<span class="icon_number_green">209809</span>
+						<a>
+							<span class="icon_number_green" v-text="detail.totalNum"></span>
 							<div class="mui-media-body mui-ellipsis">应测人数</div>
 						</a>
 					</div>
 					<div class="mui-col-xs-6">
-						<a href="#">
-							<span class="icon_number_blue">3268</span>
+						<a>
+							<span class="icon_number_blue" v-text="detail.totalCheckNum"></span>
 							<div class="mui-media-body mui-ellipsis">已测人数</div>
 						</a>
 					</div>
 					<div class="mui-col-xs-6">
-						<a href="#">
-							<span class="icon_number_red">3268</span>
+						<a>
+							<span class="icon_number_red" v-text="detail.totalAbnormalNum"></span>
 							<div class="mui-media-body mui-ellipsis">异常人数</div>
 						</a>
 					</div>
 					<div class="mui-col-xs-6">
-						<a href="#">
-							<span class="icon_number_yellow">3268</span>
+						<a>
+							<span class="icon_number_yellow" v-text="detail.leaveNum"></span>
 							<div class="mui-media-body mui-ellipsis">离荆人数</div>
 						</a>
 					</div>
@@ -74,18 +74,11 @@
 			<div class="mui-card">
 				<div class="mui-card-content index-floor-2">
 					<ul class="mui-table-view">
-						<li class="mui-table-view-cell flew-sp">
-							<div class="mui-ellipsis mui-col-xs-6">开发区实验中学开发区实验中学开发区实验中学</div>
+						<li v-for="(item,index) in recordList" class="mui-table-view-cell flew-sp">
+							<div class="mui-ellipsis mui-col-xs-6" v-text="item.companyName"></div>
 							<div class="mui-media-body mui-col-xs-6 mui-text-right">
-								<span class="green">已测51</span> /
-								<span class="blue">应测5219</span>
-							</div>
-						</li>
-						<li class="mui-table-view-cell flew-sp">
-							<div class="mui-ellipsis mui-col-xs-6">开发区实验中学开发区实验中学开发区实验中学</div>
-							<div class="mui-media-body mui-col-xs-6 mui-text-right">
-								<span class="green">已测5</span> /
-								<span class="blue">应测19</span>
+								<span class="green">已测{{item.totalCheckNum}}</span> /
+								<span class="blue">应测{{item.totalNum}}</span>
 							</div>
 						</li>
 					</ul>
@@ -99,10 +92,11 @@
 
 <script>
 	require('$project/assets/js/mui.picker.min.js');
-	import * as API_User from '$project/apis/user'
+	import * as API_statistic from '@/apis/Control/statistic'
 	import Common from '$project/components/Common.vue'
 	import Loading from '$project/components/Loading.vue'
 	import TopHeader from '$project/components/TopHeader.vue'
+	import isReachBottom from '$project/utils/isReachBottom'
 	import {
 		mapGetters,
 		mapMutations
@@ -126,12 +120,18 @@
 				pageTitle: '开发区监管端',
 
 				listForm: {
-					queryDate: '',
-				}
+					date: '',
+					pageIndex: '',
+					pageSize: 20,
+					totalPage: 1,
+				},
+				recordList: [],
+
+				detail: {}
 			}
 		},
 		created() {
-			this.listForm.queryDate = parseUnixTime(currentTimeStamp(), '{y}-{m}-{d}');
+			this.listForm.date = parseUnixTime(currentTimeStamp(), '{y}-{m}-{d}');
 		},
 		methods: {
 			//选择时间
@@ -142,17 +142,65 @@
 					"beginYear": 2020,
 					"endYear": 2040,
 					"endDate": new Date(),
-					"value": _this.listForm.queryDate
+					"value": _this.listForm.date
 				});
 				picker.show(function(rs) {
-					_this.listForm.queryDate = rs.text;
+					_this.listForm.date = rs.text;
+					_this.listForm.pageIndex = 1;
 					_this.getList();
 					picker.dispose();
 				});
 			},
-			//获取列表数据
-			getList() {
+			//获取统计详情
+			getInfo() {
+				this.isLoading = true;
+				API_statistic.companySuperviseAllData({
+					date: this.listForm.date
+				}).then(response => {
 
+					this.detail = response;
+
+					this.isLoading = false;
+				}).catch(error => {
+					this.isLoading = false;
+					mui.toast(error);
+				})
+			},
+			//获取列表
+			getList() {
+				this.isLoading = true;
+				API_statistic.companySuperviseListData(this.listForm).then(response => {
+					this.isLoading = false;
+					
+					if (response) {
+						if (this.listForm.pageIndex == 1) {
+							this.recordList = response.data;
+							this.listForm.pageIndex = response.pageNumber;
+							this.listForm.totalPage = response.totalPage;
+						} else {
+							this.recordList = [
+								...this.recordList,
+								...response.data
+							];
+						}
+					}
+					this.listForm.pageIndex++;
+					
+				}).catch(error => {
+					this.isLoading = false;
+					mui.toast(error);
+				})
+			},
+			//下拉事件
+			handleScrool() {
+				if (isReachBottom()) {
+					console.log('到达底部')
+					if (this.listForm.pageIndex <= this.listForm.totalPage && this.isLoading == false) {
+						this.getList();
+					} else {
+						return;
+					}
+				}
 			},
 			//退出登录
 			loginOut() {
@@ -167,11 +215,28 @@
 					mui.toast(error);
 				})
 			},
+			doLoginOut() {
+				var btnArray = ['否', '是'];
+				mui.confirm('是否确认退出登录', '提示', btnArray, function(e) {
+					if (e.index == 1) {
+						_this.loginOut();
+					}
+				})
+			},
 			asynCallBack() {},
 		},
-		mounted() {},
+		mounted() {
+			//获取统计详情
+			this.getInfo();
+			this.getList();
+			//监控下拉加载事件
+			var _this = this;
+			window.addEventListener('scroll', _this.handleScrool);
+		},
 		destroyed() {
-
+			//销毁监听事件
+			var _this = this;
+			window.removeEventListener('scroll', _this.handleScrool);
 		},
 		computed: {
 			...mapGetters({

+ 84 - 53
src/projects/business/views/Master/Company/RegisterStatistics.vue

@@ -6,73 +6,34 @@
 		<div class="mui-content vongi-zctj">
 			<div class="vongi-bagfff">
 				<div class="vongi-xzdw-search">
-					<input type="search" placeholder="搜索姓名或编号">
+					<input v-model="listForm.name" @keyup.enter="searchForm" type="search" placeholder="搜索姓名或编号">
 					<span class="mui-icon mui-icon-search"></span>
 				</div>
 			</div>
 			<div id="slider" class="mui-slider mui-fullscreen ">
 				<div id="sliderSegmentedControl" class="mui-scroll-wrapper mui-slider-indicator mui-segmented-control mui-segmented-control-inverted">
 					<div class="mui-scroll">
-						<a class="mui-control-item mui-active" href="#item1mobile">
-							未激活(98人)
+						<a @click="reloadList('0')" :class="'mui-control-item '+(listForm.status=='0'?'mui-active':'')">
+							未激活({{notActivation}}人)
 						</a>
-						<a class="mui-control-item" href="#item2mobile">
-							已激活(291人)
+						<a @click="reloadList('1')" :class="'mui-control-item '+(listForm.status=='1'?'mui-active':'')">
+							已激活({{activation}}人)
 						</a>
 					</div>
 				</div>
 				<div class="mui-slider-group">
-					<div id="item1mobile" class="mui-slider-item mui-control-content">
+					<div class="mui-slider-item mui-control-content">
 						<div class="mui-scroll-wrapper">
 							<div class="mui-scroll vongi-archives">
 								<ul class="mui-table-view">
-									<li class="mui-table-view-cell">
-										<a class="mui-navigate-right" href="#">
+									<li v-for="(item,index) in recordList" class="mui-table-view-cell">
+										<router-link :to="{name:'MasterCompanyRegisterStatisticsInfo',params:{detail:item}}" class="mui-navigate-right">
 											<div class="mui-pull-left flew-items">
-												<div class="mui-media-object"><img src="~$project/assets/img/01.png"></div> 高进权
+												<div class="mui-media-object"><img :src="item.faceImagUrl?item.faceImagUrl:require('$project/assets/img/default_face.png')"></div>
+												{{item.personName}}
 											</div>
-											<span class="mui-pull-right">员工</span>
-										</a>
-									</li>
-									<li class="mui-table-view-cell">
-										<a class="mui-navigate-right" href="#">
-											<div class="mui-pull-left flew-items">
-												<div class="mui-media-object"><img src="~$project/assets/img/01.png"></div> 高进权
-											</div>
-											<span class="mui-pull-right">员工</span>
-										</a>
-									</li>
-								</ul>
-							</div>
-						</div>
-					</div>
-					<div id="item2mobile" class="mui-slider-item mui-control-content">
-						<div class="mui-scroll-wrapper">
-							<div class="mui-scroll">
-								<ul class="mui-table-view">
-									<li class="mui-table-view-cell">
-										<a href="">
-											<div class="mui-media-body flew-sp">
-												<div class="mui-col-xs-9">欢迎加入恒大名都业主羽毛球群——羽你同行!欢迎加入恒大名都业主羽毛球群——羽你同行!</div>
-												<div class="mui-col-xs-3"><button type="button" class="mui-btn mui-btn-success mui-btn-outlined">已同意</button></div>
-											</div>
-											<p class="flew-items flew-sp">
-												发 起 人:李广宵 1-1-2201
-												<span class='mui-ellipsis'>2020-10-10 10:00:00</span>
-											</p>
-										</a>
-									</li>
-									<li class="mui-table-view-cell">
-										<a href="">
-											<div class="mui-media-body flew-sp">
-												<div class="mui-col-xs-9">欢迎加入恒大名都业主羽毛球群——羽你同行!欢迎加入恒大名都业主羽毛球群——羽你同行!</div>
-												<div class="mui-col-xs-3"><button type="button" class="mui-btn mui-btn-danger mui-btn-outlined">已拒绝</button></div>
-											</div>
-											<p class="flew-items flew-sp">
-												发 起 人:李广宵 1-1-2201
-												<span class='mui-ellipsis'>2020-10-10 10:00:00</span>
-											</p>
-										</a>
+											<span class="mui-pull-right" v-text="item.personRoleName"></span>
+										</router-link>
 									</li>
 								</ul>
 							</div>
@@ -93,6 +54,7 @@
 	import Common from '$project/components/Common.vue'
 	import Loading from '$project/components/Loading.vue'
 	import TopHeader from '$project/components/TopHeader.vue'
+	import isReachBottom from '$project/utils/isReachBottom'
 	import {
 		mapGetters,
 		mapMutations
@@ -109,15 +71,84 @@
 				isLoading: false,
 
 				pageTitle: '激活统计',
+
+				listForm: {
+					name: '',
+					status: '0',
+					pageIndex: '',
+					pageSize: 20,
+					totalPage: 1,
+				},
+				recordList: [],
+
+				activation: 0,
+				notActivation: 0
 			}
 		},
 		created() {},
 		methods: {
+			//获取列表
+			getList() {
+				this.isLoading = true;
+				API_Company.activationListData(this.listForm).then(response => {
+					this.isLoading = false;
+
+					this.activation = response.activation;
+					this.notActivation = response.notActivation;
+
+					if (response) {
+						if (this.listForm.pageIndex == 1) {
+							this.recordList = response.data;
+							this.listForm.pageIndex = response.pageNumber;
+							this.listForm.totalPage = response.totalPage;
+						} else {
+							this.recordList = [
+								...this.recordList,
+								...response.data
+							];
+						}
+					}
+					this.listForm.pageIndex++;
+
+				}).catch(error => {
+					this.isLoading = false;
+					mui.toast(error);
+				})
+			},
+			//重新加载列表
+			reloadList(status) {
+				this.listForm.status = status;
+				this.listForm.pageIndex = 1;
+				this.getList();
+			},
+			//搜索
+			searchForm() {
+				this.listForm.pageIndex = 1;
+				this.getList();
+			},
+			//下拉事件
+			handleScrool() {
+				if (isReachBottom()) {
+					console.log('到达底部')
+					if (this.listForm.pageIndex <= this.listForm.totalPage && this.isLoading == false) {
+						this.getList();
+					} else {
+						return;
+					}
+				}
+			},
 			asynCallBack() {},
 		},
-		mounted() {},
+		mounted() {
+			this.getList();
+			//监控下拉加载事件
+			var _this = this;
+			window.addEventListener('scroll', _this.handleScrool);
+		},
 		destroyed() {
-
+			//销毁监听事件
+			var _this = this;
+			window.removeEventListener('scroll', _this.handleScrool);
 		},
 		computed: {
 			...mapGetters({

+ 19 - 9
src/projects/business/views/Master/Company/RegisterStatisticsInfo.vue

@@ -6,10 +6,11 @@
 		<div class="mui-content vongi-kqtj-center">
 			<div class="vongi-jy-list">
 				<div class="vongi-wordcard flew-items vongi-yuan-img68">
-					<div class="mui-media-object mui-pull-left"><img src="~$project/assets/img/03.jpg" width="50" /></div>
+					<div class="mui-media-object mui-pull-left"><img :src="detail.faceImagUrl?detail.faceImagUrl:require('$project/assets/img/default_face.png')"
+						 width="50" /></div>
 					<div class="mui-media-body">
-						<h2>赵双龙</h2>
-						<p class='mui-ellipsis mui-h5'>信息工程中心 员工</p>
+						<h2 v-text="detail.personName"></h2>
+						<p class='mui-ellipsis mui-h5' v-text="detail.companyName+' '+detail.personRoleName"></p>
 					</div>
 				</div>
 			</div>
@@ -17,17 +18,17 @@
 				<ul class="mui-table-view">
 					<li class="mui-table-view-cell flew-sp">
 						注册状态
-						<div class="colorf8b155">未注册</div>
+						<div :class="detail.activationStatus=='1'?'color389E0D':'colorf8b155'" v-text="detail.activationStatus=='1'?'已激活':'未激活'"></div>
 					</li>
 				</ul>
 			</div>
 			<div class="vongi-me-list">
 				<ul class="mui-table-view">
 					<li class="mui-table-view-cell">
-						<a href="" class="">
-							客服热线
+						<a :href="'tel:'+detail.telephone">
+							联系方式
 							<span class="mui-pull-right">
-								<span>400-8899-619</span>
+								<span v-text="detail.telephone"></span>
 								<span class="mui-icon mui-icon-phone color4fc5f7"></span>
 							</span>
 						</a>
@@ -61,9 +62,15 @@
 				isLoading: false,
 
 				pageTitle: '个人资料',
+
+				detail: this.$route.params.detail,
+			}
+		},
+		created() {
+			if (!this.detail) {
+				this.$router.go(-1);
 			}
 		},
-		created() {},
 		methods: {
 			asynCallBack() {},
 		},
@@ -86,5 +93,8 @@
 
 <style scoped src="$project/assets/css/xpwyfyy.css"></style>
 <style src="$project/assets/css/iconfont.css"></style>
-<style>
+<style scoped>
+	.color389E0D {
+		color: #389E0D
+	}
 </style>