master
			
			
		
		
						commit
						64b9f0e16c
					
				|  | @ -7047,7 +7047,7 @@ | ||||||
|     }, |     }, | ||||||
|     "node_modules/object-copy/node_modules/is-descriptor/node_modules/kind-of": { |     "node_modules/object-copy/node_modules/is-descriptor/node_modules/kind-of": { | ||||||
|       "version": "5.1.0", |       "version": "5.1.0", | ||||||
|       "resolved": "https://registry.nlark.com/kind-of/download/kind-of-5.1.0.tgz", |       "resolved": "https://registry.npm.taobao.org/kind-of/download/kind-of-5.1.0.tgz", | ||||||
|       "integrity": "sha1-cpyR4thXt6QZofmqZWhcTDP1hF0=", |       "integrity": "sha1-cpyR4thXt6QZofmqZWhcTDP1hF0=", | ||||||
|       "engines": { |       "engines": { | ||||||
|         "node": ">=0.10.0" |         "node": ">=0.10.0" | ||||||
|  | @ -7055,7 +7055,7 @@ | ||||||
|     }, |     }, | ||||||
|     "node_modules/object-copy/node_modules/kind-of": { |     "node_modules/object-copy/node_modules/kind-of": { | ||||||
|       "version": "3.2.2", |       "version": "3.2.2", | ||||||
|       "resolved": "https://registry.nlark.com/kind-of/download/kind-of-3.2.2.tgz", |       "resolved": "https://registry.npm.taobao.org/kind-of/download/kind-of-3.2.2.tgz", | ||||||
|       "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", |       "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", | ||||||
|       "dependencies": { |       "dependencies": { | ||||||
|         "is-buffer": "^1.1.5" |         "is-buffer": "^1.1.5" | ||||||
|  | @ -11696,7 +11696,7 @@ | ||||||
|     }, |     }, | ||||||
|     "node_modules/static-extend/node_modules/is-accessor-descriptor/node_modules/kind-of": { |     "node_modules/static-extend/node_modules/is-accessor-descriptor/node_modules/kind-of": { | ||||||
|       "version": "3.2.2", |       "version": "3.2.2", | ||||||
|       "resolved": "https://registry.nlark.com/kind-of/download/kind-of-3.2.2.tgz", |       "resolved": "https://registry.npm.taobao.org/kind-of/download/kind-of-3.2.2.tgz", | ||||||
|       "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", |       "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", | ||||||
|       "dependencies": { |       "dependencies": { | ||||||
|         "is-buffer": "^1.1.5" |         "is-buffer": "^1.1.5" | ||||||
|  | @ -11718,7 +11718,7 @@ | ||||||
|     }, |     }, | ||||||
|     "node_modules/static-extend/node_modules/is-data-descriptor/node_modules/kind-of": { |     "node_modules/static-extend/node_modules/is-data-descriptor/node_modules/kind-of": { | ||||||
|       "version": "3.2.2", |       "version": "3.2.2", | ||||||
|       "resolved": "https://registry.nlark.com/kind-of/download/kind-of-3.2.2.tgz", |       "resolved": "https://registry.npm.taobao.org/kind-of/download/kind-of-3.2.2.tgz", | ||||||
|       "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", |       "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", | ||||||
|       "dependencies": { |       "dependencies": { | ||||||
|         "is-buffer": "^1.1.5" |         "is-buffer": "^1.1.5" | ||||||
|  | @ -11742,7 +11742,7 @@ | ||||||
|     }, |     }, | ||||||
|     "node_modules/static-extend/node_modules/kind-of": { |     "node_modules/static-extend/node_modules/kind-of": { | ||||||
|       "version": "5.1.0", |       "version": "5.1.0", | ||||||
|       "resolved": "https://registry.nlark.com/kind-of/download/kind-of-5.1.0.tgz", |       "resolved": "https://registry.npm.taobao.org/kind-of/download/kind-of-5.1.0.tgz", | ||||||
|       "integrity": "sha1-cpyR4thXt6QZofmqZWhcTDP1hF0=", |       "integrity": "sha1-cpyR4thXt6QZofmqZWhcTDP1hF0=", | ||||||
|       "engines": { |       "engines": { | ||||||
|         "node": ">=0.10.0" |         "node": ">=0.10.0" | ||||||
|  | @ -19968,14 +19968,14 @@ | ||||||
|           "dependencies": { |           "dependencies": { | ||||||
|             "kind-of": { |             "kind-of": { | ||||||
|               "version": "5.1.0", |               "version": "5.1.0", | ||||||
|               "resolved": "https://registry.nlark.com/kind-of/download/kind-of-5.1.0.tgz", |               "resolved": "https://registry.npm.taobao.org/kind-of/download/kind-of-5.1.0.tgz", | ||||||
|               "integrity": "sha1-cpyR4thXt6QZofmqZWhcTDP1hF0=" |               "integrity": "sha1-cpyR4thXt6QZofmqZWhcTDP1hF0=" | ||||||
|             } |             } | ||||||
|           } |           } | ||||||
|         }, |         }, | ||||||
|         "kind-of": { |         "kind-of": { | ||||||
|           "version": "3.2.2", |           "version": "3.2.2", | ||||||
|           "resolved": "https://registry.nlark.com/kind-of/download/kind-of-3.2.2.tgz", |           "resolved": "https://registry.npm.taobao.org/kind-of/download/kind-of-3.2.2.tgz", | ||||||
|           "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", |           "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", | ||||||
|           "requires": { |           "requires": { | ||||||
|             "is-buffer": "^1.1.5" |             "is-buffer": "^1.1.5" | ||||||
|  | @ -23836,7 +23836,7 @@ | ||||||
|           "dependencies": { |           "dependencies": { | ||||||
|             "kind-of": { |             "kind-of": { | ||||||
|               "version": "3.2.2", |               "version": "3.2.2", | ||||||
|               "resolved": "https://registry.nlark.com/kind-of/download/kind-of-3.2.2.tgz", |               "resolved": "https://registry.npm.taobao.org/kind-of/download/kind-of-3.2.2.tgz", | ||||||
|               "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", |               "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", | ||||||
|               "requires": { |               "requires": { | ||||||
|                 "is-buffer": "^1.1.5" |                 "is-buffer": "^1.1.5" | ||||||
|  | @ -23854,7 +23854,7 @@ | ||||||
|           "dependencies": { |           "dependencies": { | ||||||
|             "kind-of": { |             "kind-of": { | ||||||
|               "version": "3.2.2", |               "version": "3.2.2", | ||||||
|               "resolved": "https://registry.nlark.com/kind-of/download/kind-of-3.2.2.tgz", |               "resolved": "https://registry.npm.taobao.org/kind-of/download/kind-of-3.2.2.tgz", | ||||||
|               "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", |               "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", | ||||||
|               "requires": { |               "requires": { | ||||||
|                 "is-buffer": "^1.1.5" |                 "is-buffer": "^1.1.5" | ||||||
|  | @ -23874,7 +23874,7 @@ | ||||||
|         }, |         }, | ||||||
|         "kind-of": { |         "kind-of": { | ||||||
|           "version": "5.1.0", |           "version": "5.1.0", | ||||||
|           "resolved": "https://registry.nlark.com/kind-of/download/kind-of-5.1.0.tgz", |           "resolved": "https://registry.npm.taobao.org/kind-of/download/kind-of-5.1.0.tgz", | ||||||
|           "integrity": "sha1-cpyR4thXt6QZofmqZWhcTDP1hF0=" |           "integrity": "sha1-cpyR4thXt6QZofmqZWhcTDP1hF0=" | ||||||
|         } |         } | ||||||
|       } |       } | ||||||
|  |  | ||||||
|  | @ -52,6 +52,8 @@ | ||||||
| 			goDetail(e){ | 			goDetail(e){ | ||||||
| 				localStorage.Id=e | 				localStorage.Id=e | ||||||
| 				this.showDetail = true; | 				this.showDetail = true; | ||||||
|  | 				// 获取当前学生信息 | ||||||
|  | 				this.queryattendancebyidEv(this.babyArr[e].StuGuid); | ||||||
| 			}, | 			}, | ||||||
| 			// 继承详情返回事件 | 			// 继承详情返回事件 | ||||||
| 			backNews(e){ | 			backNews(e){ | ||||||
|  | @ -87,13 +89,26 @@ | ||||||
| 				this.cunArr = leftInfo.list; | 				this.cunArr = leftInfo.list; | ||||||
| 			}, | 			}, | ||||||
| 			// 获取出勤详情数量问题 | 			// 获取出勤详情数量问题 | ||||||
| 			async queryattendancebyidEv(){ | 			async queryattendancebyidEv(UserGuid){ | ||||||
| 				let data = await this.$axios({ | 				let data = await this.$axios({ | ||||||
| 					// 调用 serviceAPI | 					// 调用 serviceAPI | ||||||
| 					url: this.$https.queryattendancebyid, | 					url: this.$https.queryattendancebyid, | ||||||
| 					methods: "get", | 					methods: "get", | ||||||
| 					params: { | 					params: { | ||||||
| 						EquipmentGuid: "yaohaotest001" | 						UserGuid | ||||||
|  | 					}, | ||||||
|  | 				}); | ||||||
|  | 				console.log(data.data.data); | ||||||
|  | 				 | ||||||
|  | 			}, | ||||||
|  | 			// 获取出勤详情数量问题 | ||||||
|  | 			async getuserattendanceinfoEv(){ | ||||||
|  | 				let data = await this.$axios({ | ||||||
|  | 					// 调用 serviceAPI | ||||||
|  | 					url: this.$https.getuserattendanceinfo, | ||||||
|  | 					methods: "get", | ||||||
|  | 					params: { | ||||||
|  | 						UserGuid:'1ec20f7e-85c7-a982-b506-67f71d64d1f6' | ||||||
| 					}, | 					}, | ||||||
| 				}); | 				}); | ||||||
| 				console.log(data.data.data); | 				console.log(data.data.data); | ||||||
|  | @ -103,8 +118,7 @@ | ||||||
| 		mounted() { | 		mounted() { | ||||||
| 			// 获取出勤数据 | 			// 获取出勤数据 | ||||||
| 			this.checkAttendanceNum(); | 			this.checkAttendanceNum(); | ||||||
| 			// 获取当前学生信息 | 			this.getuserattendanceinfoEv(); | ||||||
| 			this.queryattendancebyidEv(); |  | ||||||
| 		} | 		} | ||||||
| 	} | 	} | ||||||
| </script> | </script> | ||||||
|  |  | ||||||
|  | @ -87,8 +87,8 @@ | ||||||
| 						<div>1</div> | 						<div>1</div> | ||||||
| 					</div> | 					</div> | ||||||
| 					<div class="msg-box"> | 					<div class="msg-box"> | ||||||
| 						<div>生日提醒</div> | 						<div v-if="babyBirthdayData!=0">生日提醒</div> | ||||||
| 						<div>1</div> | 						<div>{{babyBirthdayData}}</div> | ||||||
| 					</div> | 					</div> | ||||||
| 				</div> | 				</div> | ||||||
| 			</div> | 			</div> | ||||||
|  | @ -122,7 +122,7 @@ | ||||||
| 				threeMeals: ["早餐", "午餐", "晚餐"], | 				threeMeals: ["早餐", "午餐", "晚餐"], | ||||||
| 				threeMealIndex: 0, | 				threeMealIndex: 0, | ||||||
| 				noticeData: 0, | 				noticeData: 0, | ||||||
| 				babyBirthdayData: "", | 				babyBirthdayData: 0, | ||||||
| 				dynamicPictureData: "", | 				dynamicPictureData: "", | ||||||
| 				noonArr: [], | 				noonArr: [], | ||||||
| 				moId:"", | 				moId:"", | ||||||
|  | @ -151,7 +151,7 @@ | ||||||
| 				}); | 				}); | ||||||
| 				this.threeMeals = data.data.data; | 				this.threeMeals = data.data.data; | ||||||
| 			}, | 			}, | ||||||
| 
 | 			// 通知消息数量 | ||||||
| 			async notice() { | 			async notice() { | ||||||
| 				let data = await this.$axios({ | 				let data = await this.$axios({ | ||||||
| 					// 调用 serviceAPI | 					// 调用 serviceAPI | ||||||
|  | @ -173,18 +173,18 @@ | ||||||
| 					}, | 					}, | ||||||
| 				}); | 				}); | ||||||
| 				this.noonArr = data.data.data[0].WeekData; | 				this.noonArr = data.data.data[0].WeekData; | ||||||
| 
 |  | ||||||
| 			}, | 			}, | ||||||
|  | 			// 获取当日宝宝生日 | ||||||
| 			async babyBirthday() { | 			async babyBirthday() { | ||||||
| 				let data = await this.$axios({ | 				let data = await this.$axios({ | ||||||
| 					// 调用 serviceAPI | 					// 调用 serviceAPI | ||||||
| 					url: this.$https.babyBirthday, | 					url: this.$https.babyBirthday, | ||||||
| 					methods: "get", | 					methods: "get", | ||||||
| 					params: { | 					params: { | ||||||
| 						EquipmentID: "yaohaotest001", | 						EquipmentGuid: "yaohaotest001", | ||||||
| 					}, | 					}, | ||||||
| 				}); | 				}); | ||||||
| 				this.babyBirthdayData = data.data; | 				this.babyBirthdayData = data.data.count; | ||||||
| 
 | 
 | ||||||
| 			}, | 			}, | ||||||
| 			async dynamicPicture() { | 			async dynamicPicture() { | ||||||
|  | @ -198,17 +198,6 @@ | ||||||
| 				}); | 				}); | ||||||
| 				this.classImgArr = data.data.data.PictureUrls; | 				this.classImgArr = data.data.data.PictureUrls; | ||||||
| 			}, | 			}, | ||||||
| 			// 获取当日宝宝生日 |  | ||||||
| 			async babyBirthdayEv() { |  | ||||||
| 				let data = await this.$axios({ |  | ||||||
| 					// 调用 serviceAPI |  | ||||||
| 					url: this.$https.babyBirthday, |  | ||||||
| 					methods: "post", |  | ||||||
| 					params: { |  | ||||||
| 						EquipmentGuid: "yaohaotest001", |  | ||||||
| 					}, |  | ||||||
| 				}); |  | ||||||
| 			}, |  | ||||||
| 			// 班级情况 | 			// 班级情况 | ||||||
| 			async classStatusEv() { | 			async classStatusEv() { | ||||||
| 				let data = await this.$axios({ | 				let data = await this.$axios({ | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue