From e6fad6e58c809029b6dab460ba326ba6ba6c55f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A7=9A=E4=B8=B9ab?= <1421553879@qq.com>
Date: Sun, 26 Mar 2023 22:15:20 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=8F=90=E7=A4=BA=E6=8E=88=E6=9D=83?=
 =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E6=98=AF=E5=90=A6=E8=BF=87=E6=9C=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 admin-core/src/main/resources/templates/index.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/admin-core/src/main/resources/templates/index.html b/admin-core/src/main/resources/templates/index.html
index fd393315..a71f3e2a 100644
--- a/admin-core/src/main/resources/templates/index.html
+++ b/admin-core/src/main/resources/templates/index.html
@@ -447,7 +447,7 @@
 
             var isAdmin = $("#isAdmin").val();
             if(isAdmin == "true"){
-                layer.msg(text+'等'+data.length+'个学校应用(课程)授权即将到期，点击查看', {
+                layer.msg(text+'等'+"<span style='color: red'>"+data.length+"</span>"+'个学校应用(课程)授权即将到期，点击查看', {
                     time: 20000, //20s后自动关闭
                     offset: 'rb',
                     btn: ['查看'],
@@ -461,7 +461,7 @@
                     }
                 });
             }else {
-                layer.msg('学校应用(课程)授权即将到期，请联系管理员，过期将影响登录系统', {
+                layer.msg('学校授权课程'+"<span style='color: red'>"+ret.data[0].lastDay+"天</span>"+'即将到期，请联系管理员，过期将影响登录系统', {
                     time: 20000, //20s后自动关闭
                     offset: 'rb'
                 });

From 585f194140feeec08d44b458aaecbabd14fe5471 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A7=9A=E4=B8=B9ab?= <1421553879@qq.com>
Date: Sun, 26 Mar 2023 23:24:45 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=8A=98=E7=BA=BF=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jlw/teacher/statisticalReport.html        | 30 +++++++++++++++++--
 1 file changed, 28 insertions(+), 2 deletions(-)

diff --git a/web/src/main/resources/templates/jlw/teacher/statisticalReport.html b/web/src/main/resources/templates/jlw/teacher/statisticalReport.html
index 0fcad412..8cd4a6a4 100644
--- a/web/src/main/resources/templates/jlw/teacher/statisticalReport.html
+++ b/web/src/main/resources/templates/jlw/teacher/statisticalReport.html
@@ -57,7 +57,21 @@
 </div>
 
 <table id="teacherTable" lay-filter="teacherTable"></table>
-<div class="layui-row" style="margin-bottom:10px;padding-top: 60px;"><h2>在线人数变化折线图：</h2></div>
+<div class="layui-row" style="margin-bottom:10px;padding-top: 60px;">
+    <div class="layui-inline"><h2>在线人数变化折线图：</h2></div>
+
+    <div class="layui-inline">
+        <label class="layui-form-label">请选择日期</label>
+        <div class="layui-input-inline">
+            <input type="text" class="layui-input" id="zxTime" placeholder="yyyy-MM-dd">
+        </div>
+    </div>
+    <div class="layui-inline" style="margin-left: 20px">
+        <layui:accessButton function="teacher.query" action="searchZX"><i
+                class="layui-icon">&#xe615;</i>搜索
+        </layui:accessButton>
+    </div>
+</div>
 
 <!-- 为 ECharts 准备一个定义了宽高的 DOM，必须定义宽高才可以显示 -->
 <div style="width: 100%;height: 300px" id="monitor"></div>
@@ -114,6 +128,13 @@
             , value: [Common.getNowDate(-365 / 2) + ' ~ ' + Common.getNowDate(1)]
             , trigger: 'click'
         });
+
+        laydate.render({
+            elem: '#zxTime'
+            ,format: 'yyyy-MM-dd'
+            ,value:Common.getNowDate(0)
+        });
+
         laydate.render({
             elem: '#test5'
             , type: 'date'
@@ -121,6 +142,7 @@
             , value: [Common.getNowDate(-365 / 2) + ' ~ ' + Common.getNowDate(1)]
             , trigger: 'click'
         });
+
         teacherTable = table.render({
             elem: '#teacherTable',
             height: Lib.getTableHeight(),
@@ -224,6 +246,8 @@
                         curr: 1
                     }
                 });
+            },searchZX:function(){
+                count();
             },import: function () {
                 var url = "/jlw/teacher/importPage.do";
                 Common.openDlg(url, "");
@@ -250,9 +274,11 @@
             var onLineCountData = [];//在线人数Data
             var timeData = [];//日期Date
             var url = '/jlw/analysis/systemUseLogsAnalysis.json';
-            var param = getParam();
+            var param = {};
             param.page = 1;
             param.limit = 1000;
+            param.day = $("#zxTime").val();
+
             var ret = Common.postAjax(url,param);
             var data = ret.data;
             if (ret.code == 0) {