From 71db5f2f121b07d23e33c2f7f037a88499eb2243 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A7=9A=E4=B8=B9ab?= <1421553879@qq.com> Date: Tue, 20 Dec 2022 01:26:57 +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 --- .../modules/layui-icon-extend/demo_index.html | 29 ++++- .../modules/layui-icon-extend/iconfont.css | 10 +- .../css/modules/layui-icon-extend/iconfont.js | 2 +- .../modules/layui-icon-extend/iconfont.json | 7 ++ .../modules/layui-icon-extend/iconfont.ttf | Bin 13456 -> 13948 bytes .../modules/layui-icon-extend/iconfont.woff | Bin 8356 -> 8660 bytes .../modules/layui-icon-extend/iconfont.woff2 | Bin 6196 -> 6524 bytes .../src/main/resources/templates/index.html | 6 +- .../resources/templates/teacherIndex.html | 51 ++++---- .../jlw/teacher/statisticalReport.html | 119 +++++++++++------- .../templates/jlw/teacher/studentLogin.html | 33 ++++- .../jlw/teacher/studentUsageLog.html | 31 ++++- 12 files changed, 207 insertions(+), 81 deletions(-) diff --git a/admin-core/src/main/resources/static/plugins/layui/css/modules/layui-icon-extend/demo_index.html b/admin-core/src/main/resources/static/plugins/layui/css/modules/layui-icon-extend/demo_index.html index 61bc75b3..346ee55c 100644 --- a/admin-core/src/main/resources/static/plugins/layui/css/modules/layui-icon-extend/demo_index.html +++ b/admin-core/src/main/resources/static/plugins/layui/css/modules/layui-icon-extend/demo_index.html @@ -80,6 +80,12 @@
&#xebd8;
+
  • + +
    党建_主题课件
    +
    &#xe684;
    +
    • +
  • 钥匙
    @@ -267,9 +273,9 @@ >@font-face { font-family: 'iconfont'; src: - url('iconfont.woff2?t=1671248939642') format('woff2'), - url('iconfont.woff?t=1671248939642') format('woff'), - url('iconfont.ttf?t=1671248939642') format('truetype'); + url('iconfont.woff2?t=1671414659965') format('woff2'), + url('iconfont.woff?t=1671414659965') format('woff'), + url('iconfont.ttf?t=1671414659965') format('truetype'); }

    第二步：定义使用 iconfont 的样式

    @@ -331,6 +337,15 @@
    • +
  • + +
    + 党建_主题课件 +
    +
    .layui-extend-dangjian_zhutikejian +
    +
    • +
  • @@ -642,6 +657,14 @@
    #layui-extend-bianji-copy
    • +
  • + +
    党建_主题课件
    +
    #layui-extend-dangjian_zhutikejian
    +
    • +
  • -
    修改密码 + +
    退出登录
    • diff --git a/admin-core/src/main/resources/templates/teacherIndex.html b/admin-core/src/main/resources/templates/teacherIndex.html index f86ac6dd..f6127e34 100644 --- a/admin-core/src/main/resources/templates/teacherIndex.html +++ b/admin-core/src/main/resources/templates/teacherIndex.html @@ -261,7 +261,6 @@ - @@ -284,29 +283,35 @@ var adminIndexDetailData = []; var adminIndexBarchartData = []; - loadInfo(); - var isSignRole = $("input[name='isSignRole']").val(); + locadInfo(); //日期时间范围选择 laydate.render({ elem: '#allDate' , type: 'date' , range: true - , change: function (value, date) { + , done: function (value, date) { if ($.isEmpty(value)) { Common.info("请选择时间！！"); return; } var sTime = value.split(" - ")[0]; var eTime = value.split(" - ")[1]; - loadInfo(sTime, eTime) + locadInfo(sTime, eTime); + localTB(); } }); - - if (isSignRole == 1) { + if ("${isSignRole.get()!''}" == 1) { getTpl = admin_Demo.innerHTML; view = document.getElementById('admin_view'); + + } else { + getTpl = uniAdmin_Demo.innerHTML; + view = document.getElementById('uniAdmin_view'); + } + + function localTB() { var chartDom = document.getElementById('monitor'); - var myChart= echarts.init(chartDom); + var myChart = echarts.init(chartDom); var option = { tooltip: { trigger: 'axis', @@ -354,27 +359,31 @@ ] }; option && myChart.setOption(option); - } else { - getTpl = uniAdmin_Demo.innerHTML; - view = document.getElementById('uniAdmin_view'); - } - laytpl(getTpl).render(adminIndexDetailData, function (html) { - view.innerHTML = html; - }); - - function loadInfo(sTime, eTime) { - var ret = Common.getAjax("/api/statisticalAnalysis/adminIndexDetail.do", {stime: sTime, etime: eTime}); - var retChart = Common.getAjax("/api/statisticalAnalysis/adminIndexBarchart.do", {stime: sTime,etime: eTime}); + function locadInfo(sTime, eTime) { + layer.load(); + setTimeout(function () { + var ret = Common.getAjax("/api/statisticalAnalysis/adminIndexDetail.do", {stime: sTime, etime: eTime});//图标显示data + var retChart = Common.getAjax("/api/statisticalAnalysis/adminIndexBarchart.do", { + stime: sTime, + etime: eTime + });//统计图data if (retChart.code == 0) { adminIndexBarchartData = retChart.data; } if (ret.code == 0) { adminIndexDetailData = ret.data; } - $("#universitiesCollegesAuthCode").text(adminIndexDetailData.universitiesCollegesAuthCode) - + $("#universitiesCollegesAuthCode").text(adminIndexDetailData.universitiesCollegesAuthCode); + laytpl(getTpl).render(adminIndexDetailData, function (html) { + view.innerHTML = html; + }); + if ("${isSignRole.get()!''}" == 1) { + localTB() + } + layer.closeAll() + }, 50); } /* diff --git a/web/src/main/resources/templates/jlw/teacher/statisticalReport.html b/web/src/main/resources/templates/jlw/teacher/statisticalReport.html index e6349573..9adffabb 100644 --- a/web/src/main/resources/templates/jlw/teacher/statisticalReport.html +++ b/web/src/main/resources/templates/jlw/teacher/statisticalReport.html @@ -15,7 +15,7 @@

    总人数统计：

    -
    +
    @@ -30,7 +30,7 @@
    -
    @@ -45,36 +45,23 @@
    -

    在线人数变化折线图：

    -
    -
    - -
    - -
    -
    -
    - -
    -
    +

    在线人数变化折线图：

    +
    diff --git a/web/src/main/resources/templates/jlw/teacher/studentLogin.html b/web/src/main/resources/templates/jlw/teacher/studentLogin.html index c7b3675e..9c28e2fa 100644 --- a/web/src/main/resources/templates/jlw/teacher/studentLogin.html +++ b/web/src/main/resources/templates/jlw/teacher/studentLogin.html @@ -69,7 +69,7 @@
    -
    @@ -94,7 +94,9 @@ var teacherTable = null; laydate.render({ elem: '#test5' - , type: 'datetime' + , type: 'date' + , range: '~' + , trigger: 'click' }); function getDate() { @@ -196,7 +198,13 @@ Lib.doSearchForm($("#searchForm"), teacherTable, 1); }, search:function () { - Lib.doSearchForm($("#searchForm"), teacherTable, 1); + //Lib.doSearchForm($("#searchForm"), teacherTable, 1); + teacherTable.reload({ + where: getParam(), + page: { + curr: 1 + } + }); },import:function (){ var url = "/jlw/teacher/importPage.do"; Common.openDlg(url,""); @@ -217,4 +225,23 @@ Lib.getSchoolClass($("select[name='classId']"),obj.value); }); }); + + //获取检索条件（确认/取消时使用：选择学生时，传学生IDS否则传检索条件） + function getParam(checkStatus) { + var codePlural = ""; + var param = {}; + if (!$.isEmpty(checkStatus)) { + codePlural = Common.concatBatchId(checkStatus.data, "code"); + } + if ($.isEmpty(codePlural)) { + param = $("#searchForm").serializeJson(); + param.loginStartTime = param.timeZones.split(' ~ ')[0]; + param.loginEndTime = param.timeZones.split(' ~ ')[1]; + delete param.timeZones; + } else { + param.codePlural = codePlural; + } + return param; + } + diff --git a/web/src/main/resources/templates/jlw/teacher/studentUsageLog.html b/web/src/main/resources/templates/jlw/teacher/studentUsageLog.html index ef0fcbf0..a4d6be12 100644 --- a/web/src/main/resources/templates/jlw/teacher/studentUsageLog.html +++ b/web/src/main/resources/templates/jlw/teacher/studentUsageLog.html @@ -58,7 +58,7 @@
    -
    @@ -84,7 +84,9 @@ //日期时间选择器 laydate.render({ elem: '#test5' - , type: 'datetime' + , type: 'date' + , range: '~' + , trigger: 'click' }); function getDate(){ @@ -196,7 +198,13 @@ Lib.doSearchForm($("#searchForm"), teacherTable, 1); }, search:function () { - Lib.doSearchForm($("#searchForm"), teacherTable, 1); + //Lib.doSearchForm($("#searchForm"), teacherTable, 1); + teacherTable.reload({ + where: getParam(), + page: { + curr: 1 + } + }); },import:function (){ var url = "/jlw/teacher/importPage.do"; Common.openDlg(url,""); @@ -212,4 +220,21 @@ toolbar[type] ? toolbar[type].call(this) : ''; }); }); + function getParam(checkStatus) { + var codePlural = ""; + var param = {}; + if (!$.isEmpty(checkStatus)) { + codePlural = Common.concatBatchId(checkStatus.data, "code"); + } + if ($.isEmpty(codePlural)) { + param = $("#searchForm").serializeJson(); + param.loginStartTime = param.timeZones.split(' ~ ')[0]; + param.loginEndTime = param.timeZones.split(' ~ ')[1]; + delete param.timeZones; + } else { + param.codePlural = codePlural; + } + return param; + } +