From 4b20479ae5a54dee7b9c76dfecc179255cefd2f9 Mon Sep 17 00:00:00 2001
From: zhangli <1109134334@qq.com>
Date: Wed, 10 Aug 2022 11:19:21 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=80=83=E5=8A=A1=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../EducationalAdministration/Views/ClassPlan/Index.js     | 2 +-
 .../Views/Exam_ExamTeacherTime/Index.js                    | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

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();
 }

From f0b3f727f4e4711d589b99af2656f2849138ff80 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=99=93=E7=90=AA?= <y1530857136@163.com>
Date: Thu, 11 Aug 2022 14:39:02 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=AF=BE=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../LearunApp-2.2.0/common/js/common.js       |   15 +
 .../LearunApp-2.2.0/config.js                 |    3 +-
 .../LearunApp-2.2.0/pages/timeTable/list.vue  | 1274 ++++++++++++-----
 3 files changed, 954 insertions(+), 338 deletions(-)

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 @@
 				<text>{{todayWeek.Monday}}</text>
 				-
 				<text>{{todayWeek.Sunday}}</text>
-				<text class="text-xxl cuIcon cuIcon-right"  @click="timeTap(2)"></text>
+				<text class="text-xxl cuIcon cuIcon-right" @click="timeTap(2)"></text>
 			</view>
 		</view>
 		<view class="timeTable_sec2">
 			<view class="tSec2Top">
-				<view class="tSec2TopLi" v-for="(item, ind) in weekArr" :key="item.en" @click="liTap(ind)" :class="ind == num? 'active' : ''">
-					<text>{{ item.en }}</text>
-					<text>{{ item.cn }}</text>
+				<view class="tSec2TopUl">
+					<view class="tSec2TopLi" v-for="(item, ind) in weekArr" :key="item.en" @click="liTap(ind)"
+						:class="ind == num? 'active' : ''">
+						<text>{{ item.en }}</text>
+						<text>{{ item.cn }}</text>
+					</view>
 				</view>
+
 			</view>
 			<view class="tSec2Box">
-				<view class="tSec2Con" v-for="(items, i) in dataArr" :key="items.num" v-show="i == num">
+				<view class="tSec2Con" v-for="(items, i) in weekArr" :key="items.num" v-show="i == num">
 					<view class="tSec2List">
-						<view v-if="items.lessonData.length <= 0" class="tSec2ListLi"><view class="noHtml">该时间段没有课表</view></view>
-						<view v-if="items.lessonData.length > 0">
-							<view class="tSec2ListLi" v-for="(k, j) in items.lessonData" :key="j" @click="classTap(k)">
-								<view class="tSec2ListL">第 {{ k.sectionTime }} 节</view>
+						<view v-if="dataArr[i+1].length <= 0" class="tSec2ListLi">
+							<view class="noHtml">该时间段没有课表</view>
+						</view>
+						<view v-if="dataArr[i+1].length > 0">
+							<view class="tSec2ListLi" v-for="(k, j) in dataArr[i+1]" :key="j" @click="classTap(k)">
+								<view class="tSec2ListL">第 {{ k.jc }} 节</view>
 								<view class="tSec2ListR">
 									<view class="tSec2ListBox">
-										<view class="tSec2ListT">{{ k.LessonName }}</view>
+										<view class="tSec2ListT">{{ k.curriculum }}</view>
 										<view class="tSec2ListTxt">
 											<text class="text-xxl cuIcon cuIcon-profile"></text>
-											{{ k.EmpName }}
+											{{ k.teacher }}
 										</view>
 									</view>
 									<view class="tSec2Location">
 										<text class="text-xxl cuIcon cuIcon-location"></text>
-										{{ k.ClassroomName }}
+										{{ k.className }}
 									</view>
 								</view>
 							</view>
@@ -51,339 +57,933 @@
 </template>
 
 <script>
-import common from '@/common/js/common.js'
-export default {
-	data() {
-		return {
-			semester: '',
-			num: 0,
-			user: null,
-			weekDayTime: 0,
-			todayWeek: {},
-			dataArr: [],
-			weekArr: [
-				{
-					en: 'MON',
-					cn: '星期一'
-				},
-				{
-					en: 'TUE',
-					cn: '星期二'
-				},
-				{
-					en: 'WED',
-					cn: '星期三'
-				},
-				{
-					en: 'THU',
-					cn: '星期四'
-				},
-				{
-					en: 'FRI',
-					cn: '星期五'
-				},
-				{
-					en: 'SAT',
-					cn: '星期六'
-				},
-				{
-					en: 'SUN',
-					cn: '星期日'
-				}
-			]
-		};
-	},
-	onUnload() {
-		this.OFF('timeTable');
-	},
-	methods: {
-		async init() {
-			// console.log(555)
-			let _this = this;
-			_this.todayWeek = common.weekday();
-			_this.semester = common.judgeDate();
-			_this.weekDayTime = 7 * common.oneDayTime();
-			_this.user = _this.GET_GLOBAL('loginUser');
-			_this.loadData(_this.todayWeek.Monday, _this.todayWeek.Sunday);
-		},
-		liTap(ind) {
-			this.num = ind;
-		},
-		timeTap(num) {
-			let _this = this;
-			if (num == 1) {
-			    _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;
-			    _this.todayWeek.SundayTime = _this.todayWeek.SundayTime + _this.weekDayTime;
-			}
-			_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);
+	import common from '@/common/js/common.js'
+	export default {
+		data() {
+			return {
+				userInfo:null,
+				semester: '',
+				num: 0,
+				user: null,
+				weekDayTime: 0,
+				todayWeek: {},
+				dataArr: [],
+				weekArr: [{
+						en: 'ONE',
+						cn: '星期一'
+					},
+					{
+						en: 'TWO',
+						cn: '星期二'
+					},
+					{
+						en: 'THREE',
+						cn: '星期三'
+					},
+					{
+						en: 'FOUR',
+						cn: '星期四'
+					},
+					{
+						en: 'FIVE',
+						cn: '星期五'
+					},
+					{
+						en: 'SIX',
+						cn: '星期六'
+					},
+					{
+						en: 'SEVEN',
+						cn: '星期七'
+					},
+					{
+						en: 'EIGHT',
+						cn: '星期八'
+					},
+					{
+						en: 'NINE',
+						cn: '星期九'
+					},
+					{
+						en: 'TEN',
+						cn: '星期十'
+					}
+				]
+			};
 		},
-		loadData(start, end) {
-		    let param = { StartDate: start, EndDate: end };
-		    // let param = { StartDate: '2018-11-05', EndDate: '2018-11-11' };
-			let _this = this;
-			_this.LOADING('加载数据中…');
-			_this.HTTP_GET('learun/adms/timetable/list', param, '加载数据时出错').then(res => {
-				this.HIDE_LOADING();
-				// console.log(res);
-				_this.ProcessingData(res);
-			});
-			
+		onUnload() {
+			this.OFF('timeTable');
 		},
-		ProcessingData(data) {
-			let dataM = [
-				{
-					weekTime: 1,
-					num: Math.floor(Math.random() * 100000000),
-					lessonData: []
-				},
-				{
-					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: []
+		methods: {
+			async init() {
+				// console.log(555)
+				let _this = this;
+				_this.todayWeek = common.weekday2();
+				// _this.semester = common.judgeDate();
+				_this.weekDayTime = 14 * common.oneDayTime();
+				_this.user = _this.GET_GLOBAL('loginUser');
+				_this.loadData(_this.todayWeek.Monday, _this.todayWeek.Sunday);
+			},
+			liTap(ind) {
+				this.num = ind;
+			},
+			timeTap(num) {
+				let _this = this;
+				if (num == 1) {
+					_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;
+					_this.todayWeek.SundayTime = _this.todayWeek.SundayTime + _this.weekDayTime;
 				}
-			];
-			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);
+				_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 param = {
+					StartDate: start,
+					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.dataArr = _this.ProcessingData(res.weekList);
 				});
-			});
-			dataM.forEach((n, i) => {
-				n.lessonData.sort(common.compare('sectionTime'));
-			});
-			this.dataArr = dataM;
-		},
-		classTap(data) {
-			let _this = this;
-			// console.log(_this.user)
-			if (_this.user.Description == "教师") {
-			    //console.log("教师");
-			} else if (_this.user.Description == "学生") {
-			    let LeaveType = data.LeaveType;
-			    //console.log(LeaveType);
-			    let IsCheck = data.IsCheck;
-			    //console.log(IsCheck);
-			    if (LeaveType == "1") {
-			        let msg = "请假申请中";
-			        if (IsCheck == "1") {
-			            msg = "请假通过";
-			        }
-			        if (IsCheck == "2") {
-			            msg = "请假未通过";
-			        }
-					_this.TOAST(msg);
-			    }
-			    else {
-			        // var param = {
-			        //     AcademicYearNo: data.AcademicYear,
-			        //     ClassRoomNo: data.ClassRoomNo,
-			        //     EmpNo: data.EmpNo,
-			        //     LessonDate: data.LessonDate,
-			        //     LessonNo: data.LessonNo,
-			        //     LessonSortNo: data.LessonSortNo,
-			        //     LessonTime: data.LessonTime,
-			        //     Semester: data.Semester
-			        // };
-					this.NAV_TO('./leaveFrom', data, true);
-			    }
+
+			},
+			// 处理接口返回的课程数据
+			ProcessingData(res) {
+				let courseCateByDay = {}
+				for (let i = 1; i < 11; i++) {
+					courseCateByDay[i] = []
+				}
+				res.forEach((item) => {
+					item.list.sort((a, b) => {
+						return a.jc - b.jc
+					})
+					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) {
+				let _this = this;
+				// console.log(_this.user)
+				if (_this.user.Description == "教师") {
+					//console.log("教师");
+				} else if (_this.user.Description == "学生") {
+					let LeaveType = data.LeaveType;
+					//console.log(LeaveType);
+					let IsCheck = data.IsCheck;
+					//console.log(IsCheck);
+					if (LeaveType == "1") {
+						let msg = "请假申请中";
+						if (IsCheck == "1") {
+							msg = "请假通过";
+						}
+						if (IsCheck == "2") {
+							msg = "请假未通过";
+						}
+						_this.TOAST(msg);
+					} else {
+						// var param = {
+						//     AcademicYearNo: data.AcademicYear,
+						//     ClassRoomNo: data.ClassRoomNo,
+						//     EmpNo: data.EmpNo,
+						//     LessonDate: data.LessonDate,
+						//     LessonNo: data.LessonNo,
+						//     LessonSortNo: data.LessonSortNo,
+						//     LessonTime: data.LessonTime,
+						//     Semester: data.Semester
+						// };
+						this.NAV_TO('./leaveFrom', data, true);
+					}
+				}
 			}
+		},
+		created() {
+			this.ON('timeTable', this.init);
+			this.userInfo = this.GET_GLOBAL("loginUser");
+			this.init()
 		}
-	},
-	created() {
-		this.ON('timeTable', this.init);
-		this.init()
-	}
-};
+	};
 </script>
 
 <style lang="less" scoped>
-.page{
-	background: #fff;
-}
-.timeTable_sec1 {
-	padding: 14px 12px;
-	text-align: center;
-	background: #0075c4;
-	color: #94d4ff;
-	font-size: 0;
-}
-.tSec1Box > * {
-	display: inline-block;
-	vertical-align: middle;
-}
-.tSec1Line {
-	height: 13px;
-	width: 1px;
-	background: #94d4ff;
-	margin: 0 10px;
-}
-.tSec1Box {
-	font-size: 15px;
-	overflow: hidden;
-	white-space: nowrap;
-	text-overflow: ellipsis;
-}
-#semester {
-	margin-bottom: 10px;
-}
-#weekTime {
-}
-#weekTime text {
-	margin: 0 10px;
-}
-.tSec1Box > text {
-	width: auto;
-	text-align: center;
-	line-height: 22px;
-}
-.tSec1Box image {
-	width: 15px;
-	margin-right: 2px;
-}
-.tSec1Box text:after {
-	display: none;
-}
-.timeTable_sec2 {
-	margin-bottom: 30px;
-}
-.tSec2Top {
-	padding: 0 12px;
-	background: #0075c4;
-	height: 55px;
-	text-align: center;
-	overflow: hidden;
-}
-.tSec2TopLi {
-	width: 14.285714%;
-	float: left;
-	line-height: 18px;
-	padding: 9px 0 9px;
-	color: #fff;
-	font-size: 13px;
-	border-right: 1px solid #1084d2;
-	border-top: 1px solid #1084d2;
-}
-.tSec2TopLi:first-child {
-	border-left: 1px solid #1084d2;
-}
-.tSec2TopLi.active {
-	color: #0075c4;
-	background: #fff;
-	border-color: #fff;
-}
-.tSec2TopLi text {
-	display: block;
-}
-
-.tSec2TopLi text:first-child {
-	letter-spacing: 2px;
-	text-transform: uppercase;
-}
-.tSec2Box {
-	padding: 0 12px;
-	margin-top: 10px;
-}
-.tSec2Con {
-	border-left: 1px solid #d5eaf7;
-	border-right: 1px solid #d5eaf7;
-	border-top: 1px solid #d5eaf7;
-	// display: none;
-}
-.tSec2Con:first-child {
-	display: block;
-}
-.tSec2List {
-	margin-top: 10px;
-}
-.tSec2List:first-child {
-	margin-top: 0;
-}
-.tSec2ListLi {
-	border-bottom: 1px solid #d5eaf7;
-	overflow: hidden;
-	height: 60px;
-}
-.tSec2ListL {
-	float: left;
-	background: #e8f6ff;
-	height: 100%;
-	width: 25%;
-	text-align: center;
-	line-height: 36px;
-	padding: 11px 0;
-	font-size: 14px;
-	color: #646464;
-}
-.tSec2ListR {
-	float: left;
-	width: 75%;
-	height: 100%;
-	line-height: 18px;
-	padding: 4px 0;
-	overflow: hidden;
-}
-.tSec2ListBox {
-	width: 70%;
-	float: left;
-	padding-left: 5px;
-}
-.tSec2ListT {
-	color: #3e3e3e;
-	font-size: 15px;
-	margin: 5px 0;
-	overflow: hidden;
-	white-space: nowrap;
-	text-overflow: ellipsis;
-}
-.tSec2ListTxt {
-	color: #888888;
-	font-size: 13px;
-}
-.tSec2Location {
-	width: 30%;
-	float: left;
-	line-height: 44px;
-	font-size: 13px;
-	color: #888888;
-}
-.noHtml {
-	height: 100%;
-	line-height: 60px;
-	text-align: center;
-	font-size: 14px;
-}
+	.page {
+		background: #fff;
+	}
+
+	.timeTable_sec1 {
+		padding: 14px 12px;
+		text-align: center;
+		background: #0075c4;
+		color: #94d4ff;
+		font-size: 0;
+	}
+
+	.tSec1Box>* {
+		display: inline-block;
+		vertical-align: middle;
+	}
+
+	.tSec1Line {
+		height: 13px;
+		width: 1px;
+		background: #94d4ff;
+		margin: 0 10px;
+	}
+
+	.tSec1Box {
+		font-size: 15px;
+		overflow: hidden;
+		white-space: nowrap;
+		text-overflow: ellipsis;
+	}
+
+	#semester {
+		margin-bottom: 10px;
+	}
+
+	#weekTime {}
+
+	#weekTime text {
+		margin: 0 10px;
+	}
+
+	.tSec1Box>text {
+		width: auto;
+		text-align: center;
+		line-height: 22px;
+	}
+
+	.tSec1Box image {
+		width: 15px;
+		margin-right: 2px;
+	}
+
+	.tSec1Box text:after {
+		display: none;
+	}
+
+	.timeTable_sec2 {
+		margin-bottom: 30px;
+	}
+
+	.tSec2Top {
+		padding: 0 12px;
+		background: #0075c4;
+		height: 55px;
+		text-align: center;
+		overflow: auto;
+	}
+
+	.tSec2TopUl {
+		width: 800px;
+	}
+
+	.tSec2TopLi {
+		width: 10%;
+		float: left;
+		line-height: 18px;
+		padding: 9px 0 9px;
+		color: #fff;
+		font-size: 13px;
+		border-right: 1px solid #1084d2;
+		border-top: 1px solid #1084d2;
+	}
+
+	.tSec2TopLi:first-child {
+		border-left: 1px solid #1084d2;
+	}
+
+	.tSec2TopLi.active {
+		color: #0075c4;
+		background: #fff;
+		border-color: #fff;
+	}
+
+	.tSec2TopLi text {
+		display: block;
+	}
+
+	.tSec2TopLi text:first-child {
+		letter-spacing: 2px;
+		text-transform: uppercase;
+	}
+
+	.tSec2Box {
+		padding: 0 12px;
+		margin-top: 10px;
+	}
+
+	.tSec2Con {
+		border-left: 1px solid #d5eaf7;
+		border-right: 1px solid #d5eaf7;
+		border-top: 1px solid #d5eaf7;
+		// display: none;
+	}
+
+	.tSec2Con:first-child {
+		display: block;
+	}
+
+	.tSec2List {
+		margin-top: 10px;
+	}
+
+	.tSec2List:first-child {
+		margin-top: 0;
+	}
+
+	.tSec2ListLi {
+		border-bottom: 1px solid #d5eaf7;
+		overflow: hidden;
+		height: 60px;
+	}
+
+	.tSec2ListL {
+		float: left;
+		background: #e8f6ff;
+		height: 100%;
+		width: 25%;
+		text-align: center;
+		line-height: 36px;
+		padding: 11px 0;
+		font-size: 14px;
+		color: #646464;
+	}
+
+	.tSec2ListR {
+		float: left;
+		width: 75%;
+		height: 100%;
+		line-height: 18px;
+		padding: 4px 0;
+		overflow: hidden;
+	}
+
+	.tSec2ListBox {
+		width: 70%;
+		float: left;
+		padding-left: 5px;
+	}
+
+	.tSec2ListT {
+		color: #3e3e3e;
+		font-size: 15px;
+		margin: 5px 0;
+		overflow: hidden;
+		white-space: nowrap;
+		text-overflow: ellipsis;
+	}
+
+	.tSec2ListTxt {
+		color: #888888;
+		font-size: 13px;
+	}
+
+	.tSec2Location {
+		width: 30%;
+		float: left;
+		line-height: 44px;
+		font-size: 13px;
+		color: #888888;
+	}
+
+	.noHtml {
+		height: 100%;
+		line-height: 60px;
+		text-align: center;
+		font-size: 14px;
+	}
 </style>