From 794c484ebe2505c0d5bd3dea71c4acafe51cc48c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A7=9A=E4=B8=B9ab?= <1421553879@qq.com>
Date: Thu, 5 Jan 2023 23:58:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../static/js/jlw/resourcesInfo/index.js      |  2 ++
 .../static/js/jlw/schoolClass/add.js          |  5 +++++
 .../static/js/jlw/schoolClass/index.js        |  1 -
 .../templates/jlw/schoolClass/add.html        | 20 +++++++++++++++----
 .../jlw/teacher/statisticalReport.html        |  3 +++
 .../templates/jlw/teacher/studentLogin.html   |  8 ++++----
 .../jlw/teacher/studentUsageLog.html          |  9 +++------
 .../resources/templates/other/userCenter.html | 12 +++++++----
 8 files changed, 41 insertions(+), 19 deletions(-)

diff --git a/web/src/main/resources/static/js/jlw/resourcesInfo/index.js b/web/src/main/resources/static/js/jlw/resourcesInfo/index.js
index b8f850a8..88a5ca55 100644
--- a/web/src/main/resources/static/js/jlw/resourcesInfo/index.js
+++ b/web/src/main/resources/static/js/jlw/resourcesInfo/index.js
@@ -19,6 +19,8 @@ layui.define(['form', 'laydate', 'table'], function (exports) {
         });
     });
     selectList += "</select>";
+    console.log(selectList)
+    console.log(courseLabelTypes)
     var view = {
         init: function () {
             this.initTable();
diff --git a/web/src/main/resources/static/js/jlw/schoolClass/add.js b/web/src/main/resources/static/js/jlw/schoolClass/add.js
index cb89eb57..73accc01 100644
--- a/web/src/main/resources/static/js/jlw/schoolClass/add.js
+++ b/web/src/main/resources/static/js/jlw/schoolClass/add.js
@@ -3,6 +3,11 @@ layui.define([ 'form', 'laydate', 'table','schoolClassApi'], function(exports) {
     var schoolClassApi = layui.schoolClassApi;
     var index = layui.index;
     var student_tag = sessionStorage.getItem("student_tag"); //schoolClass_tag = 1： 学生页面进入 2：班级进入
+    var isSignRole = $("input[name='isSignRole']").val();
+    if(isSignRole ==2){//学校管理员
+        var value = $('input[name="universitiesCollegesId"]').data('value');
+        Lib.getUniversityFacultys($("select[name='universityFacultyId']"),value);
+    }
     sessionStorage.removeItem("student_tag");
     var view = {
         init:function(){
diff --git a/web/src/main/resources/static/js/jlw/schoolClass/index.js b/web/src/main/resources/static/js/jlw/schoolClass/index.js
index 085f7401..f32a0ccc 100644
--- a/web/src/main/resources/static/js/jlw/schoolClass/index.js
+++ b/web/src/main/resources/static/js/jlw/schoolClass/index.js
@@ -4,7 +4,6 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) {
     var table = layui.table;
     var schoolClassTable = null;
     var isSignRole = $("input[name='isSignRole']").val();
-    console.log(isSignRole)
     var view ={
         init:function(){
             this.initTable();
diff --git a/web/src/main/resources/templates/jlw/schoolClass/add.html b/web/src/main/resources/templates/jlw/schoolClass/add.html
index 53549e8f..b73f4517 100644
--- a/web/src/main/resources/templates/jlw/schoolClass/add.html
+++ b/web/src/main/resources/templates/jlw/schoolClass/add.html
@@ -4,19 +4,19 @@
     <div style="margin-left: 95px;">
         <layui:submitButtons id="addButton" buttonType="" />
     </div>
+    <!--isSignRole.get()!'' :1：admin+管理员 2:uniAdmin学院管理员 3:teacher 4student-->
+    <!--#if(isSignRole.get()!''== 2){ -->
     <div class="layui-row">
         <div class="layui-form-item">
             <div class="layui-inline">
                 <label class="layui-form-label"><span class="req">*</span>所属院校：</label>
                 <div class="layui-input-inline">
-                    <layui:simpleDictSelect style='layui-input-inline' value="${schoolClass.universitiesCollegesId}" type="universities_colleges.universities_colleges_name.universities_colleges_status=1"
-                                            id="universitiesCollegesId" name="universitiesCollegesId" layFilter="select_universitiesColleges"/>
+                    <input type="text" name="universitiesCollegesId" value="${universitiesCollegesInfo.universitiesCollegesName}"
+                           class="layui-input" data-value="${universitiesCollegesInfo.universitiesCollegesId}" disabled="disabled" style="background-color: #e7e7e7">
                 </div>
             </div>
         </div>
     </div>
-    <!--isSignRole.get()!'' :1：admin+管理员 2:uniAdmin学院管理员 3:teacher 4student-->
-    <!--#if(isSignRole.get()!''== 2){ -->
     <div class="layui-row">
         <div class="layui-form-item">
             <div class="layui-inline">
@@ -41,6 +41,17 @@
         </div>
     </div>
     <!--#}else if(isSignRole.get()!'' == 1){ -->
+    <div class="layui-row">
+        <div class="layui-form-item">
+            <div class="layui-inline">
+                <label class="layui-form-label"><span class="req">*</span>所属院校：</label>
+                <div class="layui-input-inline">
+                    <layui:simpleDictSelect style='layui-input-inline' value="${schoolClass.universitiesCollegesId}" type="universities_colleges.universities_colleges_name.universities_colleges_status=1"
+                                            id="universitiesCollegesId" name="universitiesCollegesId" layFilter="select_universitiesColleges"/>
+                </div>
+            </div>
+        </div>
+    </div>
     <div class="layui-row">
         <div class="layui-form-item">
             <div class="layui-inline">
@@ -63,6 +74,7 @@
         </div>
     </div>
     <input type="hidden" name="classId" value="${schoolClass.classId}" />
+    <input type="hidden" name="isSignRole" value="${isSignRole.get()!''}" />
 </form>
 <!--#} -->
 <script>
diff --git a/web/src/main/resources/templates/jlw/teacher/statisticalReport.html b/web/src/main/resources/templates/jlw/teacher/statisticalReport.html
index 453a0bb7..44523367 100644
--- a/web/src/main/resources/templates/jlw/teacher/statisticalReport.html
+++ b/web/src/main/resources/templates/jlw/teacher/statisticalReport.html
@@ -83,6 +83,9 @@
             var week = new Array("星期日", "星期一", "星期二", "星期三", "星期四", "星期五", "星期六")
             var Tools = document.getElementById("Main");
             var da = year + "-" + (month - 1) + "-" + days + " " + "00:00:00";
+            if(month === "01"){
+                da = (year-1) + "-" +12+ "-" + days + " " + "00:00:00";
+            }
             //var da=year+" 年 "+month+" 月 "+days+" 日 "+week[day]+" "+hour+" : "+minute+" :"+second
             return da;
         }
diff --git a/web/src/main/resources/templates/jlw/teacher/studentLogin.html b/web/src/main/resources/templates/jlw/teacher/studentLogin.html
index fa626b6a..4e7b2dfa 100644
--- a/web/src/main/resources/templates/jlw/teacher/studentLogin.html
+++ b/web/src/main/resources/templates/jlw/teacher/studentLogin.html
@@ -100,12 +100,9 @@
         });
 
         function getDate() {
-            window.setTimeout(function () {
-                window.requestAnimationFrame(getDate)
-            }, 1000 / 2);
             var d = new Date();
             var year = d.getFullYear();  //获取年
-            var month = d.getMonth() + 1;  //获取月，从 Date 对象返回月份 (0 ~ 11)，故在此处+1
+            var month = d.getMonth()+1;  //获取月，从 Date 对象返回月份 (0 ~ 11)，故在此处+1
             var day = d.getDay();   //获取日
             var days = d.getDate(); //获取日期
             var hour = d.getHours();   //获取小时
@@ -119,6 +116,9 @@
             var week = new Array("星期日", "星期一", "星期二", "星期三", "星期四", "星期五", "星期六")
             var Tools = document.getElementById("Main");
             var da = year + "-" + (month - 1) + "-" + days + " " + "00:00:00";
+            if(month === "01"){
+                da = (year-1) + "-" +12+ "-" + days + " " + "00:00:00";
+            }
             //var da=year+" 年 "+month+" 月 "+days+" 日 "+week[day]+" "+hour+" : "+minute+" :"+second
             return da;
         }
diff --git a/web/src/main/resources/templates/jlw/teacher/studentUsageLog.html b/web/src/main/resources/templates/jlw/teacher/studentUsageLog.html
index 1a019fd8..41d8f15e 100644
--- a/web/src/main/resources/templates/jlw/teacher/studentUsageLog.html
+++ b/web/src/main/resources/templates/jlw/teacher/studentUsageLog.html
@@ -91,12 +91,6 @@
 
         function getDate(){
 
-            window.setTimeout(function(){
-
-                window.requestAnimationFrame(getDate)
-
-            },1000/2);
-
             var d=new Date();
 
             var year=d.getFullYear();  //获取年
@@ -128,6 +122,9 @@
             var Tools=document.getElementById("Main");
 
             var da=year+"-"+(month-1)+"-"+days+" " +"00:00:00";
+            if(month === "01"){
+                da = (year-1) + "-" +12+ "-" + days + " " + "00:00:00";
+            }
             //var da=year+" 年 "+month+" 月 "+days+" 日 "+week[day]+" "+hour+" : "+minute+" :"+second
             return da;
         }
diff --git a/web/src/main/resources/templates/other/userCenter.html b/web/src/main/resources/templates/other/userCenter.html
index 9596d6b3..2e480fda 100644
--- a/web/src/main/resources/templates/other/userCenter.html
+++ b/web/src/main/resources/templates/other/userCenter.html
@@ -96,7 +96,11 @@
                     <div class="layui-form-item">
                         <label class="layui-form-label">最近登录时间:</label>
                         <div class="layui-input-inline">
-                            <div class="layui-form-mid" name="lastLoginTime">${userCenterData.coreUser.lastLoginTime,"yyyy-MM-dd"}</div>
+                            <div class="layui-form-mid" name="lastLoginTime">
+                                <!--#if(!(userCenterData.coreUser.lastLoginTime==null||userCenterData.coreUser.lastLoginTime==''||userCenterData.coreUser.lastLoginTime=='-')){-->
+                                ${userCenterData.coreUser.lastLoginTime,'yyyy-MM-dd'}
+                                <!--#}else{-->-<!--#}-->
+                            </div>
                         </div>
                     </div>
                 </div>
@@ -244,7 +248,7 @@
     <div id="changePassword_dialog" style="padding-top: 20px;display: none;">
         <div class="layui-form" action="" style="width: 90%;margin: 0 auto;">
             <div class="layui-form-item">
-                <label class="layui-form-label">密码</label>
+                <label class="layui-form-label">密&emsp;&emsp;码</label>
                 <div class="layui-input-inline">
                     <input type="password" name="password" lay-verify="required" placeholder="请输入密码！" autocomplete="off"
                            class="layui-input">
@@ -386,7 +390,8 @@
                 ,type:1
                 , content: $("#receivingAddress_demo")
                 , btn: ['确定', '关闭']
-                , area: ['730px', '400px']
+                , area: ['570px', '170px']
+                , offset: '80px'
                 , shadeClose: true
                 , success:function () {
                     $.Reappearance("#receivingAddress_demo", "${userCenterData.universitiesColleges.universitiesCollegesProvince}", "${userCenterData.universitiesColleges.universitiesCollegesCity}");//返显区域
@@ -424,7 +429,6 @@
                 });
             }, 10);
         }
-
         form.render();
     });