From e46904319428f17e88a597e18f9087ba0821629c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A7=9A=E4=B8=B9ab?= <1421553879@qq.com>
Date: Tue, 8 Aug 2023 21:55:14 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=81=E6=AD=A2?=
=?UTF-8?q?=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
web/src/main/resources/templates/jlw/resourcesQuestion/add.html | 2 +-
.../jlw/teacherOpenCourseMergeResourcesQuestion/add.html | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/web/src/main/resources/templates/jlw/resourcesQuestion/add.html b/web/src/main/resources/templates/jlw/resourcesQuestion/add.html
index f17ec4e2..087d9952 100644
--- a/web/src/main/resources/templates/jlw/resourcesQuestion/add.html
+++ b/web/src/main/resources/templates/jlw/resourcesQuestion/add.html
@@ -172,7 +172,7 @@
diff --git a/web/src/main/resources/templates/jlw/teacherOpenCourseMergeResourcesQuestion/add.html b/web/src/main/resources/templates/jlw/teacherOpenCourseMergeResourcesQuestion/add.html
index ac91786f..c5f1228c 100644
--- a/web/src/main/resources/templates/jlw/teacherOpenCourseMergeResourcesQuestion/add.html
+++ b/web/src/main/resources/templates/jlw/teacherOpenCourseMergeResourcesQuestion/add.html
@@ -173,7 +173,7 @@
From f4ba626b0c25a3124dd8ae6aed55f2b17e58ab6b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A7=9A=E4=B8=B9ab?= <1421553879@qq.com>
Date: Wed, 9 Aug 2023 10:42:35 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E6=94=B9=E9=94=99=E4=BA=86=EF=BC=8C?=
=?UTF-8?q?=E7=BB=99=E6=94=B9=E5=9B=9E=E6=9D=A5=E3=80=82=E8=AF=95=E9=A2=98?=
=?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=B8=8D=E8=83=BD=E7=BC=96=E8=BE=91=E7=9A=84?=
=?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
web/src/main/resources/templates/jlw/resourcesQuestion/add.html | 2 +-
.../jlw/teacherOpenCourseMergeResourcesQuestion/add.html | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/web/src/main/resources/templates/jlw/resourcesQuestion/add.html b/web/src/main/resources/templates/jlw/resourcesQuestion/add.html
index 087d9952..f17ec4e2 100644
--- a/web/src/main/resources/templates/jlw/resourcesQuestion/add.html
+++ b/web/src/main/resources/templates/jlw/resourcesQuestion/add.html
@@ -172,7 +172,7 @@
diff --git a/web/src/main/resources/templates/jlw/teacherOpenCourseMergeResourcesQuestion/add.html b/web/src/main/resources/templates/jlw/teacherOpenCourseMergeResourcesQuestion/add.html
index c5f1228c..ac91786f 100644
--- a/web/src/main/resources/templates/jlw/teacherOpenCourseMergeResourcesQuestion/add.html
+++ b/web/src/main/resources/templates/jlw/teacherOpenCourseMergeResourcesQuestion/add.html
@@ -173,7 +173,7 @@
From 453ebf9c8f2be084e4b71be89656ea8a29233927 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A7=9A=E4=B8=B9ab?= <1421553879@qq.com>
Date: Wed, 9 Aug 2023 16:45:45 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E9=99=A2=E6=A0=A1=E6=9D=83=E9=99=90?=
=?UTF-8?q?=EF=BC=9A=E9=BB=98=E8=AE=A4=E8=B4=AD=E4=B9=B0+3=E5=B9=B4?=
=?UTF-8?q?=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/main/resources/static/js/common.js | 2 +-
.../add.html | 28 +++++++++++++------
2 files changed, 21 insertions(+), 9 deletions(-)
diff --git a/admin-core/src/main/resources/static/js/common.js b/admin-core/src/main/resources/static/js/common.js
index 30b83cee..f00e1437 100644
--- a/admin-core/src/main/resources/static/js/common.js
+++ b/admin-core/src/main/resources/static/js/common.js
@@ -357,7 +357,7 @@ var Common = {
if(pastMonth<10) pastMonth="0"+pastMonth;
if(pastDay<10) pastDay="0"+pastDay;
- let time = pastYear + '-' + pastMonth + '-' + pastDay;
+ let time = pastYear + '-' + pastMonth + '-' + pastDay + " 00:00";
return time;
/*var d = new Date();
diff --git a/web/src/main/resources/templates/jlw/universitiesCollegesJurisdictionExperimentalSystem/add.html b/web/src/main/resources/templates/jlw/universitiesCollegesJurisdictionExperimentalSystem/add.html
index eb50db17..0a1d242f 100644
--- a/web/src/main/resources/templates/jlw/universitiesCollegesJurisdictionExperimentalSystem/add.html
+++ b/web/src/main/resources/templates/jlw/universitiesCollegesJurisdictionExperimentalSystem/add.html
@@ -110,7 +110,7 @@
|
|
@@ -201,7 +201,7 @@
|
@@ -345,10 +345,9 @@
xtList[i].subsystemBottomBar = $(this).val();
});
+ loadTime("useStartTime_xt_" + i,v);
- loadTime("useStartTime_xt_" + i);
-
- loadTime("useEndTime_xt_" + i);
+ loadTime("useEndTime_xt_" + i,v);
//子系统登录页logo设计
updateLogo("subsystemIndexLogo_xt_" + i);
@@ -392,9 +391,9 @@
kcList[i].secondLevelName = $(this).val();
});
- loadTime("useStartTime_kc_" + i);
+ loadTime("useStartTime_kc_" + i,v);
- loadTime("useEndTime_kc_" + i);
+ loadTime("useEndTime_kc_" + i,v);
updateLogo("secondLevelLogo_kc_" + i);//二级课程logo设置
@@ -427,11 +426,24 @@
//开始结束时间
- function loadTime(id) {
+ function loadTime(id,data) {
+ var timeValue = data.useStartTime;
+ if(data.useType == 0 || $.isEmpty(data.useType)){
+ var timeValue = Common.getNowDate(0);
+ if(id.indexOf("useEndTime") > -1){
+ timeValue = Common.getNowDate(1095);
+ }
+ }else {
+ if(id.indexOf("useEndTime") > -1){
+ timeValue = data.useEndTime;
+ }
+ }
+
laydate.render({
elem: '#' + id
, type: 'datetime'
, format: 'yyyy-MM-dd HH:mm'
+ , value: [timeValue]
, done: function (value, date, endDate) {
var i = $("#" + id).parents("tr").attr("index");//当前编辑行号
if (id.indexOf("useStartTime_xt") >= 0) {