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
malx 2 years ago
parent 4fe67a8a79 664395d69a
commit 61845889e3
3 changed files with 107 additions and 100 deletions
Show Stats Download Patch File Download Diff File

26
web/src/main/resources/static/js/jlw/generalQuestionSetting/add.js
Unescape Escape View File

@ -7,6 +7,7 @@ layui.define(['laydate', 'form', 'laydate', 'table','generalQuestionSettingApi',
var laytpl = layui.laytpl;
var questionTypeGroupInfoTable = null;
var resourcesQuestionTable =null;
var resourcesQuestionTable1 = null;
var classData = Common.getAjax('/jlw/schoolClass/getValues.json').data;//上课班级多选框data
var xmSeValue = $("#generalQuestionSettingSchoolClassIds").data('value');
@ -61,14 +62,15 @@ layui.define(['laydate', 'form', 'laydate', 'table','generalQuestionSettingApi',
}
layer.open({
type: 1
, title: '选择题库'
,offset: ['100px', '150px']
, title: '选择题库>归属课程：'+'<span style="color: red;border: 2px solid red;border-radius: 5px;">'+$("#courseInfoIds").find("option:selected").text()+'</span>'
,fixed:false//固定页面后，弹出框随着滚动
, shadeClose: true
, scrollbar: false
, scrollbar: true//滚动条
, content: $("#resourcesQuestionTable_demo")
, btn: ['保存', '关闭']
,success:function () {
resourcesQuestionTable();
Lib.getCourseInfo($("select[name='courseInfoId_1']"), courseInfoIds);
}
, yes: function (index, layero) {
layer.close(index);
@ -85,6 +87,9 @@ layui.define(['laydate', 'form', 'laydate', 'table','generalQuestionSettingApi',
});
$('#randomlySetQuestions').click(function () {
console.log("dianj")
});
$("#del").click(function () {
});
var view = {
init:function(){
@ -141,7 +146,7 @@ layui.define(['laydate', 'form', 'laydate', 'table','generalQuestionSettingApi',
});
resourcesQuestionTable= function(){
table.render({
resourcesQuestionTable1=table.render({
elem: '#resourcesQuestionTable',
cellMinWidth: 100,
method: 'post',
@ -179,12 +184,17 @@ layui.define(['laydate', 'form', 'laydate', 'table','generalQuestionSettingApi',
}
},
initSearchForm: function () {
/*var btn = $("#searchForm");
var btn = $("#searchFormQuestion");
btn.on('click', function () {
questionTypeGroupInfoTable.reload({
where: {"courseId":$("#courseInfoIds").find("option:selected").val()},
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()
},
});
});
});*/
form.on('select(select_courseInfoIds)', function (data) {
courseInfoIds = data.value;
questionTypeGroupInfoTable.reload({

98
web/src/main/resources/static/js/jlw/generalQuestionSetting/index.js
Unescape Escape View File

@ -29,7 +29,8 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) {
,limit : 10,
cols : [ [ // 表头
{
type : 'checkbox',
type : 'numbers',
title : '序号',
},
/*{
@ -47,7 +48,7 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) {
align:"center",
hideField :false,
hide:$.isEmpty(sx_['bussinessId'])?false:sx_['bussinessId'],
},*/
},
{
field : 'bussinessType',
title : '业务类型',
@ -55,20 +56,6 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) {
hideField :false,
hide:$.isEmpty(sx_['bussinessType'])?false:sx_['bussinessType'],
},
{
field : 'generalQuestionSettingSchoolClassIdsText',
title : '班级',
align:"center",
hideField :false,
hide:$.isEmpty(sx_['generalQuestionSettingSchoolClassIdsText'])?false:sx_['generalQuestionSettingSchoolClassIdsText'],
},
{
field : 'generalQuestionSettingDoCount',
title : '作答次数',
align:"center",
hideField :false,
hide:$.isEmpty(sx_['generalQuestionSettingDoCount'])?false:sx_['generalQuestionSettingDoCount'],
},
{
field : 'generalQuestionSettingQuestionNoOrder',
title : '题目乱序（同一大题内）',
@ -98,82 +85,79 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) {
hide:$.isEmpty(sx_['generalQuestionSettingEndShowTrueFalse'])?false:sx_['generalQuestionSettingEndShowTrueFalse'],
},
{
field : 'generalQuestionSettingName',
title : '题目-名称',
field : 'generalQuestionSettingFile',
title : '附件，老师上传附件（单文件）',
align:"center",
hideField :false,
hide:$.isEmpty(sx_['generalQuestionSettingName'])?false:sx_['generalQuestionSettingName'],
hide:$.isEmpty(sx_['generalQuestionSettingFile'])?false:sx_['generalQuestionSettingFile'],
},
{
field : 'generalQuestionStartTime',
title : '题目开始时间',
field : 'generalQuestionSettingStatusText', //数据字典类型为 global_status
title : '状态',
align:"center",
hideField :false,
hide:$.isEmpty(sx_['generalQuestionStartTime'])?false:sx_['generalQuestionStartTime'],
hide:$.isEmpty(sx_['generalQuestionSettingStatusText'])?false:sx_['generalQuestionSettingStatusText'],
},
*/
{
field : 'generalQuestionEndTime',
title : '题目结束时间',
field : 'generalQuestionSettingName',
width:280,
title : '题目-名称',
align:"center",
hideField :false,
hide:$.isEmpty(sx_['generalQuestionEndTime'])?false:sx_['generalQuestionEndTime'],
hide:$.isEmpty(sx_['generalQuestionSettingName'])?false:sx_['generalQuestionSettingName'],
},
{
field : 'generalQuestionSettingTypeText',
title : '类型',
field : 'generalQuestionSettingSchoolClassIdsText',
title : '班级',
align:"center",
hideField :false,
hide:$.isEmpty(sx_['generalQuestionSettingTypeText'])?false:sx_['generalQuestionSettingTypeText'],
hide:$.isEmpty(sx_['generalQuestionSettingSchoolClassIdsText'])?false:sx_['generalQuestionSettingSchoolClassIdsText'],
},
{
field : 'generalQuestionSettingRequire',
title : '题目要求',
field : 'generalQuestionSettingDoCount',
title : '作答次数',
align:"center",
hideField :false,
hide:$.isEmpty(sx_['generalQuestionSettingRequire'])?false:sx_['generalQuestionSettingRequire'],
hide:$.isEmpty(sx_['generalQuestionSettingDoCount'])?false:sx_['generalQuestionSettingDoCount'],
},
{
field : 'generalQuestionSettingFile',
title : '附件，老师上传附件（单文件）',
field : 'generalQuestionStartTime',
width:320,
title : '题目时间',
align:"center",
hideField :false,
hide:$.isEmpty(sx_['generalQuestionSettingFile'])?false:sx_['generalQuestionSettingFile'],
hide:$.isEmpty(sx_['generalQuestionStartTime'])?false:sx_['generalQuestionStartTime'],
templet:function (d) {
var htm = d.generalQuestionStartTime+' ~ '+d.generalQuestionEndTime;
return htm
}
},
{
field : 'generalQuestionSettingPushStatusText', //数据字典类型为 global_push_status
title : '发布状态',
field : 'generalQuestionSettingTypeText',
title : '类型',
align:"center",
hideField :false,
hide:$.isEmpty(sx_['generalQuestionSettingPushStatusText'])?false:sx_['generalQuestionSettingPushStatusText'],
hide:$.isEmpty(sx_['generalQuestionSettingTypeText'])?false:sx_['generalQuestionSettingTypeText'],
},
{
field : 'generalQuestionSettingStatusText', //数据字典类型为 global_status
title : '状态',
field : 'generalQuestionSettingRequire',
title : '题目要求',
align:"center",
hideField :false,
hide:$.isEmpty(sx_['generalQuestionSettingStatusText'])?false:sx_['generalQuestionSettingStatusText'],
hide:$.isEmpty(sx_['generalQuestionSettingRequire'])?false:sx_['generalQuestionSettingRequire'],
},
{
field : 'generalQuestionSettingAddTime',
title : '创建时间',
align:"center",
hideField :false,
hide:$.isEmpty(sx_['generalQuestionSettingAddTime'])?false:sx_['generalQuestionSettingAddTime'],
},
/*{
field : 'orgId',
title : '组织ID',
field : 'generalQuestionSettingPushStatusText', //数据字典类型为 global_push_status
title : '发布状态',
align:"center",
hideField :false,
hide:$.isEmpty(sx_['orgId'])?false:sx_['orgId'],
hide:$.isEmpty(sx_['generalQuestionSettingPushStatusText'])?false:sx_['generalQuestionSettingPushStatusText'],
},
{
field : 'userId',
title : '用户ID',
align:"center",
hideField :false,
hide:$.isEmpty(sx_['userId'])?false:sx_['userId'],
},*/
{
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>';

51
web/src/main/resources/templates/jlw/generalQuestionSetting/add.html
Unescape Escape View File

@ -1,5 +1,20 @@
<!--# layout("/common/layout.html",{"jsBase":"/js/jlw/generalQuestionSetting/"}){ -->
<link rel="stylesheet" type="text/css" href="${ctxPath}/css/plugin.css?v=${jsVer}" media="all"/>
<style>
#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">
<div class="layui-row" style="margin-left: 103px;">
<layui:submitButtons id="addButton" buttonType="" showExamine="2" />
@ -270,37 +285,35 @@
</div>-->
<!-- 业务对象须有hidden字段，保存delFlag和version字段-->
<input type="hidden" name="generalQuestionSettingId" value="${generalQuestionSetting.generalQuestionSettingId}" />
</form>
<div id="resourcesQuestionTable_demo" style="display: none;padding: 20px 50px;">
<div class="layui-inline">
<div class="layui-input-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">
<label class="layui-form-label">归属课程</label>
<div class="layui-input-inline">
<layui:simpleDictSelect style='layui-input-inline'
type="course_info.course_info_name.course_info_status=1,course_info_type=1,find_in_set(course_label_id,(select group_concat(course_label_id) from course_label where course_label_status = 1))"
id="courseInfoIds" name="courseInfoId_0"
layFilter="select_courseInfoIds"/>
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">题型</label>
<div class="layui-input-inline">
<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" disabled>多选</option>
<option value="3" selected>判断</option>
<option value="4" selected>填空</option>
<option value="5" selected>分析</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>
</div>
</form>
<!--#} -->

Write Preview
Loading…
Cancel
Save