Merge branch '长阳分支中职' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl into 长阳分支中职

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("不能选择已排课的课程计划");
                     }
                 }
             });

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

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]

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": [