Browse Source

no message

MS-CIAZDCOIXVRW\Administrator 3 years atrás
parent
commit
f44bcea047
53 changed files with 684 additions and 282 deletions
  1. 3 0
      components/chocolate-progress-bar/chocolate-progress-bar.vue
  2. 3 0
      pages/my/my.vue
  3. 79 52
      pages/particulars/particulars.vue
  4. 1 1
      pages/punchTime/punchTime.vue
  5. 202 73
      pages/stat/stat.vue
  6. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map
  7. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map
  8. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/components/chocolate-progress-bar/chocolate-progress-bar.js.map
  9. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/components/tki-tree/tki-tree.js.map
  10. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/404/404.js.map
  11. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/addLocation/addLocation.js.map
  12. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/addRules/addRules.js.map
  13. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/authentication/authentication.js.map
  14. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/cardRecord/cardRecord.js.map
  15. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/editRules/editRules.js.map
  16. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/group/group.js.map
  17. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/home/home.js.map
  18. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/location/location.js.map
  19. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/my.js.map
  20. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/particulars/particulars.js.map
  21. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/powerSet/powerSet.js.map
  22. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/punchLocation/punchLocation.js.map
  23. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/punchTime/punchTime.js.map
  24. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/ruleName/ruleName.js.map
  25. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/ruleSet/ruleSet.js.map
  26. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/rulesDetail/rulesDetail.js.map
  27. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/setPunchTime/setPunchTime.js.map
  28. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/stat/stat.js.map
  29. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/statDetail/statDetail.js.map
  30. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/jlk-week/components/jlk-week/jlk-week.js.map
  31. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-calendar/components/uni-calendar/uni-calendar-item.js.map
  32. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-calendar/components/uni-calendar/uni-calendar.js.map
  33. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-collapse/components/uni-collapse-item/uni-collapse-item.js.map
  34. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-collapse/components/uni-collapse/uni-collapse.js.map
  35. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.js.map
  36. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-icons/components/uni-icons/uni-icons.js.map
  37. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-popup/components/uni-popup/uni-popup.js.map
  38. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-search-bar/components/uni-search-bar/uni-search-bar.js.map
  39. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-segmented-control/components/uni-segmented-control/uni-segmented-control.js.map
  40. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-swipe-action/components/uni-swipe-action-item/uni-swipe-action-item.js.map
  41. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/zwx-dropDown/components/zwx-dropDown/zwx-dropDown.js.map
  42. 2 0
      unpackage/dist/dev/mp-weixin/common/vendor.js
  43. 3 0
      unpackage/dist/dev/mp-weixin/components/chocolate-progress-bar/chocolate-progress-bar.js
  44. 2 1
      unpackage/dist/dev/mp-weixin/pages/my/my.js
  45. 92 50
      unpackage/dist/dev/mp-weixin/pages/particulars/particulars.js
  46. 1 1
      unpackage/dist/dev/mp-weixin/pages/particulars/particulars.wxml
  47. 11 0
      unpackage/dist/dev/mp-weixin/pages/particulars/particulars.wxss
  48. 1 1
      unpackage/dist/dev/mp-weixin/pages/punchTime/punchTime.js
  49. 225 66
      unpackage/dist/dev/mp-weixin/pages/stat/stat.js
  50. 1 1
      unpackage/dist/dev/mp-weixin/pages/stat/stat.wxml
  51. 13 0
      unpackage/dist/dev/mp-weixin/pages/stat/stat.wxss
  52. 7 0
      unpackage/dist/dev/mp-weixin/project.private.config.json
  53. 2 0
      util/api.js

+ 3 - 0
components/chocolate-progress-bar/chocolate-progress-bar.vue

@@ -40,6 +40,9 @@
 				ctx.draw();
 			},
 			drawCircle(step) {
+				if(step==0){
+					return
+				}
 				var ctx = uni.createCanvasContext('cpbar', this);
 				// 进度条的渐变(中心x坐标-半径-边宽,中心Y坐标,中心x坐标+半径+边宽,中心Y坐标)
 				var gradient = ctx.createLinearGradient(28, 55, 192, 55);

+ 3 - 0
pages/my/my.vue

@@ -58,6 +58,9 @@
 			};
 		},
 		onLoad() {
+			
+		},
+		onShow() {
 			let flag = uni.getStorageSync("manager")
 			let flag2 = uni.getStorageSync("sub-administrator")
 			if(flag||flag2){

+ 79 - 52
pages/particulars/particulars.vue

@@ -3,33 +3,39 @@
 		<!-- 顶部搜索框区域 -->
 		<view class="search">
 			<uni-search-bar bgColor="#fff" placeholder="请输入打卡规则名称" cancelButton="none" v-model="searchValue"
-				@input="input" @clear="clear" @blur="blur">
+				@input="input">
 			</uni-search-bar>
 		</view>
 
 		<!-- 规则列表区域 -->
-		<view class="list">
+		<view class="list" v-if="list.length">
 			<!-- 每一个规则区域 -->
-			<view class="box" v-for="item in list" :key="item.id" @click="handleLook">
+			<view class="box" v-for="(item,index) in list" :key="index" @click="handleLook">
 				<view class="icon">
 					<img src="./imgs/rule.png">
 				</view>
 				<view class="info">
 					<view class="title">
-						{{item.title}}
+						{{item.name}}
 					</view>
 					<view class="status">
-						<span class="right">全勤:{{item.allPeople}}人</span>
-						<span>异常:{{item.errPeople}}人</span>
+						<span class="right">全勤:{{item.peopleTotal}}人</span>
+						<span>异常:{{item.failCount}}人</span>
 					</view>
 				</view>
 				<!-- 右上角图标区域 -->
 				<view class="image">
-					<img v-if="item.status==1" src="./imgs/unfinished.png">
-					<img v-if="item.status==2" src="./imgs/finished.png">
+					<img v-if="item.failCount==0" src="./imgs/finished.png">
+					<img v-else src="./imgs/unfinished.png">
 				</view>
 			</view>
+		</view>
 
+		<view class="list2" v-else>
+			<img src="../../static/nodata.png">
+			<view class="info">
+				暂无数据
+			</view>
 		</view>
 	</view>
 </template>
@@ -38,61 +44,67 @@
 	export default {
 		data() {
 			return {
+				page: 1,
+				total: 0,
+				// 当前时间
+				nowTime: "",
 				searchValue: "",
-				list: [{
-						id: 1,
-						title: "课间操打卡",
-						allPeople: 500,
-						errPeople: 20,
-						status: 1
-					},
-					{
-						id: 2,
-						title: "课间操打卡",
-						allPeople: 600,
-						errPeople: 20,
-						status: 1
-					},
-					{
-						id: 3,
-						title: "课间操打卡",
-						allPeople: 100,
-						errPeople: 10,
-						status: 2
-					},
-					{
-						id: 4,
-						title: "课间操打卡",
-						allPeople: 600,
-						errPeople: 20,
-						status: 1
-					},
-				]
+				list: []
+			}
+		},
+		onLoad() {
+			this.getTime()
+			this.getData()
+		},
+		onReachBottom() {
+			if (this.list.length < this.total) {
+				this.page++
+				this.getData()
+			} else {
+				uni.showToast({
+					title: "没有更多数据了",
+					icon: 'none'
+				})
 			}
 		},
 		methods: {
+			// 获取当前年 月 日
+			getTime() {
+				let date = new Date()
+				let year = date.getFullYear()
+				let month = date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1
+				let day = date.getDate() < 10 ? '0' + date.getDate() : date.getDate()
+				this.nowTime = year + "-" + month + "-" + day + " " + "00:00:00"
+			},
+			// 获取列表数据
+			async getData() {
+				let res = await this.$myRequest({
+					url: "/attendance/api/sign/check/in/summary",
+					data: {
+						name: this.searchValue,
+						page: this.page,
+						time: this.nowTime,
+						type: 1
+					}
+				})
+				// console.log(res);
+				if (res.code == 200) {
+					this.list = [...this.list, ...res.data.list]
+					this.total = res.data.total
+				}
+			},
+
+			// 点击每一个规则回调
 			handleLook() {
 				uni.navigateTo({
 					url: "/pages/rulesDetail/rulesDetail"
 				})
 			},
-			// 搜索框失焦回调
-			blur(res) {
-				uni.showToast({
-					title: '搜索:' + res.value,
-					icon: 'none'
-				})
-			},
 			// 搜索框输入时的回调
 			input(res) {
-				console.log('----input:', res)
-			},
-			// 清除搜索框内容时的回调
-			clear(res) {
-				uni.showToast({
-					title: 'clear事件,清除值为:' + res.value,
-					icon: 'none'
-				})
+				this.list = []
+				this.page = 1
+				this.getData()
 			},
 		}
 	}
@@ -169,6 +181,21 @@
 				}
 			}
 		}
+
+		.list2 {
+			margin-top: 260rpx;
+			text-align: center;
+
+			img {
+				width: 480rpx;
+				height: 508rpx;
+			}
+
+			.info {
+				color: #5792F0;
+			}
+
+		}
 	}
 
 	// 解决输入框不居中问题

+ 1 - 1
pages/punchTime/punchTime.vue

@@ -87,7 +87,7 @@
 			}
 		},
 		onShow() {
-			let ruleTime = uni.getStorageSync("ruleTime_edit")
+			let ruleTime = uni.getStorageSync("ruleTime_edit")||uni.getStorageSync("ruleTime")
 			if (ruleTime) {
 				this.list = ruleTime
 			}

+ 202 - 73
pages/stat/stat.vue

@@ -66,7 +66,7 @@
 			<!-- 环形图区域 -->
 			<view class="progress" v-if="current==0">
 				<view class="chart">
-					<progressBar :progress_txt="progress_txt" :progress_total="progress_total" />
+					<progressBar v-if="showBar" :progress_txt="progress_txt" :progress_total="progress_total" />
 				</view>
 
 				<view class="look">
@@ -119,19 +119,26 @@
 				</view>
 			</view>
 
-			<view class="e_list">
-				<view class="e_box" v-for="item in errList" :key="item.id">
+			<view class="e_list" v-if="errList.length">
+				<view class="e_box" v-for="item in errList" :key="item.userId">
 					<view class="e_img">
-						<img :src="item.peopleImg">
+						<img
+							:src="item.headImage||'https://gimg2.baidu.com/image_search/src=http%3A%2F%2Finews.gtimg.com%2Fnewsapp_bt%2F0%2F13579194276%2F1000&refer=http%3A%2F%2Finews.gtimg.com&app=2002&size=f9999,10000&q=a80&n=0&g=0n&fmt=auto?sec=1671596163&t=52c9def84f0fa7832bfc5824364917e0'">
 					</view>
 					<view class="e_name">
 						{{item.name}}
 					</view>
 					<view class="e_msg">
-						未打卡{{item.num}}次
+						未打卡{{item.times}}次
 					</view>
 				</view>
+			</view>
 
+			<view class="e_list2" v-else>
+				<img src="../../static/nodata.png">
+				<view class="info">
+					暂无数据
+				</view>
 			</view>
 
 		</view>
@@ -167,66 +174,48 @@
 					}
 				],
 				// 考勤规则列表
-				list2: [{
-						id: 1,
-						msg: "规则:课间操考勤打卡09:00 - 09:15",
-						status: 0,
-						time: "09:25:25"
-					},
-					{
-						id: 2,
-						msg: "规则:考勤打卡19:00 - 20:15",
-						status: 1,
-						time: "19:25:25"
-					},
-				],
+				list2: [],
 				month: null,
 				items: ['团队统计', '我的统计'],
 				current: 1,
 				year: null,
 				month: null,
-				errList: [{
-						id: 1,
-						peopleImg: "https://gimg2.baidu.com/image_search/src=http%3A%2F%2Finews.gtimg.com%2Fnewsapp_bt%2F0%2F13579194276%2F1000&refer=http%3A%2F%2Finews.gtimg.com&app=2002&size=f9999,10000&q=a80&n=0&g=0n&fmt=auto?sec=1671596163&t=52c9def84f0fa7832bfc5824364917e0",
-						name: "程佳欢",
-						num: 20
-					},
-					{
-						id: 2,
-						peopleImg: "https://gimg2.baidu.com/image_search/src=http%3A%2F%2Finews.gtimg.com%2Fnewsapp_bt%2F0%2F13579194276%2F1000&refer=http%3A%2F%2Finews.gtimg.com&app=2002&size=f9999,10000&q=a80&n=0&g=0n&fmt=auto?sec=1671596163&t=52c9def84f0fa7832bfc5824364917e0",
-						name: "程欢",
-						num: 10
-					},
-					{
-						id: 3,
-						peopleImg: "https://gimg2.baidu.com/image_search/src=http%3A%2F%2Finews.gtimg.com%2Fnewsapp_bt%2F0%2F13579194276%2F1000&refer=http%3A%2F%2Finews.gtimg.com&app=2002&size=f9999,10000&q=a80&n=0&g=0n&fmt=auto?sec=1671596163&t=52c9def84f0fa7832bfc5824364917e0",
-						name: "张三",
-						num: 30
-					},
-					{
-						id: 4,
-						peopleImg: "https://gimg2.baidu.com/image_search/src=http%3A%2F%2Finews.gtimg.com%2Fnewsapp_bt%2F0%2F13579194276%2F1000&refer=http%3A%2F%2Finews.gtimg.com&app=2002&size=f9999,10000&q=a80&n=0&g=0n&fmt=auto?sec=1671596163&t=52c9def84f0fa7832bfc5824364917e0",
-						name: "李四",
-						num: 30
-					},
-				],
-				progress_txt: 50,
-				progress_total: 70,
+				day: null,
+				errList: [],
+				progress_txt: 0,
+				progress_total: 0,
 				// 当前时间
 				nowTime: "",
 				// 打卡异常次数
 				fail_count: 0,
 				// 打卡成功次数
-				success_count: 0
+				success_count: 0,
+				page: 1,
+				total: 0,
+				page_my: 1,
+				total_my: 0,
+				showBar: true
 			};
 		},
 		onLoad() {
+			this.getTime()
+		},
+		onShow() {
+			let flag = uni.getStorageSync("manager")
+			let flag2 = uni.getStorageSync("sub-administrator")
+			if (flag || flag2) {
+				this.flag = true
+			}
 			if (this.flag) {
 				this.current = 0
+				this.getMonthTimes_team()
+				this.getProportion()
+				this.getErrList()
+			} else {
+				this.current = 1
+				this.getMonthTimes()
+				this.getRulesList()
 			}
-			this.getTime()
-			this.getMonthTimes()
-			this.getRulesList()
 		},
 		computed: {
 			comMonth() {
@@ -234,6 +223,39 @@
 					let month = this.month < 10 ? '0' + this.month : this.month
 					return month
 				}
+			},
+		},
+		watch: {
+			progress_txt() {
+				this.showBar = false
+				this.showBar = true
+			},
+			progress_total() {
+				this.showBar = false
+				this.showBar = true
+			},
+		},
+		onReachBottom() {
+			if (this.current == 0) {
+				if (this.errList.length < this.total) {
+					this.page++
+					this.getErrList()
+				} else {
+					uni.showToast({
+						title: "没有更多数据了",
+						icon: 'none'
+					})
+				}
+			} else {
+				if (this.list2.length < this.total_my) {
+					this.page_my++
+					this.getRulesList()
+				} else {
+					uni.showToast({
+						title: "没有更多数据了",
+						icon: 'none'
+					})
+				}
 			}
 		},
 		methods: {
@@ -243,9 +265,10 @@
 				let year = date.getFullYear()
 				let month = date.getMonth() + 1
 				let day = date.getDate() < 10 ? '0' + date.getDate() : date.getDate()
-				this.nowTime = year + "-" + month + "-" + day + " " + "00:00:00"
 				this.year = year
 				this.month = month
+				this.day = day
+				this.nowTime = year + "-" + this.comMonth + "-" + day + " " + "00:00:00"
 			},
 
 			// 获取我的月打卡次数
@@ -263,38 +286,99 @@
 				}
 			},
 
+			// 获取我的团队月打卡次数
+			async getMonthTimes_team() {
+				let res = await this.$myRequest({
+					url: "/attendance/api/sign/check/in/month/times/team",
+					data: {
+						time: this.nowTime
+					}
+				})
+				// console.log(res);
+				if (res.code == 200) {
+					this.fail_count = res.data.fail
+					this.success_count = res.data.success
+				}
+			},
+			// 获取团队打卡每日完成占比
+			async getProportion() {
+				let res = await this.$myRequest({
+					url: "/attendance/api/sign/check/in/proportion",
+					data: {
+						time: this.nowTime
+					}
+				})
+				// console.log(res);
+				if (res.code == 200) {
+					this.progress_txt = res.data.complete
+					this.progress_total = res.data.total
+				}
+			},
+
+			// 获取打卡异常人员名单
+			async getErrList() {
+				let res = await this.$myRequest({
+					url: "/attendance/api/sign/check/in/abnormal",
+					data: {
+						time: this.nowTime,
+						page: this.page,
+						size: 9
+					}
+				})
+				// console.log(res);
+				if (res.code == 200) {
+					this.total = res.data.total
+					this.errList = [...this.errList, ...res.data.list]
+				}
+			},
+
 			// 获取打卡规则列表
 			async getRulesList() {
 				let name = uni.getStorageSync("userInfo").username
 				let res = await this.$myRequest({
 					url: "/attendance/api/sign/check/in/list",
 					data: {
-						name: name ? name : "",
-						size: 999,
-						beginTimeBegin: this.nowTime
+						name: name ? name : "甘昱新",
+						page: this.page_my,
+						updateTimeBegin: this.nowTime
 					}
 				})
 				// console.log(res);
 				if (res.code == 200) {
-					this.list2 = res.data.list
+					this.list2 = [...this.list2, ...res.data.list]
+					this.total_my = res.data.total
 				}
 			},
 
 			// 点击日历日期回调
 			change(e) {
-				console.log('change 返回:', e.fulldate)
+				// console.log('change 返回:', e.fulldate)
 				this.nowTime = e.fulldate + " " + "00:00:00"
-				this.getRulesList()
+				if (this.current == 0) {
+					this.getProportion()
+				} else {
+					this.page_my = 1
+					this.getRulesList()
+				}
 			},
+			// 分段器点击回调
 			onClickItem(e) {
-				console.log(e.currentIndex);
+				this.fail_count = ""
+				this.success_count = ""
+				this.list2 = []
+				this.errList = []
+				// console.log(e.currentIndex);
 				this.current = e.currentIndex
-				// if (e.currentIndex == 0) {
-				// 	this.list = this.list2
-				// } else {
-				// 	this.list = this.list3
-				// }
+				if (e.currentIndex == 0) {
+					this.getMonthTimes_team()
+					this.getProportion()
+					this.getErrList()
+				} else {
+					this.getMonthTimes()
+					this.getRulesList()
+				}
 			},
+
 			// 跳转统计详情页面
 			goToDetail() {
 				if (this.current == 1) {
@@ -307,6 +391,8 @@
 					})
 				}
 			},
+
+			// 往后选择年份回调
 			handleDoubleLeft() {
 				if (this.year <= 2000) {
 					uni.showToast({
@@ -315,8 +401,28 @@
 					})
 				} else {
 					this.year -= 1
+					this.nowTime = this.year + "-" + this.comMonth + "-" + this.day + " " + "00:00:00"
+					this.page = 1
+					this.errList = []
+					this.getErrList()
 				}
 			},
+			// 往前选择年份回调
+			handleDoubleRight() {
+				if (this.year >= 2025) {
+					uni.showToast({
+						title: "不能选择2025年之后",
+						icon: 'none'
+					})
+				} else {
+					this.year += 1
+					this.nowTime = this.year + "-" + this.comMonth + "-" + this.day + " " + "00:00:00"
+					this.page = 1
+					this.errList = []
+					this.getErrList()
+				}
+			},
+			// 往后选择月份回调
 			handleLeft() {
 				if (this.month <= 1) {
 					if (this.year <= 2000) {
@@ -327,12 +433,20 @@
 					} else {
 						this.year -= 1
 						this.month = 12
+						this.nowTime = this.year + "-" + this.comMonth + "-" + this.day + " " + "00:00:00"
+						this.page = 1
+						this.errList = []
+						this.getErrList()
 					}
 				} else {
 					this.month -= 1
+					this.nowTime = this.year + "-" + this.comMonth + "-" + this.day + " " + "00:00:00"
+					this.page = 1
+					this.errList = []
+					this.getErrList()
 				}
 			},
-
+			// 往前选择月份回调
 			handleRight() {
 				if (this.month >= 12) {
 					if (this.year >= 2025) {
@@ -343,21 +457,20 @@
 					} else {
 						this.year += 1
 						this.month = 1
+						this.nowTime = this.year + "-" + this.comMonth + "-" + this.day + " " + "00:00:00"
+						this.page = 1
+						this.errList = []
+						this.getErrList()
 					}
 				} else {
 					this.month += 1
+					this.nowTime = this.year + "-" + this.comMonth + "-" + this.day + " " + "00:00:00"
+					this.page = 1
+					this.errList = []
+					this.getErrList()
 				}
 			},
-			handleDoubleRight() {
-				if (this.year >= 2025) {
-					uni.showToast({
-						title: "不能选择2025年之后",
-						icon: 'none'
-					})
-				} else {
-					this.year += 1
-				}
-			},
+
 		}
 	}
 </script>
@@ -673,6 +786,22 @@
 					}
 				}
 			}
+
+			.e_list2 {
+				margin: 0 auto;
+				margin-top: 200rpx;
+				text-align: center;
+
+				img {
+					width: 480rpx;
+					height: 508rpx;
+				}
+
+				.info {
+					padding-bottom: 50rpx;
+					color: #5792F0;
+				}
+			}
 		}
 	}
 

File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/components/chocolate-progress-bar/chocolate-progress-bar.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/components/tki-tree/tki-tree.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/404/404.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/addLocation/addLocation.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/addRules/addRules.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/authentication/authentication.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/cardRecord/cardRecord.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/editRules/editRules.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/group/group.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/home/home.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/location/location.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/my.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/particulars/particulars.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/powerSet/powerSet.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/punchLocation/punchLocation.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/punchTime/punchTime.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/ruleName/ruleName.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/ruleSet/ruleSet.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/rulesDetail/rulesDetail.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/setPunchTime/setPunchTime.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/stat/stat.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/statDetail/statDetail.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/jlk-week/components/jlk-week/jlk-week.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-calendar/components/uni-calendar/uni-calendar-item.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-calendar/components/uni-calendar/uni-calendar.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-collapse/components/uni-collapse-item/uni-collapse-item.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-collapse/components/uni-collapse/uni-collapse.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-icons/components/uni-icons/uni-icons.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-popup/components/uni-popup/uni-popup.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-search-bar/components/uni-search-bar/uni-search-bar.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-segmented-control/components/uni-segmented-control/uni-segmented-control.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-swipe-action/components/uni-swipe-action-item/uni-swipe-action-item.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/zwx-dropDown/components/zwx-dropDown/zwx-dropDown.js.map


+ 2 - 0
unpackage/dist/dev/mp-weixin/common/vendor.js

@@ -10744,6 +10744,8 @@ var myRequest = function myRequest(options) {
               },
               success: function success(res) {
                 if (res.data.code == 200) {
+                  uni.removeStorageSync("manager");
+                  uni.removeStorageSync("sub-administrator");
                   uni.showModal({
                     title: "提示",
                     content: "用户权限变更,请重新授权",

+ 3 - 0
unpackage/dist/dev/mp-weixin/components/chocolate-progress-bar/chocolate-progress-bar.js

@@ -162,6 +162,9 @@ var _default = {
       ctx.draw();
     },
     drawCircle: function drawCircle(step) {
+      if (step == 0) {
+        return;
+      }
       var ctx = uni.createCanvasContext('cpbar', this);
       // 进度条的渐变(中心x坐标-半径-边宽,中心Y坐标,中心x坐标+半径+边宽,中心Y坐标)
       var gradient = ctx.createLinearGradient(28, 55, 192, 55);

+ 2 - 1
unpackage/dist/dev/mp-weixin/pages/my/my.js

@@ -219,7 +219,8 @@ var _default = {
       }]
     };
   },
-  onLoad: function onLoad() {
+  onLoad: function onLoad() {},
+  onShow: function onShow() {
     var flag = uni.getStorageSync("manager");
     var flag2 = uni.getStorageSync("sub-administrator");
     if (flag || flag2) {

+ 92 - 50
unpackage/dist/dev/mp-weixin/pages/particulars/particulars.js

@@ -126,22 +126,28 @@ var render = function () {
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
   var m0 = __webpack_require__(/*! ./imgs/rule.png */ 139)
-  var l0 = _vm.__map(_vm.list, function (item, __i0__) {
-    var $orig = _vm.__get_orig(item)
-    var m1 = item.status == 1 ? __webpack_require__(/*! ./imgs/unfinished.png */ 140) : null
-    var m2 = item.status == 2 ? __webpack_require__(/*! ./imgs/finished.png */ 141) : null
-    return {
-      $orig: $orig,
-      m1: m1,
-      m2: m2,
-    }
-  })
+  var l0 = _vm.list.length
+    ? _vm.__map(_vm.list, function (item, index) {
+        var $orig = _vm.__get_orig(item)
+        var m1 = item.failCount == 0 ? __webpack_require__(/*! ./imgs/finished.png */ 141) : null
+        var m2 = !(item.failCount == 0)
+          ? __webpack_require__(/*! ./imgs/unfinished.png */ 140)
+          : null
+        return {
+          $orig: $orig,
+          m1: m1,
+          m2: m2,
+        }
+      })
+    : null
+  var m3 = !_vm.list.length ? __webpack_require__(/*! ../../static/nodata.png */ 167) : null
   _vm.$mp.data = Object.assign(
     {},
     {
       $root: {
         m0: m0,
         l0: l0,
+        m3: m3,
       },
     }
   )
@@ -180,10 +186,20 @@ __webpack_require__.r(__webpack_exports__);
 "use strict";
 /* WEBPACK VAR INJECTION */(function(uni) {
 
+var _interopRequireDefault = __webpack_require__(/*! @babel/runtime/helpers/interopRequireDefault */ 3);
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
+var _regenerator = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/regenerator */ 39));
+var _toConsumableArray2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/toConsumableArray */ 17));
+var _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/asyncToGenerator */ 41));
+//
+//
+//
+//
+//
+//
 //
 //
 //
@@ -223,57 +239,83 @@ exports.default = void 0;
 var _default = {
   data: function data() {
     return {
+      page: 1,
+      total: 0,
+      // 当前时间
+      nowTime: "",
       searchValue: "",
-      list: [{
-        id: 1,
-        title: "课间操打卡",
-        allPeople: 500,
-        errPeople: 20,
-        status: 1
-      }, {
-        id: 2,
-        title: "课间操打卡",
-        allPeople: 600,
-        errPeople: 20,
-        status: 1
-      }, {
-        id: 3,
-        title: "课间操打卡",
-        allPeople: 100,
-        errPeople: 10,
-        status: 2
-      }, {
-        id: 4,
-        title: "课间操打卡",
-        allPeople: 600,
-        errPeople: 20,
-        status: 1
-      }]
+      list: []
     };
   },
+  onLoad: function onLoad() {
+    this.getTime();
+    this.getData();
+  },
+  onReachBottom: function onReachBottom() {
+    if (this.list.length < this.total) {
+      this.page++;
+      this.getData();
+    } else {
+      uni.showToast({
+        title: "没有更多数据了",
+        icon: 'none'
+      });
+    }
+  },
   methods: {
+    // 获取当前年 月 日
+    getTime: function getTime() {
+      var date = new Date();
+      var year = date.getFullYear();
+      var month = date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1;
+      var day = date.getDate() < 10 ? '0' + date.getDate() : date.getDate();
+      this.nowTime = year + "-" + month + "-" + day + " " + "00:00:00";
+    },
+    // 获取列表数据
+    getData: function getData() {
+      var _this = this;
+      return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
+        var res;
+        return _regenerator.default.wrap(function _callee$(_context) {
+          while (1) {
+            switch (_context.prev = _context.next) {
+              case 0:
+                _context.next = 2;
+                return _this.$myRequest({
+                  url: "/attendance/api/sign/check/in/summary",
+                  data: {
+                    name: _this.searchValue,
+                    page: _this.page,
+                    time: _this.nowTime,
+                    type: 1
+                  }
+                });
+              case 2:
+                res = _context.sent;
+                // console.log(res);
+                if (res.code == 200) {
+                  _this.list = [].concat((0, _toConsumableArray2.default)(_this.list), (0, _toConsumableArray2.default)(res.data.list));
+                  _this.total = res.data.total;
+                }
+              case 4:
+              case "end":
+                return _context.stop();
+            }
+          }
+        }, _callee);
+      }))();
+    },
+    // 点击每一个规则回调
     handleLook: function handleLook() {
       uni.navigateTo({
         url: "/pages/rulesDetail/rulesDetail"
       });
     },
-    // 搜索框失焦回调
-    blur: function blur(res) {
-      uni.showToast({
-        title: '搜索:' + res.value,
-        icon: 'none'
-      });
-    },
     // 搜索框输入时的回调
     input: function input(res) {
-      console.log('----input:', res);
-    },
-    // 清除搜索框内容时的回调
-    clear: function clear(res) {
-      uni.showToast({
-        title: 'clear事件,清除值为:' + res.value,
-        icon: 'none'
-      });
+      this.list = [];
+      this.page = 1;
+      this.getData();
     }
   }
 };

File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/mp-weixin/pages/particulars/particulars.wxml


+ 11 - 0
unpackage/dist/dev/mp-weixin/pages/particulars/particulars.wxss

@@ -60,6 +60,17 @@
   width: 100%;
   height: 100%;
 }
+.container .list2.data-v-553e5b04 {
+  margin-top: 260rpx;
+  text-align: center;
+}
+.container .list2 ._img.data-v-553e5b04 {
+  width: 480rpx;
+  height: 508rpx;
+}
+.container .list2 .info.data-v-553e5b04 {
+  color: #5792F0;
+}
 .data-v-553e5b04 .uni-searchbar {
   padding: 10rpx;
 }

+ 1 - 1
unpackage/dist/dev/mp-weixin/pages/punchTime/punchTime.js

@@ -275,7 +275,7 @@ var _default = {
     }
   },
   onShow: function onShow() {
-    var ruleTime = uni.getStorageSync("ruleTime_edit");
+    var ruleTime = uni.getStorageSync("ruleTime_edit") || uni.getStorageSync("ruleTime");
     if (ruleTime) {
       this.list = ruleTime;
     }

File diff suppressed because it is too large
+ 225 - 66
unpackage/dist/dev/mp-weixin/pages/stat/stat.js


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/mp-weixin/pages/stat/stat.wxml


+ 13 - 0
unpackage/dist/dev/mp-weixin/pages/stat/stat.wxss

@@ -264,6 +264,19 @@
   font-size: 24rpx;
   color: #808080;
 }
+.container .errPeople .e_list2.data-v-44536cf4 {
+  margin: 0 auto;
+  margin-top: 200rpx;
+  text-align: center;
+}
+.container .errPeople .e_list2 ._img.data-v-44536cf4 {
+  width: 480rpx;
+  height: 508rpx;
+}
+.container .errPeople .e_list2 .info.data-v-44536cf4 {
+  padding-bottom: 50rpx;
+  color: #5792F0;
+}
 .data-v-44536cf4 .uni-calendar-item--isDay {
   border-radius: 50rpx;
 }

+ 7 - 0
unpackage/dist/dev/mp-weixin/project.private.config.json

@@ -63,6 +63,13 @@
                     "query": "",
                     "launchMode": "default",
                     "scene": null
+                },
+                {
+                    "name": "",
+                    "pathName": "pages/stat/stat",
+                    "query": "",
+                    "launchMode": "default",
+                    "scene": null
                 }
             ]
         }

+ 2 - 0
util/api.js

@@ -31,6 +31,8 @@ export const myRequest = (options) => {
 							},
 							success: (res) => {
 								if (res.data.code == 200) {
+									uni.removeStorageSync("manager")
+									uni.removeStorageSync("sub-administrator")
 									uni.showModal({
 										title: "提示",
 										content: "用户权限变更,请重新授权",