no message

pages/addLocation/addLocation.vue

@@ -51,8 +51,10 @@
 	export default {
 		data() {
 			return {
+				// 当前位置的经纬度
 				latitude: null,
 				longitude: null,
+				// 标记点的配置
 				covers: [{
 					id: 1,
 					latitude: null,
@@ -65,7 +67,6 @@
 						display: "ALWAYS"
 					}
 				}],
-				imgUrl: "",
 				// 搜索框绑定的值
 				searchValue: "",
 				// 范围选择数组
@@ -74,17 +75,16 @@
 				placeList: [],
 				// 范围数值
 				rangeValue: 300,
+				// 选中的地点数组
 				chooseList: [],
-				type: ""
 			}
 		},
-		onLoad(options) {
+		onLoad() {
 			// 实例化API核心类
 			qqmapsdk = new QQMapWX({
 				// 申请的key
 				key: 'R43BZ-2XROX-L7T45-T5OQI-IBDFT-GNBOI'
 			});
-			this.type = options.type
 			this.getLocationData()
 		},
 		methods: {
@@ -93,7 +93,6 @@
 				qqmapsdk.reverseGeocoder({
 					success: (res) => {
 						// console.log(res);
-						// console.log(res.result);
 						if (res.status == 0) {
 							// 获取地址经纬度
 							this.latitude = res.result.location.lat
@@ -132,7 +131,6 @@
 					poi_options: "policy=2",
 					success: (res) => {
 						// console.log(res.result);
-						// console.log(res.result.pois);
 						if (res.status == 0) {
 							this.placeList = res.result.pois
 							this.covers[0].callout.content = res.result.address
@@ -147,34 +145,19 @@
 			},
 			// 选择单个地址时的回调
 			handleChoose(item) {
-				// console.log(item);
-				if (this.type == 1) {
-					let arr = uni.getStorageSync("chooseList_edit")
-					if (arr.length) {
-						this.chooseList = arr
-					}
-					this.chooseList.push({
-						name: item.title,
-						address: item.address,
-						radius: this.rangeValue,
-						lat: item.location.lat,
-						lng: item.location.lng,
-					})
-					uni.setStorageSync("chooseList_edit", this.chooseList)
-				} else {
-					let arr = uni.getStorageSync("chooseList")
-					if (arr.length) {
-						this.chooseList = arr
-					}
-					this.chooseList.push({
-						name: item.title,
-						address: item.address,
-						radius: this.rangeValue,
-						lat: item.location.lat,
-						lng: item.location.lng,
-					})
-					uni.setStorageSync("chooseList", this.chooseList)
+				let arr = uni.getStorageSync("chooseList")
+				if (arr.length) {
+					this.chooseList = arr
 				}
+				this.chooseList.push({
+					name: item.title,
+					address: item.address,
+					radius: this.rangeValue,
+					lat: item.location.lat,
+					lng: item.location.lng,
+				})
+				uni.setStorageSync("chooseList", this.chooseList)
+
 				uni.navigateBack({
 					delta: 1
 				})

pages/addRules/addRules.vue

@@ -45,11 +45,11 @@
 				</view>
 				<view class="ele black" v-else>
 					<span v-for="(item,index) in time" :key="index">
-						<span v-for="(item_week,index_week) in item.selectedWeeks" :key="index_week">
-							{{item_week}}
+						<span v-for="(item_week,index_week) in item.dayOfWeeks" :key="index_week">
+							{{arr[item_week]}}
 						</span>
-						<span v-for="(item_time,index_time) in item.list" :key="index_time">
-							{{item_time.beginTime}}-{{item_time.endTime}}
+						<span v-for="(item_time,index_time) in item.periods" :key="index_time">
+							{{format_time(item_time.beginTime)}}-{{format_time(item_time.endTime)}}
 						</span>
 					</span>
 				</view>
@@ -95,6 +95,14 @@
 			</picker>
 		</view>
 
+		<view class="box">
+			<view class="name">
+				除去法定节假：
+			</view>
+			<view class="val2">
+				<switch style="transform:scale(0.8)" color="#3396FB" :checked="holiday" @change="switchChange" />
+			</view>
+		</view>
 
 		<!-- 确认按钮区域 -->
 		<view class="button" @click="handleConfirm">
@@ -122,77 +130,54 @@
 				array: ['5分钟', '10分钟', '15分钟', '20分钟'],
 				// 提前通知时间选择数组默认选择的索引
 				index: 0,
+				// 考勤组id数组
 				groupIds: [],
-				timeGroups: [],
-				locations: []
+				// 打卡地点数组
+				locations: [],
+				// 是否同步节假日
+				holiday: false,
+				// 星期映射数组
+				arr: ["", "星期一", "星期二", "星期三", "星期四", "星期五", "星期六", "星期天"]
 			};
 		},
 		onLoad() {
-			uni.removeStorageSync("flag_place")
-		},
-		onShow() {
-			let ruleName = uni.getStorageSync("ruleName")
-			if (ruleName) {
-				this.ruleName = ruleName
-			}
+			// 监听updateRuleName事件修改规则名称
+			uni.$on('updateRuleName', (data) => {
+				this.ruleName = data
+			})
 
-			let ruleGroup = uni.getStorageSync("ruleGroup")
-			if (ruleGroup) {
+			// 监听updateRuleGroup事件修改考勤组
+			uni.$on('updateRuleGroup', (data) => {
 				let temList = []
 				this.groupIds = []
-				ruleGroup.forEach((ele) => {
+				data.forEach((ele) => {
 					temList.push(ele.name)
 					this.groupIds.push(ele.id)
 				})
 				this.group = temList.join("，")
-			}
-
+			})
+		},
+		onShow() {
+			// 从缓存获取打卡时间数据
 			let ruleTime = uni.getStorageSync("ruleTime")
+			// 从缓存获取打卡时间数据是否为空的标识 true为空数组 false不为空
+			let flag = uni.getStorageSync("flag")
+
+			// 如果打卡时间数组不为空,将数组赋值给time
 			if (ruleTime) {
 				this.time = ruleTime
-				let temList = []
-				ruleTime.forEach((ele) => {
-					temList.push({
-						dayOfWeeks: ele.selectedWeeks,
-						periods: ele.list
-					})
-				})
-				temList.forEach((item) => {
-					item.dayOfWeeks = item.dayOfWeeks.map((element) => {
-						if (element == '星期一') {
-							return element = 1
-						}
-						if (element == '星期二') {
-							return element = 2
-						}
-						if (element == '星期三') {
-							return element = 3
-						}
-						if (element == '星期四') {
-							return element = 4
-						}
-						if (element == '星期五') {
-							return element = 5
-						}
-						if (element == '星期六') {
-							return element = 6
-						}
-						if (element == '星期天') {
-							return element = 7
-						}
-					})
-				})
-				this.timeGroups = temList
+			}
+			// 如果打卡时间数组为空,修改time的值
+			if (ruleTime.length == 0 && flag) {
+				this.time = "未设置"
 			}
 
+			// 从缓存获取打卡地点数据
 			let temPlace = uni.getStorageSync("chooseList")
-			let flag = uni.getStorageSync("flag_place")
-
-			if (temPlace.length == 0 && flag) {
-				this.place = "未设置"
-				uni.removeStorageSync("chooseList")
-			}
-			if (temPlace.length > 0) {
+			// 从缓存获取打卡地点数据是否为空的标识 true为空数组 false不为空
+			let flag_place = uni.getStorageSync("flag_place")
+			// 如果打卡地点数组不为空,将数组赋值给locations
+			if (temPlace) {
 				this.locations = temPlace
 				let temList = []
 				temPlace.forEach((ele) => {
@@ -200,11 +185,9 @@
 				})
 				this.place = temList.join("，")
 			}
-
-
-			let ruleValue = uni.getStorageSync("ruleValue")
-			if (ruleValue) {
-				this.value = ruleValue
+			// 如果打卡地点数组为空,修改place的值
+			if (temPlace.length == 0 && flag_place) {
+				this.place = "未设置"
 			}
 		},
 		methods: {
@@ -255,16 +238,6 @@
 					content: '确定新增吗？',
 					success: async (res) => {
 						if (res.confirm) {
-							let temList = []
-							this.timeGroups.forEach((ele) => {
-								ele.periods.forEach((item) => {
-									temList.push({
-										beginTime: this.formatTime(item.beginTime),
-										endTime: this.formatTime(item.endTime)
-									})
-								})
-								ele.periods = temList
-							})
 							let res = await this.$myRequest({
 								url: "/attendance/api/settings/rule/add",
 								method: "post",
@@ -278,7 +251,7 @@
 									// 考勤组ID列表
 									groupIds: this.groupIds,
 									// 是否同步节假日
-									holiday: true,
+									holiday: this.holiday,
 									// 是否可选择本地图片
 									localPicture: false,
 									// 规则名称
@@ -290,7 +263,7 @@
 									// 打卡地点列表
 									locations: this.locations,
 									// 打卡时间列表
-									timeGroups: this.timeGroups
+									timeGroups: this.time
 								},
 							})
 							// console.log(res)
@@ -299,18 +272,13 @@
 									title: "添加成功",
 									icon: 'success'
 								})
-								uni.removeStorageSync('ruleName');
-								uni.removeStorageSync('ruleGroup');
-								uni.removeStorageSync('ruleTime');
-								uni.removeStorageSync('chooseList');
-								uni.removeStorageSync('ruleValue');
 								setTimeout(() => {
 									uni.navigateBack({
 										delta: 1
 									})
 								}, 1500)
 							}
-						} else if (res.cancel) {}
+						}
 					}
 				});
 			},
@@ -320,30 +288,34 @@
 				this.value = this.array[index]
 				let index2 = this.value.indexOf("分", 0)
 				this.value = this.value.substring(0, index2);
-				uni.setStorageSync("ruleValue", this.value)
+			},
+			// switch的值改变回调
+			switchChange(e) {
+				this.holiday = e.detail.value
+				// console.log(this.holiday);
 			},
 			// 点击规则名称跳转回调
 			goPageRuleName() {
 				uni.navigateTo({
-					url: `/pages/ruleName/ruleName?type=2`
+					url: `/pages/ruleName/ruleName`
 				})
 			},
 			// 点击考勤组跳转回调
 			goPageGroup() {
 				uni.navigateTo({
-					url: `/pages/group/group?flag=2&type=2`
+					url: `/pages/group/group?flag=2`
 				})
 			},
 			// 点击打卡时间跳转回调
 			goPagePunchTime() {
 				uni.navigateTo({
-					url: "/pages/punchTime/punchTime?&type=2"
+					url: "/pages/punchTime/punchTime"
 				})
 			},
 			// 点击打卡地点跳转回调
 			goPagePunchLocation() {
 				uni.navigateTo({
-					url: "/pages/punchLocation/punchLocation?type=2"
+					url: "/pages/punchLocation/punchLocation"
 				})
 			},
 			// 格式化时间
@@ -353,6 +325,15 @@
 				let date = new Date(tem);
 				let time = date.getTime();
 				return time
+			},
+			// 格式化时间
+			format_time(timestamp) {
+				//时间戳为10位需*1000，时间戳为13位的话不需乘1000
+				var date = new Date(timestamp);
+				var h = (date.getHours() < 10 ? '0' + date.getHours() : date.getHours()) + ':';
+				var m = (date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes());
+				let strDate = h + m;
+				return strDate;
 			}
 		}
 	}
@@ -412,6 +393,12 @@
 					}
 				}
 			}
+
+			.val2 {
+				flex: 1;
+				margin-right: 20rpx;
+				text-align: end;
+			}
 		}
 
 		.button {

pages/editRules/editRules.vue

@@ -45,9 +45,13 @@
 					{{time}}
 				</view>
 				<view class="ele black" v-else>
-					<span>{{time.join("，")}}</span>
-					<span v-for="(item,index) in periods" :key="index">
-						{{item.beginTime}}-{{item.endTime}}
+					<span v-for="(item,index) in time" :key="index">
+						<span v-for="(item_week,index_week) in item.dayOfWeeks" :key="index_week">
+							{{arr[item_week]}}
+						</span>
+						<span v-for="(item_time,index_time) in item.periods" :key="index_time">
+							{{format_time(item_time.beginTime)}}-{{format_time(item_time.endTime)}}
+						</span>
 					</span>
 				</view>
 				<view class="right">
@@ -90,9 +94,16 @@
 					</view>
 				</view>
 			</picker>
-
 		</view>
-
+		
+		<view class="box">
+			<view class="name">
+				除去法定节假：
+			</view>
+			<view class="val2">
+				<switch style="transform:scale(0.8)" color="#3396FB" :checked="holiday" @change="switchChange" />
+			</view>
+		</view>
 
 		<!-- 确认按钮区域 -->
 		<view class="button" @click="handleConfirm">
@@ -111,7 +122,6 @@
 	export default {
 		data() {
 			return {
-				info: {},
 				// 规则名称
 				ruleName: "未设置",
 				// 考勤组
@@ -124,19 +134,21 @@
 				value: "未设置",
 				// 提前通知选项
 				array: ['5分钟', '10分钟', '15分钟', '20分钟'],
-				periods: [],
+				// 提前通知时间选择数组默认选择的索引
 				index: 0,
+				// 当前规则ID
 				id: "",
+				// 考勤组id数组
 				groupIds: [],
-				timeGroups: [],
-				locations: []
+				// 打卡地点数组
+				locations: [],
+				// 是否同步节假日
+				holiday: false,
+				// 星期映射数组
+				arr: ["", "星期一", "星期二", "星期三", "星期四", "星期五", "星期六", "星期天"]
 			};
 		},
 		onLoad(option) {
-			uni.removeStorageSync("chooseList_edit")
-			uni.removeStorageSync("ruleTime_edit")
-			uni.removeStorageSync("flag")
-
 			uni.$on('updateRuleName', (data) => {
 				this.ruleName = data
 			})
@@ -151,29 +163,13 @@
 				this.group = temList.join("，")
 			})
 
-			this.info = JSON.parse(option.info)
-			console.log(this.info);
-			if (this.info) {
-				this.ruleName = this.info.name
-				this.group = this.info.groups
-				this.place = this.info.locations
-				this.value = this.info.noticeTime
-				this.id = this.info.id
-
-				this.time = this.info.temList
-
-				this.periods = []
-				this.info.periods.forEach((ele) => {
-					this.periods.push({
-						beginTime: this.format_time(ele.beginTime),
-						endTime: this.format_time(ele.endTime)
-					})
-				})
-			}
+			this.id = option.id
+			this.getData()
 		},
 		onShow() {
-
-			let rulePlace = uni.getStorageSync("chooseList") || uni.getStorageSync("chooseList_edit")
+			let rulePlace = uni.getStorageSync("chooseList")
+			let flag_place = uni.getStorageSync("flag_place")
+			
 			if (rulePlace) {
 				this.locations = rulePlace
 				let temList = []
@@ -182,112 +178,58 @@
 				})
 				this.place = temList.join("，")
 			}
+			if (rulePlace.length == 0 && flag_place) {
+				this.place = "未设置"
+			}
 
-			let ruleTime = uni.getStorageSync("ruleTime") || uni.getStorageSync("ruleTime_edit")
+			let ruleTime = uni.getStorageSync("ruleTime")
 			let flag = uni.getStorageSync("flag")
 
 			if (ruleTime.length == 0 && flag) {
 				this.time = "未设置"
 			}
 			if (ruleTime.length > 0) {
-
-				let temList = []
-				ruleTime.forEach((ele) => {
-					temList.push({
-						dayOfWeeks: ele.selectedWeeks,
-						periods: ele.list
-					})
-				})
-				this.periods = []
-				this.time = []
-				temList.forEach((element) => {
-					this.time.push(element.dayOfWeeks.join("，"))
-					this.periods.push(element.periods[0])
+				this.time = ruleTime
+			}
+		},
+		methods: {
+			// 获取规则详细信息
+			async getData() {
+				let res = await this.$myRequest({
+					url: `/attendance/api/settings/rule/detail/${this.id}`
 				})
+				// console.log(res);
+				if (res.code == 200) {
+					// 规则名称
+					this.ruleName = res.data.name
+
+					// 考勤组
+					let temList = []
+					this.groupIds = []
+					res.data.groups.forEach((ele) => {
+						temList.push(ele.name)
+						this.groupIds.push(ele.id)
+					})
+					this.group = temList.join("，")
 
-				temList.forEach((item) => {
-					item.dayOfWeeks = item.dayOfWeeks.map((element) => {
-						if (element == '星期一') {
-							return element = 1
-						}
-						if (element == '星期二') {
-							return element = 2
-						}
-						if (element == '星期三') {
-							return element = 3
-						}
-						if (element == '星期四') {
-							return element = 4
-						}
-						if (element == '星期五') {
-							return element = 5
-						}
-						if (element == '星期六') {
-							return element = 6
-						}
-						if (element == '星期天') {
-							return element = 7
-						}
+					// 打卡时间
+					this.time = res.data.timeGroups
+
+					// 打卡地点
+					let temList2 = []
+					this.locations = res.data.locations
+					res.data.locations.forEach((ele) => {
+						temList2.push(ele.name)
 					})
-				})
-				this.timeGroups = temList
-			}
+					this.place = temList2.join("，")
 
-			// let ruleTime = uni.getStorageSync("ruleTime_edit")
-			// console.log(ruleTime);
-			// if (ruleTime) {
-			// 	this.time = ruleTime
-			// 	let temList = []
-			// 	ruleTime.forEach((ele) => {
-			// 		temList.push({
-			// 			dayOfWeeks: ele.selectedWeeks,
-			// 			periods: ele.list
-			// 		})
-			// 	})
-			// 	temList.forEach((item) => {
-			// 		item.dayOfWeeks = item.dayOfWeeks.map((element) => {
-			// 			if (element == '星期一') {
-			// 				return element = 1
-			// 			}
-			// 			if (element == '星期二') {
-			// 				return element = 2
-			// 			}
-			// 			if (element == '星期三') {
-			// 				return element = 3
-			// 			}
-			// 			if (element == '星期四') {
-			// 				return element = 4
-			// 			}
-			// 			if (element == '星期五') {
-			// 				return element = 5
-			// 			}
-			// 			if (element == '星期六') {
-			// 				return element = 6
-			// 			}
-			// 			if (element == '星期天') {
-			// 				return element = 7
-			// 			}
-			// 		})
-			// 	})
-			// 	this.timeGroups = temList
-			// }
-			// 	let ruleName = uni.getStorageSync("ruleName")
-			// 	if (ruleName) {
-			// 		this.ruleName = ruleName
-			// 	}
-
-			// 	let ruleGroup = uni.getStorageSync("ruleGroup")
-			// 	if (ruleGroup) {
-			// 		let temList = []
-			// 		this.groupIds = []
-			// 		ruleGroup.forEach((ele) => {
-			// 			temList.push(ele.name)
-			// 			this.groupIds.push(ele.id)
-			// 		})
-			// 		this.group = temList.join("，")
-			// 	}
-		},
-		methods: {
+					// 提前通知
+					this.value = res.data.noticeTime
+					
+					// 法定节假日
+					this.holiday = res.data.holiday
+				}
+			},
 			// 点击确认按钮回调
 			handleConfirm() {
 				if (this.ruleName == '未设置') {
@@ -334,18 +276,6 @@
 					content: '确定修改吗？',
 					success: async (res) => {
 						if (res.confirm) {
-
-							let temList = []
-							this.timeGroups.forEach((ele) => {
-								ele.periods.forEach((item) => {
-									temList.push({
-										beginTime: this.formatTime(item.beginTime),
-										endTime: this.formatTime(item.endTime)
-									})
-								})
-								ele.periods = temList
-							})
-
 							let res = await this.$myRequest({
 								url: "/attendance/api/settings/rule/update",
 								method: "put",
@@ -361,7 +291,7 @@
 									// 考勤组ID列表
 									groupIds: this.groupIds,
 									// 是否同步节假日
-									holiday: true,
+									holiday: this.holiday,
 									// 是否可选择本地图片
 									localPicture: false,
 									// 规则名称
@@ -373,12 +303,21 @@
 									// 打卡地点列表
 									locations: this.locations,
 									// 打卡时间列表
-									timeGroups: this.timeGroups
+									timeGroups: this.time
 								}
 							})
-							console.log(res);
-
-						} else if (res.cancel) {}
+							// console.log(res);
+							if (res.code == 200) {
+								uni.showToast({
+									title: "编辑成功"
+								})
+								setTimeout(() => {
+									uni.navigateBack({
+										delta: 1
+									})
+								}, 1500)
+							}
+						}
 					}
 				});
 			},
@@ -407,7 +346,7 @@
 									})
 								}, 1500)
 							}
-						} else if (res.cancel) {}
+						}
 					}
 				});
 			},
@@ -418,38 +357,35 @@
 				let index2 = this.value.indexOf("分", 0)
 				this.value = this.value.substring(0, index2);
 			},
+			// switch的值改变回调
+			switchChange(e) {
+				this.holiday = e.detail.value
+				// console.log(this.holiday);
+			},
 			// 点击规则名称跳转回调
 			goPageRuleName() {
 				uni.navigateTo({
-					url: `/pages/ruleName/ruleName?type=1`
+					url: `/pages/ruleName/ruleName`
 				})
 			},
 			// 点击考勤组跳转回调
 			goPageGroup() {
 				uni.navigateTo({
-					url: `/pages/group/group?flag=2&type=1`
+					url: `/pages/group/group?flag=2`
 				})
 			},
 			// 点击打卡时间跳转回调
 			goPagePunchTime() {
-				if (this.time == "未设置") {
-					let periods = []
-					let time = []
-					uni.navigateTo({
-						url: `/pages/punchTime/punchTime?time=${time}&periods=${periods}&type=1`
-					})
-				} else {
-					let periods = JSON.stringify(this.periods)
-					let time = JSON.stringify(this.time)
-					uni.navigateTo({
-						url: `/pages/punchTime/punchTime?time=${time}&periods=${periods}&type=1`
-					})
-				}
+				let time = JSON.stringify(this.time)
+				uni.navigateTo({
+					url: `/pages/punchTime/punchTime?time=${time}`
+				})
 			},
 			// 点击打卡地点跳转回调
 			goPagePunchLocation() {
+				let locations = JSON.stringify(this.locations)
 				uni.navigateTo({
-					url: `/pages/punchLocation/punchLocation?id=${this.id}&type=1`
+					url: `/pages/punchLocation/punchLocation?locations=${locations}`
 				})
 			},
 			// 格式化时间
@@ -528,6 +464,11 @@
 					}
 				}
 			}
+			.val2{
+				flex: 1;
+				margin-right: 20rpx;
+				text-align: end;
+			}
 		}
 
 		.button {

pages/group/group.vue

@@ -153,12 +153,10 @@
 				list: [],
 				// 考勤组范围数组
 				range: [],
-				type:""
 			};
 		},
 		onLoad(options) {
 			this.flag = options.flag
-			this.type = options.type
 			if (this.flag == 1) {
 				this.checkStatus = true
 			}
@@ -326,11 +324,7 @@
 						icon: "none"
 					})
 				} else {
-					if (this.type == 1) {
-						uni.$emit('updateRuleGroup', temList)
-					} else {
-						uni.setStorageSync("ruleGroup", temList)
-					}
+					uni.$emit('updateRuleGroup', temList)
 					uni.navigateBack({
 						delta: 1
 					})

pages/particulars/particulars.vue

@@ -10,7 +10,7 @@
 		<!-- 规则列表区域 -->
 		<view class="list" v-if="list.length">
 			<!-- 每一个规则区域 -->
-			<view class="box" v-for="(item,index) in list" :key="index" @click="handleLook">
+			<view class="box" v-for="(item,index) in list" :key="index" @click="handleLook(item)">
 				<view class="icon">
 					<img src="./imgs/rule.png">
 				</view>
@@ -44,15 +44,26 @@
 	export default {
 		data() {
 			return {
+				// 当前页
 				page: 1,
+				// 总条数
 				total: 0,
 				// 当前时间
 				nowTime: "",
+				// 当前时间-每一天
+				nowTime_day: "",
+				// 搜索框绑定数值
 				searchValue: "",
-				list: []
+				// 列表数组
+				list: [],
+				type: ""
 			}
 		},
-		onLoad() {
+		onLoad(options) {
+			if (options.nowTime_day) {
+				this.nowTime_day = options.nowTime_day
+			}
+			this.type = options.type
 			this.getTime()
 			this.getData()
 		},
@@ -83,7 +94,7 @@
 					data: {
 						name: this.searchValue,
 						page: this.page,
-						time: this.nowTime,
+						time: this.type == 1 ? this.nowTime_day : this.nowTime,
 						type: 1
 					}
 				})
@@ -95,9 +106,11 @@
 			},
 
 			// 点击每一个规则回调
-			handleLook() {
+			handleLook(item) {
+				// console.log(item);
+				let info = JSON.stringify(item)
 				uni.navigateTo({
-					url: "/pages/rulesDetail/rulesDetail"
+					url: `/pages/rulesDetail/rulesDetail?info=${info}`
 				})
 			},
 			// 搜索框输入时的回调

pages/punchLocation/punchLocation.vue

@@ -47,9 +47,9 @@
 	export default {
 		data() {
 			return {
+				// 地点数组
 				list: [],
-				id: "",
-				type: "",
+				// 左滑选项配置
 				options: [{
 					text: '删除',
 					style: {
@@ -59,31 +59,22 @@
 			}
 		},
 		onLoad(options) {
-			this.type = options.type
-			if (options.id) {
-				this.id = options.id
-				this.getRuleDetail()
+			if (options.locations) {
+				this.list = JSON.parse(options.locations)
+				uni.setStorageSync("chooseList", this.list)
 			}
 		},
 		onShow() {
-			let arr = uni.getStorageSync("chooseList") || uni.getStorageSync("chooseList_edit")
+			uni.removeStorageSync("flag_place")
+			let arr = uni.getStorageSync("chooseList")
 			if (arr) {
 				this.list = arr
 			}
+			if (arr.lenght == 0) {
+				uni.setStorageSync("flag_place", true)
+			}
 		},
 		methods: {
-			// 获取打卡规则的详细信息
-			async getRuleDetail() {
-				let res = await this.$myRequest({
-					url: `/attendance/api/settings/rule/detail/${this.id}`
-				})
-				// console.log(res);
-				if (res.code == 200) {
-					this.list = res.data.locations
-					uni.setStorageSync("chooseList_edit", this.list)
-				}
-			},
-
 			// 点击添加打卡位置回调
 			handleAdd() {
 				// 获取用户位置权限
@@ -91,7 +82,7 @@
 					scope: 'scope.userLocation',
 					success: () => {
 						uni.navigateTo({
-							url: `/pages/addLocation/addLocation?type=${this.type}`
+							url: `/pages/addLocation/addLocation`
 						})
 					},
 					fail() {
@@ -105,7 +96,7 @@
 									uni.openSetting({
 										success(res) {}
 									})
-								} else if (res.cancel) {}
+								}
 							}
 						});
 					}
@@ -123,16 +114,11 @@
 								icon: 'success'
 							})
 							this.list.splice(index, 1)
-							if (this.type == 1) {
-								uni.setStorageSync("chooseList_edit", this.list)
-							} else {
-								uni.setStorageSync("chooseList", this.list)
-							}
-							var flag = uni.getStorageSync("chooseList")
-							if (flag == []) {
+							if (this.list.length == 0) {
 								uni.setStorageSync("flag_place", true)
 							}
-						} else if (res.cancel) {}
+							uni.setStorageSync("chooseList", this.list)
+						}
 					}
 				});
 			},

pages/punchTime/punchTime.vue

@@ -24,7 +24,9 @@
 									星期
 								</view>
 								<view class="value">
-									{{(item.selectedWeeks).join("，")}}
+									<span v-for="(item_week,index_week) in item.dayOfWeeks" :key="index_week">
+										{{arr[item_week]}}
+									</span>
 								</view>
 							</view>
 							<view class="week">
@@ -32,8 +34,8 @@
 									时段
 								</view>
 								<view class="value">
-									<span v-for="(item_time,index_time) in item.list" :key="index_time">
-										{{item_time.beginTime}}-{{item_time.endTime}}
+									<span v-for="(item_time,index_time) in item.periods" :key="index_time">
+										{{format_time(item_time.beginTime)}}-{{format_time(item_time.endTime)}}
 									</span>
 								</view>
 							</view>
@@ -52,58 +54,49 @@
 	export default {
 		data() {
 			return {
+				// 时间数组
 				list: [],
-				type: "",
+				// 左滑选项配置
 				options: [{
 					text: '删除',
 					style: {
 						backgroundColor: '#D43030'
 					}
 				}],
+				// 星期映射数组
+				arr: ["", "星期一", "星期二", "星期三", "星期四", "星期五", "星期六", "星期天"]
 			}
 		},
 		onLoad(options) {
-			this.type = options.type
 			if (options.time) {
-				let time = JSON.parse(options.time)
-				let periods = JSON.parse(options.periods)
-				console.log(time);
-				console.log(periods);
-				// let temArr = []
-				// periods.forEach((ele) => {
-				// 	temArr.push({
-				// 		beginTime: this.format_time(ele.beginTime),
-				// 		endTime: this.format_time(ele.endTime)
-				// 	})
-				// })
-				// periods = temArr
-				let temList = []
-				temList.push({
-					selectedWeeks: time,
-					list: periods
-				})
-				this.list = temList
-				uni.setStorageSync("ruleTime_edit", this.list)
+				if(JSON.parse(options.time)!='未设置'){
+					this.list = JSON.parse(options.time)
+					uni.setStorageSync("ruleTime", this.list)
+				}
 			}
 		},
 		onShow() {
-			let ruleTime = uni.getStorageSync("ruleTime_edit")||uni.getStorageSync("ruleTime")
+			uni.removeStorageSync("flag")
+			let ruleTime = uni.getStorageSync("ruleTime")
 			if (ruleTime) {
 				this.list = ruleTime
 			}
+			if (ruleTime.lenght == 0) {
+				uni.setStorageSync("flag", true)
+			}
 		},
 		methods: {
 			// 点击添加打卡时间回调 跳转到添加页面
 			handleAdd() {
 				uni.navigateTo({
-					url: `/pages/setPunchTime/setPunchTime?flag=1&type=${this.type}`
+					url: `/pages/setPunchTime/setPunchTime?flag=1`
 				})
 			},
 			// 点击每一个时间段回调 跳转到编辑页面
 			handleEdit(item, index) {
 				let info = JSON.stringify(item)
 				uni.navigateTo({
-					url: `/pages/setPunchTime/setPunchTime?flag=2&info=${info}&index=${index}&type=${this.type}`
+					url: `/pages/setPunchTime/setPunchTime?flag=2&info=${info}&index=${index}`
 				})
 			},
 			// 点击右侧删除按钮回调
@@ -119,28 +112,23 @@
 								icon: 'success'
 							})
 							this.list.splice(index, 1)
-							if (this.type == 1) {
-								uni.setStorageSync("ruleTime_edit", this.list)
-							} else {
-								uni.setStorageSync("ruleTime", this.list)
-							}
-							var flag = uni.getStorageSync("ruleTime")
-							if (flag == []) {
+							if (this.list.length == 0) {
 								uni.setStorageSync("flag", true)
 							}
+							uni.setStorageSync("ruleTime", this.list)
 						} else if (res.cancel) {}
 					}
 				});
 			},
 			// 格式化时间
-			// format_time(timestamp) {
-			// 	//时间戳为10位需*1000，时间戳为13位的话不需乘1000
-			// 	var date = new Date(timestamp);
-			// 	var h = (date.getHours() < 10 ? '0' + date.getHours() : date.getHours()) + ':';
-			// 	var m = (date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes());
-			// 	let strDate = h + m;
-			// 	return strDate;
-			// }
+			format_time(timestamp) {
+				//时间戳为10位需*1000，时间戳为13位的话不需乘1000
+				var date = new Date(timestamp);
+				var h = (date.getHours() < 10 ? '0' + date.getHours() : date.getHours()) + ':';
+				var m = (date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes());
+				let strDate = h + m;
+				return strDate;
+			}
 		}
 	}
 </script>

pages/ruleName/ruleName.vue

@@ -16,13 +16,10 @@
 	export default {
 		data() {
 			return {
+				// 输入框绑定数值
 				name: "",
-				type: ""
 			};
 		},
-		onLoad(options) {
-			this.type = options.type
-		},
 		methods: {
 			// 点击确认按钮回调
 			handleConfirm() {
@@ -32,11 +29,7 @@
 						icon: 'none'
 					})
 				} else {
-					if (this.type == 1) {
-						uni.$emit('updateRuleName', this.name)
-					} else {
-						uni.setStorageSync("ruleName", this.name)
-					}
+					uni.$emit('updateRuleName', this.name)
 					uni.navigateBack({
 						delta: 1
 					})

pages/ruleSet/ruleSet.vue

@@ -13,7 +13,7 @@
 		<!-- 具体规则区域 -->
 		<view class="rules">
 			<!-- 每一个规则区域 -->
-			<view class="box" v-for="item in list" :key="item.id" @click="toPageEditRules(item)">
+			<view class="box" v-for="item in list" :key="item.id" @click="toPageEditRules(item.id)">
 				<view class="box_title">
 					<view class="icon">
 						<img src="../../static/my1.png">
@@ -54,40 +54,19 @@
 	export default {
 		data() {
 			return {
+				// 规则列表数组
 				list: []
 			};
 		},
 		onShow() {
+			// 清空缓存
+			uni.removeStorageSync("flag_place")
+			uni.removeStorageSync("flag")
+			uni.removeStorageSync("chooseList")
+			uni.removeStorageSync('ruleTime');
+			// 获取最新打卡规则列表数据
 			this.getRuleList()
-			let ruleName = uni.getStorageSync('ruleName')
-			let ruleGroup = uni.getStorageSync('ruleGroup')
-			let ruleTime = uni.getStorageSync('ruleTime')
-			let chooseList = uni.getStorageSync('chooseList')
-			let ruleValue = uni.getStorageSync('ruleValue')
-			if (ruleName || ruleGroup || ruleTime || chooseList || ruleValue) {
-				uni.showModal({
-					title: '提示',
-					content: '上一个页面有未保存的数据，确定不保存吗？',
-					cancelText: '返回上页',
-					success: (res)=> {
-						if (res.confirm) {
-							uni.removeStorageSync('ruleName');
-							uni.removeStorageSync('ruleGroup');
-							uni.removeStorageSync('ruleTime');
-							uni.removeStorageSync('chooseList');
-							uni.removeStorageSync('ruleValue');
-						} else if (res.cancel) {
-							uni.navigateTo({
-								url: `/pages/addRules/addRules`
-							})
-						}
-					}
-				});
-			}
 		},
-		// onLoad() {
-		// 	this.getRuleList()
-		// },
 		methods: {
 			// 获取打卡规则列表数据
 			async getRuleList() {
@@ -111,11 +90,10 @@
 				}
 			},
 			// 点击每一项跳转编辑规则页面
-			toPageEditRules(item) {
-				// console.log(item);
-				let info = JSON.stringify(item)
+			toPageEditRules(id) {
+				// console.log(id);
 				uni.navigateTo({
-					url: `/pages/editRules/editRules?info=${info}`
+					url: `/pages/editRules/editRules?id=${id}`
 				})
 			},
 			// 新增规则跳转页面回调

pages/rulesDetail/rulesDetail.vue

@@ -2,8 +2,8 @@
 	<view class="container">
 		<!-- 顶部搜索框区域 -->
 		<view class="search">
-			<uni-search-bar bgColor="#fff" placeholder="请输入名字或院系" cancelButton="none" v-model="searchValue" @input="input"
-				@clear="clear" @blur="blur">
+			<uni-search-bar bgColor="#fff" placeholder="请输入名字或院系" cancelButton="none" v-model="searchValue"
+				@input="input">
 			</uni-search-bar>
 		</view>
 
@@ -14,26 +14,33 @@
 					activeColor="#0082FC"></uni-segmented-control>
 			</view>
 			<!-- 列表区域 -->
-			<view class="listbox">
+			<view class="listbox" v-if="list.length">
 				<!-- 每一个盒子区域 -->
 				<view class="item" v-for="item in list" :key="item.id">
 					<view class="left">
-						<img :src="item.url">
+						<img :src="item.headImage||'../../static/headImage.png'">
 					</view>
 					<view class="center">
 						<view class="name">
 							{{item.name}}
 						</view>
 						<view class="college">
-							{{item.college}}
+							{{item.college?item.college:"南昌交通学院"}}
 						</view>
 					</view>
 					<view class="right">
-						{{item.status==1?"正常":"缺卡"}}
+						{{item.status==4?"正常":"缺卡"}}
 					</view>
 				</view>
 			</view>
 
+			<view class="listbox2" v-else>
+				<img src="../../static/nodata.png">
+				<view class="info">
+					暂无数据
+				</view>
+			</view>
+
 		</view>
 
 	</view>
@@ -43,86 +50,87 @@
 	export default {
 		data() {
 			return {
+				// 总人数
+				peopleTotal: 0,
+				// 打卡失败人数
+				failCount: 0,
+				// 打卡成功人数
+				successCount: 0,
+				// 搜索框绑定值
 				searchValue: "",
-				items: ['打卡成功（50/150人）', '打卡失败（28/150人）'],
+				// 分段器绑定数组
+				items: ['打卡成功', '打卡失败'],
+				// 当前分段器所在的索引
 				current: 0,
-
+				// 列表数组
 				list: [],
-				list2: [{
-						id: 1,
-						url: "../../static/ceshi.jpg",
-						name: "张三",
-						college: "文法学院",
-						status: 1
-					},
-					{
-						id: 2,
-						url: "../../static/ceshi.jpg",
-						name: "李四",
-						college: "文法学院",
-						status: 1
-					},
-					{
-						id: 3,
-						url: "../../static/ceshi.jpg",
-						name: "王五",
-						college: "文法学院",
-						status: 1
-					},
-				],
-				list3: [{
-						id: 1,
-						url: "../../static/ceshi.jpg",
-						name: "伍六七",
-						college: "文法学院",
-						status: 2
-					},
-					{
-						id: 2,
-						url: "../../static/ceshi.jpg",
-						name: "喜羊羊",
-						college: "文法学院",
-						status: 2
-					},
-					{
-						id: 3,
-						url: "../../static/ceshi.jpg",
-						name: "灰太狼",
-						college: "文法学院",
-						status: 2
-					},
-				]
+				// 规则ID
+				taskId: "",
+				// 打卡状态 3代表失败 4代表成功
+				status: 4,
+				// 当前页
+				page: 1,
+				// 列表总条数
+				total: 0
 			}
 		},
 		onLoad(options) {
-			this.list = this.list2
+			let info = JSON.parse(options.info)
+			// console.log(info);
+			this.peopleTotal = info.peopleTotal
+			this.failCount = info.failCount
+			this.successCount = info.peopleTotal - info.failCount
+			this.items[0] = `打卡成功（${this.successCount}/${this.peopleTotal}人）`
+			this.items[1] = `打卡失败（${this.failCount}/${this.peopleTotal}人）`
+			this.taskId = info.taskId
+			this.getData()
+		},
+		onReachBottom() {
+			if (this.list.length < this.total) {
+				this.page++
+				this.getData()
+			} else {
+				uni.showToast({
+					title: "没有更多数据了",
+					icon: 'none'
+				})
+			}
 		},
 		methods: {
+			// 获取列表数据
+			async getData() {
+				let res = await this.$myRequest({
+					url: "/attendance/api/sign/check/in/rule",
+					data: {
+						name: this.searchValue,
+						page: this.page,
+						status: this.status,
+						taskId: this.taskId
+					}
+				})
+				// console.log(res);
+				if (res.code == 200) {
+					this.total = res.data.total
+					this.list = [...this.list, ...res.data.list]
+				}
+			},
+			// 点击分段器回调
 			onClickItem(e) {
-				console.log(e.currentIndex);
+				// console.log(e.currentIndex);
+				this.list = []
+				this.page = 1
 				if (e.currentIndex == 0) {
-					this.list = this.list2
+					this.status = 4
 				} else {
-					this.list = this.list3
+					this.status = 3
 				}
-			},
-			// 搜索框失焦回调
-			blur(res) {
-				uni.showToast({
-					title: '搜索：' + res.value,
-					icon: 'none'
-				})
+				this.getData()
 			},
 			// 搜索框输入时的回调
-			input(res) {
-				console.log('----input:', res)
-			},
-			// 清除搜索框内容时的回调
-			clear(res) {
-				uni.showToast({
-					title: 'clear事件，清除值为：' + res.value,
-					icon: 'none'
-				})
+			input() {
+				this.list = []
+				this.page = 1
+				this.getData()
 			},
 		}
 	}
@@ -142,6 +150,7 @@
 		.list {
 			margin-top: 20rpx;
 			width: 750rpx;
+			min-height: 85vh;
 			background-color: #fff;
 
 			.control {
@@ -201,6 +210,20 @@
 					}
 				}
 			}
+
+			.listbox2 {
+				margin-top: 230rpx;
+				text-align: center;
+
+				img {
+					width: 480rpx;
+					height: 508rpx;
+				}
+
+				.info {
+					color: #5792F0;
+				}
+			}
 		}
 	}
 

pages/setPunchTime/setPunchTime.vue

@@ -56,20 +56,6 @@
 				</uni-swipe-action-item>
 			</uni-swipe-action>
 
-			<!-- <view class="edit">
-				编辑
-			</view> -->
-
-		</view>
-
-		<!-- switch区域 -->
-		<view class="switch">
-			<view class="switch_title">
-				除去法定节假日
-			</view>
-			<view class="switch_button">
-				<switch color="#2A82E4" :checked="holiday" @change="switchChange" />
-			</view>
 		</view>
 
 		<view class="button" @click="handleSave">
@@ -94,8 +80,6 @@
 					beginTime: "00:00",
 					endTime: "00:00",
 				}],
-				// 是否同步法定节假日
-				holiday: false,
 				// 编辑打卡时间页面带过来的对象
 				info: {},
 				// 左滑配置
@@ -109,12 +93,10 @@
 				flag: null,
 				// 时间列表索引
 				index: null,
-				type: "",
 			}
 		},
 		onLoad(options) {
 			this.flag = options.flag
-			this.type = options.type
 			if (this.flag == 1) {
 				uni.setNavigationBarTitle({
 					title: '添加打卡时间'
@@ -125,30 +107,17 @@
 				});
 				this.index = options.index
 				this.info = JSON.parse(options.info)
-				console.log(this.info);
-				this.list = this.info.list
-				this.holiday = this.info.holiday
-				this.selectedWeeks = this.info.selectedWeeks.map((ele) => {
-					if (ele == '星期一') {
-						return ele = 1
-					}
-					if (ele == '星期二') {
-						return ele = 2
-					}
-					if (ele == '星期三') {
-						return ele = 3
-					}
-					if (ele == '星期四') {
-						return ele = 4
-					}
-					if (ele == '星期五') {
-						return ele = 5
-					}
-					if (ele == '星期六') {
-						return ele = 6
-					}
-					if (ele == '星期天') {
+				// console.log(this.info);
+				this.list = this.info.periods
+				this.list.forEach((ele) => {
+					ele.beginTime = this.format_time(ele.beginTime)
+					ele.endTime = this.format_time(ele.endTime)
+				})
+				this.selectedWeeks = this.info.dayOfWeeks.map((ele) => {
+					if (ele == 7) {
 						return ele = 0
+					} else {
+						return ele
 					}
 				})
 			}
@@ -179,83 +148,44 @@
 								title: "保存成功",
 								icon: 'success'
 							})
-							this.selectedWeeks = this.selectedWeeks.map((ele) => {
-								if (ele == 1) {
-									return ele = '星期一'
-								}
-								if (ele == 2) {
-									return ele = '星期二'
-								}
-								if (ele == 3) {
-									return ele = '星期三'
-								}
-								if (ele == 4) {
-									return ele = '星期四'
-								}
-								if (ele == 5) {
-									return ele = '星期五'
-								}
-								if (ele == 6) {
-									return ele = '星期六'
-								}
-								if (ele == 0) {
-									return ele = '星期天'
-								}else {
-									return ele
-								}
-							})
-
-							// 从编辑规则页面进入
-							if (this.type == 1) {
-								setTimeout(() => {
-									let temList = uni.getStorageSync("ruleTime_edit") || []
-									if (this.flag == 1) {
-										temList.push({
-											selectedWeeks: this.selectedWeeks,
-											list: this.list,
-											holiday: this.holiday
-										})
+							setTimeout(() => {
+								let temArr = []
+								temArr = this.list
+								temArr.forEach((ele) => {
+									ele.beginTime = this.formatTime(ele.beginTime)
+									ele.endTime = this.formatTime(ele.endTime)
+								})
+								
+								let temArr_week = []
+								temArr_week = this.selectedWeeks.map((ele) => {
+									if (ele == 0) {
+										return ele = 7
 									} else {
-										temList.splice(this.index, 1, {
-											selectedWeeks: this.selectedWeeks,
-											list: this.list,
-											holiday: this.holiday
-										})
+										return ele
 									}
-									uni.setStorageSync("ruleTime_edit", temList)
-									uni.navigateBack({
-										delta: 1
+								})
+								let temList = uni.getStorageSync("ruleTime") || []
+								// 编辑时间
+								if (this.flag == 2) {
+									temList.splice(this.index, 1, {
+										dayOfWeeks: temArr_week,
+										periods: temArr,
 									})
-								}, 1500)
-							} else {
-								setTimeout(() => {
-									let temList = uni.getStorageSync("ruleTime") || []
-									// 编辑时间
-									if (this.flag == 2) {
-										temList.splice(this.index, 1, {
-											selectedWeeks: this.selectedWeeks,
-											list: this.list,
-											holiday: this.holiday
-										})
-									} else {
-										// 添加时间
-										temList.push({
-											selectedWeeks: this.selectedWeeks,
-											list: this.list,
-											holiday: this.holiday
-										})
-									}
-									uni.setStorageSync("ruleTime", temList)
-									uni.navigateBack({
-										delta: 1
+								} else {
+									// 添加时间
+									temList.push({
+										dayOfWeeks: temArr_week,
+										periods: temArr
 									})
-								}, 1500)
-							}
-
-						} else if (res.cancel) {}
+								}
+								uni.setStorageSync("ruleTime", temList)
+								uni.navigateBack({
+									delta: 1
+								})
+							}, 1500)
+						}
 					}
 				});
-
 			},
 			// 选择星期回调
 			changeWeek(value) {
@@ -271,12 +201,7 @@
 				value.sort((a, b) => {
 					return a - b
 				})
-				// 把数字转换成星期
-				let arr = ["", "星期一", "星期二", "星期三", "星期四", "星期五", "星期六", "星期天"]
-				this.selectedWeeks = value.map((ele) => {
-					return ele = arr[ele]
-				})
-				console.log(this.selectedWeeks);
+				this.selectedWeeks = value
 			},
 			// 选择时间段回调
 			bindTimeChange(e, val, item) {
@@ -293,11 +218,6 @@
 					endTime: "00:00",
 				})
 			},
-			// switch改变回调
-			switchChange(e) {
-				// console.log('switch1 发生 change 事件，携带值为', e.detail.value)
-				this.holiday = e.detail.value
-			},
 			// 点击右侧删除按钮回调
 			onClick(index) {
 				uni.showModal({
@@ -310,10 +230,27 @@
 								title: "删除成功",
 								icon: 'success'
 							})
-						} else if (res.cancel) {}
+						}
 					}
 				});
 			},
+			// 格式化时间
+			formatTime(val) {
+				let tem = '2021-11-22 ' + val + ':00'
+				// console.log(tem);
+				let date = new Date(tem);
+				let time = date.getTime();
+				return time
+			},
+			// 格式化时间
+			format_time(timestamp) {
+				//时间戳为10位需*1000，时间戳为13位的话不需乘1000
+				var date = new Date(timestamp);
+				var h = (date.getHours() < 10 ? '0' + date.getHours() : date.getHours()) + ':';
+				var m = (date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes());
+				let strDate = h + m;
+				return strDate;
+			}
 		}
 	}
 </script>
@@ -420,29 +357,6 @@
 			// }
 		}
 
-		.switch {
-			box-sizing: border-box;
-			display: flex;
-			align-items: center;
-			margin: 0 auto;
-			margin-top: 20rpx;
-			padding: 0 20rpx;
-			width: 690rpx;
-			height: 86rpx;
-			border-radius: 10rpx;
-			background: #FFFFFF;
-
-			.switch_title {
-				flex: 5;
-				font-size: 34rpx;
-				font-weight: 500;
-			}
-
-			.switch_button {
-				flex: 1;
-			}
-		}
-
 		.button {
 			margin: 0 auto;
 			margin-top: 50rpx;

pages/stat/stat.vue

@@ -69,7 +69,7 @@
 					<progressBar v-if="showBar" :progress_txt="progress_txt" :progress_total="progress_total" />
 				</view>
 
-				<view class="look">
+				<view class="look" @click="handleLookDetail">
 					<view class="info">
 						查看明细
 					</view>
@@ -86,10 +86,10 @@
 					异常人员名单
 				</view>
 				<view class="right">
-					<view class="icon">
+					<view class="icon" @click="handleInform">
 						<img src="../../static/notice.png">
 					</view>
-					<view class="info">
+					<view class="info" @click="handleInform">
 						通知
 					</view>
 				</view>
@@ -383,6 +383,27 @@
 					this.getRulesList()
 				}
 			},
+			// 点击通知回调
+			handleInform() {
+				uni.showModal({
+					title: '提示',
+					content: `当前列表中有 ${this.total} 位异常人员，确定需要全部通知吗？`,
+					success: (res)=> {
+						if (res.confirm) {
+							
+						} else if (res.cancel) {
+							
+						}
+					}
+				});
+			},
+			// 点击查看明细回调
+			handleLookDetail() {
+				// console.log(this.nowTime);
+				uni.navigateTo({
+					url: `/pages/particulars/particulars?nowTime_day=${this.nowTime}&type=1`
+				})
+			},
 
 			// 跳转统计详情页面
 			goToDetail() {
@@ -392,7 +413,7 @@
 					})
 				} else {
 					uni.navigateTo({
-						url: "/pages/particulars/particulars"
+						url: "/pages/particulars/particulars?type=2"
 					})
 				}
 			},
@@ -493,7 +514,7 @@
 
 		.header {
 			margin: 0 auto;
-			width: 690rpx;
+			width: 710rpx;
 			height: 236rpx;
 			background-color: #fff;
 
@@ -566,7 +587,7 @@
 		.calendar {
 			margin: 0 auto;
 			margin-top: 30rpx;
-			width: 693rpx;
+			width: 710rpx;
 			background-color: #fff;
 
 			.calendar_title {
@@ -662,7 +683,7 @@
 		.errPeople {
 			margin: 0 auto;
 			margin-top: 32rpx;
-			width: 690rpx;
+			width: 710rpx;
 			border-radius: 7rpx;
 			background-color: #fff;
 

unpackage/dist/dev/mp-weixin/pages/addLocation/addLocation.js

@@ -223,13 +223,15 @@ exports.default = void 0;
 //
 //
 
-var QQMapWX = __webpack_require__(/*! ../../util/qqmap-wx-jssdk1.1/qqmap-wx-jssdk */ 43);
+var QQMapWX = __webpack_require__(/*! ../../util/qqmap-wx-jssdk1.1/qqmap-wx-jssdk */ 49);
 var qqmapsdk;
 var _default = {
   data: function data() {
     return {
+      // 当前位置的经纬度
       latitude: null,
       longitude: null,
+      // 标记点的配置
       covers: [{
         id: 1,
         latitude: null,
@@ -242,7 +244,6 @@ var _default = {
           display: "ALWAYS"
         }
       }],
-      imgUrl: "",
       // 搜索框绑定的值
       searchValue: "",
       // 范围选择数组
@@ -251,17 +252,16 @@ var _default = {
       placeList: [],
       // 范围数值
       rangeValue: 300,
-      chooseList: [],
-      type: ""
+      // 选中的地点数组
+      chooseList: []
     };
   },
-  onLoad: function onLoad(options) {
+  onLoad: function onLoad() {
     // 实例化API核心类
     qqmapsdk = new QQMapWX({
       // 申请的key
       key: 'R43BZ-2XROX-L7T45-T5OQI-IBDFT-GNBOI'
     });
-    this.type = options.type;
     this.getLocationData();
   },
   methods: {
@@ -271,7 +271,6 @@ var _default = {
       qqmapsdk.reverseGeocoder({
         success: function success(res) {
           // console.log(res);
-          // console.log(res.result);
           if (res.status == 0) {
             // 获取地址经纬度
             _this.latitude = res.result.location.lat;
@@ -307,7 +306,6 @@ var _default = {
         poi_options: "policy=2",
         success: function success(res) {
           // console.log(res.result);
-          // console.log(res.result.pois);
           if (res.status == 0) {
             _this2.placeList = res.result.pois;
             _this2.covers[0].callout.content = res.result.address;
@@ -322,34 +320,18 @@ var _default = {
     },
     // 选择单个地址时的回调
     handleChoose: function handleChoose(item) {
-      // console.log(item);
-      if (this.type == 1) {
-        var arr = uni.getStorageSync("chooseList_edit");
-        if (arr.length) {
-          this.chooseList = arr;
-        }
-        this.chooseList.push({
-          name: item.title,
-          address: item.address,
-          radius: this.rangeValue,
-          lat: item.location.lat,
-          lng: item.location.lng
-        });
-        uni.setStorageSync("chooseList_edit", this.chooseList);
-      } else {
-        var _arr = uni.getStorageSync("chooseList");
-        if (_arr.length) {
-          this.chooseList = _arr;
-        }
-        this.chooseList.push({
-          name: item.title,
-          address: item.address,
-          radius: this.rangeValue,
-          lat: item.location.lat,
-          lng: item.location.lng
-        });
-        uni.setStorageSync("chooseList", this.chooseList);
+      var arr = uni.getStorageSync("chooseList");
+      if (arr.length) {
+        this.chooseList = arr;
       }
+      this.chooseList.push({
+        name: item.title,
+        address: item.address,
+        radius: this.rangeValue,
+        lat: item.location.lat,
+        lng: item.location.lng
+      });
+      uni.setStorageSync("chooseList", this.chooseList);
       uni.navigateBack({
         delta: 1
       });

unpackage/dist/dev/mp-weixin/pages/addRules/addRules.js

@@ -104,18 +104,38 @@ var render = function () {
   var _c = _vm._self._c || _h
   var m0 = __webpack_require__(/*! ../../static/right.png */ 82)
   var m1 = __webpack_require__(/*! ../../static/right.png */ 82)
-  var m2 = __webpack_require__(/*! ../../static/right.png */ 82)
-  var m3 = __webpack_require__(/*! ../../static/right.png */ 82)
+  var l1 = !(_vm.time == "未设置")
+    ? _vm.__map(_vm.time, function (item, index) {
+        var $orig = _vm.__get_orig(item)
+        var l0 = _vm.__map(item.periods, function (item_time, index_time) {
+          var $orig = _vm.__get_orig(item_time)
+          var m2 = _vm.format_time(item_time.beginTime)
+          var m3 = _vm.format_time(item_time.endTime)
+          return {
+            $orig: $orig,
+            m2: m2,
+            m3: m3,
+          }
+        })
+        return {
+          $orig: $orig,
+          l0: l0,
+        }
+      })
+    : null
   var m4 = __webpack_require__(/*! ../../static/right.png */ 82)
+  var m5 = __webpack_require__(/*! ../../static/right.png */ 82)
+  var m6 = __webpack_require__(/*! ../../static/right.png */ 82)
   _vm.$mp.data = Object.assign(
     {},
     {
       $root: {
         m0: m0,
         m1: m1,
-        m2: m2,
-        m3: m3,
+        l1: l1,
         m4: m4,
+        m5: m5,
+        m6: m6,
       },
     }
   )
@@ -159,8 +179,16 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _regenerator = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/regenerator */ 40));
-var _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/asyncToGenerator */ 42));
+var _regenerator = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/regenerator */ 39));
+var _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/asyncToGenerator */ 41));
+//
+//
+//
+//
+//
+//
+//
+//
 //
 //
 //
@@ -284,84 +312,65 @@ var _default = {
       array: ['5分钟', '10分钟', '15分钟', '20分钟'],
       // 提前通知时间选择数组默认选择的索引
       index: 0,
+      // 考勤组id数组
       groupIds: [],
-      timeGroups: [],
-      locations: []
+      // 打卡地点数组
+      locations: [],
+      // 是否同步节假日
+      holiday: false,
+      // 星期映射数组
+      arr: ["", "星期一", "星期二", "星期三", "星期四", "星期五", "星期六", "星期天"]
     };
   },
   onLoad: function onLoad() {
-    uni.removeStorageSync("flag_place");
-  },
-  onShow: function onShow() {
     var _this = this;
-    var ruleName = uni.getStorageSync("ruleName");
-    if (ruleName) {
-      this.ruleName = ruleName;
-    }
-    var ruleGroup = uni.getStorageSync("ruleGroup");
-    if (ruleGroup) {
+    // 监听updateRuleName事件修改规则名称
+    uni.$on('updateRuleName', function (data) {
+      _this.ruleName = data;
+    });
+
+    // 监听updateRuleGroup事件修改考勤组
+    uni.$on('updateRuleGroup', function (data) {
       var temList = [];
-      this.groupIds = [];
-      ruleGroup.forEach(function (ele) {
+      _this.groupIds = [];
+      data.forEach(function (ele) {
         temList.push(ele.name);
         _this.groupIds.push(ele.id);
       });
-      this.group = temList.join("，");
-    }
+      _this.group = temList.join("，");
+    });
+  },
+  onShow: function onShow() {
+    // 从缓存获取打卡时间数据
     var ruleTime = uni.getStorageSync("ruleTime");
+    // 从缓存获取打卡时间数据是否为空的标识 true为空数组 false不为空
+    var flag = uni.getStorageSync("flag");
+
+    // 如果打卡时间数组不为空,将数组赋值给time
     if (ruleTime) {
       this.time = ruleTime;
-      var _temList = [];
-      ruleTime.forEach(function (ele) {
-        _temList.push({
-          dayOfWeeks: ele.selectedWeeks,
-          periods: ele.list
-        });
-      });
-      _temList.forEach(function (item) {
-        item.dayOfWeeks = item.dayOfWeeks.map(function (element) {
-          if (element == '星期一') {
-            return element = 1;
-          }
-          if (element == '星期二') {
-            return element = 2;
-          }
-          if (element == '星期三') {
-            return element = 3;
-          }
-          if (element == '星期四') {
-            return element = 4;
-          }
-          if (element == '星期五') {
-            return element = 5;
-          }
-          if (element == '星期六') {
-            return element = 6;
-          }
-          if (element == '星期天') {
-            return element = 7;
-          }
-        });
-      });
-      this.timeGroups = _temList;
     }
-    var temPlace = uni.getStorageSync("chooseList");
-    var flag = uni.getStorageSync("flag_place");
-    if (temPlace.length == 0 && flag) {
-      this.place = "未设置";
-      uni.removeStorageSync("chooseList");
+    // 如果打卡时间数组为空,修改time的值
+    if (ruleTime.length == 0 && flag) {
+      this.time = "未设置";
     }
-    if (temPlace.length > 0) {
+
+    // 从缓存获取打卡地点数据
+    var temPlace = uni.getStorageSync("chooseList");
+    // 从缓存获取打卡地点数据是否为空的标识 true为空数组 false不为空
+    var flag_place = uni.getStorageSync("flag_place");
+    // 如果打卡地点数组不为空,将数组赋值给locations
+    if (temPlace) {
       this.locations = temPlace;
-      var _temList2 = [];
+      var temList = [];
       temPlace.forEach(function (ele) {
-        _temList2.push(ele.name);
+        temList.push(ele.name);
       });
-      this.place = _temList2.join("，");
+      this.place = temList.join("，");
     }
-    var ruleValue = uni.getStorageSync("ruleValue");
-    if (ruleValue) {
-      this.value = ruleValue;
+    // 如果打卡地点数组为空,修改place的值
+    if (temPlace.length == 0 && flag_place) {
+      this.place = "未设置";
     }
   },
   methods: {
@@ -408,26 +417,16 @@ var _default = {
         content: '确定新增吗？',
         success: function () {
           var _success = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(res) {
-            var temList, _res;
+            var _res;
             return _regenerator.default.wrap(function _callee$(_context) {
               while (1) {
                 switch (_context.prev = _context.next) {
                   case 0:
                     if (!res.confirm) {
-                      _context.next = 9;
+                      _context.next = 5;
                       break;
                     }
-                    temList = [];
-                    _this2.timeGroups.forEach(function (ele) {
-                      ele.periods.forEach(function (item) {
-                        temList.push({
-                          beginTime: _this2.formatTime(item.beginTime),
-                          endTime: _this2.formatTime(item.endTime)
-                        });
-                      });
-                      ele.periods = temList;
-                    });
-                    _context.next = 5;
+                    _context.next = 3;
                     return _this2.$myRequest({
                       url: "/attendance/api/settings/rule/add",
                       method: "post",
@@ -440,7 +439,7 @@ var _default = {
                         // 考勤组ID列表
                         groupIds: _this2.groupIds,
                         // 是否同步节假日
-                        holiday: true,
+                        holiday: _this2.holiday,
                         // 是否可选择本地图片
                         localPicture: false,
                         // 规则名称
@@ -452,10 +451,10 @@ var _default = {
                         // 打卡地点列表
                         locations: _this2.locations,
                         // 打卡时间列表
-                        timeGroups: _this2.timeGroups
+                        timeGroups: _this2.time
                       }
                     });
-                  case 5:
+                  case 3:
                     _res = _context.sent;
                     // console.log(res)
                     if (_res.code == 200) {
@@ -463,22 +462,13 @@ var _default = {
                         title: "添加成功",
                         icon: 'success'
                       });
-                      uni.removeStorageSync('ruleName');
-                      uni.removeStorageSync('ruleGroup');
-                      uni.removeStorageSync('ruleTime');
-                      uni.removeStorageSync('chooseList');
-                      uni.removeStorageSync('ruleValue');
                       setTimeout(function () {
                         uni.navigateBack({
                           delta: 1
                         });
                       }, 1500);
                     }
-                    _context.next = 10;
-                    break;
-                  case 9:
-                    if (res.cancel) {}
-                  case 10:
+                  case 5:
                   case "end":
                     return _context.stop();
                 }
@@ -498,30 +488,34 @@ var _default = {
       this.value = this.array[index];
       var index2 = this.value.indexOf("分", 0);
       this.value = this.value.substring(0, index2);
-      uni.setStorageSync("ruleValue", this.value);
+    },
+    // switch的值改变回调
+    switchChange: function switchChange(e) {
+      this.holiday = e.detail.value;
+      // console.log(this.holiday);
     },
     // 点击规则名称跳转回调
     goPageRuleName: function goPageRuleName() {
       uni.navigateTo({
-        url: "/pages/ruleName/ruleName?type=2"
+        url: "/pages/ruleName/ruleName"
       });
     },
     // 点击考勤组跳转回调
     goPageGroup: function goPageGroup() {
       uni.navigateTo({
-        url: "/pages/group/group?flag=2&type=2"
+        url: "/pages/group/group?flag=2"
       });
     },
     // 点击打卡时间跳转回调
     goPagePunchTime: function goPagePunchTime() {
       uni.navigateTo({
-        url: "/pages/punchTime/punchTime?&type=2"
+        url: "/pages/punchTime/punchTime"
       });
     },
     // 点击打卡地点跳转回调
     goPagePunchLocation: function goPagePunchLocation() {
       uni.navigateTo({
-        url: "/pages/punchLocation/punchLocation?type=2"
+        url: "/pages/punchLocation/punchLocation"
       });
     },
     // 格式化时间
@@ -531,6 +525,15 @@ var _default = {
       var date = new Date(tem);
       var time = date.getTime();
       return time;
+    },
+    // 格式化时间
+    format_time: function format_time(timestamp) {
+      //时间戳为10位需*1000，时间戳为13位的话不需乘1000
+      var date = new Date(timestamp);
+      var h = (date.getHours() < 10 ? '0' + date.getHours() : date.getHours()) + ':';
+      var m = date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes();
+      var strDate = h + m;
+      return strDate;
     }
   }
 };

unpackage/dist/dev/mp-weixin/pages/addRules/addRules.wxss

@@ -48,6 +48,11 @@
   width: 16rpx;
   height: 25rpx;
 }
+.container .box .val2.data-v-441b8746 {
+  flex: 1;
+  margin-right: 20rpx;
+  text-align: end;
+}
 .container .button.data-v-441b8746 {
   margin: auto;
   margin-top: 52rpx;

unpackage/dist/dev/mp-weixin/pages/cardRecord/cardRecord.js

@@ -193,9 +193,9 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _regenerator = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/regenerator */ 40));
+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 */ 42));
+var _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/asyncToGenerator */ 41));
 //
 //
 //

unpackage/dist/dev/mp-weixin/pages/editRules/editRules.js

@@ -104,20 +104,38 @@ var render = function () {
   var _c = _vm._self._c || _h
   var m0 = __webpack_require__(/*! ../../static/right.png */ 82)
   var m1 = __webpack_require__(/*! ../../static/right.png */ 82)
-  var g0 = !(_vm.time == "未设置") ? _vm.time.join("，") : null
-  var m2 = __webpack_require__(/*! ../../static/right.png */ 82)
-  var m3 = __webpack_require__(/*! ../../static/right.png */ 82)
+  var l1 = !(_vm.time == "未设置")
+    ? _vm.__map(_vm.time, function (item, index) {
+        var $orig = _vm.__get_orig(item)
+        var l0 = _vm.__map(item.periods, function (item_time, index_time) {
+          var $orig = _vm.__get_orig(item_time)
+          var m2 = _vm.format_time(item_time.beginTime)
+          var m3 = _vm.format_time(item_time.endTime)
+          return {
+            $orig: $orig,
+            m2: m2,
+            m3: m3,
+          }
+        })
+        return {
+          $orig: $orig,
+          l0: l0,
+        }
+      })
+    : null
   var m4 = __webpack_require__(/*! ../../static/right.png */ 82)
+  var m5 = __webpack_require__(/*! ../../static/right.png */ 82)
+  var m6 = __webpack_require__(/*! ../../static/right.png */ 82)
   _vm.$mp.data = Object.assign(
     {},
     {
       $root: {
         m0: m0,
         m1: m1,
-        g0: g0,
-        m2: m2,
-        m3: m3,
+        l1: l1,
         m4: m4,
+        m5: m5,
+        m6: m6,
       },
     }
   )
@@ -161,8 +179,19 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _regenerator = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/regenerator */ 40));
-var _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/asyncToGenerator */ 42));
+var _regenerator = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/regenerator */ 39));
+var _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/asyncToGenerator */ 41));
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
 //
 //
 //
@@ -275,7 +304,6 @@ var _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(/*! @babel/r
 var _default = {
   data: function data() {
     return {
-      info: {},
       // 规则名称
       ruleName: "未设置",
       // 考勤组
@@ -288,19 +316,22 @@ var _default = {
       value: "未设置",
       // 提前通知选项
       array: ['5分钟', '10分钟', '15分钟', '20分钟'],
-      periods: [],
+      // 提前通知时间选择数组默认选择的索引
       index: 0,
+      // 当前规则ID
       id: "",
+      // 考勤组id数组
       groupIds: [],
-      timeGroups: [],
-      locations: []
+      // 打卡地点数组
+      locations: [],
+      // 是否同步节假日
+      holiday: false,
+      // 星期映射数组
+      arr: ["", "星期一", "星期二", "星期三", "星期四", "星期五", "星期六", "星期天"]
     };
   },
   onLoad: function onLoad(option) {
     var _this = this;
-    uni.removeStorageSync("chooseList_edit");
-    uni.removeStorageSync("ruleTime_edit");
-    uni.removeStorageSync("flag");
     uni.$on('updateRuleName', function (data) {
       _this.ruleName = data;
     });
@@ -313,27 +344,12 @@ var _default = {
       });
       _this.group = temList.join("，");
     });
-    this.info = JSON.parse(option.info);
-    console.log(this.info);
-    if (this.info) {
-      this.ruleName = this.info.name;
-      this.group = this.info.groups;
-      this.place = this.info.locations;
-      this.value = this.info.noticeTime;
-      this.id = this.info.id;
-      this.time = this.info.temList;
-      this.periods = [];
-      this.info.periods.forEach(function (ele) {
-        _this.periods.push({
-          beginTime: _this.format_time(ele.beginTime),
-          endTime: _this.format_time(ele.endTime)
-        });
-      });
-    }
+    this.id = option.id;
+    this.getData();
   },
   onShow: function onShow() {
-    var _this2 = this;
-    var rulePlace = uni.getStorageSync("chooseList") || uni.getStorageSync("chooseList_edit");
+    var rulePlace = uni.getStorageSync("chooseList");
+    var flag_place = uni.getStorageSync("flag_place");
     if (rulePlace) {
       this.locations = rulePlace;
       var temList = [];
@@ -342,109 +358,73 @@ var _default = {
       });
       this.place = temList.join("，");
     }
-    var ruleTime = uni.getStorageSync("ruleTime") || uni.getStorageSync("ruleTime_edit");
+    if (rulePlace.length == 0 && flag_place) {
+      this.place = "未设置";
+    }
+    var ruleTime = uni.getStorageSync("ruleTime");
     var flag = uni.getStorageSync("flag");
     if (ruleTime.length == 0 && flag) {
       this.time = "未设置";
     }
     if (ruleTime.length > 0) {
-      var _temList = [];
-      ruleTime.forEach(function (ele) {
-        _temList.push({
-          dayOfWeeks: ele.selectedWeeks,
-          periods: ele.list
-        });
-      });
-      this.periods = [];
-      this.time = [];
-      _temList.forEach(function (element) {
-        _this2.time.push(element.dayOfWeeks.join("，"));
-        _this2.periods.push(element.periods[0]);
-      });
-      _temList.forEach(function (item) {
-        item.dayOfWeeks = item.dayOfWeeks.map(function (element) {
-          if (element == '星期一') {
-            return element = 1;
-          }
-          if (element == '星期二') {
-            return element = 2;
-          }
-          if (element == '星期三') {
-            return element = 3;
-          }
-          if (element == '星期四') {
-            return element = 4;
-          }
-          if (element == '星期五') {
-            return element = 5;
-          }
-          if (element == '星期六') {
-            return element = 6;
-          }
-          if (element == '星期天') {
-            return element = 7;
-          }
-        });
-      });
-      this.timeGroups = _temList;
+      this.time = ruleTime;
     }
-
-    // let ruleTime = uni.getStorageSync("ruleTime_edit")
-    // console.log(ruleTime);
-    // if (ruleTime) {
-    // 	this.time = ruleTime
-    // 	let temList = []
-    // 	ruleTime.forEach((ele) => {
-    // 		temList.push({
-    // 			dayOfWeeks: ele.selectedWeeks,
-    // 			periods: ele.list
-    // 		})
-    // 	})
-    // 	temList.forEach((item) => {
-    // 		item.dayOfWeeks = item.dayOfWeeks.map((element) => {
-    // 			if (element == '星期一') {
-    // 				return element = 1
-    // 			}
-    // 			if (element == '星期二') {
-    // 				return element = 2
-    // 			}
-    // 			if (element == '星期三') {
-    // 				return element = 3
-    // 			}
-    // 			if (element == '星期四') {
-    // 				return element = 4
-    // 			}
-    // 			if (element == '星期五') {
-    // 				return element = 5
-    // 			}
-    // 			if (element == '星期六') {
-    // 				return element = 6
-    // 			}
-    // 			if (element == '星期天') {
-    // 				return element = 7
-    // 			}
-    // 		})
-    // 	})
-    // 	this.timeGroups = temList
-    // }
-    // 	let ruleName = uni.getStorageSync("ruleName")
-    // 	if (ruleName) {
-    // 		this.ruleName = ruleName
-    // 	}
-
-    // 	let ruleGroup = uni.getStorageSync("ruleGroup")
-    // 	if (ruleGroup) {
-    // 		let temList = []
-    // 		this.groupIds = []
-    // 		ruleGroup.forEach((ele) => {
-    // 			temList.push(ele.name)
-    // 			this.groupIds.push(ele.id)
-    // 		})
-    // 		this.group = temList.join("，")
-    // 	}
   },
-
   methods: {
+    // 获取规则详细信息
+    getData: function getData() {
+      var _this2 = this;
+      return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
+        var res, temList, temList2;
+        return _regenerator.default.wrap(function _callee$(_context) {
+          while (1) {
+            switch (_context.prev = _context.next) {
+              case 0:
+                _context.next = 2;
+                return _this2.$myRequest({
+                  url: "/attendance/api/settings/rule/detail/".concat(_this2.id)
+                });
+              case 2:
+                res = _context.sent;
+                // console.log(res);
+                if (res.code == 200) {
+                  // 规则名称
+                  _this2.ruleName = res.data.name;
+
+                  // 考勤组
+                  temList = [];
+                  _this2.groupIds = [];
+                  res.data.groups.forEach(function (ele) {
+                    temList.push(ele.name);
+                    _this2.groupIds.push(ele.id);
+                  });
+                  _this2.group = temList.join("，");
+
+                  // 打卡时间
+                  _this2.time = res.data.timeGroups;
+
+                  // 打卡地点
+                  temList2 = [];
+                  _this2.locations = res.data.locations;
+                  res.data.locations.forEach(function (ele) {
+                    temList2.push(ele.name);
+                  });
+                  _this2.place = temList2.join("，");
+
+                  // 提前通知
+                  _this2.value = res.data.noticeTime;
+
+                  // 法定节假日
+                  _this2.holiday = res.data.holiday;
+                }
+              case 4:
+              case "end":
+                return _context.stop();
+            }
+          }
+        }, _callee);
+      }))();
+    },
     // 点击确认按钮回调
     handleConfirm: function handleConfirm() {
       var _this3 = this;
@@ -487,27 +467,17 @@ var _default = {
         title: '提示',
         content: '确定修改吗？',
         success: function () {
-          var _success = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(res) {
-            var temList, _res;
-            return _regenerator.default.wrap(function _callee$(_context) {
+          var _success = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(res) {
+            var _res;
+            return _regenerator.default.wrap(function _callee2$(_context2) {
               while (1) {
-                switch (_context.prev = _context.next) {
+                switch (_context2.prev = _context2.next) {
                   case 0:
                     if (!res.confirm) {
-                      _context.next = 9;
+                      _context2.next = 5;
                       break;
                     }
-                    temList = [];
-                    _this3.timeGroups.forEach(function (ele) {
-                      ele.periods.forEach(function (item) {
-                        temList.push({
-                          beginTime: _this3.formatTime(item.beginTime),
-                          endTime: _this3.formatTime(item.endTime)
-                        });
-                      });
-                      ele.periods = temList;
-                    });
-                    _context.next = 5;
+                    _context2.next = 3;
                     return _this3.$myRequest({
                       url: "/attendance/api/settings/rule/update",
                       method: "put",
@@ -522,7 +492,7 @@ var _default = {
                         // 考勤组ID列表
                         groupIds: _this3.groupIds,
                         // 是否同步节假日
-                        holiday: true,
+                        holiday: _this3.holiday,
                         // 是否可选择本地图片
                         localPicture: false,
                         // 规则名称
@@ -534,22 +504,28 @@ var _default = {
                         // 打卡地点列表
                         locations: _this3.locations,
                         // 打卡时间列表
-                        timeGroups: _this3.timeGroups
+                        timeGroups: _this3.time
                       }
                     });
+                  case 3:
+                    _res = _context2.sent;
+                    // console.log(res);
+                    if (_res.code == 200) {
+                      uni.showToast({
+                        title: "编辑成功"
+                      });
+                      setTimeout(function () {
+                        uni.navigateBack({
+                          delta: 1
+                        });
+                      }, 1500);
+                    }
                   case 5:
-                    _res = _context.sent;
-                    console.log(_res);
-                    _context.next = 10;
-                    break;
-                  case 9:
-                    if (res.cancel) {}
-                  case 10:
                   case "end":
-                    return _context.stop();
+                    return _context2.stop();
                 }
               }
-            }, _callee);
+            }, _callee2);
           }));
           function success(_x) {
             return _success.apply(this, arguments);
@@ -565,17 +541,17 @@ var _default = {
         title: '提示',
         content: '确定删除吗？',
         success: function () {
-          var _success2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(res) {
+          var _success2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3(res) {
             var _res2;
-            return _regenerator.default.wrap(function _callee2$(_context2) {
+            return _regenerator.default.wrap(function _callee3$(_context3) {
               while (1) {
-                switch (_context2.prev = _context2.next) {
+                switch (_context3.prev = _context3.next) {
                   case 0:
                     if (!res.confirm) {
-                      _context2.next = 7;
+                      _context3.next = 5;
                       break;
                     }
-                    _context2.next = 3;
+                    _context3.next = 3;
                     return _this4.$myRequest({
                       url: "/attendance/api/settings/rule/delete",
                       method: "delete",
@@ -584,7 +560,7 @@ var _default = {
                       }
                     });
                   case 3:
-                    _res2 = _context2.sent;
+                    _res2 = _context3.sent;
                     // console.log(res);
                     if (_res2.code == 200) {
                       uni.showToast({
@@ -596,16 +572,12 @@ var _default = {
                         });
                       }, 1500);
                     }
-                    _context2.next = 8;
-                    break;
-                  case 7:
-                    if (res.cancel) {}
-                  case 8:
+                  case 5:
                   case "end":
-                    return _context2.stop();
+                    return _context3.stop();
                 }
               }
-            }, _callee2);
+            }, _callee3);
           }));
           function success(_x2) {
             return _success2.apply(this, arguments);
@@ -621,38 +593,35 @@ var _default = {
       var index2 = this.value.indexOf("分", 0);
       this.value = this.value.substring(0, index2);
     },
+    // switch的值改变回调
+    switchChange: function switchChange(e) {
+      this.holiday = e.detail.value;
+      // console.log(this.holiday);
+    },
     // 点击规则名称跳转回调
     goPageRuleName: function goPageRuleName() {
       uni.navigateTo({
-        url: "/pages/ruleName/ruleName?type=1"
+        url: "/pages/ruleName/ruleName"
       });
     },
     // 点击考勤组跳转回调
     goPageGroup: function goPageGroup() {
       uni.navigateTo({
-        url: "/pages/group/group?flag=2&type=1"
+        url: "/pages/group/group?flag=2"
       });
     },
     // 点击打卡时间跳转回调
     goPagePunchTime: function goPagePunchTime() {
-      if (this.time == "未设置") {
-        var periods = [];
-        var time = [];
-        uni.navigateTo({
-          url: "/pages/punchTime/punchTime?time=".concat(time, "&periods=").concat(periods, "&type=1")
-        });
-      } else {
-        var _periods = JSON.stringify(this.periods);
-        var _time = JSON.stringify(this.time);
-        uni.navigateTo({
-          url: "/pages/punchTime/punchTime?time=".concat(_time, "&periods=").concat(_periods, "&type=1")
-        });
-      }
+      var time = JSON.stringify(this.time);
+      uni.navigateTo({
+        url: "/pages/punchTime/punchTime?time=".concat(time)
+      });
     },
     // 点击打卡地点跳转回调
     goPagePunchLocation: function goPagePunchLocation() {
+      var locations = JSON.stringify(this.locations);
       uni.navigateTo({
-        url: "/pages/punchLocation/punchLocation?id=".concat(this.id, "&type=1")
+        url: "/pages/punchLocation/punchLocation?locations=".concat(locations)
       });
     },
     // 格式化时间

unpackage/dist/dev/mp-weixin/pages/editRules/editRules.wxss

@@ -49,6 +49,11 @@
   width: 16rpx;
   height: 25rpx;
 }
+.container .box .val2.data-v-138ca3bc {
+  flex: 1;
+  margin-right: 20rpx;
+  text-align: end;
+}
 .container .button.data-v-138ca3bc {
   margin: auto;
   margin-top: 52rpx;

unpackage/dist/dev/mp-weixin/pages/group/group.js

@@ -198,8 +198,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _regenerator = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/regenerator */ 40));
-var _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/asyncToGenerator */ 42));
+var _regenerator = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/regenerator */ 39));
+var _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/asyncToGenerator */ 41));
 var tkiTree = function tkiTree() {
   __webpack_require__.e(/*! require.ensure | components/tki-tree/tki-tree */ "components/tki-tree/tki-tree").then((function () {
     return resolve(__webpack_require__(/*! @/components/tki-tree/tki-tree.vue */ 288));
@@ -237,13 +237,11 @@ var _default = {
       // 考勤组列表数据
       list: [],
       // 考勤组范围数组
-      range: [],
-      type: ""
+      range: []
     };
   },
   onLoad: function onLoad(options) {
     this.flag = options.flag;
-    this.type = options.type;
     if (this.flag == 1) {
       this.checkStatus = true;
     }
@@ -477,11 +475,7 @@ var _default = {
           icon: "none"
         });
       } else {
-        if (this.type == 1) {
-          uni.$emit('updateRuleGroup', temList);
-        } else {
-          uni.setStorageSync("ruleGroup", temList);
-        }
+        uni.$emit('updateRuleGroup', temList);
         uni.navigateBack({
           delta: 1
         });

unpackage/dist/dev/mp-weixin/pages/location/location.js

@@ -196,7 +196,7 @@ exports.default = void 0;
 //
 //
 
-var QQMapWX = __webpack_require__(/*! ../../util/qqmap-wx-jssdk1.1/qqmap-wx-jssdk */ 43);
+var QQMapWX = __webpack_require__(/*! ../../util/qqmap-wx-jssdk1.1/qqmap-wx-jssdk */ 49);
 var qqmapsdk;
 var _default = {
   data: function data() {

unpackage/dist/dev/mp-weixin/pages/particulars/particulars.js

@@ -191,9 +191,9 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _regenerator = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/regenerator */ 40));
+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 */ 42));
+var _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/asyncToGenerator */ 41));
 //
 //
 //
@@ -239,15 +239,26 @@ var _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(/*! @babel/r
 var _default = {
   data: function data() {
     return {
+      // 当前页
       page: 1,
+      // 总条数
       total: 0,
       // 当前时间
       nowTime: "",
+      // 当前时间-每一天
+      nowTime_day: "",
+      // 搜索框绑定数值
       searchValue: "",
-      list: []
+      // 列表数组
+      list: [],
+      type: ""
     };
   },
-  onLoad: function onLoad() {
+  onLoad: function onLoad(options) {
+    if (options.nowTime_day) {
+      this.nowTime_day = options.nowTime_day;
+    }
+    this.type = options.type;
     this.getTime();
     this.getData();
   },
@@ -286,7 +297,7 @@ var _default = {
                   data: {
                     name: _this.searchValue,
                     page: _this.page,
-                    time: _this.nowTime,
+                    time: _this.type == 1 ? _this.nowTime_day : _this.nowTime,
                     type: 1
                   }
                 });
@@ -306,9 +317,11 @@ var _default = {
       }))();
     },
     // 点击每一个规则回调
-    handleLook: function handleLook() {
+    handleLook: function handleLook(item) {
+      // console.log(item);
+      var info = JSON.stringify(item);
       uni.navigateTo({
-        url: "/pages/rulesDetail/rulesDetail"
+        url: "/pages/rulesDetail/rulesDetail?info=".concat(info)
       });
     },
     // 搜索框输入时的回调

unpackage/dist/dev/mp-weixin/pages/powerSet/powerSet.js

@@ -177,8 +177,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _regenerator = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/regenerator */ 40));
-var _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/asyncToGenerator */ 42));
+var _regenerator = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/regenerator */ 39));
+var _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/asyncToGenerator */ 41));
 //
 //
 //

unpackage/dist/dev/mp-weixin/pages/punchLocation/punchLocation.js

@@ -176,13 +176,10 @@ __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 */ 40));
-var _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/asyncToGenerator */ 42));
 //
 //
 //
@@ -231,9 +228,9 @@ var _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(/*! @babel/r
 var _default = {
   data: function data() {
     return {
+      // 地点数组
       list: [],
-      id: "",
-      type: "",
+      // 左滑选项配置
       options: [{
         text: '删除',
         style: {
@@ -243,56 +240,30 @@ var _default = {
     };
   },
   onLoad: function onLoad(options) {
-    this.type = options.type;
-    if (options.id) {
-      this.id = options.id;
-      this.getRuleDetail();
+    if (options.locations) {
+      this.list = JSON.parse(options.locations);
+      uni.setStorageSync("chooseList", this.list);
     }
   },
   onShow: function onShow() {
-    var arr = uni.getStorageSync("chooseList") || uni.getStorageSync("chooseList_edit");
+    uni.removeStorageSync("flag_place");
+    var arr = uni.getStorageSync("chooseList");
     if (arr) {
       this.list = arr;
     }
+    if (arr.lenght == 0) {
+      uni.setStorageSync("flag_place", true);
+    }
   },
   methods: {
-    // 获取打卡规则的详细信息
-    getRuleDetail: function getRuleDetail() {
-      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/settings/rule/detail/".concat(_this.id)
-                });
-              case 2:
-                res = _context.sent;
-                // console.log(res);
-                if (res.code == 200) {
-                  _this.list = res.data.locations;
-                  uni.setStorageSync("chooseList_edit", _this.list);
-                }
-              case 4:
-              case "end":
-                return _context.stop();
-            }
-          }
-        }, _callee);
-      }))();
-    },
     // 点击添加打卡位置回调
     handleAdd: function handleAdd() {
-      var _this2 = this;
       // 获取用户位置权限
       uni.authorize({
         scope: 'scope.userLocation',
         success: function success() {
           uni.navigateTo({
-            url: "/pages/addLocation/addLocation?type=".concat(_this2.type)
+            url: "/pages/addLocation/addLocation"
           });
         },
         fail: function fail() {
@@ -306,7 +277,7 @@ var _default = {
                 uni.openSetting({
                   success: function success(res) {}
                 });
-              } else if (res.cancel) {}
+              }
             }
           });
         }
@@ -314,7 +285,7 @@ var _default = {
     },
     // 点击右侧删除按钮回调
     onClick: function onClick(index) {
-      var _this3 = this;
+      var _this = this;
       uni.showModal({
         title: '提示',
         content: '确定删除该打卡位置吗？',
@@ -324,17 +295,12 @@ var _default = {
               title: "删除成功",
               icon: 'success'
             });
-            _this3.list.splice(index, 1);
-            if (_this3.type == 1) {
-              uni.setStorageSync("chooseList_edit", _this3.list);
-            } else {
-              uni.setStorageSync("chooseList", _this3.list);
-            }
-            var flag = uni.getStorageSync("chooseList");
-            if (flag == []) {
+            _this.list.splice(index, 1);
+            if (_this.list.length == 0) {
               uni.setStorageSync("flag_place", true);
             }
-          } else if (res.cancel) {}
+            uni.setStorageSync("chooseList", _this.list);
+          }
         }
       });
     }

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

@@ -129,13 +129,22 @@ var render = function () {
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
   var m0 = __webpack_require__(/*! ../../static/add.png */ 71)
-  var m1 = __webpack_require__(/*! ../../static/right.png */ 82)
-  var l0 = _vm.__map(_vm.list, function (item, index) {
+  var m3 = __webpack_require__(/*! ../../static/right.png */ 82)
+  var l1 = _vm.__map(_vm.list, function (item, index) {
     var $orig = _vm.__get_orig(item)
-    var g0 = item.selectedWeeks.join("，")
+    var l0 = _vm.__map(item.periods, function (item_time, index_time) {
+      var $orig = _vm.__get_orig(item_time)
+      var m1 = _vm.format_time(item_time.beginTime)
+      var m2 = _vm.format_time(item_time.endTime)
+      return {
+        $orig: $orig,
+        m1: m1,
+        m2: m2,
+      }
+    })
     return {
       $orig: $orig,
-      g0: g0,
+      l0: l0,
     }
   })
   _vm.$mp.data = Object.assign(
@@ -143,8 +152,8 @@ var render = function () {
     {
       $root: {
         m0: m0,
-        m1: m1,
-        l0: l0,
+        m3: m3,
+        l1: l1,
       },
     }
   )
@@ -237,61 +246,54 @@ exports.default = void 0;
 //
 //
 //
+//
+//
 var _default = {
   data: function data() {
     return {
+      // 时间数组
       list: [],
-      type: "",
+      // 左滑选项配置
       options: [{
         text: '删除',
         style: {
           backgroundColor: '#D43030'
         }
-      }]
+      }],
+      // 星期映射数组
+      arr: ["", "星期一", "星期二", "星期三", "星期四", "星期五", "星期六", "星期天"]
     };
   },
   onLoad: function onLoad(options) {
-    this.type = options.type;
     if (options.time) {
-      var time = JSON.parse(options.time);
-      var periods = JSON.parse(options.periods);
-      console.log(time);
-      console.log(periods);
-      // let temArr = []
-      // periods.forEach((ele) => {
-      // 	temArr.push({
-      // 		beginTime: this.format_time(ele.beginTime),
-      // 		endTime: this.format_time(ele.endTime)
-      // 	})
-      // })
-      // periods = temArr
-      var temList = [];
-      temList.push({
-        selectedWeeks: time,
-        list: periods
-      });
-      this.list = temList;
-      uni.setStorageSync("ruleTime_edit", this.list);
+      if (JSON.parse(options.time) != '未设置') {
+        this.list = JSON.parse(options.time);
+        uni.setStorageSync("ruleTime", this.list);
+      }
     }
   },
   onShow: function onShow() {
-    var ruleTime = uni.getStorageSync("ruleTime_edit") || uni.getStorageSync("ruleTime");
+    uni.removeStorageSync("flag");
+    var ruleTime = uni.getStorageSync("ruleTime");
     if (ruleTime) {
       this.list = ruleTime;
     }
+    if (ruleTime.lenght == 0) {
+      uni.setStorageSync("flag", true);
+    }
   },
   methods: {
     // 点击添加打卡时间回调 跳转到添加页面
     handleAdd: function handleAdd() {
       uni.navigateTo({
-        url: "/pages/setPunchTime/setPunchTime?flag=1&type=".concat(this.type)
+        url: "/pages/setPunchTime/setPunchTime?flag=1"
       });
     },
     // 点击每一个时间段回调 跳转到编辑页面
     handleEdit: function handleEdit(item, index) {
       var info = JSON.stringify(item);
       uni.navigateTo({
-        url: "/pages/setPunchTime/setPunchTime?flag=2&info=".concat(info, "&index=").concat(index, "&type=").concat(this.type)
+        url: "/pages/setPunchTime/setPunchTime?flag=2&info=".concat(info, "&index=").concat(index)
       });
     },
     // 点击右侧删除按钮回调
@@ -308,27 +310,23 @@ var _default = {
               icon: 'success'
             });
             _this.list.splice(index, 1);
-            if (_this.type == 1) {
-              uni.setStorageSync("ruleTime_edit", _this.list);
-            } else {
-              uni.setStorageSync("ruleTime", _this.list);
-            }
-            var flag = uni.getStorageSync("ruleTime");
-            if (flag == []) {
+            if (_this.list.length == 0) {
               uni.setStorageSync("flag", true);
             }
+            uni.setStorageSync("ruleTime", _this.list);
           } else if (res.cancel) {}
         }
       });
-    } // 格式化时间
-    // format_time(timestamp) {
-    // 	//时间戳为10位需*1000，时间戳为13位的话不需乘1000
-    // 	var date = new Date(timestamp);
-    // 	var h = (date.getHours() < 10 ? '0' + date.getHours() : date.getHours()) + ':';
-    // 	var m = (date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes());
-    // 	let strDate = h + m;
-    // 	return strDate;
-    // }
+    },
+    // 格式化时间
+    format_time: function format_time(timestamp) {
+      //时间戳为10位需*1000，时间戳为13位的话不需乘1000
+      var date = new Date(timestamp);
+      var h = (date.getHours() < 10 ? '0' + date.getHours() : date.getHours()) + ':';
+      var m = date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes();
+      var strDate = h + m;
+      return strDate;
+    }
   }
 };
 exports.default = _default;

unpackage/dist/dev/mp-weixin/pages/ruleName/ruleName.js

@@ -181,13 +181,10 @@ exports.default = void 0;
 var _default = {
   data: function data() {
     return {
-      name: "",
-      type: ""
+      // 输入框绑定数值
+      name: ""
     };
   },
-  onLoad: function onLoad(options) {
-    this.type = options.type;
-  },
   methods: {
     // 点击确认按钮回调
     handleConfirm: function handleConfirm() {
@@ -197,11 +194,7 @@ var _default = {
           icon: 'none'
         });
       } else {
-        if (this.type == 1) {
-          uni.$emit('updateRuleName', this.name);
-        } else {
-          uni.setStorageSync("ruleName", this.name);
-        }
+        uni.$emit('updateRuleName', this.name);
         uni.navigateBack({
           delta: 1
         });

unpackage/dist/dev/mp-weixin/pages/ruleSet/ruleSet.js

@@ -175,8 +175,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _regenerator = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/regenerator */ 40));
-var _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/asyncToGenerator */ 42));
+var _regenerator = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/regenerator */ 39));
+var _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/asyncToGenerator */ 41));
 //
 //
 //
@@ -232,40 +232,19 @@ var _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(/*! @babel/r
 var _default = {
   data: function data() {
     return {
+      // 规则列表数组
       list: []
     };
   },
   onShow: function onShow() {
+    // 清空缓存
+    uni.removeStorageSync("flag_place");
+    uni.removeStorageSync("flag");
+    uni.removeStorageSync("chooseList");
+    uni.removeStorageSync('ruleTime');
+    // 获取最新打卡规则列表数据
     this.getRuleList();
-    var ruleName = uni.getStorageSync('ruleName');
-    var ruleGroup = uni.getStorageSync('ruleGroup');
-    var ruleTime = uni.getStorageSync('ruleTime');
-    var chooseList = uni.getStorageSync('chooseList');
-    var ruleValue = uni.getStorageSync('ruleValue');
-    if (ruleName || ruleGroup || ruleTime || chooseList || ruleValue) {
-      uni.showModal({
-        title: '提示',
-        content: '上一个页面有未保存的数据，确定不保存吗？',
-        cancelText: '返回上页',
-        success: function success(res) {
-          if (res.confirm) {
-            uni.removeStorageSync('ruleName');
-            uni.removeStorageSync('ruleGroup');
-            uni.removeStorageSync('ruleTime');
-            uni.removeStorageSync('chooseList');
-            uni.removeStorageSync('ruleValue');
-          } else if (res.cancel) {
-            uni.navigateTo({
-              url: "/pages/addRules/addRules"
-            });
-          }
-        }
-      });
-    }
   },
-  // onLoad() {
-  // 	this.getRuleList()
-  // },
   methods: {
     // 获取打卡规则列表数据
     getRuleList: function getRuleList() {
@@ -306,11 +285,10 @@ var _default = {
       }))();
     },
     // 点击每一项跳转编辑规则页面
-    toPageEditRules: function toPageEditRules(item) {
-      // console.log(item);
-      var info = JSON.stringify(item);
+    toPageEditRules: function toPageEditRules(id) {
+      // console.log(id);
       uni.navigateTo({
-        url: "/pages/editRules/editRules?info=".concat(info)
+        url: "/pages/editRules/editRules?id=".concat(id)
       });
     },
     // 新增规则跳转页面回调

unpackage/dist/dev/mp-weixin/pages/rulesDetail/rulesDetail.js

@@ -128,6 +128,15 @@ var render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
+  var m0 = !_vm.list.length ? __webpack_require__(/*! ../../static/nodata.png */ 88) : null
+  _vm.$mp.data = Object.assign(
+    {},
+    {
+      $root: {
+        m0: m0,
+      },
+    }
+  )
 }
 var recyclableRender = false
 var staticRenderFns = []
@@ -163,10 +172,21 @@ __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));
+//
+//
+//
+//
+//
+//
+//
 //
 //
 //
@@ -211,79 +231,104 @@ exports.default = void 0;
 var _default = {
   data: function data() {
     return {
+      // 总人数
+      peopleTotal: 0,
+      // 打卡失败人数
+      failCount: 0,
+      // 打卡成功人数
+      successCount: 0,
+      // 搜索框绑定值
       searchValue: "",
-      items: ['打卡成功（50/150人）', '打卡失败（28/150人）'],
+      // 分段器绑定数组
+      items: ['打卡成功', '打卡失败'],
+      // 当前分段器所在的索引
       current: 0,
+      // 列表数组
       list: [],
-      list2: [{
-        id: 1,
-        url: "../../static/ceshi.jpg",
-        name: "张三",
-        college: "文法学院",
-        status: 1
-      }, {
-        id: 2,
-        url: "../../static/ceshi.jpg",
-        name: "李四",
-        college: "文法学院",
-        status: 1
-      }, {
-        id: 3,
-        url: "../../static/ceshi.jpg",
-        name: "王五",
-        college: "文法学院",
-        status: 1
-      }],
-      list3: [{
-        id: 1,
-        url: "../../static/ceshi.jpg",
-        name: "伍六七",
-        college: "文法学院",
-        status: 2
-      }, {
-        id: 2,
-        url: "../../static/ceshi.jpg",
-        name: "喜羊羊",
-        college: "文法学院",
-        status: 2
-      }, {
-        id: 3,
-        url: "../../static/ceshi.jpg",
-        name: "灰太狼",
-        college: "文法学院",
-        status: 2
-      }]
+      // 规则ID
+      taskId: "",
+      // 打卡状态 3代表失败 4代表成功
+      status: 4,
+      // 当前页
+      page: 1,
+      // 列表总条数
+      total: 0
     };
   },
   onLoad: function onLoad(options) {
-    this.list = this.list2;
+    var info = JSON.parse(options.info);
+    // console.log(info);
+    this.peopleTotal = info.peopleTotal;
+    this.failCount = info.failCount;
+    this.successCount = info.peopleTotal - info.failCount;
+    this.items[0] = "\u6253\u5361\u6210\u529F\uFF08".concat(this.successCount, "/").concat(this.peopleTotal, "\u4EBA\uFF09");
+    this.items[1] = "\u6253\u5361\u5931\u8D25\uFF08".concat(this.failCount, "/").concat(this.peopleTotal, "\u4EBA\uFF09");
+    this.taskId = info.taskId;
+    this.getData();
+  },
+  onReachBottom: function onReachBottom() {
+    if (this.list.length < this.total) {
+      this.page++;
+      this.getData();
+    } else {
+      uni.showToast({
+        title: "没有更多数据了",
+        icon: 'none'
+      });
+    }
   },
   methods: {
+    // 获取列表数据
+    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/rule",
+                  data: {
+                    name: _this.searchValue,
+                    page: _this.page,
+                    status: _this.status,
+                    taskId: _this.taskId
+                  }
+                });
+              case 2:
+                res = _context.sent;
+                // console.log(res);
+                if (res.code == 200) {
+                  _this.total = res.data.total;
+                  _this.list = [].concat((0, _toConsumableArray2.default)(_this.list), (0, _toConsumableArray2.default)(res.data.list));
+                }
+              case 4:
+              case "end":
+                return _context.stop();
+            }
+          }
+        }, _callee);
+      }))();
+    },
+    // 点击分段器回调
     onClickItem: function onClickItem(e) {
-      console.log(e.currentIndex);
+      // console.log(e.currentIndex);
+      this.list = [];
+      this.page = 1;
       if (e.currentIndex == 0) {
-        this.list = this.list2;
+        this.status = 4;
       } else {
-        this.list = this.list3;
+        this.status = 3;
       }
-    },
-    // 搜索框失焦回调
-    blur: function blur(res) {
-      uni.showToast({
-        title: '搜索：' + res.value,
-        icon: 'none'
-      });
+      this.getData();
     },
     // 搜索框输入时的回调
-    input: function input(res) {
-      console.log('----input:', res);
-    },
-    // 清除搜索框内容时的回调
-    clear: function clear(res) {
-      uni.showToast({
-        title: 'clear事件，清除值为：' + res.value,
-        icon: 'none'
-      });
+    input: function input() {
+      this.list = [];
+      this.page = 1;
+      this.getData();
     }
   }
 };

unpackage/dist/dev/mp-weixin/pages/rulesDetail/rulesDetail.wxss

@@ -13,6 +13,7 @@
 .container .list.data-v-76b7c1d8 {
   margin-top: 20rpx;
   width: 750rpx;
+  min-height: 85vh;
   background-color: #fff;
 }
 .container .list .control.data-v-76b7c1d8 {
@@ -63,6 +64,17 @@
   align-items: center;
   font-size: 28rpx;
 }
+.container .list .listbox2.data-v-76b7c1d8 {
+  margin-top: 230rpx;
+  text-align: center;
+}
+.container .list .listbox2 ._img.data-v-76b7c1d8 {
+  width: 480rpx;
+  height: 508rpx;
+}
+.container .list .listbox2 .info.data-v-76b7c1d8 {
+  color: #5792F0;
+}
 .data-v-76b7c1d8 .uni-searchbar {
   padding: 10rpx;
 }

unpackage/dist/dev/mp-weixin/pages/setPunchTime/setPunchTime.js

@@ -199,8 +199,6 @@ var _default = {
         beginTime: "00:00",
         endTime: "00:00"
       }],
-      // 是否同步法定节假日
-      holiday: false,
       // 编辑打卡时间页面带过来的对象
       info: {},
       // 左滑配置
@@ -213,13 +211,12 @@ var _default = {
       // 添加时间 编辑时间 标识
       flag: null,
       // 时间列表索引
-      index: null,
-      type: ""
+      index: null
     };
   },
   onLoad: function onLoad(options) {
+    var _this = this;
     this.flag = options.flag;
-    this.type = options.type;
     if (this.flag == 1) {
       uni.setNavigationBarTitle({
         title: '添加打卡时间'
@@ -230,30 +227,17 @@ var _default = {
       });
       this.index = options.index;
       this.info = JSON.parse(options.info);
-      console.log(this.info);
-      this.list = this.info.list;
-      this.holiday = this.info.holiday;
-      this.selectedWeeks = this.info.selectedWeeks.map(function (ele) {
-        if (ele == '星期一') {
-          return ele = 1;
-        }
-        if (ele == '星期二') {
-          return ele = 2;
-        }
-        if (ele == '星期三') {
-          return ele = 3;
-        }
-        if (ele == '星期四') {
-          return ele = 4;
-        }
-        if (ele == '星期五') {
-          return ele = 5;
-        }
-        if (ele == '星期六') {
-          return ele = 6;
-        }
-        if (ele == '星期天') {
+      // console.log(this.info);
+      this.list = this.info.periods;
+      this.list.forEach(function (ele) {
+        ele.beginTime = _this.format_time(ele.beginTime);
+        ele.endTime = _this.format_time(ele.endTime);
+      });
+      this.selectedWeeks = this.info.dayOfWeeks.map(function (ele) {
+        if (ele == 7) {
           return ele = 0;
+        } else {
+          return ele;
         }
       });
     }
@@ -261,7 +245,7 @@ var _default = {
   methods: {
     // 保存按钮回调
     handleSave: function handleSave() {
-      var _this = this;
+      var _this2 = this;
       if (!this.selectedWeeks.length) {
         uni.showToast({
           title: "请选择需要打卡的星期",
@@ -285,79 +269,41 @@ var _default = {
               title: "保存成功",
               icon: 'success'
             });
-            _this.selectedWeeks = _this.selectedWeeks.map(function (ele) {
-              if (ele == 1) {
-                return ele = '星期一';
-              }
-              if (ele == 2) {
-                return ele = '星期二';
-              }
-              if (ele == 3) {
-                return ele = '星期三';
-              }
-              if (ele == 4) {
-                return ele = '星期四';
-              }
-              if (ele == 5) {
-                return ele = '星期五';
-              }
-              if (ele == 6) {
-                return ele = '星期六';
-              }
-              if (ele == 0) {
-                return ele = '星期天';
-              } else {
-                return ele;
-              }
-            });
-
-            // 从编辑规则页面进入
-            if (_this.type == 1) {
-              setTimeout(function () {
-                var temList = uni.getStorageSync("ruleTime_edit") || [];
-                if (_this.flag == 1) {
-                  temList.push({
-                    selectedWeeks: _this.selectedWeeks,
-                    list: _this.list,
-                    holiday: _this.holiday
-                  });
+            setTimeout(function () {
+              var temArr = [];
+              temArr = _this2.list;
+              temArr.forEach(function (ele) {
+                ele.beginTime = _this2.formatTime(ele.beginTime);
+                ele.endTime = _this2.formatTime(ele.endTime);
+              });
+              var temArr_week = [];
+              temArr_week = _this2.selectedWeeks.map(function (ele) {
+                if (ele == 0) {
+                  return ele = 7;
                 } else {
-                  temList.splice(_this.index, 1, {
-                    selectedWeeks: _this.selectedWeeks,
-                    list: _this.list,
-                    holiday: _this.holiday
-                  });
+                  return ele;
                 }
-                uni.setStorageSync("ruleTime_edit", temList);
-                uni.navigateBack({
-                  delta: 1
+              });
+              var temList = uni.getStorageSync("ruleTime") || [];
+              // 编辑时间
+              if (_this2.flag == 2) {
+                temList.splice(_this2.index, 1, {
+                  dayOfWeeks: temArr_week,
+                  periods: temArr
                 });
-              }, 1500);
-            } else {
-              setTimeout(function () {
-                var temList = uni.getStorageSync("ruleTime") || [];
-                // 编辑时间
-                if (_this.flag == 2) {
-                  temList.splice(_this.index, 1, {
-                    selectedWeeks: _this.selectedWeeks,
-                    list: _this.list,
-                    holiday: _this.holiday
-                  });
-                } else {
-                  // 添加时间
-                  temList.push({
-                    selectedWeeks: _this.selectedWeeks,
-                    list: _this.list,
-                    holiday: _this.holiday
-                  });
-                }
-                uni.setStorageSync("ruleTime", temList);
-                uni.navigateBack({
-                  delta: 1
+              } else {
+                // 添加时间
+                temList.push({
+                  dayOfWeeks: temArr_week,
+                  periods: temArr
                 });
-              }, 1500);
-            }
-          } else if (res.cancel) {}
+              }
+              uni.setStorageSync("ruleTime", temList);
+              uni.navigateBack({
+                delta: 1
+              });
+            }, 1500);
+          }
         }
       });
     },
@@ -375,12 +321,7 @@ var _default = {
       value.sort(function (a, b) {
         return a - b;
       });
-      // 把数字转换成星期
-      var arr = ["", "星期一", "星期二", "星期三", "星期四", "星期五", "星期六", "星期天"];
-      this.selectedWeeks = value.map(function (ele) {
-        return ele = arr[ele];
-      });
-      console.log(this.selectedWeeks);
+      this.selectedWeeks = value;
     },
     // 选择时间段回调
     bindTimeChange: function bindTimeChange(e, val, item) {
@@ -397,27 +338,39 @@ var _default = {
         endTime: "00:00"
       });
     },
-    // switch改变回调
-    switchChange: function switchChange(e) {
-      // console.log('switch1 发生 change 事件，携带值为', e.detail.value)
-      this.holiday = e.detail.value;
-    },
     // 点击右侧删除按钮回调
     onClick: function onClick(index) {
-      var _this2 = this;
+      var _this3 = this;
       uni.showModal({
         title: '提示',
         content: '确定删除该打卡时间段吗？',
         success: function success(res) {
           if (res.confirm) {
-            _this2.list.splice(index, 1);
+            _this3.list.splice(index, 1);
             uni.showToast({
               title: "删除成功",
               icon: 'success'
             });
-          } else if (res.cancel) {}
+          }
         }
       });
+    },
+    // 格式化时间
+    formatTime: function formatTime(val) {
+      var tem = '2021-11-22 ' + val + ':00';
+      // console.log(tem);
+      var date = new Date(tem);
+      var time = date.getTime();
+      return time;
+    },
+    // 格式化时间
+    format_time: function format_time(timestamp) {
+      //时间戳为10位需*1000，时间戳为13位的话不需乘1000
+      var date = new Date(timestamp);
+      var h = (date.getHours() < 10 ? '0' + date.getHours() : date.getHours()) + ':';
+      var m = date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes();
+      var strDate = h + m;
+      return strDate;
     }
   }
 };

unpackage/dist/dev/mp-weixin/pages/setPunchTime/setPunchTime.wxss

@@ -80,26 +80,6 @@
   width: 26rpx;
   height: 26rpx;
 }
-.container .switch.data-v-bb96deb4 {
-  box-sizing: border-box;
-  display: flex;
-  align-items: center;
-  margin: 0 auto;
-  margin-top: 20rpx;
-  padding: 0 20rpx;
-  width: 690rpx;
-  height: 86rpx;
-  border-radius: 10rpx;
-  background: #FFFFFF;
-}
-.container .switch .switch_title.data-v-bb96deb4 {
-  flex: 5;
-  font-size: 34rpx;
-  font-weight: 500;
-}
-.container .switch .switch_button.data-v-bb96deb4 {
-  flex: 1;
-}
 .container .button.data-v-bb96deb4 {
   margin: 0 auto;
   margin-top: 50rpx;

unpackage/dist/dev/mp-weixin/pages/stat/stat.js

@@ -194,9 +194,9 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _regenerator = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/regenerator */ 40));
+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 */ 42));
+var _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/asyncToGenerator */ 41));
 var _defineProperty2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/defineProperty */ 10));
 var progressBar = function progressBar() {
   __webpack_require__.e(/*! require.ensure | components/chocolate-progress-bar/chocolate-progress-bar */ "components/chocolate-progress-bar/chocolate-progress-bar").then((function () {
@@ -505,6 +505,23 @@ var _default = {
         this.getRulesList();
       }
     },
+    // 点击通知回调
+    handleInform: function handleInform() {
+      uni.showModal({
+        title: '提示',
+        content: "\u5F53\u524D\u5217\u8868\u4E2D\u6709 ".concat(this.total, " \u4F4D\u5F02\u5E38\u4EBA\u5458\uFF0C\u786E\u5B9A\u9700\u8981\u5168\u90E8\u901A\u77E5\u5417\uFF1F"),
+        success: function success(res) {
+          if (res.confirm) {} else if (res.cancel) {}
+        }
+      });
+    },
+    // 点击查看明细回调
+    handleLookDetail: function handleLookDetail() {
+      // console.log(this.nowTime);
+      uni.navigateTo({
+        url: "/pages/particulars/particulars?nowTime_day=".concat(this.nowTime, "&type=1")
+      });
+    },
     // 跳转统计详情页面
     goToDetail: function goToDetail() {
       if (this.current == 1) {
@@ -513,7 +530,7 @@ var _default = {
         });
       } else {
         uni.navigateTo({
-          url: "/pages/particulars/particulars"
+          url: "/pages/particulars/particulars?type=2"
         });
       }
     },

unpackage/dist/dev/mp-weixin/pages/stat/stat.wxss

@@ -12,7 +12,7 @@
 }
 .container .header.data-v-44536cf4 {
   margin: 0 auto;
-  width: 690rpx;
+  width: 710rpx;
   height: 236rpx;
   background-color: #fff;
 }
@@ -73,7 +73,7 @@
 .container .calendar.data-v-44536cf4 {
   margin: 0 auto;
   margin-top: 30rpx;
-  width: 693rpx;
+  width: 710rpx;
   background-color: #fff;
 }
 .container .calendar .calendar_title.data-v-44536cf4 {
@@ -154,7 +154,7 @@
 .container .errPeople.data-v-44536cf4 {
   margin: 0 auto;
   margin-top: 32rpx;
-  width: 690rpx;
+  width: 710rpx;
   border-radius: 7rpx;
   background-color: #fff;
 }

unpackage/dist/dev/mp-weixin/pages/statDetail/statDetail.js

@@ -193,9 +193,9 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _regenerator = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/regenerator */ 40));
+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 */ 42));
+var _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/asyncToGenerator */ 41));
 //
 //
 //

unpackage/dist/dev/mp-weixin/uni_modules/zwx-dropDown/components/zwx-dropDown/zwx-dropDown.js

@@ -121,8 +121,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _regenerator = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/regenerator */ 40));
-var _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/asyncToGenerator */ 42));
+var _regenerator = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/regenerator */ 39));
+var _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/asyncToGenerator */ 41));
 var dropDown = function dropDown() {
   Promise.resolve(/*! require.ensure */).then((function () {
     return resolve(__webpack_require__(/*! @/uni_modules/zwx-dropDown/components/zwx-dropDown/zwx-dropDown */ 232));