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 04be8ff3..987313f2 100644 --- a/web/src/main/resources/static/js/jlw/generalQuestionSetting/add.js +++ b/web/src/main/resources/static/js/jlw/generalQuestionSetting/add.js @@ -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: '选择题库>归属课程:'+''+$("#courseInfoIds").find("option:selected").text()+'' + ,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({ 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 16755a7f..697ba4e0 100644 --- a/web/src/main/resources/static/js/jlw/generalQuestionSetting/index.js +++ b/web/src/main/resources/static/js/jlw/generalQuestionSetting/index.js @@ -29,7 +29,8 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) { ,limit : 10, cols : [ [ // 表头 { - type : 'checkbox', + type : 'numbers', + title : '序号', }, /*{ @@ -47,76 +48,93 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) { align:"center", hideField :false, hide:$.isEmpty(sx_['bussinessId'])?false:sx_['bussinessId'], - },*/ - { - field : 'bussinessType', + }, + { + field : 'bussinessType', title : '业务类型', align:"center", 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', + field : 'generalQuestionSettingQuestionNoOrder', title : '题目乱序(同一大题内)', align:"center", hideField :false, hide:$.isEmpty(sx_['generalQuestionSettingQuestionNoOrder'])?false:sx_['generalQuestionSettingQuestionNoOrder'], }, { - field : 'generalQuestionSettingOptionNoOrder', + field : 'generalQuestionSettingOptionNoOrder', title : '选项乱序(限单选、多选)', align:"center", hideField :false, hide:$.isEmpty(sx_['generalQuestionSettingOptionNoOrder'])?false:sx_['generalQuestionSettingOptionNoOrder'], }, { - field : 'generalQuestionSettingEndShowQa', + field : 'generalQuestionSettingEndShowQa', title : '答卷后显示答案解析', align:"center", hideField :false, hide:$.isEmpty(sx_['generalQuestionSettingEndShowQa'])?false:sx_['generalQuestionSettingEndShowQa'], }, { - field : 'generalQuestionSettingEndShowTrueFalse', + field : 'generalQuestionSettingEndShowTrueFalse', title : '答卷后显示答案对错', align:"center", hideField :false, hide:$.isEmpty(sx_['generalQuestionSettingEndShowTrueFalse'])?false:sx_['generalQuestionSettingEndShowTrueFalse'], }, + { + field : 'generalQuestionSettingFile', + title : '附件,老师上传附件(单文件)', + align:"center", + hideField :false, + hide:$.isEmpty(sx_['generalQuestionSettingFile'])?false:sx_['generalQuestionSettingFile'], + }, + { + field : 'generalQuestionSettingStatusText', //数据字典类型为 global_status + title : '状态', + align:"center", + hideField :false, + hide:$.isEmpty(sx_['generalQuestionSettingStatusText'])?false:sx_['generalQuestionSettingStatusText'], + }, + */ + { + field : 'generalQuestionSettingName', + width:280, + title : '题目-名称', + align:"center", + hideField :false, + hide:$.isEmpty(sx_['generalQuestionSettingName'])?false:sx_['generalQuestionSettingName'], + }, + { - field : 'generalQuestionSettingName', - title : '题目-名称', + field : 'generalQuestionSettingSchoolClassIdsText', + title : '班级', align:"center", hideField :false, - hide:$.isEmpty(sx_['generalQuestionSettingName'])?false:sx_['generalQuestionSettingName'], + hide:$.isEmpty(sx_['generalQuestionSettingSchoolClassIdsText'])?false:sx_['generalQuestionSettingSchoolClassIdsText'], }, { - field : 'generalQuestionStartTime', - title : '题目开始时间', + field : 'generalQuestionSettingDoCount', + title : '作答次数', align:"center", hideField :false, - hide:$.isEmpty(sx_['generalQuestionStartTime'])?false:sx_['generalQuestionStartTime'], + hide:$.isEmpty(sx_['generalQuestionSettingDoCount'])?false:sx_['generalQuestionSettingDoCount'], }, + + { - field : 'generalQuestionEndTime', - title : '题目结束时间', + field : 'generalQuestionStartTime', + width:320, + title : '题目时间', align:"center", hideField :false, - hide:$.isEmpty(sx_['generalQuestionEndTime'])?false:sx_['generalQuestionEndTime'], + hide:$.isEmpty(sx_['generalQuestionStartTime'])?false:sx_['generalQuestionStartTime'], + templet:function (d) { + var htm = d.generalQuestionStartTime+' ~ '+d.generalQuestionEndTime; + return htm + } }, { field : 'generalQuestionSettingTypeText', @@ -132,13 +150,7 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) { hideField :false, hide:$.isEmpty(sx_['generalQuestionSettingRequire'])?false:sx_['generalQuestionSettingRequire'], }, - { - field : 'generalQuestionSettingFile', - title : '附件,老师上传附件(单文件)', - align:"center", - hideField :false, - hide:$.isEmpty(sx_['generalQuestionSettingFile'])?false:sx_['generalQuestionSettingFile'], - }, + { field : 'generalQuestionSettingPushStatusText', //数据字典类型为 global_push_status title : '发布状态', @@ -146,34 +158,6 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) { hideField :false, hide:$.isEmpty(sx_['generalQuestionSettingPushStatusText'])?false:sx_['generalQuestionSettingPushStatusText'], }, - { - field : 'generalQuestionSettingStatusText', //数据字典类型为 global_status - title : '状态', - align:"center", - hideField :false, - hide:$.isEmpty(sx_['generalQuestionSettingStatusText'])?false:sx_['generalQuestionSettingStatusText'], - }, - { - field : 'generalQuestionSettingAddTime', - title : '创建时间', - align:"center", - hideField :false, - hide:$.isEmpty(sx_['generalQuestionSettingAddTime'])?false:sx_['generalQuestionSettingAddTime'], - }, - /*{ - field : 'orgId', - title : '组织ID', - align:"center", - hideField :false, - hide:$.isEmpty(sx_['orgId'])?false:sx_['orgId'], - }, - { - 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 = ''; diff --git a/web/src/main/resources/templates/jlw/generalQuestionSetting/add.html b/web/src/main/resources/templates/jlw/generalQuestionSetting/add.html index 2b0df673..cdd37344 100644 --- a/web/src/main/resources/templates/jlw/generalQuestionSetting/add.html +++ b/web/src/main/resources/templates/jlw/generalQuestionSetting/add.html @@ -1,5 +1,20 @@ +
@@ -270,37 +285,35 @@
--> - -
-