vue新增网络检测、设备id获取

src/assets/css/electron.css

@@ -529,6 +529,9 @@ overflow: hidden;overflow-y: scroll;}
 .nothing-box {width: 879px;height: 641px;display: flex;justify-content: center;align-items: center;box-sizing: border-box;}
 .nothing-box img {width: 116px;height: 195px;margin-right: 36px;}
 .nothing-box div {font-size: 24px;color: #3F3F3F;font-weight: bold;margin-top: 80px;}
+.attendance-right>div{
+	width: 100%;
+}
 /* 宝宝相册 */
 .babyalbum-box {
 	width: 1210px;
@@ -689,6 +692,9 @@ overflow: hidden;overflow-y: scroll;}
 .baby-name {font-size: 24px;font-weight: 800;color: #3F3F3F;}
 .baby-album-box {padding: 97px 0 126px 0;height: 100%; display: flex;align-items: center;justify-content: space-between;box-sizing: border-box;position: relative;}
 .baby-album-box > img {width: 58px;height: 58px; -webkit-tap-highlight-color:transparent;}
+.babyalbum-detail-box .swiper-container{
+	padding: 20px 0px;
+}
 .introduce-img {display: flex;flex-wrap: wrap;}
 .introduce-img img {margin: 10px 10px 0 0;}
 
@@ -712,4 +718,4 @@ overflow: hidden;overflow-y: scroll;}
 .chengjian>div{display: flex;align-items: flex-end;width: 50%;line-height: 30px;}
 .wellcome-img{position: fixed;z-index: 100;top: 0;left: 0;right: 0;bottom: 0;}
 .erro-box{position: fixed;top: 0;left: 0;right: 0;bottom: 0;z-index: 9999999;display: flex;justify-content: center;align-items: center;background-color: #FFFFFF;}
-.erro-box img{width: 660px;height: 614px;}
+.erro-box img{width: 660px;height: 614px;}

src/components/attendanceBabuDetail.vue

@@ -112,13 +112,27 @@
 			}
 		},
 		methods: {
+		async getuserattendanceinfo() {
+			let UserGuid=""
+			UserGuid="1ec20f7e-85c7-a982-b506-67f71d64d1f6"
+
+				let data = await this.$axios({
+					// 调用 serviceAPI
+					url: this.$https.getuserattendanceinfo,
+					methods: "get",
+					params: {
+						EquipmentID: "yaohaotest001",
+						UserGuid
+					},
+				});
+			},
 			backNews(){
 				this.$emit('backNews',false);
 			},
 			
 		},
 		mounted() {
-			
+			 this.getuserattendanceinfo()
 		}
 	}
 </script>

src/components/babyAlbumDetail.vue

@@ -69,6 +69,6 @@
 <style>
 	.swiper-slide {
 		background-color: #F5F5F5;
-		box-shadow: 10px 10px 10px 10px rgba(134, 105, 220, 0.2);
+	box-shadow: 0 10px 20px rgba(195, 174, 255,0.7);;
 	}
 </style>

src/components/header.vue

@@ -174,20 +174,20 @@
 				e == 0 ? this.activeTitle = 'activeTitle' : this.activeTitle = 'activeTitle2';
 			},
 			// 网络状态
-			// updateOnlineStatus(e) {
-			// 	const {
-			// 		type
-			// 	} = e;
-			// 	this.onLine = type === 'online';
+			updateOnlineStatus(e) {
+				const {
+					type
+				} = e;
+				this.onLine = type === 'online';
 				
-			// 	if (this.onLine) {
-			// 		this.refreshEv();
-			// 		this.weatherEv();
-			// 		this.isNetwork = false;
-			// 	} else {
-			// 		this.isNetwork = true;
-			// 	}
-			// },
+				if (this.onLine) {
+					this.refreshEv();
+					this.weatherEv();
+					this.isNetwork = false;
+				} else {
+					this.isNetwork = true;
+				}
+			},
 			// 天气
 			// weatherEv() {
 			// 	// 获取时间

src/components/homepage.vue

@@ -97,6 +97,10 @@
 					</div>
 					<div class="msg-box">
 						<div>生日提醒</div>
+						<div v-if="remindData!=0">{{remindData}}</div>
+					</div>
+					<div class="msg-box">
+						<div >生日提醒</div>
 						<div v-if="babyBirthdayData!=0">{{babyBirthdayData}}</div>
 					</div>
 				</div>
@@ -137,6 +141,9 @@
 				babyNotice:0,//宝宝提醒数量
 				dynamicPictureData: "",
 				noonArr: [],
+				moId:"",
+				model:"",
+				remindData:"",
 				className:'',//班级名称
 				teacherName:'',//老师姓名
 				classNum:'',//班级人数
@@ -222,7 +229,6 @@
 					this.noticeObj =this.$storage.get('noticeObj');
 					this.noticeObj.PublishTime = this.$storage.get('PublishTime');
 				}
-				
 				this.showLoading_three = false;
 			},
 			// 今日活动
@@ -379,6 +385,11 @@
 		},
 		destroyed(){
 			clearInterval(this.timer);
+			this.babyBirthday()
+			this.dynamicPicture()
+
+			// 班级详情
+			this.classStatusEv();
 		},
 		created() {
 			this.notice();

src/components/yiqingmanagement.vue

@@ -71,7 +71,6 @@
 			},
 		},
 		mounted() {
-			this.getdatalistbyorgguidStyle();
 		}
 	}
 </script>

src/config.js

@@ -29,4 +29,5 @@ const url = {
 	classcardById:host + '/api/admin/electronicclasscard/Classcard_ById',//获取模式
 }
 
+
 module.exports = url