From 1a849a7b10f28ed3856d374c856066e3daf20ab3 Mon Sep 17 00:00:00 2001 From: chen <2659004835@qq.com> Date: Fri, 24 Dec 2021 09:56:55 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=87=BA=E5=8B=A4=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/css/electron.css | 4 +- src/components/attendanceDetail.vue | 14 +- src/components/header.vue | 27 +- src/components/homepage.vue | 630 ++++++++++++++-------------- src/config.js | 13 +- 5 files changed, 355 insertions(+), 333 deletions(-) diff --git a/src/assets/css/electron.css b/src/assets/css/electron.css index e4c4f4b..cc89d5a 100644 --- a/src/assets/css/electron.css +++ b/src/assets/css/electron.css @@ -172,7 +172,7 @@ img { font-size: 30px!important;font-weight: bold!important; } .meal-box {padding-top: 10px;display: flex;align-items: center;} -.meal-box img {width: 130px;border-radius: 10px;object-fit: cover;margin-right: 34px;} +.meal-box img {width: 130px;max-height: 106px; border-radius: 10px;object-fit: cover;margin-right: 34px;} .meal-box div {font-size: 18px;line-height: 30px;} .main-center { margin: 0 20px; @@ -201,7 +201,7 @@ img { background: url(../home/right-back.png) no-repeat; background-size: 100% 100%; } -.right-content {color: #7557CC;text-align: center;height: 90%; overflow: hidden;overflow-y: scroll;margin-top: 10px;} +.right-content {color: #7557CC;text-align: center;height: 90%; overflow: hidden;overflow-y: scroll;} .right-content::-webkit-scrollbar { display: none; } diff --git a/src/components/attendanceDetail.vue b/src/components/attendanceDetail.vue index a689199..49ad7bc 100644 --- a/src/components/attendanceDetail.vue +++ b/src/components/attendanceDetail.vue @@ -51,10 +51,22 @@ chooseNavEv(e){ this.navIndex = e; this.isNothing = true; + }, + // 获取出勤详情数量问题 + async checkAttendanceNum(){ + let data = await this.$axios({ + // 调用 serviceAPI + url: this.$https.getstudentattendanceinfo, + methods: "get", + params: { + EquipmentID: "yaohaotest001", + }, + }); + console.log(data); } }, mounted() { - + this.checkAttendanceNum(); } } diff --git a/src/components/header.vue b/src/components/header.vue index 27e9114..0671930 100644 --- a/src/components/header.vue +++ b/src/components/header.vue @@ -27,7 +27,7 @@ -
+
@@ -74,8 +74,8 @@
控制操作： -
刷新
-
返回首页
+
刷新
+
返回首页
@@ -107,6 +107,7 @@ return { titleArr: ['首页', '幼儿园介绍', '宝宝活动', '出勤详情', '宝宝相册', '疫情管理'], activeIndex: 0, + cunIndex:0, modeArr: [{ isActive: true, title: '欢迎模式' @@ -142,7 +143,7 @@ }, // 导航切换 chooseTitle(e) { - this.activeIndex = e; + this.cunIndex = this.activeIndex = e; e == 0 ? this.activeTitle = 'activeTitle' : this.activeTitle = 'activeTitle2'; }, // 网络状态 @@ -190,6 +191,24 @@ // 当前时间 this.time = `${hour < 10 ? '0'+hour : hour}:${minute < 10 ? '0'+minute : minute}`; }, + // 右上角按钮点击 + clickFun(){ + this.isNetwork = true; + }, + refreshEv(){ + this.activeIndex = '-1'; + setTimeout(()=>{ + this.activeIndex = this.cunIndex; + this.isNetwork = false; + },100) + }, + backHomeEv(){ + this.activeIndex = '-1'; + setTimeout(()=>{ + this.activeIndex = 0; + this.isNetwork = false; + },100) + } }, mounted() { this.weatherEv(); diff --git a/src/components/homepage.vue b/src/components/homepage.vue index 292e7d7..eb2dacf 100644 --- a/src/components/homepage.vue +++ b/src/components/homepage.vue @@ -1,326 +1,314 @@ diff --git a/src/config.js b/src/config.js index 4aecff6..799bbdc 100644 --- a/src/config.js +++ b/src/config.js @@ -10,11 +10,14 @@ const url = { schedulingWeb:host+"/api/admin/electronicclasscardcourse/getbabynowcourse", //查看当日宝宝课表（班排web） notice:host+'/api/admin/electronicclasscard/getnoice',//通知 weather:host+ '/api/admin/electronicclasscard/getweather', //天气接口 - introduce:host+'/api/admin/electronicclasscard/kindergartenintroduction'//幼儿园介绍 -// 教师风采列表/api/admin/electronicclasscard/getteachers_demeanor -// 班级动态详情/api/admin/electronicclasscard/classnewsdetails -// 公告列表/api/admin/electronicclasscard/getnotice -// 班级动态详情/api/admin/electronicclasscard/classnewsdetails + introduce:host+'/api/admin/electronicclasscard/kindergartenintroduction',//幼儿园介绍 + getteachers_demeanor:host+'/api/admin/electronicclasscard/getteachers_demeanor',// 教师风采列表 + classnewsdetails:host+'/api/admin/electronicclasscard/classnewsdetails',// 班级动态详情 + getnotice:host+'/api/admin/electronicclasscard/getnotice',// 公告列表 + getstudentattendanceinfo:host + '/api/admin/electronicclasscard/getstudentattendanceinfo',//获取当天出勤详情(1：到校情况，2：离校情况，3：未到校学生，4：请假学生) + getupdatestudentlist:host + '/api/admin​/electronicclasscard​/getupdatestudentlist',//获取当个学生信息 + getuserattendanceinfo:host + '/api/admin/electronicclasscard/getuserattendanceinfo',//获取宝宝考勤详细 + queryattendancebyid:host + '/api/admin/electronicclasscard/queryattendancebyid'//查询学生历史考勤、晨检记录 } module.exports = url