修改bug

beetlsql3-dev
姚丹ab 2 years ago
parent 5549d92f15
commit 71db5f2f12

@ -80,6 +80,12 @@
<div class="code-name">&amp;#xebd8;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe684;</span>
<div class="name">党建_主题课件</div>
<div class="code-name">&amp;#xe684;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe83c;</span>
<div class="name">钥匙</div>
@ -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');
}
</code></pre>
<h3 id="-iconfont-">第二步:定义使用 iconfont 的样式</h3>
@ -331,6 +337,15 @@
</div>
</li>
<li class="dib">
<span class="icon iconfont layui-extend-dangjian_zhutikejian"></span>
<div class="name">
党建_主题课件
</div>
<div class="code-name">.layui-extend-dangjian_zhutikejian
</div>
</li>
<li class="dib">
<span class="icon iconfont layui-extend-key"></span>
<div class="name">
@ -642,6 +657,14 @@
<div class="code-name">#layui-extend-bianji-copy</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#layui-extend-dangjian_zhutikejian"></use>
</svg>
<div class="name">党建_主题课件</div>
<div class="code-name">#layui-extend-dangjian_zhutikejian</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#layui-extend-key"></use>

@ -2,9 +2,9 @@
font-family: "iconfont"; /* Project id 3695701 */
/* Color fonts */
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 {
@ -31,6 +31,10 @@
content: "\ebd8";
}
.layui-extend-dangjian_zhutikejian:before {
content: "\e684";
}
.layui-extend-key:before {
content: "\e83c";
}

@ -33,6 +33,13 @@
"unicode": "ebd8",
"unicode_decimal": 60376
},
{
"icon_id": "23245177",
"name": "党建_主题课件",
"font_class": "dangjian_zhutikejian",
"unicode": "e684",
"unicode_decimal": 59012
},
{
"icon_id": "29133720",
"name": "钥匙",

@ -174,10 +174,10 @@
${user.get().name!''}</a>
<dl class="layui-nav-child">
<dd id="changePassword"><a href="javascript:void (0);" style="color: #000!important;">修改密码</a>
<!--<dd id="changePassword"><a href="javascript:void (0);" style="color: #000!important;">修改密码</a>
</dd>
<dd id="basicsInfo"><a href="javascript:void (0);" style="color: #000!important;">基本资料</a></dd>
<dd id="quitSystem"><a href="javascript:void (0);" style="color: #000!important;">退出</a></dd>
<dd id="basicsInfo"><a href="javascript:void (0);" style="color: #000!important;">基本资料</a></dd>-->
<dd id="quitSystem"><a href="javascript:void (0);" style="color: #000!important;">退出登录</a></dd>
</dl>
</li>
</ul>

@ -261,7 +261,6 @@
</div>
<!--#} -->
<input type="hidden" name="isSignRole" value="${isSignRole.get()!''}"/>
<!--<div style="margin: 1% 4%;width: 92%;margin-bottom: 60px;">
<table id="rankingTable" lay-filter="rankingTable"></table>
</div>-->
@ -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);
}
/*

@ -15,7 +15,7 @@
</style>
<div class="layui-inline" style="margin-bottom:10px;padding-right: 110px;"><h2>总人数统计:</h2></div>
<div class="layui-inline">
<form id="searchForm" class="layui-form" style="background-color: #fdfdfd;padding: 10px 0;margin: 0px 10px;">
<form id="searchForm" class="layui-form" style="background-color: #fdfdfd;padding: 10px 0;margin-bottom: 15px;">
<!--#if(isSignRole.get()!''!= 2){ -->
<div class="layui-inline">
<label class="layui-form-label">所属院校</label>
@ -30,7 +30,7 @@
<div class="layui-inline">
<label class="layui-form-label">登录时间</label>
<div class="layui-input-inline">
<input type="text" class="layui-input" id="test5" name="loginTime"
<input type="text" class="layui-input" id="test5" name="timeZones"
placeholder="请输入登录时间">
</div>
</div>
@ -45,36 +45,23 @@
</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>
<div class="layui-row" style="margin-bottom:10px;padding-top: 60px;"><h2>在线人数变化折线图:</h2></div>
<!-- 为 ECharts 准备一个定义了宽高的 DOM必须定义宽高才可以显示 -->
<div style="width: 100%;height: 300px" id="monitor"></div>
<!--#} -->
<script>
layui.use([ 'form', 'laydate', 'table' ], function(){
var form = layui.form;
var laydate = layui.laydate;
var table = layui.table;
var teacherTable = null;
laydate.render({
elem: '#test5'
, type: 'datetime'
});
laydate.render({
elem: '#test6'
, type: 'date'
, range: '~'
, trigger: 'click'
});
function getDate() {
window.setTimeout(function () {
@ -108,6 +95,7 @@
method : 'get',
size:"lg",
url : Common.ctxPath + '/jlw/student/studentLogAnalysisList.json' // 数据接口
, where: {'loginStartTime': getDate(), 'loginEndTime': Common.getNowDate()}
,page : Lib.tablePage // 开启分页
,limit : 10,
cols : [ [ // 表头
@ -128,7 +116,7 @@
{
field : 'onLineCount', title : '实时在线人数',align: "center"
}
] ]
]]
});
toolbar = {
@ -141,7 +129,14 @@
Lib.doSearchForm($("#searchForm"), teacherTable, 1);
},
search:function () {
Lib.doSearchForm($("#searchForm"), teacherTable, 1);
//Lib.doSearchForm($("#searchForm"), teacherTable, 1);
teacherTable.reload({
where: getParam(),
page: {
curr: 1
}
});
count();
},import:function (){
var url = "/jlw/teacher/importPage.do";
Common.openDlg(url,"");
@ -156,27 +151,63 @@
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);
count();
function count() {
var onLineCountData = [];//在线人数Data
var timeData = [];//日期Date
var url = '/jlw/student/studentLogAnalysisList.json';
var param = getParam();
param.page = 1;
param.limit = 1000;
var ret = Common.getAjax(url, param);
var data = ret.data;
if (ret.code == 0) {
data.forEach(function(v, k) {
onLineCountData.push(v.onLineCount);
timeData.push(v.time)
});
var chartDom = document.getElementById('monitor');
var myChart= echarts.init(chartDom);
var option = {
title: {
left: 'center',
text: '在线人数'
},
xAxis: {
type: 'category',
data: timeData
},
yAxis: {
type: 'value'
},
series: [
{
data: onLineCountData,
type: 'line'
}
]
};
option && myChart.setOption(option);
}
}
});
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;
}
</script>

@ -69,7 +69,7 @@
<div class="layui-inline">
<label class="layui-form-label">登录时间</label>
<div class="layui-input-inline">
<input type="text" class="layui-input" id="test5" name="loginTime"
<input type="text" class="layui-input" id="test5" name="timeZones"
placeholder="请输入登录时间">
</div>
</div>
@ -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;
}
</script>

@ -58,7 +58,7 @@
<div class="layui-inline">
<label class="layui-form-label">登录时间</label>
<div class="layui-input-inline">
<input type="text" class="layui-input" id="test5" name="loginTime"
<input type="text" class="layui-input" id="test5" name="timeZones"
placeholder="请输入登录时间">
</div>
</div>
@ -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;
}
</script>

Loading…
Cancel
Save