Merge remote-tracking branch 'origin/beetlsql3-dev' into beetlsql3-dev

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

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) {

web/src/main/resources/templates/jlw/teacher/studentLogin.html

@@ -26,7 +26,7 @@
     }
 </style>
 <div class="layui-inline">
-<form id="searchForm" class="layui-form" style="background-color: #fdfdfd;padding: 10px 0;margin-bottom: 10px;">
+    <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>
@@ -54,7 +54,7 @@
                                             layFilter="select_universitiesColleges"/>
                 </div>
             </div>
-        <div class="layui-inline" style="float: right;margin-right: 30px;">
+            <div class="layui-inline">
                 <label class="layui-form-label">是否在线</label>
                 <div class="layui-input-inline">
                     <select name="isOnLine" lay-verify="">
@@ -73,8 +73,9 @@
                            placeholder="请输入登录时间">
                 </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();
+            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;

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");//当前编辑行号