From 9fef6ca2a0cbd8cd9f55d1ac603b80c686c85dc8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A7=9A=E4=B8=B9ab?= <1421553879@qq.com> Date: Thu, 2 Feb 2023 01:34:41 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=97=A5=E5=BF=97=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1=E5=8C=BA=E9=97=B4=E7=BB=9F=E8=AE=A1=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/static/js/common.js | 25 +++++++++-- .../resources/application-local.properties | 2 +- .../jlw/teacher/statisticalReport.html | 30 ++----------- .../templates/jlw/teacher/studentLogin.html | 28 ++---------- .../jlw/teacher/studentUsageLog.html | 45 ++----------------- 5 files changed, 33 insertions(+), 97 deletions(-) diff --git a/admin-core/src/main/resources/static/js/common.js b/admin-core/src/main/resources/static/js/common.js index a6485fbc..5d52d627 100644 --- a/admin-core/src/main/resources/static/js/common.js +++ b/admin-core/src/main/resources/static/js/common.js @@ -342,8 +342,24 @@ var Common = { } }, - getNowDate: function (date, pattern) {//获取当前时间 - var d = new Date(); + getNowDate: function (day) {//获取当前时间 + // 获取当前时间 + let curDate = (new Date()).getTime(); + // 将换算时间单位换算成毫秒 + let changeDay = day * 24 * 3600 * 1000; + let pastResult = curDate + changeDay; // 换算的时间（毫秒单位） + + // 日期函数，定义起点为半年前 + let pastDate = new Date(pastResult), + pastYear = pastDate.getFullYear(), + pastMonth = pastDate.getMonth() + 1, + pastDay = pastDate.getDate(); + if(pastMonth<10) pastMonth="0"+pastMonth; + + if(pastDay<10) pastDay="0"+pastDay; + let time = pastYear + '-' + pastMonth + '-' + pastDay; + return time; + /*var d = new Date(); var year = d.getFullYear(); //获取年 @@ -373,9 +389,10 @@ var Common = { var Tools = document.getElementById("Main"); - var da = year + "-" +month+ "-" + days + " " + "00:00:00"; + var da = year + "-" +month+ "-" + days;*/ + //var da = year + "-" +month+ "-" + days + " " + "00:00:00"; //var da=year+" 年 "+month+" 月 "+days+" 日 "+week[day]+" "+hour+" : "+minute+" :"+second - return da; + //return da; }, /** * ajax初始化 diff --git a/web/src/main/resources/application-local.properties b/web/src/main/resources/application-local.properties index 1c1a307a..69f56020 100644 --- a/web/src/main/resources/application-local.properties +++ b/web/src/main/resources/application-local.properties @@ -24,7 +24,7 @@ spring.datasource.dynamic.hikari.connection-test-query=SELECT 1 spring.datasource.dynamic.datasource.master.driverClassName=com.mysql.cj.jdbc.Driver spring.datasource.dynamic.datasource.master.url=jdbc:mysql://localhost:3306/tzcj?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowMultiQueries=true spring.datasource.dynamic.datasource.master.username=root -spring.datasource.dynamic.datasource.master.password=root +spring.datasource.dynamic.datasource.master.password=shuchuang123@. spring.datasource.dynamic.datasource.master.hikari.max-lifetime=60000 # ds2 diff --git a/web/src/main/resources/templates/jlw/teacher/statisticalReport.html b/web/src/main/resources/templates/jlw/teacher/statisticalReport.html index 3b5f9bc0..9b147197 100644 --- a/web/src/main/resources/templates/jlw/teacher/statisticalReport.html +++ b/web/src/main/resources/templates/jlw/teacher/statisticalReport.html @@ -61,34 +61,9 @@ elem: '#test5' , type: 'date' , range: '~' + , value: [Common.getNowDate(-365 / 2) +' ~ '+Common.getNowDate(1)] , trigger: 'click' }); - 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 day = d.getDay(); //获取日 - var days = d.getDate(); //获取日期 - var hour = d.getHours(); //获取小时 - var minute = d.getMinutes(); //获取分钟 - var second = d.getSeconds(); //获取秒 - if (month < 10) month = "0" + month; - if (days < 10) days = "0" + days; - if (hour < 10) hour = "0" + hour; - if (minute < 10) minute = "0" + minute; - if (second < 10) second = "0" + second; - 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; - } teacherTable = table.render({ elem : '#teacherTable', height : Lib.getTableHeight(), @@ -98,7 +73,8 @@ method : 'get', size:"lg", url : Common.ctxPath + '/jlw/student/studentLogAnalysisList.json' // 数据接口 - , where: {'loginStartTime': getDate(), 'loginEndTime': Common.getNowDate()} + ,where:getParam() + //, where: {'loginStartTime': getDate(), 'loginEndTime': Common.getNowDate()} ,page : Lib.tablePage // 开启分页 ,limit : 10, cols : [ [ // 表头 diff --git a/web/src/main/resources/templates/jlw/teacher/studentLogin.html b/web/src/main/resources/templates/jlw/teacher/studentLogin.html index f030e9d6..d8238f0f 100644 --- a/web/src/main/resources/templates/jlw/teacher/studentLogin.html +++ b/web/src/main/resources/templates/jlw/teacher/studentLogin.html @@ -92,36 +92,15 @@ var laydate = layui.laydate; var table = layui.table; var teacherTable = null; + laydate.render({ elem: '#test5' , type: 'date' , range: '~' + , value: [Common.getNowDate(-365 / 2) +' ~ '+Common.getNowDate(1)] , trigger: 'click' }); - function getDate() { - var d = new Date(); - var year = d.getFullYear(); //获取年 - var month = d.getMonth()+1; //获取月，从 Date 对象返回月份 (0 ~ 11)，故在此处+1 - var day = d.getDay(); //获取日 - var days = d.getDate(); //获取日期 - var hour = d.getHours(); //获取小时 - var minute = d.getMinutes(); //获取分钟 - var second = d.getSeconds(); //获取秒 - if (month < 10) month = "0" + month; - if (days < 10) days = "0" + days; - if (hour < 10) hour = "0" + hour; - if (minute < 10) minute = "0" + minute; - if (second < 10) second = "0" + second; - 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; - } teacherTable = table.render({ elem : '#teacherTable', height : Lib.getTableHeight(), @@ -131,7 +110,8 @@ size:"lg", method : 'get', url: Common.ctxPath + '/jlw/student/studentLoginLogList.json' // 数据接口 - , where: {'loginStartTime': getDate(),'loginEndTime':Common.getNowDate()} + ,where:getParam() + //, where: {'loginStartTime': getDate(),'loginEndTime':Common.getNowDate()} // , where: {'loginTime':getDate()} ,page : Lib.tablePage // 开启分页 ,limit : 10, diff --git a/web/src/main/resources/templates/jlw/teacher/studentUsageLog.html b/web/src/main/resources/templates/jlw/teacher/studentUsageLog.html index 40cf4272..20cf5507 100644 --- a/web/src/main/resources/templates/jlw/teacher/studentUsageLog.html +++ b/web/src/main/resources/templates/jlw/teacher/studentUsageLog.html @@ -81,53 +81,15 @@ var table = layui.table; var teacherTable = null; var laydate = layui.laydate; + //日期时间选择器 laydate.render({ elem: '#test5' , type: 'date' , range: '~' + , value: [Common.getNowDate(-365 / 2) +' ~ '+Common.getNowDate(1)] , trigger: 'click' }); - - function getDate(){ - - var d=new Date(); - - var year=d.getFullYear(); //获取年 - - var month=d.getMonth()+1; //获取月，从 Date 对象返回月份 (0 ~ 11)，故在此处+1 - - var day=d.getDay(); //获取日 - - var days=d.getDate(); //获取日期 - - var hour=d.getHours(); //获取小时 - - var minute=d.getMinutes(); //获取分钟 - - var second=d.getSeconds(); //获取秒 - - if(month<10) month="0"+month; - - if(days<10) days="0"+days; - - if(hour<10) hour="0"+hour; - - if(minute<10) minute="0"+minute; - - if(second<10) second="0"+second; - - 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; - } teacherTable = table.render({ elem : '#teacherTable', height : Lib.getTableHeight(), @@ -137,7 +99,8 @@ method: 'get', size:"lg", url: Common.ctxPath + '/jlw/student/studentUseLogList.json' // 数据接口 - , where: {'loginStartTime': getDate(),'loginEndTime':Common.getNowDate()} + , where: getParam() + //, where: {'loginStartTime': getDate(),'loginEndTime':Common.getNowDate()} // , where: {'loginTime':getDate()} ,page : Lib.tablePage // 开启分页 ,limit : 10,