diff --git a/admin-core/src/main/resources/templates/teacherIndex.html b/admin-core/src/main/resources/templates/teacherIndex.html
index 9f811c78..f86ac6dd 100644
--- a/admin-core/src/main/resources/templates/teacherIndex.html
+++ b/admin-core/src/main/resources/templates/teacherIndex.html
@@ -283,6 +283,8 @@
var view;
var adminIndexDetailData = [];
var adminIndexBarchartData = [];
+
+ loadInfo();
var isSignRole = $("input[name='isSignRole']").val();
//日期时间范围选择
laydate.render({
@@ -357,8 +359,10 @@
view = document.getElementById('uniAdmin_view');
}
+ laytpl(getTpl).render(adminIndexDetailData, function (html) {
+ view.innerHTML = html;
+ });
- loadInfo();
function loadInfo(sTime, eTime) {
var ret = Common.getAjax("/api/statisticalAnalysis/adminIndexDetail.do", {stime: sTime, etime: eTime});
@@ -370,9 +374,7 @@
adminIndexDetailData = ret.data;
}
$("#universitiesCollegesAuthCode").text(adminIndexDetailData.universitiesCollegesAuthCode)
- laytpl(getTpl).render(adminIndexDetailData, function (html) {
- view.innerHTML = html;
- });
+
}
/*
diff --git a/web/src/main/java/com/ibeetl/jlw/web/query/GeneralQuestionSettingQuery.java b/web/src/main/java/com/ibeetl/jlw/web/query/GeneralQuestionSettingQuery.java
index fdd37ec2..d72058b3 100644
--- a/web/src/main/java/com/ibeetl/jlw/web/query/GeneralQuestionSettingQuery.java
+++ b/web/src/main/java/com/ibeetl/jlw/web/query/GeneralQuestionSettingQuery.java
@@ -65,9 +65,9 @@ public class GeneralQuestionSettingQuery extends PageParam {
private String generalQuestionSettingRequire;
@Query(name = "附件，老师上传附件（单文件）", display = false)
private String generalQuestionSettingFile;
- @Query(name = "发布状态。 1发布，2未发布", display = true,type=Query.TYPE_DICT,dict="global_push_status")
+ @Query(name = "发布状态", display = true,type=Query.TYPE_DICT,dict="global_push_status")
private GlobalPushStatusEnum generalQuestionSettingPushStatus;
- @Query(name = "状态 （1正常 2删除）", display = true,type=Query.TYPE_DICT,dict="global_status")
+ @Query(name = "状态", display = true,type=Query.TYPE_DICT,dict="global_status")
private Integer generalQuestionSettingStatus;
@Query(name = "创建时间", display = false)
private Date generalQuestionSettingAddTime;
diff --git a/web/src/main/resources/static/js/jlw/generalQuestionSetting/add.js b/web/src/main/resources/static/js/jlw/generalQuestionSetting/add.js
index e0b58161..c28dd322 100644
--- a/web/src/main/resources/static/js/jlw/generalQuestionSetting/add.js
+++ b/web/src/main/resources/static/js/jlw/generalQuestionSetting/add.js
@@ -1,7 +1,48 @@
-layui.define([ 'form', 'laydate', 'table','generalQuestionSettingApi'], function(exports) {
+layui.define(['laydate', 'form', 'laydate', 'table','generalQuestionSettingApi'], function(exports) {
var form = layui.form;
var generalQuestionSettingApi = layui.generalQuestionSettingApi;
var index = layui.index;
+ var laydate= layui.laydate;
+ var classSelectData = [];
+ var x=$("#xx").data('value')
+console.log(x)
+ var classData = Common.getAjax('/jlw/schoolClass/getValues.json').data;//上课班级多选框data
+ //班级值获取并处理成{name:xx,value:xx,selected:false}格式
+ classData.forEach(function (item, index) {
+ classSelectData[index] = {name: item.className, value: item.classId, selected: false}
+ });
+ var xmSeValue = $("#generalQuestionSettingSchoolClassIds").data('value');
+
+ var xmSeInitValue = [];
+ if(!$.isEmpty(xmSeValue)){
+ if(xmSeValue.toString().indexOf(",")>=0){
+ xmSeValue.split(',').forEach(function (value) {
+ xmSeInitValue.push(parseInt(value))
+ });
+ }else {
+ xmSeInitValue.push(xmSeValue)
+ }
+ }
+
+ /*班级下拉多选*/
+ var xmClassIds = xmSelect.render({
+ el: '#generalQuestionSettingSchoolClassIds',
+ name: 'generalQuestionSettingSchoolClassIds',
+ data: classSelectData,
+ initValue: xmSeInitValue,//xxxx为你当前的value值
+ /*theme: {
+ color: '#1e9fff',
+ },*/
+ });
+ //日期时间范围
+ laydate.render({
+ elem: '#generalQuestionStartTime'
+ ,type: 'date'
+ ,range: true
+ , trigger: 'click'
+ });
+
+
var view = {
init:function(){
Lib.initGenrealForm($("#addForm"),form);
diff --git a/web/src/main/resources/static/js/jlw/generalQuestionSetting/index.js b/web/src/main/resources/static/js/jlw/generalQuestionSetting/index.js
index 6635fb27..fa3ed6e1 100644
--- a/web/src/main/resources/static/js/jlw/generalQuestionSetting/index.js
+++ b/web/src/main/resources/static/js/jlw/generalQuestionSetting/index.js
@@ -24,15 +24,15 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) {
method : 'post',
url : Common.ctxPath + '/jlw/generalQuestionSetting/list.json' // 数据接口
,page : Lib.tablePage // 开启分页
- ,toolbar: '#toolbar_generalQuestionSetting' //自定义头部左侧工具栏
- ,defaultToolbar: ['filter', 'print', 'exports'] //头部右侧工具栏
+ /*,toolbar: '#toolbar_generalQuestionSetting' //自定义头部左侧工具栏
+ ,defaultToolbar: ['filter', 'print', 'exports'] //头部右侧工具栏*/
,limit : 10,
cols : [ [ // 表头
{
type : 'checkbox',
},
- {
+ /*{
field : 'generalQuestionSettingId',
title : '通用题目设置ID',
align:"center",
@@ -47,7 +47,7 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) {
align:"center",
hideField :false,
hide:$.isEmpty(sx_['bussinessId'])?false:sx_['bussinessId'],
- },
+ },*/
{
field : 'bussinessType',
title : '业务类型',
@@ -141,14 +141,14 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) {
},
{
field : 'generalQuestionSettingPushStatusText', //数据字典类型为 global_push_status
- title : '发布状态。 1发布，2未发布',
+ title : '发布状态',
align:"center",
hideField :false,
hide:$.isEmpty(sx_['generalQuestionSettingPushStatusText'])?false:sx_['generalQuestionSettingPushStatusText'],
},
{
field : 'generalQuestionSettingStatusText', //数据字典类型为 global_status
- title : '状态 （1正常 2删除）',
+ title : '状态',
align:"center",
hideField :false,
hide:$.isEmpty(sx_['generalQuestionSettingStatusText'])?false:sx_['generalQuestionSettingStatusText'],
@@ -160,7 +160,7 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) {
hideField :false,
hide:$.isEmpty(sx_['generalQuestionSettingAddTime'])?false:sx_['generalQuestionSettingAddTime'],
},
- {
+ /*{
field : 'orgId',
title : '组织ID',
align:"center",
@@ -173,9 +173,9 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) {
align:"center",
hideField :false,
hide:$.isEmpty(sx_['userId'])?false:sx_['userId'],
- }
- ,{
- field : 'operation_',title : '操作',align:"center", templet: function (d) {
+ },*/
+ {
+ field : 'operation_',title : '操作',align:"center",fixed:"right",width:120, templet: function (d) {
var htm = '<button type="button" class="layui-btn layui-btn-normal layui-btn-xs" lay-event="edit">编辑</button>';
htm += '<button type="button" class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">删除</button>';
return htm;
diff --git a/web/src/main/resources/static/js/jlw/teacherOpenCourseScheduleSession/add.js b/web/src/main/resources/static/js/jlw/teacherOpenCourseScheduleSession/add.js
index 5cedaeb8..cf74187c 100644
--- a/web/src/main/resources/static/js/jlw/teacherOpenCourseScheduleSession/add.js
+++ b/web/src/main/resources/static/js/jlw/teacherOpenCourseScheduleSession/add.js
@@ -28,7 +28,7 @@ layui.define(['form', 'laydate', 'table', 'xmSelect', 'teacherOpenCourseSchedule
});
}else {
xmSeInitValue.push(xmSeValue)
- }
+ }
}
/*班级下拉多选*/
var demo1 = xmSelect.render({
diff --git a/web/src/main/resources/templates/jlw/courseInfo/courseConfigureNew.html b/web/src/main/resources/templates/jlw/courseInfo/courseConfigureNew.html
index 7b305cfc..e6832aca 100644
--- a/web/src/main/resources/templates/jlw/courseInfo/courseConfigureNew.html
+++ b/web/src/main/resources/templates/jlw/courseInfo/courseConfigureNew.html
@@ -9,7 +9,7 @@
color: red;
border: 2px solid red;
border-radius: 5px;
- margin: 3px;
+ padding: 3px;
}
.ppt {
@@ -206,8 +206,17 @@
};
addOpen("",'子章节名称',"",param);
}else if (obj.event === 'updateResources') {//上传资源
-
-
+ layer.open({
+ title: '在线调试'
+ ,content: '配置各种参数，试试效果'
+ , btn: ['确定', '关闭']
+ , shadeClose:true
+ , success:function () {}
+ , yes: function (index, layero) {}
+ , btn2: function (index, layero) {
+ layer.close(index);
+ }
+ });
}else if (obj.event === 'addLine') {//添加链接
}else if (obj.event === 'addWP') {//添加图文
diff --git a/web/src/main/resources/templates/jlw/generalQuestionSetting/add.html b/web/src/main/resources/templates/jlw/generalQuestionSetting/add.html
index c7da12de..bbad9a23 100644
--- a/web/src/main/resources/templates/jlw/generalQuestionSetting/add.html
+++ b/web/src/main/resources/templates/jlw/generalQuestionSetting/add.html
@@ -1,7 +1,85 @@
<!--# layout("/common/layout.html",{"jsBase":"/js/jlw/generalQuestionSetting/"}){ -->
-
+<link rel="stylesheet" type="text/css" href="${ctxPath}/css/plugin.css?v=${jsVer}" media="all"/>
<form class="layui-form" id="addForm">
<div class="layui-row">
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <label class="layui-form-label">题目名称</label>
+ <div class="layui-input-inline">
+ <input type="text" name="generalQuestionSettingName" value="${generalQuestionSetting.generalQuestionSettingName}" class="layui-input" >
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div value="${schoolClassList}" id="xx"></div>
+ <div class="layui-row">
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <label class="layui-form-label">题目班级</label>
+ <div class="layui-input-inline" data-value="">
+ <div id="generalQuestionSettingSchoolClassIds" data-value="${generalQuestionSetting.generalQuestionSettingSchoolClassIds}"></div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <label class="layui-form-label">题目时间</label>
+ <div class="layui-input-inline">
+ <input type="text" autocomplete="off" name="generalQuestionStartTime" id="generalQuestionStartTime" class="layui-input" placeholder="请选择"
+ value="${generalQuestionSetting.generalQuestionStartTime,"yyyy-MM-dd"} - ${generalQuestionSetting.generalQuestionEndTime,"yyyy-MM-dd"}">
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <label class="layui-form-label">设置</label>
+ <div class="layui-input-inline">
+
+ <div class="layui-form-item">
+ <label class="layui-form-label">作答次数</label>
+ <div class="layui-input-block">
+ <input type="text" name="generalQuestionSettingDoCount" value="${generalQuestionSetting.generalQuestionSettingDoCount}" class="layui-input" >
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">题目乱序(同一大题内)</label>
+ <div class="layui-input-block">
+ <input type="radio" name="sex" value="男" title="是">
+ <input type="radio" name="sex" value="女" title="否" checked>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">题目乱序(同一大题内)</label>
+ <div class="layui-input-block">
+ <input type="radio" name="sex" value="男" title="是">
+ <input type="radio" name="sex" value="女" title="否" checked>
+ </div>
+ </div>
+
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row" >
+ <div class="layui-form-item" >
+ <div class="layui-inline">
+ <label class="layui-form-label">题目设置</label>
+ <div class="layui-input-block">
+ <button type="button" class="layui-btn layui-btn-normal">手动出题</button>
+ <button type="button" class="layui-btn layui-btn-normal">随机出题</button>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <table></table>
+ </div>
+ </div>
+ </div>
+ <!--<div class="layui-row">
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">业务ID</label>
@@ -76,7 +154,7 @@
<div class="layui-inline">
<label class="layui-form-label">题目开始时间</label>
<div class="layui-input-inline">
- <input type="text" id="generalQuestionStartTime" name="generalQuestionStartTime" value="${generalQuestionSetting.generalQuestionStartTime,"yyyy-MM-dd"}" class="layui-input input-date" >
+ <input type="text" id="" name="generalQuestionStartTime" value="${generalQuestionSetting.generalQuestionStartTime,"yyyy-MM-dd"}" class="layui-input input-date" >
</div>
</div>
</div>
@@ -156,12 +234,13 @@
</div>
</div>
</div>
- </div>
+ </div>-->
<!-- 业务对象须有hidden字段，保存delFlag和version字段-->
<input type="hidden" name="generalQuestionSettingId" value="${generalQuestionSetting.generalQuestionSettingId}" />
<layui:submitButtons id="addButton" buttonType="" showExamine="2" />
</form>
<!--#} -->
+<script type="text/javascript" src="${ctxPath}/plugins/xm-select.js?v=${jsVer}"></script>
<script>
layui.use(['add'], function(){
var generalQuestionSettingAdd = layui.add
diff --git a/web/src/main/resources/templates/jlw/generalQuestionSetting/index.html b/web/src/main/resources/templates/jlw/generalQuestionSetting/index.html
index 110049e5..836ec6e3 100644
--- a/web/src/main/resources/templates/jlw/generalQuestionSetting/index.html
+++ b/web/src/main/resources/templates/jlw/generalQuestionSetting/index.html
@@ -1,6 +1,9 @@
<!--#layout("/common/layout.html",{"jsBase":"/js/jlw/generalQuestionSetting/"}){ -->
<layui:searchForm formId="searchForm" searchList="" condition="${search}">
</layui:searchForm>
+<div class="layui-btn-group">
+ <layui:accessButton function="generalQuestionSetting.add" action="add"><i class="layui-icon"></i>添加</layui:accessButton>
+</div>
<table id="generalQuestionSettingTable" lay-filter="generalQuestionSettingTable"></table>
<!--#} -->