From ebf1d57e1ed0d2d77f1aad1910166190b9fa8af2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A7=9A=E4=B8=B9ab?= <1421553879@qq.com>
Date: Sat, 25 Mar 2023 12:02:39 +0800
Subject: [PATCH] 1

---
 .../src/main/resources/templates/index.html   | 10 ++++++++
 .../templates/jlw/courseLabel/index.html      |  6 ++++-
 .../jlw/teacher/statisticalReport.html        | 23 ++++++++-----------
 3 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/admin-core/src/main/resources/templates/index.html b/admin-core/src/main/resources/templates/index.html
index ff8640a5..6cdcae74 100644
--- a/admin-core/src/main/resources/templates/index.html
+++ b/admin-core/src/main/resources/templates/index.html
@@ -336,6 +336,16 @@
         var form = layui.form;
         var element = layui.element;
 
+        var ret = Common.getAjax("/getAuthResourcesAndSystemInfo.json");//图标显示data
+
+
+        layer.msg('XXXX学校到期，请点击', {
+            time: 20000, //20s后自动关闭
+            offset: 'rb',
+            btn: ['查看', '知道了']
+        });
+
+
         $(".menu_three").on("click", function () {
             $(this).next().toggle(500);
             $(".three_this").removeClass("three_this");
diff --git a/web/src/main/resources/templates/jlw/courseLabel/index.html b/web/src/main/resources/templates/jlw/courseLabel/index.html
index 4a1a71f6..e1788bf0 100644
--- a/web/src/main/resources/templates/jlw/courseLabel/index.html
+++ b/web/src/main/resources/templates/jlw/courseLabel/index.html
@@ -68,6 +68,7 @@
 
 </div>
 <script id="demo" type="text/html">
+    <!--#if(user.get().isAdmin){ -->
     <div class="layui-colla-item">
         <h2 class="layui-colla-title">应用课程类</h2>
         <div class="layui-colla-content layui-show">
@@ -76,7 +77,8 @@
                 <div class="layui-form-item" courseLabelId="{{item.courseLabelId}}">
                     <label class="layui-form-label">{{item.courseLabelName}}</label>
                     <div class="layui-input-block" style="line-height: 36px;">
-                        {{# if((item.addType == 'ADMIN_ADD' && ${user.get().isAdmin!false}) || (item.addType == 'FACULTY_ADD' && ${user.get().isUniAdmin!false})){ }}
+                        {{# if((item.addType == 'ADMIN_ADD' && ${user.get().isAdmin!false}) || (item.addType ==
+                        'FACULTY_ADD' && ${user.get().isUniAdmin!false})){ }}
                         <i class="layui-icon classEdit">&#xe642;</i>
                         <i class="layui-icon classDel">&#xe640;</i>
                         {{# } }}
@@ -122,6 +124,8 @@
             </div>
         </div>
     </div>
+    <!--#} -->
+
     <div class="layui-colla-item">
         <h2 class="layui-colla-title">理论课程类</h2>
         <div class="layui-colla-content">
diff --git a/web/src/main/resources/templates/jlw/teacher/statisticalReport.html b/web/src/main/resources/templates/jlw/teacher/statisticalReport.html
index 9a1574b6..0fcad412 100644
--- a/web/src/main/resources/templates/jlw/teacher/statisticalReport.html
+++ b/web/src/main/resources/templates/jlw/teacher/statisticalReport.html
@@ -164,7 +164,7 @@
             method: 'post',
             size: "lg",
             url: Common.ctxPath + '/jlw/studentTeacherSystemUseLogAnalysis/applicationUseLogsAnalysis.json' // 数据接口
-            , where: getParam()
+            , where: getParamSR()
             //, where: {'loginStartTime': getDate(),'loginEndTime':Common.getNowDate()}
             // , where: {'loginTime':getDate()}
             , page: Lib.tablePage // 开启分页
@@ -180,22 +180,19 @@
                     field: 'firstName', title: '归属模块', align: "center",
                 },
                 {
-                    field: 'name', title: '使用院校', align: "center",
+                    field: 'universitiesCollegesName', title: '使用院校', align: "center",
                 },
                 {
-                    field: 'code', title: '所属省份', align: "center",
+                    field: 'province', title: '所属省份', align: "center",
                 },
                 {
-                    field: 'universitiesCollegesName', title: '使用人数', align: "center",
+                    field: 'usePeopleCount', title: '使用人数', align: "center",
                 },
                 {
-                    field: 'startDayTime,endDayTime', title: '使用时长(分钟)', align: "center",
-                    templet: function (d) {
-                        return d.endDayTime - d.startDayTime;
-                    }
+                    field: 'sumUseDuration', title: '使用时长(分钟)', align: "center",
                 },
                 {
-                    field: 'endDayTime', title: '使用日期', align: "center",
+                    field: 'dayTime课程分类管理', title: '使用日期', align: "center",
                 }
             ]]
         });
@@ -256,12 +253,12 @@
             var param = getParam();
             param.page = 1;
             param.limit = 1000;
-            var ret = Common.postAjax((url));
+            var ret = Common.postAjax(url,param);
             var data = ret.data;
             if (ret.code == 0) {
                 //console.log(data)
                 data.forEach(function (v, k) {
-                    onLineCountData.push(v.onLineCount);
+                    onLineCountData.push(v.count);
                     timeData.push(v.time)
                 });
                 var chartDom = document.getElementById('monitor');
@@ -315,8 +312,8 @@
         }
         if ($.isEmpty(codePlural)) {
             param = $("#searchFormSR").serializeJson();
-            param.loginStartTime = param.valueTime.split(' ~ ')[0];
-            param.loginEndTime = param.valueTime.split(' ~ ')[1];
+            param.startDayTime = param.valueTime.split(' ~ ')[0];
+            param.endDayTime = param.valueTime.split(' ~ ')[1];
             delete param.valueTime;
         } else {
             param.codePlural = codePlural;