tianzeOrg
/
tianze-pro
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/beetlsql3-dev' into beetlsql3-dev

Browse Source
beetlsql3-dev
wgf 2 years ago
parent 2df9a5980b 2c83e00035
commit 9c504603fd
4 changed files with 56 additions and 49 deletions
Show Stats Download Patch File Download Diff File

2
admin-core/src/main/resources/static/js/common.js
Unescape Escape View File

@ -357,7 +357,7 @@ var Common = {
if(pastMonth<10) pastMonth="0"+pastMonth;
if(pastDay<10) pastDay="0"+pastDay;
let time = pastYear + '-' + pastMonth + '-' + pastDay + " 00:00";
let time = pastYear + '-' + pastMonth + '-' + pastDay;
return time;
/*var d = new Date();

4
web/src/main/resources/static/js/jlw/universitiesColleges/index.js
Unescape Escape View File

@ -63,9 +63,9 @@ layui.define(['form', 'laydate', 'table'], function (exports) {
{
field: 'addTime',
title: '创建日期', align: "center",
templet: function (d) {
/*templet: function (d) {
return Common.getDate(d.addTime);
},
},*/
},
{
field: 'userId', title: '操作', align: "center", templet: function (d) {

93
web/src/main/resources/templates/jlw/teacher/studentLogin.html
Unescape Escape View File

@ -26,55 +26,56 @@
}
</style>
<div class="layui-inline">
<form id="searchForm" class="layui-form" style="background-color: #fdfdfd;padding: 10px 0;margin-bottom: 10px;">
<div class="layui-form-item" style="margin-bottom: 0;">
<div class="layui-inline">
<label class="layui-form-label">用户名：</label>
<div class="layui-input-inline">
<input type="text" name="codeOrName" placeholder="请输入检索条件" autocomplete="off" class="layui-input">
<form id="searchForm" class="layui-form" style="background-color: #fdfdfd;padding: 10px 0;margin-bottom: 10px;">
<div class="layui-form-item" style="margin-bottom: 0;">
<div class="layui-inline">
<label class="layui-form-label">用户名：</label>
<div class="layui-input-inline">
<input type="text" name="codeOrName" placeholder="请输入检索条件" autocomplete="off" class="layui-input">
</div>
</div>
</div>
<!--isSignRole.get()!'' :1：admin+管理员 2:uniAdmin学院管理员 3:teacher 4student-->
<!--#if(isSignRole.get()!''== 2){ -->
<div class="layui-inline">
<label class="layui-form-label">所属班级：</label>
<div class="layui-input-inline">
<layui:simpleDictSelect style='layui-input-inline' type="school_class.class_name.class_status=1,universities_colleges_id=${universitiesCollegesId}"
id="classId" name="classId"/>
<!--isSignRole.get()!'' :1：admin+管理员 2:uniAdmin学院管理员 3:teacher 4student-->
<!--#if(isSignRole.get()!''== 2){ -->
<div class="layui-inline">
<label class="layui-form-label">所属班级：</label>
<div class="layui-input-inline">
<layui:simpleDictSelect style='layui-input-inline' type="school_class.class_name.class_status=1,universities_colleges_id=${universitiesCollegesId}"
id="classId" name="classId"/>
</div>
</div>
</div>
<!--#}else{ -->
<div class="layui-inline">
<label class="layui-form-label">所属院校</label>
<div class="layui-input-inline">
<layui:simpleDictSelect style='layui-input-inline'
type="universities_colleges.universities_colleges_name.universities_colleges_status=1"
id="universitiesCollegesId" name="universitiesCollegesId"
layFilter="select_universitiesColleges"/>
<!--#}else{ -->
<div class="layui-inline">
<label class="layui-form-label">所属院校</label>
<div class="layui-input-inline">
<layui:simpleDictSelect style='layui-input-inline'
type="universities_colleges.universities_colleges_name.universities_colleges_status=1"
id="universitiesCollegesId" name="universitiesCollegesId"
layFilter="select_universitiesColleges"/>
</div>
</div>
</div>
<div class="layui-inline" style="float: right;margin-right: 30px;">
<label class="layui-form-label">是否在线</label>
<div class="layui-input-inline">
<select name="isOnLine" lay-verify="">
<option value="">全选</option>
<option value="true">是</option>
<option value="false">否</option>
</select>
<div class="layui-inline">
<label class="layui-form-label">是否在线</label>
<div class="layui-input-inline">
<select name="isOnLine" lay-verify="">
<option value="">全选</option>
<option value="true">是</option>
<option value="false">否</option>
</select>
</div>
</div>
</div>
<!--#} -->
<!--#} -->
<div class="layui-inline">
<label class="layui-form-label">登录时间</label>
<div class="layui-input-inline">
<input type="text" class="layui-input" id="test5" name="timeZones"
placeholder="请输入登录时间">
<div class="layui-inline">
<label class="layui-form-label">登录时间</label>
<div class="layui-input-inline">
<input type="text" class="layui-input" id="test5" name="timeZones"
placeholder="请输入登录时间">
</div>
</div>
</div>
</div>
</form>
</form>
</div>
<div class="layui-btn-group" style="margin-bottom:16px;margin-left: 20px;">
<layui:accessButton function="teacher.query" id="searchFormSearch" action="search"><i
@ -226,8 +227,14 @@
}
if ($.isEmpty(codePlural)) {
param = $("#searchForm").serializeJson();
param.loginStartTime = param.timeZones.split(' ~ ')[0];
param.loginEndTime = param.timeZones.split(' ~ ')[1];
if(!$.isEmpty(param.timeZones)){
param.loginStartTime = param.timeZones.split(' ~ ')[0];
param.loginEndTime = param.timeZones.split(' ~ ')[1];
}else {
param.loginStartTime = "";
param.loginEndTime = "";
}
delete param.timeZones;
} else {
param.codePlural = codePlural;

6
web/src/main/resources/templates/jlw/universitiesCollegesJurisdictionExperimentalSystem/add.html
Unescape Escape View File

@ -429,9 +429,9 @@
function loadTime(id,data) {
var timeValue = data.useStartTime;
if(data.useType == 0 || $.isEmpty(data.useType)){
var timeValue = Common.getNowDate(0);
var timeValue = Common.getNowDate(0) + ' 00:00:00';
if(id.indexOf("useEndTime") > -1){
timeValue = Common.getNowDate(1095);
timeValue = Common.getNowDate(1095) + ' 00:00:00';;
}
}else {
if(id.indexOf("useEndTime") > -1){
@ -442,7 +442,7 @@
laydate.render({
elem: '#' + id
, type: 'datetime'
, format: 'yyyy-MM-dd HH:mm'
, format: 'yyyy-MM-dd HH:mm:ss'
, value: [timeValue]
, done: function (value, date, endDate) {
var i = $("#" + id).parents("tr").attr("index");//当前编辑行号

Write Preview
Loading…
Cancel
Save