From 2c83e0003519ff13a460bdf5c3802e04f6e0608f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A7=9A=E4=B8=B9ab?= <1421553879@qq.com>
Date: Thu, 10 Aug 2023 23:43:42 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=97=E8=A1=A8=E4=B8=AD=E7=9A=84=E5=88=9B?=
 =?UTF-8?q?=E5=BB=BA=E6=97=B6=E9=97=B4=E7=B2=BE=E7=A1=AE=E5=88=B0=E6=97=B6?=
 =?UTF-8?q?=E5=88=86=E7=A7=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/static/js/common.js    |  2 +-
 .../js/jlw/universitiesColleges/index.js      |  4 +-
 .../templates/jlw/teacher/studentLogin.html   | 93 ++++++++++---------
 .../add.html                                  |  6 +-
 4 files changed, 56 insertions(+), 49 deletions(-)

diff --git a/admin-core/src/main/resources/static/js/common.js b/admin-core/src/main/resources/static/js/common.js
index f00e1437..30b83cee 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 + " 00:00";
+        let time = pastYear + '-' + pastMonth + '-' + pastDay;
         return time;
         /*var d = new Date();
 
diff --git a/web/src/main/resources/static/js/jlw/universitiesColleges/index.js b/web/src/main/resources/static/js/jlw/universitiesColleges/index.js
index bf1ebf61..4dc46899 100644
--- a/web/src/main/resources/static/js/jlw/universitiesColleges/index.js
+++ b/web/src/main/resources/static/js/jlw/universitiesColleges/index.js
@@ -63,9 +63,9 @@ layui.define(['form', 'laydate', 'table'], function (exports) {
                     {
                         field: 'addTime',
                         title: '创建日期', align: "center",
-                        templet: function (d) {
+                        /*templet: function (d) {
                             return Common.getDate(d.addTime);
-                        },
+                        },*/
                     },
                     {
                         field: 'userId', title: '操作', align: "center", templet: function (d) {
diff --git a/web/src/main/resources/templates/jlw/teacher/studentLogin.html b/web/src/main/resources/templates/jlw/teacher/studentLogin.html
index e6ebdf01..ce614854 100644
--- a/web/src/main/resources/templates/jlw/teacher/studentLogin.html
+++ b/web/src/main/resources/templates/jlw/teacher/studentLogin.html
@@ -26,55 +26,56 @@
     }
 </style>
 <div class="layui-inline">
-<form id="searchForm" class="layui-form" style="background-color: #fdfdfd;padding: 10px 0;margin-bottom: 10px;">
-    <div class="layui-form-item" style="margin-bottom: 0;">
-        <div class="layui-inline">
-            <label class="layui-form-label">用户名：</label>
-            <div class="layui-input-inline">
-                <input type="text" name="codeOrName" placeholder="请输入检索条件" autocomplete="off" class="layui-input">
+    <form id="searchForm" class="layui-form" style="background-color: #fdfdfd;padding: 10px 0;margin-bottom: 10px;">
+        <div class="layui-form-item" style="margin-bottom: 0;">
+            <div class="layui-inline">
+                <label class="layui-form-label">用户名：</label>
+                <div class="layui-input-inline">
+                    <input type="text" name="codeOrName" placeholder="请输入检索条件" autocomplete="off" class="layui-input">
+                </div>
             </div>
-        </div>
 
-        <!--isSignRole.get()!'' :1：admin+管理员 2:uniAdmin学院管理员 3:teacher 4student-->
-        <!--#if(isSignRole.get()!''== 2){ -->
-        <div class="layui-inline">
-            <label class="layui-form-label">所属班级：</label>
-            <div class="layui-input-inline">
-                <layui:simpleDictSelect style='layui-input-inline' type="school_class.class_name.class_status=1,universities_colleges_id=${universitiesCollegesId}"
-                                        id="classId" name="classId"/>
+            <!--isSignRole.get()!'' :1：admin+管理员 2:uniAdmin学院管理员 3:teacher 4student-->
+            <!--#if(isSignRole.get()!''== 2){ -->
+            <div class="layui-inline">
+                <label class="layui-form-label">所属班级：</label>
+                <div class="layui-input-inline">
+                    <layui:simpleDictSelect style='layui-input-inline' type="school_class.class_name.class_status=1,universities_colleges_id=${universitiesCollegesId}"
+                                            id="classId" name="classId"/>
+                </div>
             </div>
-        </div>
-        <!--#}else{ -->
-        <div class="layui-inline">
-            <label class="layui-form-label">所属院校</label>
-            <div class="layui-input-inline">
-                <layui:simpleDictSelect style='layui-input-inline'
-                                        type="universities_colleges.universities_colleges_name.universities_colleges_status=1"
-                                        id="universitiesCollegesId" name="universitiesCollegesId"
-                                        layFilter="select_universitiesColleges"/>
+            <!--#}else{ -->
+            <div class="layui-inline">
+                <label class="layui-form-label">所属院校</label>
+                <div class="layui-input-inline">
+                    <layui:simpleDictSelect style='layui-input-inline'
+                                            type="universities_colleges.universities_colleges_name.universities_colleges_status=1"
+                                            id="universitiesCollegesId" name="universitiesCollegesId"
+                                            layFilter="select_universitiesColleges"/>
+                </div>
             </div>
-        </div>
-        <div class="layui-inline" style="float: right;margin-right: 30px;">
-            <label class="layui-form-label">是否在线</label>
-            <div class="layui-input-inline">
-                <select name="isOnLine" lay-verify="">
-                    <option value="">全选</option>
-                    <option value="true">是</option>
-                    <option value="false">否</option>
-                </select>
+            <div class="layui-inline">
+                <label class="layui-form-label">是否在线</label>
+                <div class="layui-input-inline">
+                    <select name="isOnLine" lay-verify="">
+                        <option value="">全选</option>
+                        <option value="true">是</option>
+                        <option value="false">否</option>
+                    </select>
+                </div>
             </div>
-        </div>
-        <!--#} -->
+            <!--#} -->
 
-        <div class="layui-inline">
-            <label class="layui-form-label">登录时间</label>
-            <div class="layui-input-inline">
-                <input type="text" class="layui-input" id="test5" name="timeZones"
-                       placeholder="请输入登录时间">
+            <div class="layui-inline">
+                <label class="layui-form-label">登录时间</label>
+                <div class="layui-input-inline">
+                    <input type="text" class="layui-input" id="test5" name="timeZones"
+                           placeholder="请输入登录时间">
+                </div>
             </div>
+
         </div>
-    </div>
-</form>
+    </form>
 </div>
 <div class="layui-btn-group" style="margin-bottom:16px;margin-left: 20px;">
     <layui:accessButton function="teacher.query" id="searchFormSearch" action="search"><i
@@ -226,8 +227,14 @@
         }
         if ($.isEmpty(codePlural)) {
             param = $("#searchForm").serializeJson();
-            param.loginStartTime = param.timeZones.split(' ~ ')[0];
-            param.loginEndTime = param.timeZones.split(' ~ ')[1];
+            if(!$.isEmpty(param.timeZones)){
+                param.loginStartTime = param.timeZones.split(' ~ ')[0];
+                param.loginEndTime = param.timeZones.split(' ~ ')[1];
+            }else {
+                param.loginStartTime = "";
+                param.loginEndTime = "";
+            }
+
             delete param.timeZones;
         } else {
             param.codePlural = codePlural;
diff --git a/web/src/main/resources/templates/jlw/universitiesCollegesJurisdictionExperimentalSystem/add.html b/web/src/main/resources/templates/jlw/universitiesCollegesJurisdictionExperimentalSystem/add.html
index 0a1d242f..95770faf 100644
--- a/web/src/main/resources/templates/jlw/universitiesCollegesJurisdictionExperimentalSystem/add.html
+++ b/web/src/main/resources/templates/jlw/universitiesCollegesJurisdictionExperimentalSystem/add.html
@@ -429,9 +429,9 @@
         function loadTime(id,data) {
             var timeValue = data.useStartTime;
             if(data.useType == 0 || $.isEmpty(data.useType)){
-                var timeValue = Common.getNowDate(0);
+                var timeValue = Common.getNowDate(0) + ' 00:00:00';
                 if(id.indexOf("useEndTime") > -1){
-                    timeValue = Common.getNowDate(1095);
+                    timeValue = Common.getNowDate(1095) + ' 00:00:00';;
                 }
             }else {
                 if(id.indexOf("useEndTime") > -1){
@@ -442,7 +442,7 @@
             laydate.render({
                 elem: '#' + id
                 , type: 'datetime'
-                , format: 'yyyy-MM-dd HH:mm'
+                , format: 'yyyy-MM-dd HH:mm:ss'
                 , value: [timeValue]
                 , done: function (value, date, endDate) {
                     var i = $("#" + id).parents("tr").attr("index");//当前编辑行号