From b644c04b9ac29e8263c95d5a65784f88147d7a97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A7=9A=E4=B8=B9ab?= <1421553879@qq.com> Date: Fri, 2 Dec 2022 01:43:19 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=9A=E7=94=A8=E9=A2=98=E7=9B=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/templates/teacherIndex.html | 10 ++- .../query/GeneralQuestionSettingQuery.java | 4 +- .../js/jlw/generalQuestionSetting/add.js | 43 +++++++++- .../js/jlw/generalQuestionSetting/index.js | 20 ++--- .../teacherOpenCourseScheduleSession/add.js | 2 +- .../jlw/courseInfo/courseConfigureNew.html | 15 +++- .../jlw/generalQuestionSetting/add.html | 85 ++++++++++++++++++- .../jlw/generalQuestionSetting/index.html | 3 + 8 files changed, 158 insertions(+), 24 deletions(-) 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 = ''; htm += ''; 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 @@ - +
+
+
+ +
+ +
+
+
+
+ +
+
+
+
+ +
+
+
+
+
+
+
+
+
+ +
+ +
+
+
+
+
+
+
+ +
+ +
+ +
+ +
+
+
+ +
+ + +
+
+
+ +
+ + +
+
+ +
+
+
+
+
+
+
+ +
+ + +
+
+
+
+
+
+
+ +