From ffb8ed9a8e7a57ec6edc262db23644e568969a05 Mon Sep 17 00:00:00 2001 From: ndbs Date: Thu, 11 Aug 2022 16:33:05 +0800 Subject: [PATCH 1/5] =?UTF-8?q?app2.0=20=E6=89=8B=E6=9C=BA=E7=AB=AF?= =?UTF-8?q?=E5=AD=A6=E7=94=9F=E8=AF=BE=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Modules/TimeTable.cs | 22 ++++++++++++++----- 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/TimeTable.cs b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/TimeTable.cs index 74cc17b24..fe3934459 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/TimeTable.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/TimeTable.cs @@ -192,15 +192,25 @@ namespace Learun.Application.WebApi.Modules var startDate = Common.CalculateFirstDateOfWeek(startdate).ToString("yyyy-MM-dd"); var endDate = Common.CalculateLastDateOfWeek(startdate).ToString("yyyy-MM-dd"); - //获取学年,学期 + // 获取学年,学期 var semesterAndYear = Common.GetSemesterAndYear(startDate); var strAcademicYear = semesterAndYear.AcademicYearLong; var strSemester = semesterAndYear.Semester; - var entity = schoolCalendarIbll.GetSchoolCalendarEntityByNo(semesterAndYear.AcademicYearShort, semesterAndYear.Semester); - var StartTime = entity.StartTime.Value; - - + if (param.StartDate.IsEmpty() && param.EndDate.IsEmpty()) + { + // 校历 + var entity = schoolCalendarIbll.GetSchoolCalendarEntityByNo(semesterAndYear.AcademicYearShort, semesterAndYear.Semester); + var StartTime = entity.StartTime.Value; + startDate = Common.CalculateFirstDateOfWeek(StartTime.AddDays(3)).ToString("yyyy-MM-dd");//StartTime.AddDays(((curWeek - 1) * 14)).ToString("yyyy-MM-dd"); + if (Convert.ToDateTime(startDate) < StartTime) + { + startDate = StartTime.ToString("yyyy-MM-dd"); + } + endDate = Common.CalculateFirstDateOfWeek(StartTime).AddDays(12).ToString("yyyy-MM-dd"); + param.StartDate = startDate; + param.EndDate = endDate; + } var Data = arrangeLessonTermIBLL.GetTimeTableInEducation("", "", "", "", ""); if (param.Description == "学生") { @@ -253,7 +263,7 @@ namespace Learun.Application.WebApi.Modules } ; var result = new - { schoolName = "课程表", semester = $"{strAcademicYear}学年度 第{strSemester}学期", weekList = formatData }; + { schoolName = "课程表", semester = $"{strAcademicYear}学年度 第{strSemester}学期", startDate = startDate, endDate = endDate, weekList = formatData }; return Success(result); } From 28efd715ba404b7a5cbdea3a3a7870e87809edff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=99=93=E7=90=AA?= Date: Thu, 11 Aug 2022 17:14:49 +0800 Subject: [PATCH 2/5] =?UTF-8?q?app=E5=AD=A6=E7=94=9F=E8=AF=BE=E8=A1=A8?= =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=80=89=E8=AF=BE=E6=97=A5=E6=9C=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LearunApp-2.2.0/pages/timeTable/list.vue | 628 +----------------- 1 file changed, 29 insertions(+), 599 deletions(-) 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 aae0ad956..5cd8cb6ef 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 @@ -61,11 +61,11 @@ export default { data() { return { - userInfo:null, semester: '', num: 0, user: null, weekDayTime: 0, + noClassTime:0, todayWeek: {}, dataArr: [], weekArr: [{ @@ -115,22 +115,22 @@ this.OFF('timeTable'); }, methods: { + // 初始化数据 async init() { - // console.log(555) let _this = this; - _this.todayWeek = common.weekday2(); - // _this.semester = common.judgeDate(); + // _this.todayWeek = common.weekday2(); _this.weekDayTime = 14 * common.oneDayTime(); - _this.user = _this.GET_GLOBAL('loginUser'); - _this.loadData(_this.todayWeek.Monday, _this.todayWeek.Sunday); + _this.noClassTime = 4 * common.oneDayTime(); + _this.loadData(); }, liTap(ind) { this.num = ind; }, + // 切换时间 timeTap(num) { let _this = this; if (num == 1) { - _this.todayWeek.MondayTime = _this.todayWeek.MondayTime - _this.weekDayTime; + _this.todayWeek.MondayTime = _this.todayWeek.MondayTime - _this.weekDayTime ; _this.todayWeek.SundayTime = _this.todayWeek.SundayTime - _this.weekDayTime; } else { _this.todayWeek.MondayTime = _this.todayWeek.MondayTime + _this.weekDayTime; @@ -139,523 +139,38 @@ _this.num = 0; _this.todayWeek.Monday = common.fmtDate(_this.todayWeek.MondayTime); _this.todayWeek.Sunday = common.fmtDate(_this.todayWeek.SundayTime); - // _this.semester = common.judgeDate(_this.todayWeek.SundayTime); _this.loadData(_this.todayWeek.Monday, _this.todayWeek.Sunday); }, + // 获取数据 loadData(start, end) { - let {Description,account:Account,} = this.userInfo + let { + Description, + account: Account + } = this.user let param = { StartDate: start, - EndDate: end, + EndDate: end, Description, Account, }; - console.log(this.userInfo) - // let param = { StartDate: '2018-11-05', EndDate: '2018-11-11' }; let _this = this; _this.LOADING('加载数据中…'); - // learun/adms/timetable/list _this.HTTP_GET('learun/adms/timetable/TenDay', param, '加载数据时出错').then(res => { this.HIDE_LOADING(); - let res1 = { - "schoolName": "课程表", - "semester": "2022-2023学年度 第1学期", - "weekList": [{ - "time": "10", - "list": [{ - "ALTId": "18778c62-2d53-484f-850a-7f736395e86b", - "day": "9", - "curriculum": "英语2", - "teacher": "曾令法", - "classRoom": "8-209-210", - "academicyear": "22-23", - "semester": "1", - "lessonNo": "G0101106", - "teachClassNo": "202107", - "empno": "JZG1007", - "lessonTime": "9-10", - "lessonDate": "2022-09-06", - "classRoomNo": "K006", - "lessonSortNo": "1", - "OLPEId": null, - "className": "21计算机1班" - }, - { - "ALTId": "a3598edb-ad86-4ea5-82a7-bbaf5239e1a0", - "day": "4", - "curriculum": "数学2", - "teacher": "谢晓东", - "classRoom": "8-209-210", - "academicyear": "22-23", - "semester": "1", - "lessonNo": "G0101104", - "teachClassNo": "202107", - "empno": "JZG1204", - "lessonTime": "4-10", - "lessonDate": "2022-09-01", - "classRoomNo": "K006", - "lessonSortNo": "1", - "OLPEId": null, - "className": "21计算机1班" - }, - { - "ALTId": "ce07dcfa-6c8c-4620-a31b-94f1a9bc8954", - "day": "5", - "curriculum": "语文2", - "teacher": "黄发艳", - "classRoom": "8-209-210", - "academicyear": "22-23", - "semester": "1", - "lessonNo": "G0101102", - "teachClassNo": "202107", - "empno": "JZG1297", - "lessonTime": "5-10", - "lessonDate": "2022-09-02", - "classRoomNo": "K006", - "lessonSortNo": "1", - "OLPEId": null, - "className": "21计算机1班" - } - ] - }, - { - "time": "11", - "list": [{ - "ALTId": "6eae1cba-c468-4890-9ff6-dcdedfe02873", - "day": "5", - "curriculum": "语文2", - "teacher": "黄发艳", - "classRoom": "8-209-210", - "academicyear": "22-23", - "semester": "1", - "lessonNo": "G0101102", - "teachClassNo": "202107", - "empno": "JZG1297", - "lessonTime": "5-11", - "lessonDate": "2022-09-02", - "classRoomNo": "K006", - "lessonSortNo": "1", - "OLPEId": null, - "className": "21计算机1班" - }, - { - "ALTId": "cbec706f-1964-4b56-bddb-798d76a9df0e", - "day": "4", - "curriculum": "数学2", - "teacher": "谢晓东", - "classRoom": "8-209-210", - "academicyear": "22-23", - "semester": "1", - "lessonNo": "G0101104", - "teachClassNo": "202107", - "empno": "JZG1204", - "lessonTime": "4-11", - "lessonDate": "2022-09-01", - "classRoomNo": "K006", - "lessonSortNo": "1", - "OLPEId": null, - "className": "21计算机1班" - } - ] - }, - { - "time": "2", - "list": [{ - "ALTId": "67c8ee24-ae96-4323-81e0-5c19759240fd", - "day": "8", - "curriculum": "数学2", - "teacher": "谢晓东", - "classRoom": "8-209-210", - "academicyear": "22-23", - "semester": "1", - "lessonNo": "G0101104", - "teachClassNo": "202107", - "empno": "JZG1204", - "lessonTime": "8-2", - "lessonDate": "2022-09-05", - "classRoomNo": "K006", - "lessonSortNo": "1", - "OLPEId": null, - "className": "21计算机1班" - }, - { - "ALTId": "8d78f99e-dcb8-4ab2-9dc5-54d0e12cc785", - "day": "6", - "curriculum": "英语2", - "teacher": "曾令法", - "classRoom": "8-209-210", - "academicyear": "22-23", - "semester": "1", - "lessonNo": "G0101106", - "teachClassNo": "202107", - "empno": "JZG1007", - "lessonTime": "6-2", - "lessonDate": "2022-09-03", - "classRoomNo": "K006", - "lessonSortNo": "1", - "OLPEId": null, - "className": "21计算机1班" - }, - { - "ALTId": "b978df65-831d-409d-ae3b-76eb70fd251e", - "day": "5", - "curriculum": "英语2", - "teacher": "曾令法", - "classRoom": "8-209-210", - "academicyear": "22-23", - "semester": "1", - "lessonNo": "G0101106", - "teachClassNo": "202107", - "empno": "JZG1007", - "lessonTime": "5-2", - "lessonDate": "2022-09-02", - "classRoomNo": "K006", - "lessonSortNo": "1", - "OLPEId": null, - "className": "21计算机1班" - } - ] - }, - { - "time": "3", - "list": [{ - "ALTId": "0322d4af-289f-4594-8cbb-dc97582516d5", - "day": "5", - "curriculum": "英语2", - "teacher": "曾令法", - "classRoom": "8-209-210", - "academicyear": "22-23", - "semester": "1", - "lessonNo": "G0101106", - "teachClassNo": "202107", - "empno": "JZG1007", - "lessonTime": "5-3", - "lessonDate": "2022-09-02", - "classRoomNo": "K006", - "lessonSortNo": "1", - "OLPEId": null, - "className": "21计算机1班" - }, - { - "ALTId": "07413840-473e-4888-a3f5-a7449786c6a9", - "day": "4", - "curriculum": "英语2", - "teacher": "曾令法", - "classRoom": "8-209-210", - "academicyear": "22-23", - "semester": "1", - "lessonNo": "G0101106", - "teachClassNo": "202107", - "empno": "JZG1007", - "lessonTime": "4-3", - "lessonDate": "2022-09-01", - "classRoomNo": "K006", - "lessonSortNo": "1", - "OLPEId": null, - "className": "21计算机1班" - }, - { - "ALTId": "0dc7913e-cf75-4876-a0c5-941f919bf490", - "day": "9", - "curriculum": "数学2", - "teacher": "谢晓东", - "classRoom": "8-209-210", - "academicyear": "22-23", - "semester": "1", - "lessonNo": "G0101104", - "teachClassNo": "202107", - "empno": "JZG1204", - "lessonTime": "9-3", - "lessonDate": "2022-09-06", - "classRoomNo": "K006", - "lessonSortNo": "1", - "OLPEId": null, - "className": "21计算机1班" - }, - { - "ALTId": "e8185446-6d3e-4103-af34-8d607fd52ff8", - "day": "10", - "curriculum": "数学2", - "teacher": "谢晓东", - "classRoom": "8-209-210", - "academicyear": "22-23", - "semester": "1", - "lessonNo": "G0101104", - "teachClassNo": "202107", - "empno": "JZG1204", - "lessonTime": "10-3", - "lessonDate": "2022-09-07", - "classRoomNo": "K006", - "lessonSortNo": "1", - "OLPEId": null, - "className": "21计算机1班" - } - ] - }, - { - "time": "4", - "list": [{ - "ALTId": "8b1837fc-3530-45b5-8842-1fa3daf74b35", - "day": "10", - "curriculum": "语文2", - "teacher": "黄发艳", - "classRoom": "8-209-210", - "academicyear": "22-23", - "semester": "1", - "lessonNo": "G0101102", - "teachClassNo": "202107", - "empno": "JZG1297", - "lessonTime": "10-4", - "lessonDate": "2022-09-07", - "classRoomNo": "K006", - "lessonSortNo": "1", - "OLPEId": null, - "className": "21计算机1班" - }, - { - "ALTId": "a45986a2-22da-4cc1-815a-938034f96c46", - "day": "7", - "curriculum": "英语2", - "teacher": "曾令法", - "classRoom": "8-209-210", - "academicyear": "22-23", - "semester": "1", - "lessonNo": "G0101106", - "teachClassNo": "202107", - "empno": "JZG1007", - "lessonTime": "7-4", - "lessonDate": "2022-09-04", - "classRoomNo": "K006", - "lessonSortNo": "1", - "OLPEId": null, - "className": "21计算机1班" - } - ] - }, - { - "time": "5", - "list": [{ - "ALTId": "1eccfee7-833b-464e-811d-60f55bdfa9e5", - "day": "10", - "curriculum": "英语2", - "teacher": "曾令法", - "classRoom": "8-209-210", - "academicyear": "22-23", - "semester": "1", - "lessonNo": "G0101106", - "teachClassNo": "202107", - "empno": "JZG1007", - "lessonTime": "10-5", - "lessonDate": "2022-09-07", - "classRoomNo": "K006", - "lessonSortNo": "1", - "OLPEId": null, - "className": "21计算机1班" - }, - { - "ALTId": "2e28f9c2-bbb4-4144-b99f-ba3dcce34dc8", - "day": "9", - "curriculum": "语文2", - "teacher": "黄发艳", - "classRoom": "8-209-210", - "academicyear": "22-23", - "semester": "1", - "lessonNo": "G0101102", - "teachClassNo": "202107", - "empno": "JZG1297", - "lessonTime": "9-5", - "lessonDate": "2022-09-06", - "classRoomNo": "K006", - "lessonSortNo": "1", - "OLPEId": null, - "className": "21计算机1班" - }, - { - "ALTId": "d0d883bd-de43-4967-92e4-d3de7138b4a2", - "day": "4", - "curriculum": "语文2", - "teacher": "黄发艳", - "classRoom": "8-209-210", - "academicyear": "22-23", - "semester": "1", - "lessonNo": "G0101102", - "teachClassNo": "202107", - "empno": "JZG1297", - "lessonTime": "4-5", - "lessonDate": "2022-09-01", - "classRoomNo": "K006", - "lessonSortNo": "1", - "OLPEId": null, - "className": "21计算机1班" - } - ] - }, - { - "time": "6", - "list": [{ - "ALTId": "67c42aae-284f-49dd-b5bc-607a6c498ed3", - "day": "8", - "curriculum": "语文2", - "teacher": "黄发艳", - "classRoom": "8-209-210", - "academicyear": "22-23", - "semester": "1", - "lessonNo": "G0101102", - "teachClassNo": "202107", - "empno": "JZG1297", - "lessonTime": "8-6", - "lessonDate": "2022-09-05", - "classRoomNo": "K006", - "lessonSortNo": "1", - "OLPEId": null, - "className": "21计算机1班" - }, - { - "ALTId": "8e5fed6b-835d-4112-925b-30e6b4bd0429", - "day": "5", - "curriculum": "数学2", - "teacher": "谢晓东", - "classRoom": "8-209-210", - "academicyear": "22-23", - "semester": "1", - "lessonNo": "G0101104", - "teachClassNo": "202107", - "empno": "JZG1204", - "lessonTime": "5-6", - "lessonDate": "2022-09-02", - "classRoomNo": "K006", - "lessonSortNo": "1", - "OLPEId": null, - "className": "21计算机1班" - }, - { - "ALTId": "febb8a53-835c-4873-ad31-d5e1bcbdbed4", - "day": "4", - "curriculum": "英语2", - "teacher": "曾令法", - "classRoom": "8-209-210", - "academicyear": "22-23", - "semester": "1", - "lessonNo": "G0101106", - "teachClassNo": "202107", - "empno": "JZG1007", - "lessonTime": "4-6", - "lessonDate": "2022-09-01", - "classRoomNo": "K006", - "lessonSortNo": "1", - "OLPEId": null, - "className": "21计算机1班" - } - ] - }, - { - "time": "7", - "list": [{ - "ALTId": "1a06dcf9-fb8e-441a-b6de-be652d2187d4", - "day": "6", - "curriculum": "语文2", - "teacher": "黄发艳", - "classRoom": "8-209-210", - "academicyear": "22-23", - "semester": "1", - "lessonNo": "G0101102", - "teachClassNo": "202107", - "empno": "JZG1297", - "lessonTime": "6-7", - "lessonDate": "2022-09-03", - "classRoomNo": "K006", - "lessonSortNo": "1", - "OLPEId": null, - "className": "21计算机1班" - }, - { - "ALTId": "86330adc-c6ec-41b9-b61b-91f87beb0767", - "day": "8", - "curriculum": "英语2", - "teacher": "曾令法", - "classRoom": "8-209-210", - "academicyear": "22-23", - "semester": "1", - "lessonNo": "G0101106", - "teachClassNo": "202107", - "empno": "JZG1007", - "lessonTime": "8-7", - "lessonDate": "2022-09-05", - "classRoomNo": "K006", - "lessonSortNo": "1", - "OLPEId": null, - "className": "21计算机1班" - }, - { - "ALTId": "edace417-6bed-48a4-ab97-87afaab25be5", - "day": "4", - "curriculum": "语文2", - "teacher": "黄发艳", - "classRoom": "8-209-210", - "academicyear": "22-23", - "semester": "1", - "lessonNo": "G0101102", - "teachClassNo": "202107", - "empno": "JZG1297", - "lessonTime": "4-7", - "lessonDate": "2022-09-01", - "classRoomNo": "K006", - "lessonSortNo": "1", - "OLPEId": null, - "className": "21计算机1班" - } - ] - }, - { - "time": "8", - "list": [{ - "ALTId": "f21cd6b6-dffa-45ca-bcd6-76eb20985da2", - "day": "5", - "curriculum": "数学2", - "teacher": "谢晓东", - "classRoom": "8-209-210", - "academicyear": "22-23", - "semester": "1", - "lessonNo": "G0101104", - "teachClassNo": "202107", - "empno": "JZG1204", - "lessonTime": "5-8", - "lessonDate": "2022-09-02", - "classRoomNo": "K006", - "lessonSortNo": "1", - "OLPEId": null, - "className": "21计算机1班" - }] - }, - { - "time": "9", - "list": [{ - "ALTId": "24655d02-9f96-4726-b1d8-1f5a82914eb8", - "day": "7", - "curriculum": "语文2", - "teacher": "黄发艳", - "classRoom": "8-209-210", - "academicyear": "22-23", - "semester": "1", - "lessonNo": "G0101102", - "teachClassNo": "202107", - "empno": "JZG1297", - "lessonTime": "7-9", - "lessonDate": "2022-09-04", - "classRoomNo": "K006", - "lessonSortNo": "1", - "OLPEId": null, - "className": "21计算机1班" - }] - } - ] - } - _this.semester = res1.semester + _this.semester = res.semester _this.dataArr = _this.ProcessingData(res.weekList); + // 回显日期 + if (!start) { + _this.todayWeek.MondayTime = new Date(res.startDate).valueOf(); + _this.todayWeek.SundayTime = new Date(res.endDate).valueOf() + _this.noClassTime; + _this.num = 0; + _this.todayWeek.Monday = common.fmtDate(_this.todayWeek.MondayTime); + _this.todayWeek.Sunday = common.fmtDate(_this.todayWeek.SundayTime); + } }); }, - // 处理接口返回的课程数据 + // 处理课程数据 ProcessingData(res) { let courseCateByDay = {} for (let i = 1; i < 11; i++) { @@ -668,94 +183,9 @@ courseCateByDay[item.time] = item.list }) return courseCateByDay; - // let dataM = [{ - // weekTime: 1, - // num: Math.floor(Math.random() * 100000000), - // lessonData: [{ - // "time": "10", - // "ALTId": "18778c62-2d53-484f-850a-7f736395e86b", - // "day": "9", - // "curriculum": "英语2", - // "teacher": "曾令法", - // "classRoom": "8-209-210", - // "academicyear": "22-23", - // "semester": "1", - // "lessonNo": "G0101106", - // "teachClassNo": "202107", - // "empno": "JZG1007", - // "lessonTime": "9-10", - // "lessonDate": "2022-09-06", - // "classRoomNo": "K006", - // "lessonSortNo": "1", - // "OLPEId": null, - // "className": "21计算机1班" - // }, - // { - // "time": "2", - // "ALTId": "a3598edb-ad86-4ea5-82a7-bbaf5239e1a0", - // "day": "4", - // "curriculum": "数学2", - // "teacher": "谢晓东", - // "classRoom": "8-209-210", - // "academicyear": "22-23", - // "semester": "1", - // "lessonNo": "G0101104", - // "teachClassNo": "202107", - // "empno": "JZG1204", - // "lessonTime": "4-10", - // "lessonDate": "2022-09-01", - // "classRoomNo": "K006", - // "lessonSortNo": "1", - // "OLPEId": null, - // "className": "21计算机1班" - // }, - // ] - // }, - // { - // weekTime: 2, - // num: Math.floor(Math.random() * 100000000), - // lessonData: [] - // }, - // { - // weekTime: 3, - // num: Math.floor(Math.random() * 100000000), - // lessonData: [] - // }, - // { - // weekTime: 4, - // num: Math.floor(Math.random() * 100000000), - // lessonData: [] - // }, - // { - // weekTime: 5, - // num: Math.floor(Math.random() * 100000000), - // lessonData: [] - // }, - // { - // weekTime: 6, - // num: Math.floor(Math.random() * 100000000), - // lessonData: [] - // }, - // { - // weekTime: 7, - // num: Math.floor(Math.random() * 100000000), - // lessonData: [] - // } - // ]; - // data.forEach((n, i) => { - // n.sectionTime = n.LessonTime.slice(1); - // dataM.forEach((k, j) => { - // if (k.weekTime == n.LessonTime.slice(0, 1)) { - // k.lessonData.push(n); - // } - // }); - // }); - // dataM.forEach((n, i) => { - // n.lessonData.sort(common.compare('sectionTime')); - // }); - // this.dataArr = dataM; }, classTap(data) { + return "" let _this = this; // console.log(_this.user) if (_this.user.Description == "教师") { @@ -792,7 +222,7 @@ }, created() { this.ON('timeTable', this.init); - this.userInfo = this.GET_GLOBAL("loginUser"); + this.user = this.GET_GLOBAL('loginUser'); this.init() } }; @@ -935,7 +365,7 @@ float: left; background: #e8f6ff; height: 100%; - width: 25%; + width: 20%; text-align: center; line-height: 36px; padding: 11px 0; @@ -945,7 +375,7 @@ .tSec2ListR { float: left; - width: 75%; + width: 80%; height: 100%; line-height: 18px; padding: 4px 0; @@ -953,7 +383,7 @@ } .tSec2ListBox { - width: 70%; + width: 62%; float: left; padding-left: 5px; } @@ -973,7 +403,7 @@ } .tSec2Location { - width: 30%; + width: 38%; float: left; line-height: 44px; font-size: 13px; From fcd9847b397769c663925652c1a2a3f5c4fd7add Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=99=93=E7=90=AA?= Date: Thu, 11 Aug 2022 17:19:22 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E8=AF=BE=E8=A1=A8=E6=97=A5=E6=9C=9F?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LearunApp-2.2.0/pages/timeTable/list.vue | 1 + 1 file changed, 1 insertion(+) 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 5cd8cb6ef..9d5960cd4 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 @@ -143,6 +143,7 @@ }, // 获取数据 loadData(start, end) { + if(!this.user) return let { Description, account: Account From caf41f1d388a5e26de4dc9573696d0e7b0a907b7 Mon Sep 17 00:00:00 2001 From: ndbs Date: Fri, 12 Aug 2022 11:42:56 +0800 Subject: [PATCH 4/5] =?UTF-8?q?app2.0=20-=20=E9=80=9A=E8=AE=AF=E5=BD=95?= =?UTF-8?q?=E7=A6=81=E7=94=A8=E7=82=B9=E5=87=BB=E4=BA=8B=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/contact.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/contact.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/contact.vue index 5bff4a61e..fb4c21cb9 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/contact.vue +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/contact.vue @@ -33,6 +33,7 @@ export default { methods: { // 处理点击用户的场合，跳转到消息页 userClick(item) { + return this.NAV_TO(`/pages/msg/chat?id=${item.id}&name=${item.name}`) } }, From 870c492575a06984b7538ff75d8c4dc91ad11650 Mon Sep 17 00:00:00 2001 From: ndbs Date: Fri, 12 Aug 2022 12:03:36 +0800 Subject: [PATCH 5/5] =?UTF-8?q?app2.0-=E9=A6=96=E9=A1=B5=E9=9A=90=E8=97=8F?= =?UTF-8?q?=E6=B6=88=E6=81=AF=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LearunApp-2.2.0/pages.json | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages.json b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages.json index 78032ad68..8de4a6aa1 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages.json +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages.json @@ -814,7 +814,7 @@ "navigationBarTitleText": "监考安排" } }, - + //教师考勤 { "path": "pages/attendance/list", @@ -999,10 +999,10 @@ "navigationBarTitleText": "会议扫码签到" } } - - - ], + + + ], // 全局样式 "globalStyle": { @@ -1027,11 +1027,11 @@ "iconPath": "static/img-bar/tab-home.png", "selectedIconPath": "static/img-bar/tab-home-active.png", "text": "首页" - }, { - "pagePath": "pages/msg", - "iconPath": "static/img-bar/tab-msg.png", - "selectedIconPath": "static/img-bar/tab-msg-active.png", - "text": "消息" + // }, { + // "pagePath": "pages/msg", + // "iconPath": "static/img-bar/tab-msg.png", + // "selectedIconPath": "static/img-bar/tab-msg-active.png", + // "text": "消息" }, { "pagePath": "pages/contact", @@ -1096,7 +1096,7 @@ "u-parse": "@/components/u-parse/u-parse.vue" } } - } +} // "condition" : { //模式配置，仅开发期间生效 // "current": 0, //当前激活的模式(list 的索引项) // "list": [