调整接口

src/components/attendanceDetail.vue

@@ -9,10 +9,10 @@
 				</div>
 			</div>
 			<div class="attendance-right">
-				<div v-if="!isNothing" class="attendance-right-item-box" v-for="(item,index) in teatherArr" :key="index">
+				<div v-if="!isNothing" class="attendance-right-item-box" v-for="(item,index) in babyArr" :key="index">
-					<img :src="item.teatherImg" alt="">
+					<img :src="item.Head_Img" alt="">
-					<span>{{item.teatherName}}</span>
+					<span>{{item.DisplayName}}</span>
-					<div :style="{background:['#9C7CFA','#FF9393','#D3D3D3','#F4B52F'][item.status]}">{{['正常','未到校','离校','请假'][item.status]}}</div>
+					<div :style="{background:['#9C7CFA','#FF9393','#D3D3D3','#F4B52F'][item.CheckResult]}">{{['正常','未到校','离校','请假'][item.CheckResult]}}</div>
 				</div>
 				<div v-if="isNothing" class="nothing-box">
 					<img src="../../static/img/attendancedetail/icon-nothing.png">
@@ -34,7 +34,7 @@
 					{icon:require('../../static/img/attendancedetail/icon-qingj.png'),title:'请假宝宝',num:0},
 				],
 				navIndex:0,
-				teatherArr:[
+				babyArr:[
 					{teatherImg:require('../../static/img/seconds/tu-01.png'),teatherName:'张跑跑',status:0},
 					{teatherImg:require('../../static/img/seconds/tu-01.png'),teatherName:'张跑跑',status:1},
 					{teatherImg:require('../../static/img/seconds/tu-01.png'),teatherName:'张跑跑',status:2},
@@ -44,13 +44,19 @@
 					{teatherImg:require('../../static/img/seconds/tu-01.png'),teatherName:'张跑跑',status:0},
 					{teatherImg:require('../../static/img/seconds/tu-01.png'),teatherName:'张跑跑',status:0},
 				],
-				isNothing:false
+				isNothing:false,
+				cunArr:[]
 			}
 		},
 		methods: {
 			chooseNavEv(e){
 				this.navIndex = e;
-				this.isNothing = true;
+				if(e==0){
+					this.babyArr = this.cunArr;
+				} else {
+					this.babyArr = this.cunArr.filter(item=>{item.CheckResult==e});
+				}
+				this.babyArr.length ? this.isNothing = false : this.isNothing = true
 			},
 			// 获取出勤详情数量问题
 			async checkAttendanceNum(){
@@ -59,10 +65,17 @@
 					url: this.$https.getstudentattendanceinfo,
 					methods: "get",
 					params: {
-						EquipmentID: "yaohaotest001",
+						EquipmentGuid: "yaohaotest001"
 					},
 				});
-				console.log(data);  
+				let leftInfo = data.data.data;
+				
+				this.navArr[0].num = leftInfo.toSchoolNum;
+				this.navArr[1].num = leftInfo.outSchoolNum;
+				this.navArr[2].num = leftInfo.notSchoolNum;
+				this.navArr[3].num = leftInfo.leaveSchoolNum;
+				this.babyArr = leftInfo.list;
+				this.cunArr = leftInfo.list;
 			}
 		},
 		mounted() {

src/components/babyActivity.vue

@@ -13,23 +13,23 @@
 							<div class="pultitle">班级情况</div>
 						</div>
 						<div class="baby-content-box">
-							<div class="class-situation class-item-box">中二班</div>
+							<div class="class-situation class-item-box">{{className}}</div>
 							<!-- 班级老师 -->
 							<div class="class-item-box">
 								<div class="teather-title">班级老师</div>
 								<div class="teather-box">
 									<div v-for="(item,index) in teatherArr" :key="index">
-										<img :src="item.headImg" >
+										<img :src="item.AvatarUrl" >
-										<span>{{item.name}}</span>
+										<span>{{item.TeacherName}}</span>
 									</div>
 								</div>
 							</div>
 							<!-- 当前活动 -->
-							<div class="class-item-box" style="height: 210px;">
+							<div v-for="(item,index) in dangArr" :key="index" class="class-item-box" style="height: 210px;">
 								<div class="teather-title">当前活动</div>
 								<div class="class-active">
-									<label>13:00-15:00</label>
+									<label>{{item.TimePart}}</label>
-									<label>户外体育</label>
+									<label>{{item.Name}}</label>
 								</div>
 							</div>
 							<!-- 当前活动 -->
@@ -91,6 +91,7 @@
 			return {
 				weekNum:0,
 				dateTime:'2021年12月28日',
+				className:'',
 				teatherArr:[
 					{name:'张芳芳',headImg:require('../../static/img/seconds/tu-01.png')},
 					{name:'张芳芳',headImg:require('../../static/img/seconds/tu-01.png')},
@@ -100,13 +101,14 @@
 				],
 				kebiaoArr:['时间','星期一','星期二','星期三','星期四','星期五'],
 				dataArr:[],
-				isNothing:false
+				isNothing:false,
+				dangArr:[]
 			}
 		},
 		methods: {
+			// 查看一周的宝宝课表
 			async getbabycourseEv() {
 				let data = await this.$axios({
-					// 调用 serviceAPI
 					url: this.$https.getbabycourse,
 					methods: "get",
 					params: {
@@ -123,24 +125,39 @@
 				this.dataArr = newData[0].WeekData;
 				if(this.dataArr.length) this.isNothing = true;
 			},
-			async getbabynowtimecourseEv() {
+			// 当前活动
+			async schedulingWebEv() {
 				let data = await this.$axios({
-					// 调用 serviceAPI
+					url: this.$https.schedulingWeb,
-					url: this.$https.getbabynowtimecourse,
 					methods: "get",
 					params: {
 						EquipmentID: "yaohaotest001",
 					},
 				});
-				console.log(data.data.data);
+				let newData = data.data.data;
+				this.dangArr = newData[0].WeekData;
+			},
+			// 班级情况
+			async classStatusEv() {
+				let data = await this.$axios({
+					url: this.$https.classStatus,
+					methods: "get",
+					params: {
+						EquipmentID: "yaohaotest001",
+					},
+				});
+				this.teatherArr = data.data.data.Teachers;
+				this.className = data.data.data.ClassName;
 			},
 			
 		},
 		mounted() {
 			// 查看一周的宝宝课表
 			this.getbabycourseEv();
-			// 查看当前课程及下节课内容
+			// 当前活动
-			this.getbabynowtimecourseEv();
+			this.schedulingWebEv();
+			// 班级情况
+			this.classStatusEv();
 		}
 	}
 </script>

src/components/homepage.vue

@@ -6,29 +6,21 @@
 			<div class="main-left">
 				<!-- 班级详情 -->
 				<div class="left-one">
-					<div class="left-content">
+					<div class="left-content" v-if="className!=''">
 						<div class="left-title">
 							<div class="pultitle">班级详情</div>
 						</div>
-						<div class="second-title">中二班</div>
+						<div class="second-title">{{className}}</div>
 						<div class="line"></div>
 						<div class="three-content">
-							<div>老师：罗敏 宋春雪 王愉</div>
+							<div>老师：{{teacherName}}</div>
-							<div>班级人数：21</div>
+							<div>班级人数：{{classNum}}</div>
 						</div>
 						<div class="line"></div>
 						<div class="left-last">
-							<div>
+							<div v-for="(item,index) in daoArr" :key="index">
-								<div>0</div>
+								<div>{{item.num}}</div>
-								<div>实到</div>
+								<div>{{item.title}}</div>
-							</div>
-							<div>
-								<div>0</div>
-								<div>未到</div>
-							</div>
-							<div>
-								<div>0</div>
-								<div>请假</div>
 							</div>
 						</div>
 					</div>
@@ -39,7 +31,7 @@
 						<div class="left-title">
 							<div class="pultitle">宝宝食谱</div>
 						</div>
-						<block v-if="threeMeals.length!=0">
+						<div v-if="threeMeals.length!=0">
 							<div class="eat-three">
 								<div :class="threeMealIndex == index ? 'threeMealActive' : ''"
 									v-for="(item, index) in threeMeals" :key="index" @click="chooseMeal(index)">
@@ -53,7 +45,7 @@
 									<div class="clips2">{{ item.FoodName }}</div>
 								</div>
 							</div>
-						</block>
+						</div>
 					</div>
 				</div>
 				<!-- 通知公告 -->
@@ -80,7 +72,7 @@
 				<div class="center-img-box">
 					<div class="center-title">班级动态</div>
 					<div class="img-box">
-						<img src="../../static/img/seconds/tu-01.png" style="object-fit: cover" />
+						<img :src="classImgArr[0]" style="object-fit: cover" />
 					</div>
 				</div>
 				<!-- 提醒 -->
@@ -105,7 +97,7 @@
 					<div class="pultitle">今日活动</div>
 				</div>
 				<div class="right-content">
-					<block v-if="noonArr.length!=0">
+					<div v-if="noonArr.length!=0">
 						<div v-for="(item, index) in noonArr" :key="index">
 							<div class="right-title">{{ item.Ampm }}</div>
 							<div class="line" style="margin: 0 6px"></div>
@@ -115,7 +107,7 @@
 								<div class="clips3">{{ itemc.Name }}</div>
 							</div>
 						</div>
-					</block>
+					</div>
 				</div>
 			</div>
 		</div>
@@ -132,6 +124,11 @@
 				babyBirthdayData: "",
 				dynamicPictureData: "",
 				noonArr: [],
+				className:'',//班级名称
+				teacherName:'',//老师姓名
+				classNum:'',//班级人数
+				daoArr:[],//实到、未到、请假
+				classImgArr:[]
 			};
 		},
 		methods: {
@@ -190,12 +187,13 @@
 			async dynamicPicture() {
 				let data = await this.$axios({
 					// 调用 serviceAPI
-					url: this.$https.getupdatestudentlist,
+					url: this.$https.dynamicPicture,
 					methods: "post",
 					params: {
 						EquipmentID: "yaohaotest001",
 					},
 				});
+				this.classImgArr = data.data.data.PictureUrls;
 			},
 			// 获取当日宝宝生日
 			async babyBirthdayEv() {
@@ -208,12 +206,40 @@
 					},
 				});
 			},
+			// 班级情况
+			async classStatusEv() {
+				let data = await this.$axios({
+					url: this.$https.classStatus,
+					methods: "get",
+					params: {
+						EquipmentID: "yaohaotest001",
+					},
+				});
+				let classInfo = data.data.data;
+				this.className = classInfo.ClassName;
+				let newTeacher = [];
+				classInfo.Teachers.forEach(item=>{
+					newTeacher.push(item.TeacherName);
+				})
+				// 老师
+				this.teacherName = newTeacher.join(' ');
+				// 班级人数
+				this.classNum = classInfo.StudentCount;
+				// 实到、未到、请假
+				this.daoArr = [
+					{num:classInfo.Signed,title:'实到'},
+					{num:classInfo.NotSigned,title:'未到'},
+					{num:classInfo.Holiday,title:'请假'},
+				];
+			},
 		},
 		mounted() {
 			this.babyRecipeEv();
 			this.schedulingWeb();
 			this.babyBirthday()
 			this.dynamicPicture()
+			// 班级详情
+			this.classStatusEv();
 			// 引用mobile-detect文件
 			var MobileDetect = require('../utils/mobile-detect.js');
 			console.log(navigator.language, '当前系统语言');

src/components/yiqingmanagement.vue

@@ -29,10 +29,20 @@
 			}
 		},
 		methods: {
-			
+			async getdatalistbyorgguidStyle() {
+				let data = await this.$axios({
+					// 调用 serviceAPI
+					url: this.$https.getdatalistbyorgguid,
+					methods: "get",
+					params: {
+						EquipmentID: "yaohaotest001",
+					},
+				});
+				console.log(data.data.data);
+			},
 		},
 		mounted() {
-			
+			this.getdatalistbyorgguidStyle();
 		}
 	}
 </script>

src/config.js

@@ -24,7 +24,7 @@ const url = {
 	getbabycourse:host + '/api/admin/electronicclasscardcourse/getbabycourse',//查看一周的宝宝课表
 	getteachers_demeanor_detail:host + '/api/admin/organ/get_teacherfc_details_v1',//获取教师风采详情
 	getnews:host + '/api/admin/electronicclasscard/getnews',//获取新闻动态850601
-	
+	getdatalistbyorgguid:host + '/api/kindergarten/epidemicmanagementinfo/getdatalistbyorgguid',//疫情管理
 	
 }
 

src/router/index.js

@@ -1,7 +1,6 @@
 import Vue from 'vue'
 import Router from 'vue-router'
 import header from '@/components/header'
-import homepage from '@/components/homepage'
 
 Vue.use(Router)