From 997e7633ccab480c1017ae80e43d36b17697fab9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A7=9A=E4=B8=B9ab?= <1421553879@qq.com>
Date: Sun, 18 Dec 2022 23:51:47 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jlw/teacher/statisticalReport.html        | 42 +++++++++++++++++++
 .../templates/jlw/teacher/studentLogin.html   |  5 ++-
 .../jlw/teacher/studentUsageLog.html          |  2 +-
 .../jlw/universitiesColleges/add.html         | 16 ++++++-
 .../add.html                                  | 27 ++++++------
 5 files changed, 75 insertions(+), 17 deletions(-)

diff --git a/web/src/main/resources/templates/jlw/teacher/statisticalReport.html b/web/src/main/resources/templates/jlw/teacher/statisticalReport.html
index e829afe9..ede4ddec 100644
--- a/web/src/main/resources/templates/jlw/teacher/statisticalReport.html
+++ b/web/src/main/resources/templates/jlw/teacher/statisticalReport.html
@@ -1,4 +1,5 @@
 <!--#layout("/common/layout.html",{"jsBase":"/js/jlw/teacher/"}){ -->
+<script type="text/javascript" src="${ctxPath}/plugins/echarts.min_4.8.0.js?v=${jsVer}"></script>
 <!--统计报表页面-->
 <style>
     .layui-laypage .layui-laypage-curr .layui-laypage-em,button{
@@ -44,6 +45,21 @@
 </div>
 
 <table id="teacherTable" lay-filter="teacherTable"></table>
+<div class="layui-row" style="margin-bottom:10px;padding-right: 110px;"><h2>在线人数变化折线图：</h2></div>
+<div class="layui-row">
+    <div class="layui-inline">
+        <label class="layui-form-label">登录时间</label>
+        <div class="layui-input-inline">
+            <input type="text" class="layui-input" id="test6" name="loginTime"
+                   placeholder="请输入登录时间">
+        </div>
+    </div>
+    <div class="layui-inline" style="margin-left: 20px">
+        <button type="button" class="layui-btn layui-btn-normal" id="dateSearch"><i class="layui-icon">&#xe615;</i>搜索</button>
+    </div>
+</div>
+<!-- 为 ECharts 准备一个定义了宽高的 DOM，必须定义宽高才可以显示 -->
+<div style="width: 100%;height: 300px" id="monitor"></div>
 <!--#} -->
 <script>
 
@@ -56,6 +72,10 @@
             elem: '#test5'
             , type: 'datetime'
         });
+        laydate.render({
+            elem: '#test6'
+            , type: 'date'
+        });
         function getDate() {
             window.setTimeout(function () {
                 window.requestAnimationFrame(getDate)
@@ -136,5 +156,27 @@
             var type = $(this).data('type');
             toolbar[type] ? toolbar[type].call(this) : '';
         });
+        var chartDom = document.getElementById('monitor');
+        var myChart= echarts.init(chartDom);
+        var option = {
+            title: {
+                left: 'center',
+                text: '在线人数'
+            },
+            xAxis: {
+                type: 'category',
+                data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun']
+            },
+            yAxis: {
+                type: 'value'
+            },
+            series: [
+                {
+                    data: [150, 230, 224, 218, 135, 147, 260],
+                    type: 'line'
+                }
+            ]
+        };
+        option && myChart.setOption(option);
     });
 </script>
diff --git a/web/src/main/resources/templates/jlw/teacher/studentLogin.html b/web/src/main/resources/templates/jlw/teacher/studentLogin.html
index 0ed4e0d6..d3179f13 100644
--- a/web/src/main/resources/templates/jlw/teacher/studentLogin.html
+++ b/web/src/main/resources/templates/jlw/teacher/studentLogin.html
@@ -127,9 +127,10 @@
             even:true,
             // skin:'nob',
             size:"lg",
-            method : 'post',
+            method : 'get',
             url: Common.ctxPath + '/jlw/student/studentLoginLogList.json' // 数据接口
-            , where: {'loginStartTime': getDate(),'loginEndTime':Common.getNowDate()}
+            //, where: {'loginStartTime': getDate(),'loginEndTime':Common.getNowDate()}
+            , where: {'loginTime':getDate()}
             ,page : Lib.tablePage // 开启分页
             ,limit : 10,
             cols : [ [ // 表头
diff --git a/web/src/main/resources/templates/jlw/teacher/studentUsageLog.html b/web/src/main/resources/templates/jlw/teacher/studentUsageLog.html
index fdf575e0..1bbad816 100644
--- a/web/src/main/resources/templates/jlw/teacher/studentUsageLog.html
+++ b/web/src/main/resources/templates/jlw/teacher/studentUsageLog.html
@@ -137,7 +137,7 @@
             // skin:'nob',
             method: 'get',
             size:"lg",
-            url: Common.ctxPath + '/jlw/student/studentLoginLogList.json' // 数据接口
+            url: Common.ctxPath + '/jlw/student/studentUseLogList.json' // 数据接口
             , where: {'loginTime':getDate()}
             ,page : Lib.tablePage // 开启分页
             ,limit : 10,
diff --git a/web/src/main/resources/templates/jlw/universitiesColleges/add.html b/web/src/main/resources/templates/jlw/universitiesColleges/add.html
index 955a96b1..ffce3e9a 100644
--- a/web/src/main/resources/templates/jlw/universitiesColleges/add.html
+++ b/web/src/main/resources/templates/jlw/universitiesColleges/add.html
@@ -96,15 +96,29 @@
         <div class="layui-form-item">
             <div class="layui-inline">
                 <label class="layui-form-label"><span class="req">*</span>用户名：</label>
+                <!--#if(isEmpty(universitiesColleges.universitiesCollegesId)){-->
                 <div class="layui-input-inline">
-                    <input type="text" name="userCode" value="${universitiesColleges.universitiesCollegesDefaultAdminUserIdText!}" class="layui-input" >
+                    <input type="text" name="userCode" value="${universitiesColleges.universitiesCollegesDefaultAdminUserIdText}" class="layui-input" >
                 </div>
+                <!--#}else{-->
+                <div class="layui-input-inline">
+                    <div class="layui-form-mid" >${universitiesColleges.universitiesCollegesDefaultAdminUserIdText}</div>
+                </div>
+                <!--#}-->
+
             </div>
             <div class="layui-inline">
                 <label class="layui-form-label"><span class="req">*</span>密码：</label>
+                <!--#if(isEmpty(universitiesColleges.universitiesCollegesId)){-->
                 <div class="layui-input-inline">
                     <input type="text" name="password" value="" placeholder="不填写，默认初始密码" class="layui-input" >
                 </div>
+                <!--#}else{-->
+                <div class="layui-input-inline">
+                    <div class="layui-form-mid" >${universitiesColleges.universitiesCollegesDefaultAdminUserIdText}</div>
+                </div>
+                <!--#}-->
+
             </div>
         </div>
     </div>
diff --git a/web/src/main/resources/templates/jlw/universitiesCollegesJurisdictionExperimentalSystem/add.html b/web/src/main/resources/templates/jlw/universitiesCollegesJurisdictionExperimentalSystem/add.html
index 18261001..479a5133 100644
--- a/web/src/main/resources/templates/jlw/universitiesCollegesJurisdictionExperimentalSystem/add.html
+++ b/web/src/main/resources/templates/jlw/universitiesCollegesJurisdictionExperimentalSystem/add.html
@@ -19,11 +19,10 @@
     }
 </style>
 <form class="layui-form" id="addForm">
-    <layui:submitButtons id="addButton" buttonType=""/>
     <div class="layui-row">
         <div class="layui-form-item">
             <div class="layui-inline">
-                权限信息/添加权限
+                院校权限添加管理/新增权限
             </div>
         </div>
     </div>
@@ -66,11 +65,11 @@
             <tr>
                 <th><input type="checkbox" name="allSelect_1" lay-skin="primary" lay-filter="allSelect_1"></th>
                 <th>应用名称</th>
-                <th>使用级别</th>
+                <th>使用层次</th>
                 <th>开始时间</th>
                 <th>结束时间</th>
-                <th>子系统<br/>登录页logo设计</th>
-                <th>子系统logo设计</th>
+                <!--<th>子系统<br/>登录页logo设计</th>
+                <th>子系统logo设计</th>-->
                 <th>子系统底栏名称</th>
             </tr>
             </thead>
@@ -98,7 +97,7 @@
                                value="{{Common.getDate(item.useEndTime,'yyyy-MM-dd HH:mm')}}" name="useEndTime"
                                class="layui-input"/>
                     </td>
-                    <td>
+                    <!--<td>
                         {{#if(!$.isEmpty(item.subsystemIndexLogo)){}}
                         <img id="subsystemIndexLogo_xt_{{index}}" src="${ctxPath}{{item.subsystemIndexLogo}}"/>
                         {{#}else{}}
@@ -112,7 +111,7 @@
                         {{#}else{}}
                         <i class="iconfont" id="subsystemLogo_xt_{{index}}" style="font-size: 30px;color: #73a2f8;">&#xebb8;</i>
                         {{#}}}
-                    </td>
+                    </td>-->
                     <td>
                         <textarea name="subsystemBottomBar" style="min-height: 30px;"
                                   id="subsystemBottomBar_xt_{{index}}" placeholder="请输入内容" class="layui-textarea">
@@ -136,7 +135,7 @@
     <div class="layui-row">
         <div class="layui-form-item">
             <div class="layui-inline">
-                课程系统：
+                课程资源：
                 <button type="button" class="layui-btn bg plsz" index="2">批量设置</button>
             </div>
         </div>
@@ -155,7 +154,7 @@
             <tr>
                 <th><input type="checkbox" name="allSelect_2" lay-skin="primary" lay-filter="allSelect_2"></th>
                 <th>课程名称</th>
-                <th>使用级别</th>
+                <th>使用层次</th>
                 <th>开始时间</th>
                 <th>结束时间</th>
                 <th>二级课程名设置</th>
@@ -207,6 +206,8 @@
             </script>
         </table>
     </div>
+    <div style="text-align: center;margin-top: 100px;"><layui:submitButtons id="addButton" buttonType=""/></div>
+
 </form>
 <!--批量设置-->
 <div class="layui-form" id="batch_dialog" style="display: none;padding: 20px 50px;">
@@ -545,7 +546,7 @@
                         universitiesCollegesId: $("select[name='universitiesCollegesId']").val() || onUniversitiesCollegesId
                     }
                 } else {
-                    if (xtList[i].useType == 0 || $.isEmpty(xtList[i].useType)) {
+                    /*if (xtList[i].useType == 0 || $.isEmpty(xtList[i].useType)) {
                         layer.msg("请选择实验系统【" + xtList[i].applicationName + "】使用级别！", {
                             offset: ['50%'],
                             icon: 2,
@@ -553,7 +554,7 @@
                         });
                         t = false;
                         return false;
-                    }
+                    }*/
                     if ($.isEmpty(xtList[i].useStartTime)) {
                         layer.msg("请选择实验系统【" + xtList[i].applicationName + "】开始时间！", {
                             offset: ['50%'],
@@ -599,7 +600,7 @@
                         universitiesCollegesId: $("select[name='universitiesCollegesId']").val() || onUniversitiesCollegesId
                     }
                 } else {
-                    if (kcList[i].useType == 0 || $.isEmpty(kcList[i].useType)) {
+                    /*if (kcList[i].useType == 0 || $.isEmpty(kcList[i].useType)) {
                         layer.msg("请选择课程系统【" + kcList[i].applicationName + "】使用级别！", {
                             offset: ['50%'],
                             icon: 2,
@@ -607,7 +608,7 @@
                         });
                         t = false;
                         return false;
-                    }
+                    }*/
                     if ($.isEmpty(kcList[i].useStartTime)) {
                         layer.msg("请选择课程系统【" + kcList[i].courseInfoName + "】开始时间！", {
                             offset: ['50%'],