diff --git a/src/assets/css/electron.css b/src/assets/css/electron.css index 66e41d1..f575225 100644 --- a/src/assets/css/electron.css +++ b/src/assets/css/electron.css @@ -444,6 +444,7 @@ overflow: hidden;} .plan-box{ padding: 20px; display: flex;justify-content: space-around; + flex-direction: column; align-items: center; } .plan-box button{ @@ -452,8 +453,9 @@ overflow: hidden;} /* background-color: #9C7CFA; */ background-color: #FFFFFF; color: #9C7CFA; - padding: 10px 20px; + padding: 20px 40px; font-size: 16px; + margin-top: 50px; } /* 新增css */ @@ -474,6 +476,10 @@ overflow: hidden;} text-align: center; background-color: #F1ECFF; border-bottom: 1px solid #7557cc; + font-weight: bold; +} +table tr td:first-child { + padding: 12px 10px!important; } .notice-table-01>table>tr td{ box-sizing: border-box; @@ -524,6 +530,29 @@ overflow: hidden;} line-height: 1.5; } + + +.plan-big-box{padding: 0 20px;} +.plan-big-box>div{padding: 20px 0;display: flex;} +.plan-left{border: 1px solid #9C7CFA;width: 100%;} +.plan-left-one{background-color: #F1ECFF;display: flex;justify-content: space-between;font-weight: bold;font-size: 16px;} +.plan-left-one div:nth-child(1){width: 67.2%;text-align: center;padding: 16px 0;} +.plan-left-one div:nth-child(2){width: 32.8%;text-align: center;border-left: 1px solid #9C7CFA;padding: 16px 0;} +.plan-left-two{display: flex;border-top: 1px solid #9C7CFA;} +.plan-two-one{width: 10%;border-right: 1px solid #9C7CFA;padding: 20px 0;text-align: center;} +.plan-item-box{width: 100%;display: flex;} + + + + + +.plan-right-box{border: 1px solid #9C7CFA;border-left: none;width: 15%;padding: 20px 0;padding-left: 6px;overflow: hidden;overflow-y: scroll;} +.plan-right-box::-webkit-scrollbar { + display: none; +} +.plan-center-center{display: flex;justify-content: center;align-items: center;} +.plan-acenter{display: flex;align-items: center;} +/* .plan-item-box >div:first-child{width: 10%; padding: 16px 0;text-align: center;} */ /* 出勤详情 */ .attendance-box { width: 1210px; @@ -820,7 +849,7 @@ overflow: hidden;} .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;} -.notice-k{position: fixed;top: 0px;left: 0px;right: 0px;bottom: 0px;z-index: 99999;display: flex;justify-content: center;align-items: center;animation: noticed .3s linear forwards;} +.notice-k{position: fixed;top: 0px;left: 0px;right: 0px;bottom: 0px;z-index: 99999;background-color: rgba(0,0,0,.8); display: flex;justify-content: center;align-items: center;animation: noticed .3s linear forwards;} @keyframes noticed{ from{transform: scale(0);} to{transform: scale(1);} @@ -831,13 +860,19 @@ overflow: hidden;} .notice-title-box img{width: 20px;height: 20px;position: absolute;} .notice-title-box img:first-child{left: 20px;} .notice-title-box img:last-child{right: 20px;} - -/* 新增css */ -.notice-open-01{ - width: 1000px; +.plan-tank-box{padding: 0 20px;height: 790px;overflow: hidden;overflow-y: scroll;} +.plan-tank-box::-webkit-scrollbar { + display: none; } -.notice-open-02{ - width: 800px; +/* 新增css */ +.notice-open-01,.notice-open-02{ + width: 80%; + height: 90%; + overflow: hidden; + overflow-y: scroll; +} +.notice-open-01::-webkit-scrollbar,.notice-open-02::-webkit-scrollbar { + display: none; } .notice-title-other{ width: calc(100% + 10px); diff --git a/src/components/attendanceDetail.vue b/src/components/attendanceDetail.vue index eae218e..af3ed8b 100644 --- a/src/components/attendanceDetail.vue +++ b/src/components/attendanceDetail.vue @@ -11,12 +11,12 @@
-
+
{{item.StuName}} -
{{['','正常','离校','未到校','请假'][item.CheckResult]}}
+
{{['','到校','离校','未到校','请假'][item.CheckResult]}}
@@ -55,7 +55,13 @@ stuIndex:0, showLoading:true, showError:false, - checkResult:'' + checkResult:'', + babyList1:[],//全部出勤详情数据 + babyList2:[],//到校情况数据 + babyList3:[],//离校情况数据 + babyList4:[],//未到校宝宝数据 + babyList5:[],//请假宝宝数据 + type:0 } }, methods: { @@ -79,12 +85,15 @@ }, chooseNavEv(e){ this.navIndex = e; - if(e==0){ - this.babyArr = this.cunArr; - } else { - this.babyArr = this.cunArr.filter(item=>item.CheckResult===e); - } - this.babyArr.length ? this.isNothing = true : this.isNothing = false + // 赋值状态 + this.type = e; + this.checkAttendanceNum(); + // if(e==0){ + // this.babyArr = this.cunArr; + // } else { + // this.babyArr = this.cunArr.filter(item=>item.CheckResult===e); + // } + // this.babyArr.length ? this.isNothing = true : this.isNothing = false this.showDetail = false; }, // 获取出勤数据 @@ -96,7 +105,8 @@ url: this.$https.getstudentattendanceinfo, methods: "get", params: { - EquipmentGuid: this.$storage.get('EquipmentID') + EquipmentGuid: this.$storage.get('EquipmentID'), + type:this.type }, }); if(data.data.data!=undefined){ @@ -111,14 +121,28 @@ this.navArr[3].num = leftInfo.notSchoolNum; // 请假 this.navArr[4].num = leftInfo.leaveSchoolNum; - this.babyArr = leftInfo.list; - this.cunArr = leftInfo.list; + if(this.type==0) this.babyList1 = leftInfo.list; + if(this.type==1) this.babyList2 = leftInfo.list; + if(this.type==2) this.babyList3 = leftInfo.list; + if(this.type==3) this.babyList4 = leftInfo.list; + if(this.type==4) this.babyList5 = leftInfo.list; + if(this.type==0) {this.babyList1.length ? this.isNothing = true : this.isNothing = false} + if(this.type==1) {this.babyList2.length ? this.isNothing = true : this.isNothing = false} + if(this.type==2) {this.babyList3.length ? this.isNothing = true : this.isNothing = false} + if(this.type==3) {this.babyList4.length ? this.isNothing = true : this.isNothing = false} + if(this.type==4) {this.babyList5.length ? this.isNothing = true : this.isNothing = false} + // this.babyArr = leftInfo.list; + // this.cunArr = leftInfo.list; this.$storage.set('num0',this.navArr[0].num); this.$storage.set('num1',this.navArr[1].num); this.$storage.set('num2',this.navArr[2].num); this.$storage.set('num3',this.navArr[3].num); - this.$storage.set('babyArr',this.babyArr); - this.$storage.set('cunArr',this.cunArr); + this.$storage.set('babyList1',this.babyList1); + this.$storage.set('babyList2',this.babyList2); + this.$storage.set('babyList3',this.babyList3); + this.$storage.set('babyList4',this.babyList4); + this.$storage.set('babyList5',this.babyList5); + // this.$storage.set('cunArr',this.cunArr); } else { this.babyArr = []; this.$storage.set('babyArr',this.babyArr); @@ -128,9 +152,14 @@ this.navArr[1].num = this.$storage.get('num1'); this.navArr[2].num = this.$storage.get('num2'); this.navArr[3].num = this.$storage.get('num3'); - this.babyArr = this.$storage.get('babyArr'); - this.cunArr = this.$storage.get('cunArr'); - if(this.cunArr==undefined){ + this.babyList1 = this.$storage.get('babyList1'); + this.babyList2 = this.$storage.get('babyList2'); + this.babyList3 = this.$storage.get('babyList3'); + this.babyList4 = this.$storage.get('babyList4'); + this.babyList5 = this.$storage.get('babyList5'); + // this.babyArr = this.$storage.get('babyArr'); + // this.cunArr = this.$storage.get('cunArr'); + if(this.babyList1==undefined){ this.showError = true; } } diff --git a/src/components/babyActivity.vue b/src/components/babyActivity.vue index 6110ae1..0656534 100644 --- a/src/components/babyActivity.vue +++ b/src/components/babyActivity.vue @@ -27,10 +27,14 @@
- + - +
@@ -67,96 +71,114 @@
-
第15周工作计划
+
第{{dayArr[0].Months}}周工作计划
+
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
班级：时间：
上周情况分析家长工作：
内容星期一二三四五生成与调整
学
习
活
动		上午
户
外
活
动		上午 - 1.体能：
- 2.游戏：
- 3.自选器械： - 		早午操指导重点：
下午
游
戏
活
动		上午
下午环创与资源利用：
延时活动
生活活动
(观察引导重点)
+
+
+
+
+
班级：{{className}}
+
时间：{{dayArr[0].CreateTime}}
+
+
+
上周情况分析
+
{{dayArr[0].LastWeekSituationAnalysis}}
+
+
+
内容
+
+
星期
+
一
+
二
+
三
+
四
+
五
+
生成与调整
+
+
+
+
{{dayArr[0].ActivityType}}
+
+
{{dayArr[0].AMOrPM}}
+
{{dayArr[0].Week1}}
+
{{dayArr[0].Week2}}
+
{{dayArr[0].Week3}}
+
{{dayArr[0].Week4}}
+
{{dayArr[0].Week5}}
+
{{dayArr[0].GenerationAndAdjustment}}
+
+
+
+
{{dayArr[1].ActivityType}}
+
+
+
+
{{dayArr[1].AMOrPM}}
+
{{dayArr[1].Week1}}
+
{{dayArr[1].Week2}}
+
{{dayArr[1].Week3}}
+
{{dayArr[1].Week4}}
+
{{dayArr[1].Week5}}
+
+
+
{{dayArr[2].AMOrPM}}
+
{{dayArr[2].Week1}}
+
{{dayArr[2].Week2}}
+
{{dayArr[2].Week3}}
+
{{dayArr[2].Week4}}
+
{{dayArr[2].Week5}}
+
+
+
{{dayArr[2].GenerationAndAdjustment}}
+
+
+
+
{{dayArr[3].ActivityType}}
+
+
+
+
{{dayArr[3].AMOrPM}}
+
{{dayArr[3].Week1}}
+
{{dayArr[3].Week2}}
+
{{dayArr[3].Week3}}
+
{{dayArr[3].Week4}}
+
{{dayArr[3].Week5}}
+
+
+
{{dayArr[4].AMOrPM}}
+
{{dayArr[4].Week1}}
+
{{dayArr[4].Week2}}
+
{{dayArr[4].Week3}}
+
{{dayArr[4].Week4}}
+
{{dayArr[4].Week5}}
+
+
+
{{dayArr[3].GenerationAndAdjustment}}
+
+
+
+
{{dayArr[5].ActivityType}}
+
+
{{dayArr[5].AMOrPM}}
+
{{dayArr[5].Week1}}
+
{{dayArr[5].Week2}}
+
{{dayArr[5].Week3}}
+
{{dayArr[5].Week4}}
+
{{dayArr[5].Week5}}
+
{{dayArr[5].GenerationAndAdjustment}}
+
+
+
+
生活活动
(观察引导重点)
+
{{dayArr[0].LivingActivities}}
+
+
+
+
家长工作：
{{dayArr[0].ParentalWork}}
+
早午操指导重点：
{{dayArr[0].GuidanceFocus}}
+
环创与资源利用：
{{dayArr[0].ResourceUtilization}}
+
@@ -165,64 +187,63 @@
-
(2022-2)月主题活动及工作要点
+
{{monthObj.PlanMonth}}月主题活动及工作要点
+
-
+
- - + + - + - + - + - + - +
班级：时间：班级：{{monthObj.ClassName}}时间：{{monthObj.AddTime}}
本月主题
{{monthObj.Theme}}
主题目标及价值
{{monthObj.ThemeTarget}}
本月重点工作 - 内容包含（保教工作） - （环境创设） - （班务工作） +
生活活动
{{monthObj.LivingActivities}}
游戏活动

目标

+
{{monthObj.ThemeTarget}}

环境与材料调整

+
{{monthObj.EnvironmentMaterialAdjustment}}
学习活动

每周主题（简写）

- 第一周：
- 第二周：
- 第三周：
- 第四周： +

预设活动

+
{{monthObj.PresetActivity}}
体育锻炼
{{monthObj.PhysicalExercise}}
家园共育
{{monthObj.HomeCoEducation}}
@@ -292,17 +313,28 @@ teacherInfo:{}, isDay:false, isMonth:false, - classguid:''//班级guid + classguid:'',//班级guid + monthObj:{},//月计划对象 + monthText:'查看月计划', + dayArr:[],//周计划对象 + weekText:'查看周计划' } }, methods: { // 手指滑动事件 touchDayEv(){ - console.log(151); - this.isDay = true; + if(this.dayArr.length){ + this.isDay = true; + } else { + this.weekText = '查询数据为空'; + } }, touchMonthEv(){ - this.isMonth = true; + if(this.monthObj!=''){ + this.isMonth = true; + } else { + this.monthText = '查询数据为空'; + } }, // 关闭通知公告弹框 closeNotice(){ @@ -382,33 +414,33 @@ this.showLoading_right = false; }, // 当前活动 - async schedulingWebEv() { - if(this.$storage.get('network')){ - let data = await this.$axios({ - url: this.$https.schedulingWeb_two, - methods: "get", - params: { - EquipmentID: this.$storage.get('EquipmentID'), - }, - }); - if(data.data.data!=undefined){ - // let newDataa = data.data.data; - // let newDate = new Date(); - // let timeDate = `${newDate.getHours()}.${newDate.getMinutes()}`; - // if('8.00'*100 <= timeDate*100 && timeDate*100 <= '11.55'*100) { - // this.dangArr = newDataa[0].WeekData[0]; - // } else if('11.55'*100 <= timeDate*100 && timeDate*100 <= '15.00'*100) { - // this.dangArr = newDataa[0].WeekData[1]; - // } else if('15.00'*100 <= timeDate*100 && timeDate*100 <= '17.00'*100) { - // this.dangArr = newDataa[0].WeekData[2]; - // } - this.dangArr = data.data.data; - this.$storage.set('dangArracti',this.dangArr); - } - } else { - this.dangArr = this.$storage.get('dangArracti'); - } - }, + // async schedulingWebEv() { + // if(this.$storage.get('network')){ + // let data = await this.$axios({ + // url: this.$https.schedulingWeb_two, + // methods: "get", + // params: { + // EquipmentID: this.$storage.get('EquipmentID'), + // }, + // }); + // if(data.data.data!=undefined){ + // // let newDataa = data.data.data; + // // let newDate = new Date(); + // // let timeDate = `${newDate.getHours()}.${newDate.getMinutes()}`; + // // if('8.00'*100 <= timeDate*100 && timeDate*100 <= '11.55'*100) { + // // this.dangArr = newDataa[0].WeekData[0]; + // // } else if('11.55'*100 <= timeDate*100 && timeDate*100 <= '15.00'*100) { + // // this.dangArr = newDataa[0].WeekData[1]; + // // } else if('15.00'*100 <= timeDate*100 && timeDate*100 <= '17.00'*100) { + // // this.dangArr = newDataa[0].WeekData[2]; + // // } + // this.dangArr = data.data.data; + // this.$storage.set('dangArracti',this.dangArr); + // } + // } else { + // this.dangArr = this.$storage.get('dangArracti'); + // } + // }, // 班级情况 async classStatusEv() { if(this.$storage.get('network')){ @@ -420,7 +452,10 @@ }, }); if(data.data.data!=undefined){ + // 查看月计划 this.getMonthEv(data.data.data.ClassGuid); + // 查看周计划 + this.getDayEv(data.data.data.ClassGuid); this.teatherArr = data.data.data.Teachers; this.className = data.data.data.ClassName; this.$storage.set('teatherArracti',this.teatherArr); @@ -432,46 +467,68 @@ } }, // 周计划 - async getDayEv() { + async getDayEv(classguid) { if(this.$storage.get('network')){ - let data = await this.$axios({ - url: this.$https.getDay, - methods: "get", - params: { - EquipmentID: this.$storage.get('EquipmentID'), + let date = new Date(); + let year = date.getFullYear(); + let month = date.getMonth()+1; + let day = date.getDate(); + let timeText = `${year}-${month<10?'0'+month:month}-${day<10?'0'+day:day}`; + let data = await this.$axios.get( + // 调用 serviceAPI + 'http://47.109.29.153:50014/api/kindergarten/course_term_run/getweekplan', + { + params:{ + orgguid:this.$storage.get('orgGuid'), + classguid, + // datetime:'2022-02-17', + datetime:timeText + } }, - }); + { + headers: { + 'Content-Type': 'application/json-patch+json' //将表单数据传递转化为form-data类型 + }, + } + ); if(data.data.data!=undefined){ - console.log(data.data.data,443); + this.dayArr = data.data.data.list; // this.teatherArr = data.data.data.Teachers; // this.className = data.data.data.ClassName; + this.$storage.set('dayArr',this.dayArr); // this.$storage.set('teatherArracti',this.teatherArr); // this.$storage.set('classNameactu',this.className); } } else { + this.dayArr = this.$storage.get('dayArr'); // this.teatherArr = this.$storage.get('teatherArracti'); // this.className = this.$storage.get('classNameactu'); } }, - // 周计划 + // 月计划 async getMonthEv(classguid) { if(this.$storage.get('network')){ - let data = await this.$axios({ - url: this.$https.getMonth, - methods: "get", - params: { - orgguid:this.$storage.get('orgGuid'), - classguid + let data = await this.$axios.get( + // 调用 serviceAPI + 'http://47.109.29.153:50014/api/kindergarten/course_term_run/getdatalistbyorgguid', + { + params:{ + orgguid:this.$storage.get('orgGuid'), + classguid + } }, - }); + { + headers: { + 'Content-Type': 'application/json-patch+json' //将表单数据传递转化为form-data类型 + }, + } + ); if(data.data.data!=undefined){ - console.log(data.data.data,443); - // this.teatherArr = data.data.data.Teachers; - // this.className = data.data.data.ClassName; - // this.$storage.set('teatherArracti',this.teatherArr); - // this.$storage.set('classNameactu',this.className); + this.monthObj = data.data.data.list[0]; + this.$storage.set('monthObj',this.monthObj); } } else { + this.monthObj = this.$storage.set('monthObj',this.monthObj); // this.teatherArr = this.$storage.get('teatherArracti'); // this.className = this.$storage.get('classNameactu'); } @@ -481,13 +538,13 @@ // 查看一周的宝宝课表 this.getbabycourseEv(); // 当前活动 - this.schedulingWebEv(); + // this.schedulingWebEv(); // 班级情况 this.classStatusEv(); // 各一分钟调用一次当前活动 - this.timer = setInterval(()=>{ - this.schedulingWebEv(); - },1000*60) + // this.timer = setInterval(()=>{ + // this.schedulingWebEv(); + // },1000*60) }, destroyed(){ clearInterval(this.timer); diff --git a/src/components/header.vue b/src/components/header.vue index 5379ad6..b4086b2 100644 --- a/src/components/header.vue +++ b/src/components/header.vue @@ -411,10 +411,10 @@ }, // 获取设备型号(设备id) obtainEv() { - // let Build = plus.android.importClass("android.os.Build"); - // let serial = Build.SERIAL; - // this.$storage.set('EquipmentID',Build.SERIAL); - this.$storage.set('EquipmentID','B520P2RXM0'); + let Build = plus.android.importClass("android.os.Build"); + let serial = Build.SERIAL; + this.$storage.set('EquipmentID',Build.SERIAL); + // this.$storage.set('EquipmentID','B520P2RXM0'); this.classCardId = this.$storage.get('EquipmentID'); this.weatherEv(); this.introduce(); @@ -428,12 +428,12 @@ var that = this; // 手机有效 that.obtainEv(); - // if(plus.networkinfo.getCurrentType()!=1){ + if(plus.networkinfo.getCurrentType()!=1){ that.$storage.set('network', true); that.onLine = true; - // } else { - // that.onLine = false; - // } + } else { + that.onLine = false; + } //网络更改 document.addEventListener("netchange", function(res) { var network = plus.networkinfo.getCurrentType(); diff --git a/src/components/homepage.vue b/src/components/homepage.vue index a9c05e4..bb9a42b 100644 --- a/src/components/homepage.vue +++ b/src/components/homepage.vue @@ -116,7 +116,7 @@
{{ itemc.TimePart }}
-
{{ itemc.Name }}
+
{{ itemc.Name }}
@@ -201,7 +201,8 @@ topVal:0, classCardId:'', diffHeight:'', - isNotice:false + isNotice:false, + classTimer:null//班级人数心跳事件 }; }, destroyed() { @@ -209,6 +210,8 @@ this.topVal = 0; clearInterval(this.monitorTimer); clearInterval(this.chuTime); + // 清除班级人数心跳 + clearInterval(this.classTimer); }, methods: { // 手指滑动事件 @@ -448,9 +451,9 @@ plusReady(){ var device_type = navigator.userAgent;//获取userAgent信息 var that = this; - // if(plus.networkinfo.getCurrentType()!=1){ + if(plus.networkinfo.getCurrentType()!=1){ that.$storage.set('network',true); - // } + } that.requestEv(); //网络更改 document.addEventListener( "netchange", function(res) { @@ -471,8 +474,6 @@ }) }, requestEv(){ - // 班级详情 - this.classStatusEv(); this.babyRecipeEv(); this.schedulingWeb(); this.babyBirthday(); @@ -489,6 +490,13 @@ clearInterval(this.chuTime); } },1000) + // 清除班级人数心跳 + clearInterval(this.classTimer); + // 班级详情 + this.classStatusEv(); + this.classTimer = setInterval(()=>{ + this.classStatusEv();//班级人数心跳 + },1000*60) setTimeout(()=>{ this.plusReady(); },500) diff --git a/src/config.js b/src/config.js index f296c62..dc8254f 100644 --- a/src/config.js +++ b/src/config.js @@ -15,7 +15,8 @@ const url = { 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：请假学生) + // getstudentattendanceinfo:host + '/api/admin/electronicclasscard/getstudentattendanceinfo',//获取当天出勤详情(1：到校情况，2：离校情况，3：未到校学生，4：请假学生) + getstudentattendanceinfo:host + '/api/admin/electronicclasscard/GetStudentAttendanceInfonow',//获取当天出勤详情(1：到校情况，2：离校情况，3：未到校学生，4：请假学生) getupdatestudentlist:host + '/api/admin/electronicclasscard/getupdatestudentlist',//获取当前学生信息 getuserattendanceinfo:host + '/api/admin/electronicclasscard/getuserattendanceinfo',//获取宝宝考勤详细 queryattendancebyid:host + '/api/admin/electronicclasscard/queryattendancebyid',//查询学生历史考勤、晨检记录 @@ -29,7 +30,8 @@ const url = { updatemodelapi:host + '/api/admin/electronicclasscard/updatemodel_ele',//模式设置 classcardById:host + '/api/admin/electronicclasscard/Classcard_ById',//获取模式 getMonth:host + '/api/kindergarten/course_term_run/getdatalistbyorgguid',//月计划 - getDay:host + '/api/kindergarten/course_term_run/getweektermist'//周计划 + // getDay:host + '/api/kindergarten/course_term_run/getweektermist',//周计划 + getDay:host + '/api/kindergarten/course_term_run/getweekplan',//周计划 }