diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ClassPlan/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ClassPlan/Index.js index e8de585b5..52396bb6c 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ClassPlan/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ClassPlan/Index.js @@ -168,7 +168,7 @@ var bootstrap = function ($, learun) { } }); } else { - learun.alert.warning("不嫩选择已排课的课程计划"); + learun.alert.warning("不能选择已排课的课程计划"); } } }); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamTeacherTime/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamTeacherTime/Index.js index 0d3fd98d1..1b051e06c 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamTeacherTime/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamTeacherTime/Index.js @@ -4,6 +4,7 @@ * 日 期:2022-06-13 15:41 * 描 述:老师时间管理 */ +var acceptClick; var refreshGirdData; var bootstrap = function ($, learun) { "use strict"; @@ -142,5 +143,11 @@ var bootstrap = function ($, learun) { refreshGirdData = function () { $('#gridtable').jfGridSet('reload'); }; + acceptClick = function(callBack) { + if (!!callBack) { + learun.layerClose(window.name); + callBack(); + } + }; page.init(); } diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/js/common.js b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/js/common.js index 718569842..cc3c26170 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/js/common.js +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/js/common.js @@ -38,6 +38,21 @@ export default { Sunday: this.fmtDate(SundayTime) } }, + weekday2() { //根据今天得到周一与周日的时间 + var now = new Date();  + var nowTime = now.getTime();  + var day = now.getDay(); + //显示周一 + var MondayTime = nowTime - (day - 1) * this.oneDayTime() ;  + //显示周日 + var SundayTime =  nowTime + (14 - day) * this.oneDayTime() ;  + return { + MondayTime: MondayTime, + Monday: this.fmtDate(MondayTime), + SundayTime: SundayTime, + Sunday: this.fmtDate(SundayTime) + } + }, compare (key) { return (obj1, obj2) => { let value1 = obj1[key] diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/config.js b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/config.js index fb4b2bba2..7163f921a 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/config.js +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/config.js @@ -21,7 +21,8 @@ export default { // "http://192.168.2.98:8088/" // ], "apiHost": [ - "http://localhost:31173/" + // "http://localhost:31173/" + "http://192.168.10.58:8012/" ], // 开发环境下自动填充登录账号密码,与接口地址一一对应,只在开发环境下显示 "devAccount": [ diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/timeTable/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/timeTable/list.vue index 27b9a42c3..aae0ad956 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/timeTable/list.vue +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/timeTable/list.vue @@ -11,34 +11,40 @@ {{todayWeek.Monday}} - {{todayWeek.Sunday}} - + - - {{ item.en }} - {{ item.cn }} + + + {{ item.en }} + {{ item.cn }} + + - + - 该时间段没有课表 - - - 第 {{ k.sectionTime }} 节 + + 该时间段没有课表 + + + + 第 {{ k.jc }} 节 - {{ k.LessonName }} + {{ k.curriculum }} - {{ k.EmpName }} + {{ k.teacher }} - {{ k.ClassroomName }} + {{ k.className }} @@ -51,339 +57,933 @@