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

beetlsql3-dev
Mlxa0324 2 years ago
commit 693eb34dc7

@ -342,8 +342,24 @@ var Common = {
}
},
getNowDate: function (date, pattern) {//获取当前时间
var d = new Date();
getNowDate: function (day) {//获取当前时间
// 获取当前时间
let curDate = (new Date()).getTime();
// 将换算时间单位换算成毫秒
let changeDay = day * 24 * 3600 * 1000;
let pastResult = curDate + changeDay; // 换算的时间(毫秒单位)
// 日期函数,定义起点为半年前
let pastDate = new Date(pastResult),
pastYear = pastDate.getFullYear(),
pastMonth = pastDate.getMonth() + 1,
pastDay = pastDate.getDate();
if(pastMonth<10) pastMonth="0"+pastMonth;
if(pastDay<10) pastDay="0"+pastDay;
let time = pastYear + '-' + pastMonth + '-' + pastDay;
return time;
/*var d = new Date();
var year = d.getFullYear(); //获取年
@ -373,9 +389,10 @@ var Common = {
var Tools = document.getElementById("Main");
var da = year + "-" +month+ "-" + days + " " + "00:00:00";
var da = year + "-" +month+ "-" + days;*/
//var da = year + "-" +month+ "-" + days + " " + "00:00:00";
//var da=year+" 年 "+month+" 月 "+days+" 日 "+week[day]+" "+hour+" : "+minute+" :"+second
return da;
//return da;
},
/**
* ajax初始化

@ -99,7 +99,7 @@ public class HandsOnSimulationTasksController{
@GetMapping(MODEL + "/add.do")
@Function("handsOnSimulationTasks.add")
public ModelAndView add(Long taskId, Long handsOnId) {
public ModelAndView add(Long taskId, Long handsOnId,Long courseInfoId) {
ModelAndView view = new ModelAndView("/jlw/handsOnSimulationTasks/add.html");
if(null != taskId){
HandsOnSimulationTasks handsOnSimulationTasks = handsOnSimulationTasksService.queryById(taskId);
@ -110,6 +110,7 @@ public class HandsOnSimulationTasksController{
handsOnSimulationTasks.setHandsOnId(handsOnId);
view.addObject("handsOnSimulationTasks", handsOnSimulationTasks);
}
view.addObject("courseInfoId", courseInfoId);
return view;
}

@ -24,7 +24,7 @@ spring.datasource.dynamic.hikari.connection-test-query=SELECT 1
spring.datasource.dynamic.datasource.master.driverClassName=com.mysql.cj.jdbc.Driver
spring.datasource.dynamic.datasource.master.url=jdbc:mysql://localhost:3306/tzcj?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowMultiQueries=true
spring.datasource.dynamic.datasource.master.username=root
spring.datasource.dynamic.datasource.master.password=root
spring.datasource.dynamic.datasource.master.password=shuchuang123@.
spring.datasource.dynamic.datasource.master.hikari.max-lifetime=60000
# ds2

@ -13,6 +13,7 @@ layui.define(['form', 'laydate', 'table','upload','layedit', 'handsOnApi'], func
}
});
var handsOnId = $("input[name='handsOnId']").val();
var courseInfoId_ = $("input[name='courseInfoId_']").val();
if(!$.isEmpty(handsOnId)){
var ret = Common.getAjax("/jlw/handsOn/view.json",{handsOnId:handsOnId});
if(ret.code == 0){
@ -153,7 +154,7 @@ layui.define(['form', 'laydate', 'table','upload','layedit', 'handsOnApi'], func
$("#addForm input[name='handsOnId']").val(handsOnId)
}
}
var url = "/jlw/handsOnSimulationTasks/add.do?handsOnId="+handsOnId;
var url = "/jlw/handsOnSimulationTasks/add.do?handsOnId="+handsOnId+'&courseInfoId='+courseInfoId_;
Common.openDlg(url,"实训任务管理>新增");
});
//实训任务编辑

@ -1,11 +1,20 @@
layui.define([ 'form', 'laydate', 'table','element','handsOnSimulationTasksApi', 'upload', 'layedit'], function(exports) {
layui.define([ 'form', 'laydate', 'table','element','handsOnSimulationTasksApi', 'upload', 'layedit','layer','table'], function(exports) {
var form = layui.form;
var handsOnSimulationTasksApi = layui.handsOnSimulationTasksApi;
var index = layui.index;
var element = layui.element, upload = layui.upload, layedit = layui.layedit
element.render();
var layer = layui.layer;
var table = layui.table;
var one = layedit.build('test-editor1'); //建立编辑器
var editor = null;
var resourcesQuestionTable =null;
var resourcesQuestionTable1 = null;
var selectResourcesQuestion = [];
var resourcesQuestionIds = ""; //选中题目id
var courseInfoIds = $("input[name=courseInfoId_1]").val();
// setTimeout(function (){
// editor.init();
// // $("#test-editor .editormd-preview").width("50%");
@ -119,6 +128,142 @@ layui.define([ 'form', 'laydate', 'table','element','handsOnSimulationTasksApi',
});
}
});
$('#manualProblemSetting1').click(function () {//手动出题
layer.open({
type: 1
, title: '选择题库'
,fixed:false//固定页面后,弹出框随着滚动
, shadeClose: true
, scrollbar: true//滚动条
, content: $("#resourcesQuestionTable_demo")
, btn: ['保存','关闭']
,success:function () {
resourcesQuestionTable();
Lib.getCourseInfo($("select[name='courseInfoId_1']"), courseInfoIds);
}
, yes: function (index, layero) {
layer.close(index);
$('#resourcesQuestionTable_demo').hide();
}
, btn2: function (index, layero) {
layer.close(index);
$('#resourcesQuestionTable_demo').hide();
}
});
});
///jlw/teacherOpenCourseHandsOnSimulationTasks/getObjectiveProblem.do?problemIds=
var btn = $("#searchFormQuestion");
btn.on('click', function () {
resourcesQuestionTable1.reload({
where: {
'courseInfoParentId':courseInfoIds,
'courseInfoId':$("#resourcesQuestionTable_demo select[name='courseInfoId_1']").find("option:selected").val(),
"questionStem":$("#resourcesQuestionTable_demo input[name='generalQuestionSettingName']").val(),
'questionType':$("#resourcesQuestionTable_demo select[name='questionType']").find("option:selected").val()
},
});
});
table.on('checkbox(resourcesQuestionTable)', function(obj){ //test 是 table 标签对应的 lay-filter 属性
if (obj.checked) { //选中
if (obj.type == "all") {//全选
var checkStatus = table.checkStatus('resourcesQuestionTable').data;
for (var i = 0; i < checkStatus.length; i++) {
if (("," + resourcesQuestionIds + ",").indexOf(checkStatus[i].resourcesQuestionId) < 0) {
if (!$.isEmpty(resourcesQuestionIds)) {
resourcesQuestionIds += "," + checkStatus[i].resourcesQuestionId;
} else {
resourcesQuestionIds = checkStatus[i].resourcesQuestionId;
}
}
}
} else {
if (!$.isEmpty(resourcesQuestionIds)) {
resourcesQuestionIds += "," + obj.data.resourcesQuestionId;
} else {
resourcesQuestionIds = obj.data.resourcesQuestionId;
}
}
} else {//取消全选
if (obj.type == "all") {//全选
var checkStatus = table.cache["resourcesQuestionTable"];
for (var i = 0; i < checkStatus.length; i++) {
resourcesQuestionIds = Lib.stringRemove(resourcesQuestionIds, checkStatus[i].resourcesQuestionId);
}
} else {
resourcesQuestionIds = Lib.stringRemove(resourcesQuestionIds, obj.data.resourcesQuestionId);
}
}
$("#countQ").html(resourcesQuestionIds.split(',').length)
});
$("#del").click(function () {//清除已选
resourcesQuestionIds = [];
$("#countQ").html(0);
var param = {
'courseInfoParentId':courseInfoIds,
'courseInfoId':$("#resourcesQuestionTable_demo select[name='courseInfoId_1']").find("option:selected").val(),
"questionStem":$("#resourcesQuestionTable_demo input[name='generalQuestionSettingName']").val(),
'questionType':$("#resourcesQuestionTable_demo select[name='questionType']").find("option:selected").val()
};
resourcesQuestionTable1.reload({
where: param,
page: {
curr: 1
}
});
});
resourcesQuestionTable= function(){
resourcesQuestionTable1=table.render({
elem: '#resourcesQuestionTable',
cellMinWidth: 100,
method: 'post',
even: true,
size: "sms",
url: Common.ctxPath + '/jlw/resourcesQuestion/list.json' // 数据接口
, page: Lib.tablePage // 开启分页
, limit: 4
, where: {"courseInfoParentId": courseInfoIds}
,cols: [[ // 表头
{
type: 'checkbox', align: "center"
},
{
field: 'questionStem', width: 320,
title: '题干', align: "center"
},
{
field: 'questionType', align: "center", width: 80,
title: '题型', templet: function (d) {//(1单选 2多选 3判断 4填空 5分析)
return d.questionType == 1 ? '单选' : d.questionType == 2 ? '多选' : d.questionType == 3 ? '判断' : '-';
}
},
{
field: 'courseInfoParentName',
title: '归属课程', align: "center"
},
{
field: 'courseInfoName',
title: '归属章节', align: "center"
}
]],done: function(res, curr, count){
//循环所有数据找出对应关系设置checkbox选中状态
for (var i = 0; i < res.data.length; i++) {
for (var j = 0; j < resourcesQuestionIds.split(',').length; j++) {
if (res.data[i].resourcesQuestionId == resourcesQuestionIds.split(',')[j]) {
//这里才是真正的有效勾选
res.data[i]["LAY_CHECKED"] = 'true';
//找到对应数据改变勾选样式,呈现出选中效果
var index = res.data[i]['LAY_TABLE_INDEX'];
$('.layui-table tr[data-index=' + index + '] input[type="checkbox"]').prop('checked', true);
$('.layui-table tr[data-index=' + index + '] input[type="checkbox"]').next().addClass('layui-form-checked');
}
}
}
}
});
}
var view = {
init:function(){
Lib.initGenrealForm($("#addForm"),form);

@ -175,7 +175,6 @@ layui.define([ 'form', 'laydate', 'table','laytpl' ], function(exports) {
});
});
} else if (obj.event === "details") {
console.log(data)
if(data.chatLogSendType =='normal'){
var url = "/jlw/teacherOpenCourseChatLog/indexInfoNor.do?teacherOpenCourseId="+teacherOpenCourseId;
Common.openDlg(url,"讨论详情");

@ -16,6 +16,7 @@ layui.define([ 'form', 'laydate', 'table','universitiesCollegesApi'], function(e
$("#addButton").click(function(){
form.on('submit(form)', function(){
var universitiesCollegesId = $("input[name='universitiesCollegesId']").val();
if($.isEmpty(universitiesCollegesId)){
universitiesCollegesApi.addUniversitiesColleges($('#addForm'),function(){
Common.info("添加成功");

@ -213,6 +213,7 @@
<!--#} -->
<!-- 业务对象须有hidden字段保存delFlag和version字段-->
<input type="hidden" name="handsOnId" value="${handsOn.handsOnId}"/>
<input type="hidden" name="courseInfoId_" value="${courseInfoId}"/>
</form>

@ -10,6 +10,22 @@
background: #e9e9e9;
padding: 14px;
}
#first label {
width: 70px;
}
#first .layui-input-block {
margin-left: 100px;
}
#second label {
width: 42px;
}
#second .layui-input-block {
margin-left: 72px;
}
</style>
<form class="layui-form" id="addForm">
<input type="hidden" id="handsOnId" name="handsOnId" value="${handsOnSimulationTasks.handsOnId}"
@ -246,9 +262,11 @@
</div>
</div>
<div class="layui-row">
<label class="layui-form-label">实训任务</label>
<label class="layui-form-label">客观题设置</label>
<div class="layui-input-block">
<button type="button" class="layui-btn bg_button button_add" style="float: left"><i class="layui-icon">&#xe654;</i></button>
<button type="button" class="layui-btn bg_button button_add" id="manualProblemSetting1"
style="float: left">题库选择
</button>
</div>
<div class="layui-row">
<div class="layui-input-block">
@ -444,7 +462,40 @@
</div>
<!-- 业务对象须有hidden字段保存delFlag和version字段-->
<input type="hidden" name="taskId" value="${handsOnSimulationTasks.taskId}"/>
<input type="hidden" name="courseInfoId_1" value="${courseInfoId}"/>
<layui:submitButtons id="addButton" buttonType="" showExamine="2"/>
<div id="resourcesQuestionTable_demo" style="display: none;padding: 20px 50px;">
<div class="layui-inline">
<input type="text" name="generalQuestionSettingName" class="layui-input" placeholder="请输入题干名称">
</div>
<div class="layui-inline" id="first">
<label class="layui-form-label">归属章节:</label>
<layui:simpleDictSelect style='layui-input-block'
type="course_info.course_info_name.course_info_status=1,course_info_type=2"
id="courseInfoId1" name="courseInfoId_1" layFilter="select_courseInfoIds_"/>
</div>
<div class="layui-inline" id="second">
<label class="layui-form-label">题型:</label>
<div class="layui-input-block">
<select name="questionType" lay-verify="">
<option value="">请选择</option>
<option value="1">单选</option>
<option value="2">多选</option>
<option value="3">判断</option>
<option value="4">填空</option>
<option value="5">分析</option>
</select>
</div>
</div>
<button type="button" class="layui-btn layui-btn-normal" id="searchFormQuestion"><i
class="layui-icon">&#xe615;</i>搜索
</button>
<button type="button" class="layui-btn layui-btn-danger" id="del">清除已选</button>
<table id="resourcesQuestionTable" lay-filter="resourcesQuestionTable"></table>
<span>已选题目:<span id="countQ"></span></span>
</div>
</form>
<!--#} -->
<script>

@ -24,8 +24,9 @@
<div class="layui-inline">
<label class="layui-form-label"><span class="req">*</span>所属院系:</label>
<div class="layui-input-inline">
<layui:simpleDictSelect style='layui-input-inline' type="university_faculty.university_faculty_name.university_faculty_status=1,find_in_set(org_id, ${user.get().orgId!''})"
id="universityFacultyId" name="universityFacultyId" layFilter="select_universityFacultyIds"/>
<layui:simpleDictSelect style='layui-input-inline'
type="university_faculty.university_faculty_name.university_faculty_status=1,find_in_set(org_id, ${user.get().orgId!''})"
id="universityFacultyId" name="universityFacultyId" layFilter="select_universityFacultyIds" lay-verify="required"/>
</div>
</div>
</div>
@ -33,10 +34,11 @@
<div class="layui-row">
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label"><span class="req">*</span>所属专业:</label>
<div class="layui-input-inline">
<layui:simpleDictSelect style='layui-input-inline' type="university_system.university_system_name.university_system_status=1,university_faculty_id=${universitiesCollegesInfo.universitiesCollegesId}"
id="universitySystemId" name="universitySystemId"/>
id="universitySystemId" name="universitySystemId" lay-verify="required"/>
</div>
</div>
<!--<button type="button" class="layui-btn layui-btn-sm rightUniversitySystemAdd bg_button">去添加</button>-->
@ -48,8 +50,9 @@
<div class="layui-inline">
<label class="layui-form-label"><span class="req">*</span>所属院校:</label>
<div class="layui-input-inline">
<layui:simpleDictSelect style='layui-input-inline' value="${schoolClass.universitiesCollegesId}" type="universities_colleges.universities_colleges_name.universities_colleges_status=1"
id="universitiesCollegesId" name="universitiesCollegesId" layFilter="select_universitiesColleges"/>
<layui:simpleDictSelect style='layui-input-inline' value="${schoolClass.universitiesCollegesId}"
type="universities_colleges.universities_colleges_name.universities_colleges_status=1"
id="universitiesCollegesId" name="universitiesCollegesId" layFilter="select_universitiesColleges" lay-verify="required"/>
</div>
</div>
</div>
@ -59,7 +62,7 @@
<div class="layui-inline">
<label class="layui-form-label"><span class="req">*</span>班级编号:</label>
<div class="layui-input-inline">
<input type="text" name="classSn" value="${schoolClass.classSn}" class="layui-input">
<input type="text" name="classSn" value="${schoolClass.classSn}" class="layui-input" lay-verify="required">
</div>
</div>
</div>
@ -70,7 +73,7 @@
<div class="layui-inline">
<label class="layui-form-label"><span class="req">*</span>班级名称:</label>
<div class="layui-input-inline">
<input type="text" name="className" value="${schoolClass.className}" class="layui-input" >
<input type="text" name="className" value="${schoolClass.className}" class="layui-input" lay-verify="required">
</div>
</div>
</div>

@ -13,6 +13,7 @@
<div class="layui-input-inline">
<layui:simpleDictSelect style='layui-input-inline'
type="university_faculty.university_faculty_name.university_faculty_status=1,find_in_set(org_id, ${user.get().orgId!''})"
lay-verify="required"
id="universityFacultyId" name="universityFacultyId" value="${universityFacultyId}" layFilter="select_universityFaculty"/>
</div>
</div>
@ -25,7 +26,8 @@
<label class="layui-form-label"><span class="req">*</span>所属专业:</label>
<div class="layui-input-inline">
<layui:simpleDictSelect style='layui-input-inline' value="${universitySystemId}" type="university_system.university_system_name.university_system_status=1,university_faculty_id=${universityFacultyId}"
id="universitySystemId" name="universitySystemId" layFilter="select_universitySystemId" />
id="universitySystemId" name="universitySystemId" layFilter="select_universitySystemId"
lay-verify="required"/>
</div>
</div>
<button type="button" class="layui-btn layui-btn-sm rightOffUniversityAdd bg_button">去添加</button>
@ -39,7 +41,7 @@
<div class="layui-input-inline">
<layui:simpleDictSelect style='layui-input-inline' value="${universitiesCollegesId}"
type="universities_colleges.universities_colleges_name.universities_colleges_status=1"
id="universitiesCollegesId" name="universitiesCollegesId"
id="universitiesCollegesId" name="universitiesCollegesId" lay-verify="required"
layFilter="select_universitiesColleges"/>
</div>
</div>
@ -66,7 +68,7 @@
<div class="layui-inline">
<label class="layui-form-label"><span class="req">*</span>学生姓名:</label>
<div class="layui-input-inline">
<input type="text" name="studentName" value="${student.studentName}" class="layui-input">
<input type="text" name="studentName" value="${student.studentName}" class="layui-input" lay-verify="required">
</div>
</div>
</div>
@ -76,7 +78,7 @@
<div class="layui-inline">
<label class="layui-form-label"><span class="req">*</span>学号:</label>
<div class="layui-input-inline">
<input type="text" name="studentSn" value="${student.studentSn}" class="layui-input" >
<input type="text" name="studentSn" value="${student.studentSn}" class="layui-input" lay-verify="required">
</div>
</div>
</div>

@ -27,7 +27,7 @@
<div class="layui-input-inline">
<layui:simpleDictSelect style='layui-input-inline'
type="university_faculty.university_faculty_name.university_faculty_status=1,find_in_set(org_id, ${user.get().orgId!''})"
id="universityFacultyId" name="universityFacultyId"
id="universityFacultyId" name="universityFacultyId" lay-verify="required"
layFilter="select_universityFacultyIds"/>
</div>
</div>
@ -38,7 +38,7 @@
<div class="layui-inline">
<label class="layui-form-label"><span class="req">*</span>专业:</label>
<div class="layui-input-inline">
<select name="universitySystemId">
<select name="universitySystemId" lay-verify="required">
<option value="">请选择</option>
</select>
</div>
@ -54,7 +54,7 @@
<div class="layui-input-inline" id="ssyx">
<layui:simpleDictSelect style='layui-input-inline' value="${teacher.universitiesCollegesId}"
type="universities_colleges.universities_colleges_name.universities_colleges_status=1"
id="universitiesCollegesId" name="universitiesCollegesId"
id="universitiesCollegesId" name="universitiesCollegesId" lay-verify="required"
layFilter="select_universitiesColleges"/>
</div>
</div>
@ -93,7 +93,7 @@
<div class="layui-inline">
<label class="layui-form-label"><span class="req">*</span>教师姓名:</label>
<div class="layui-input-inline">
<input type="text" name="teacherName" value='${teacher.teacherName}' class="layui-input" >
<input type="text" name="teacherName" value='${teacher.teacherName}' class="layui-input" lay-verify="required">
</div>
</div>
</div>
@ -113,7 +113,7 @@
<div class="layui-inline">
<label class="layui-form-label"><span class="req">*</span>教师工号:</label>
<div class="layui-input-inline">
<input type="text" name="teacherJobNumber" value='${teacher.teacherJobNumber}' class="layui-input" >
<input type="text" name="teacherJobNumber" value='${teacher.teacherJobNumber}' class="layui-input" lay-verify="required">
</div>
</div>
</div>

@ -61,34 +61,9 @@
elem: '#test5'
, type: 'date'
, range: '~'
, value: [Common.getNowDate(-365 / 2) +' ~ '+Common.getNowDate(1)]
, trigger: 'click'
});
function getDate() {
window.setTimeout(function () {
window.requestAnimationFrame(getDate)
}, 1000 / 2);
var d = new Date();
var year = d.getFullYear(); //获取年
var month = d.getMonth() + 1; //获取月,从 Date 对象返回月份 (0 ~ 11),故在此处+1
var day = d.getDay(); //获取日
var days = d.getDate(); //获取日期
var hour = d.getHours(); //获取小时
var minute = d.getMinutes(); //获取分钟
var second = d.getSeconds(); //获取秒
if (month < 10) month = "0" + month;
if (days < 10) days = "0" + days;
if (hour < 10) hour = "0" + hour;
if (minute < 10) minute = "0" + minute;
if (second < 10) second = "0" + second;
var week = new Array("星期日", "星期一", "星期二", "星期三", "星期四", "星期五", "星期六")
var Tools = document.getElementById("Main");
var da = year + "-" + (month - 1) + "-" + days + " " + "00:00:00";
if(month === "01"){
da = (year-1) + "-" +12+ "-" + days + " " + "00:00:00";
}
//var da=year+" 年 "+month+" 月 "+days+" 日 "+week[day]+" "+hour+" : "+minute+" :"+second
return da;
}
teacherTable = table.render({
elem : '#teacherTable',
height : Lib.getTableHeight(),
@ -98,7 +73,8 @@
method : 'get',
size:"lg",
url : Common.ctxPath + '/jlw/student/studentLogAnalysisList.json' // 数据接口
, where: {'loginStartTime': getDate(), 'loginEndTime': Common.getNowDate()}
,where:getParam()
//, where: {'loginStartTime': getDate(), 'loginEndTime': Common.getNowDate()}
,page : Lib.tablePage // 开启分页
,limit : 10,
cols : [ [ // 表头

@ -92,36 +92,15 @@
var laydate = layui.laydate;
var table = layui.table;
var teacherTable = null;
laydate.render({
elem: '#test5'
, type: 'date'
, range: '~'
, value: [Common.getNowDate(-365 / 2) +' ~ '+Common.getNowDate(1)]
, trigger: 'click'
});
function getDate() {
var d = new Date();
var year = d.getFullYear(); //获取年
var month = d.getMonth()+1; //获取月,从 Date 对象返回月份 (0 ~ 11),故在此处+1
var day = d.getDay(); //获取日
var days = d.getDate(); //获取日期
var hour = d.getHours(); //获取小时
var minute = d.getMinutes(); //获取分钟
var second = d.getSeconds(); //获取秒
if (month < 10) month = "0" + month;
if (days < 10) days = "0" + days;
if (hour < 10) hour = "0" + hour;
if (minute < 10) minute = "0" + minute;
if (second < 10) second = "0" + second;
var week = new Array("星期日", "星期一", "星期二", "星期三", "星期四", "星期五", "星期六")
var Tools = document.getElementById("Main");
var da = year + "-" + (month - 1) + "-" + days + " " + "00:00:00";
if(month === "01"){
da = (year-1) + "-" +12+ "-" + days + " " + "00:00:00";
}
//var da=year+" 年 "+month+" 月 "+days+" 日 "+week[day]+" "+hour+" : "+minute+" :"+second
return da;
}
teacherTable = table.render({
elem : '#teacherTable',
height : Lib.getTableHeight(),
@ -131,7 +110,8 @@
size:"lg",
method : 'get',
url: Common.ctxPath + '/jlw/student/studentLoginLogList.json' // 数据接口
, where: {'loginStartTime': getDate(),'loginEndTime':Common.getNowDate()}
,where:getParam()
//, where: {'loginStartTime': getDate(),'loginEndTime':Common.getNowDate()}
// , where: {'loginTime':getDate()}
,page : Lib.tablePage // 开启分页
,limit : 10,

@ -81,53 +81,15 @@
var table = layui.table;
var teacherTable = null;
var laydate = layui.laydate;
//日期时间选择器
laydate.render({
elem: '#test5'
, type: 'date'
, range: '~'
, value: [Common.getNowDate(-365 / 2) +' ~ '+Common.getNowDate(1)]
, trigger: 'click'
});
function getDate(){
var d=new Date();
var year=d.getFullYear(); //获取年
var month=d.getMonth()+1; //获取月,从 Date 对象返回月份 (0 ~ 11),故在此处+1
var day=d.getDay(); //获取日
var days=d.getDate(); //获取日期
var hour=d.getHours(); //获取小时
var minute=d.getMinutes(); //获取分钟
var second=d.getSeconds(); //获取秒
if(month<10) month="0"+month;
if(days<10) days="0"+days;
if(hour<10) hour="0"+hour;
if(minute<10) minute="0"+minute;
if(second<10) second="0"+second;
var week=new Array("星期日","星期一","星期二","星期三","星期四","星期五","星期六")
var Tools=document.getElementById("Main");
var da=year+"-"+(month-1)+"-"+days+" " +"00:00:00";
if(month === "01"){
da = (year-1) + "-" +12+ "-" + days + " " + "00:00:00";
}
//var da=year+" 年 "+month+" 月 "+days+" 日 "+week[day]+" "+hour+" : "+minute+" :"+second
return da;
}
teacherTable = table.render({
elem : '#teacherTable',
height : Lib.getTableHeight(),
@ -137,7 +99,8 @@
method: 'get',
size:"lg",
url: Common.ctxPath + '/jlw/student/studentUseLogList.json' // 数据接口
, where: {'loginStartTime': getDate(),'loginEndTime':Common.getNowDate()}
, where: getParam()
//, where: {'loginStartTime': getDate(),'loginEndTime':Common.getNowDate()}
// , where: {'loginTime':getDate()}
,page : Lib.tablePage // 开启分页
,limit : 10,

@ -153,6 +153,7 @@
param.chatContent = '<p>'+$("#chatContentNew").val()+'</p>';
var url = '/api/teacherOpenCourseChatLog/add.do';
var ret = Common.postJSON(url,JSON.stringify(param));
console.log(ret,'dd')
layer.msg(ret.code == 0 ? "成功回复!" : ret.msg, {
offset: ['50%'],
icon: ret.code == 0 ? 1 : 2,
@ -209,7 +210,7 @@
' <div class="layui-row" style="float: left">' + (!$.isEmpty(data.children[j].studentIdText) ? data.children[j].studentIdText : '') + '</div>' +
' </div>' +
' <div class="layui-col-md10" ><div class="layui-row" style="margin-bottom: 10px">' + (!$.isEmpty(data.children[j].chatContent) ? data.children[j].chatContent : '') +
' <div class="layui-row" style="margin-top: 20px">' +
' <div class="layui-row" style="margin-top: 20px;margin-bottom: 10px">' +
' <div class="layui-inline" style="float: left">' + (!$.isEmpty(data.children[j].teacherOpenCourseChatLogAddTime) ? data.children[j].teacherOpenCourseChatLogAddTime : '') + '</div>' +
' <div class="layui-inline" style="float: right">' +
' <a class="layui-table-link " style="color: red;margin-right: 30px;cursor: pointer;" event="add" data-value=' + j + '>回复</a>' +

@ -72,35 +72,25 @@
cols: [[
{type:'numbers',title:'序号'},
{
field: 'code', title: '提问时间', align: "center"
field: 'teacherOpenCourseChatLogAddTime', title: '提问时间', align: "center"
},
{
field: 'name', title: '提问学生', align: "center"
field: 'studentIdText', title: '提问学生', align: "center"
},
{
field: 'name', title: '提问方式', align: "center"
field: 'chatLogSendTypeText', title: '提问方式', align: "center"
},
{
field: 'code', title: '用户编号', align: "center",
hide: "${isSignRole.get()!''}" != 2 ? false : true
field: 'schoolClassIdsText', title: '所属班级', align: "center"
},
{
field: 'universitiesCollegesName', title: '所属院校', align: "center",
hide: "${isSignRole.get()!''}" != 2 ? false : true
field: 'chatContent', title: '提问内容', align: "center",width:'30%'
},
{
field: 'universitiesCollegesProvince', title: '所属省份', align: "center",
hide: "${isSignRole.get()!''}" != 2 ? false: true,
},
{
field: 'className', title: '所属班级', align: "center"
},
{
field: 'platform', title: '提问内容', align: "center",
},
{
field: 'loginTime', title: '学生回答', align: "center",
field: 'universitiesCollegesContactsEmail', title: '学生回答', align: "center",
},
/* header.put("chatContent", "提问内容");
header.put("universitiesCollegesContactsEmail", "学生回答");*/
{
field: 'logoutTime', title: '登记得分', align: "center",
}

@ -106,12 +106,13 @@ layui.use(['form','laydate','table','laytpl'], function(){
cols : [ [ // 表头
{type:'numbers',title:'序号'},
{
field: 'studentName',
field: 'studentIdText',
title: '姓名',
align: "center",
hideField: false,
templet:function (d) {
var htm ='<div class="layui-inline"><img src="${ctxPath}/plugins/head_img.jpg" class="layui-nav-img"></div><span>'+d.studentName+'</span></div>';
var htm =
'<div class="layui-inline"><img src="${ctxPath}'+d.headImg+'" class="layui-nav-img"></div><span>'+d.studentIdText+'</span></div>';
return htm;
}
},
@ -215,7 +216,7 @@ layui.use(['form','laydate','table','laytpl'], function(){
}else if(obj.event === "look"){
layer.open({
title: '回复消息'
,content: data.questionScore
,content: data.chatContent
});
}
})

@ -11,13 +11,13 @@
<div class="layui-inline">
<label class="layui-form-label"><span class="req">*</span>院校名称:</label>
<div class="layui-input-inline">
<input type="text" name="universitiesCollegesName" value="${universitiesColleges.universitiesCollegesName}" class="layui-input" >
<input type="text" name="universitiesCollegesName" value="${universitiesColleges.universitiesCollegesName}" class="layui-input" lay-verify="required">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label"><span class="req">*</span>院校层次:</label>
<div class="layui-input-inline">
<select name="universitiesCollegesGrade">
<select name="universitiesCollegesGrade" lay-verify="required">
<option value="">请选择</option>
<option value="高校" ${universitiesColleges.universitiesCollegesGrade=='高校'?'selected':''}>高校</option>
<option value="高职" ${universitiesColleges.universitiesCollegesGrade=='高职'?'selected':''}>高职</option>
@ -50,19 +50,19 @@
<div class="layui-inline">
<label class="layui-form-label"><span class="req">*</span>院校联系人:</label>
<div class="layui-input-inline">
<input type="text" name="universitiesCollegesContacts" value="${universitiesColleges.universitiesCollegesContacts}" class="layui-input" >
<input type="text" name="universitiesCollegesContacts" value="${universitiesColleges.universitiesCollegesContacts}" class="layui-input" lay-verify="required">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">联系人电话:</label>
<div class="layui-input-inline">
<input type="text" name="universitiesCollegesContactsMobile" maxlength="11" value="${universitiesColleges.universitiesCollegesContactsMobile}" class="layui-input" >
<input type="text" name="universitiesCollegesContactsMobile" maxlength="11" value="${universitiesColleges.universitiesCollegesContactsMobile}" class="layui-input">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">联系人邮箱:</label>
<div class="layui-input-inline">
<input type="text" name="universitiesCollegesContactsEmail" value="${universitiesColleges.universitiesCollegesContactsEmail}" class="layui-input" >
<input type="text" name="universitiesCollegesContactsEmail" value="${universitiesColleges.universitiesCollegesContactsEmail}" class="layui-input">
</div>
</div>
</div>
@ -98,7 +98,7 @@
<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.universitiesCollegesDefaultAdminUserInfo.code!''}" class="layui-input" >
<input type="text" name="userCode" value="${universitiesColleges.universitiesCollegesDefaultAdminUserInfo.code!''}" class="layui-input" lay-verify="required">
</div>
<!--#}else{-->
<div class="layui-input-inline">
@ -108,7 +108,7 @@
</div>
<!--#if(isEmpty(universitiesColleges.universitiesCollegesId)){-->
<div class="layui-inline">
<label class="layui-form-label"><span class="req">*</span>密码:</label>
<label class="layui-form-label">设置密码:</label>
<div class="layui-input-inline">
<input type="text" name="password" value="" placeholder="不填写,默认初始密码" class="layui-input" >
</div>

Loading…
Cancel
Save