font-class 引用
@@ -640,6 +655,22 @@-
+
-
+
+ 云上传+#layui-extend-yunshangchuan1+
+
+
-
+
+ 云上传-copy+#layui-extend-yunshangchuan1-copy+
+
- -
-
-
- 219上传、导出-copy-#layui-extend-shangchuandaochu-copy1-
-
Symbol 引用
diff --git a/admin-core/src/main/resources/static/plugins/layui/css/modules/layui-icon-extend/iconfont.css b/admin-core/src/main/resources/static/plugins/layui/css/modules/layui-icon-extend/iconfont.css index 665a192c..bb9f07b2 100644 --- a/admin-core/src/main/resources/static/plugins/layui/css/modules/layui-icon-extend/iconfont.css +++ b/admin-core/src/main/resources/static/plugins/layui/css/modules/layui-icon-extend/iconfont.css @@ -2,9 +2,9 @@ font-family: "iconfont"; /* Project id 3695701 */ /* Color fonts */ src: - url('iconfont.woff2?t=1665674720756') format('woff2'), - url('iconfont.woff?t=1665674720756') format('woff'), - url('iconfont.ttf?t=1665674720756') format('truetype'); + url('iconfont.woff2?t=1665730790888') format('woff2'), + url('iconfont.woff?t=1665730790888') format('woff'), + url('iconfont.ttf?t=1665730790888') format('truetype'); } .iconfont { @@ -15,6 +15,14 @@ -moz-osx-font-smoothing: grayscale; } +.layui-extend-yunshangchuan1:before { + content: "\e600"; +} + +.layui-extend-yunshangchuan1-copy:before { + content: "\ebca"; +} + .layui-extend-piliangdaoru:before { content: "\e61d"; } @@ -144,10 +152,6 @@ } .layui-extend-shangchuandaochu-copy:before { - content: "\ebca"; -} - -.layui-extend-shangchuandaochu-copy1:before { content: "\e8c7"; } diff --git a/admin-core/src/main/resources/static/plugins/layui/css/modules/layui-icon-extend/iconfont.js b/admin-core/src/main/resources/static/plugins/layui/css/modules/layui-icon-extend/iconfont.js index ed606e4f..a63a108e 100644 --- a/admin-core/src/main/resources/static/plugins/layui/css/modules/layui-icon-extend/iconfont.js +++ b/admin-core/src/main/resources/static/plugins/layui/css/modules/layui-icon-extend/iconfont.js @@ -1 +1 @@ -window._iconfont_svg_string_3695701='',function(h){var l=(l=document.getElementsByTagName("script"))[l.length-1],c=l.getAttribute("data-injectcss"),l=l.getAttribute("data-disable-injectsvg");if(!l){var a,t,i,e,v,f=function(l,c){c.parentNode.insertBefore(l,c)};if(c&&!h.__iconfont__svg__cssinject__){h.__iconfont__svg__cssinject__=!0;try{document.write("")}catch(l){console&&console.log(l)}}a=function(){var l,c=document.createElement("div");c.innerHTML=h._iconfont_svg_string_3695701,(c=c.getElementsByTagName("svg")[0])&&(c.setAttribute("aria-hidden","true"),c.style.position="absolute",c.style.width=0,c.style.height=0,c.style.overflow="hidden",c=c,(l=document.body).firstChild?f(c,l.firstChild):l.appendChild(c))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(a,0):(t=function(){document.removeEventListener("DOMContentLoaded",t,!1),a()},document.addEventListener("DOMContentLoaded",t,!1)):document.attachEvent&&(i=a,e=h.document,v=!1,d(),e.onreadystatechange=function(){"complete"==e.readyState&&(e.onreadystatechange=null,o())})}function o(){v||(v=!0,i())}function d(){try{e.documentElement.doScroll("left")}catch(l){return void setTimeout(d,50)}o()}}(window); \ No newline at end of file +window._iconfont_svg_string_3695701='',function(h){var l=(l=document.getElementsByTagName("script"))[l.length-1],c=l.getAttribute("data-injectcss"),l=l.getAttribute("data-disable-injectsvg");if(!l){var a,t,i,e,f,v=function(l,c){c.parentNode.insertBefore(l,c)};if(c&&!h.__iconfont__svg__cssinject__){h.__iconfont__svg__cssinject__=!0;try{document.write("")}catch(l){console&&console.log(l)}}a=function(){var l,c=document.createElement("div");c.innerHTML=h._iconfont_svg_string_3695701,(c=c.getElementsByTagName("svg")[0])&&(c.setAttribute("aria-hidden","true"),c.style.position="absolute",c.style.width=0,c.style.height=0,c.style.overflow="hidden",c=c,(l=document.body).firstChild?v(c,l.firstChild):l.appendChild(c))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(a,0):(t=function(){document.removeEventListener("DOMContentLoaded",t,!1),a()},document.addEventListener("DOMContentLoaded",t,!1)):document.attachEvent&&(i=a,e=h.document,f=!1,d(),e.onreadystatechange=function(){"complete"==e.readyState&&(e.onreadystatechange=null,o())})}function o(){f||(f=!0,i())}function d(){try{e.documentElement.doScroll("left")}catch(l){return void setTimeout(d,50)}o()}}(window); \ No newline at end of file diff --git a/admin-core/src/main/resources/static/plugins/layui/css/modules/layui-icon-extend/iconfont.json b/admin-core/src/main/resources/static/plugins/layui/css/modules/layui-icon-extend/iconfont.json index 66348046..9bfb02e7 100644 --- a/admin-core/src/main/resources/static/plugins/layui/css/modules/layui-icon-extend/iconfont.json +++ b/admin-core/src/main/resources/static/plugins/layui/css/modules/layui-icon-extend/iconfont.json @@ -5,6 +5,20 @@ "css_prefix_text": "layui-extend-", "description": "", "glyphs": [ + { + "icon_id": "952", + "name": "云上传", + "font_class": "yunshangchuan1", + "unicode": "e600", + "unicode_decimal": 58880 + }, + { + "icon_id": "32302388", + "name": "云上传-copy", + "font_class": "yunshangchuan1-copy", + "unicode": "ebca", + "unicode_decimal": 60362 + }, { "icon_id": "31313006", "name": "批量导入", @@ -229,17 +243,10 @@ "unicode": "e8c6", "unicode_decimal": 59590 }, - { - "icon_id": "32263174", - "name": "219上传、导出-copy", - "font_class": "shangchuandaochu-copy", - "unicode": "ebca", - "unicode_decimal": 60362 - }, { "icon_id": "32211721", "name": "219上传、导出-copy", - "font_class": "shangchuandaochu-copy1", + "font_class": "shangchuandaochu-copy", "unicode": "e8c7", "unicode_decimal": 59591 } diff --git a/admin-core/src/main/resources/static/plugins/layui/css/modules/layui-icon-extend/iconfont.ttf b/admin-core/src/main/resources/static/plugins/layui/css/modules/layui-icon-extend/iconfont.ttf index 5c9fa151..d27c6f24 100644 Binary files a/admin-core/src/main/resources/static/plugins/layui/css/modules/layui-icon-extend/iconfont.ttf and b/admin-core/src/main/resources/static/plugins/layui/css/modules/layui-icon-extend/iconfont.ttf differ diff --git a/admin-core/src/main/resources/static/plugins/layui/css/modules/layui-icon-extend/iconfont.woff b/admin-core/src/main/resources/static/plugins/layui/css/modules/layui-icon-extend/iconfont.woff index a12d81ff..0305b581 100644 Binary files a/admin-core/src/main/resources/static/plugins/layui/css/modules/layui-icon-extend/iconfont.woff and b/admin-core/src/main/resources/static/plugins/layui/css/modules/layui-icon-extend/iconfont.woff differ diff --git a/admin-core/src/main/resources/static/plugins/layui/css/modules/layui-icon-extend/iconfont.woff2 b/admin-core/src/main/resources/static/plugins/layui/css/modules/layui-icon-extend/iconfont.woff2 index 1a898b02..8e1dbd16 100644 Binary files a/admin-core/src/main/resources/static/plugins/layui/css/modules/layui-icon-extend/iconfont.woff2 and b/admin-core/src/main/resources/static/plugins/layui/css/modules/layui-icon-extend/iconfont.woff2 differ diff --git a/web/src/main/resources/static/js/jlw/resourcesCompetition/index.js b/web/src/main/resources/static/js/jlw/resourcesCompetition/index.js index 5e9092f1..5b7bfb36 100644 --- a/web/src/main/resources/static/js/jlw/resourcesCompetition/index.js +++ b/web/src/main/resources/static/js/jlw/resourcesCompetition/index.js @@ -1,97 +1,107 @@ -layui.define([ 'form', 'laydate', 'table' ], function(exports) { +layui.define(['form', 'laydate', 'table'], function (exports) { var form = layui.form; var laydate = layui.laydate; var table = layui.table; var resourcesCompetitionTable = null; - var view ={ - init:function(){ + var view = { + init: function () { this.initTable(); this.initSearchForm(); this.initToolBar(); - window.dataReload = function(){ - Lib.doSearchForm($("#searchForm"),resourcesCompetitionTable) + window.dataReload = function () { + Lib.doSearchForm($("#searchForm"), resourcesCompetitionTable) } }, - initTable:function(){ + initTable: function () { resourcesCompetitionTable = table.render({ - elem : '#resourcesCompetitionTable', - height : Lib.getTableHeight(), + elem: '#resourcesCompetitionTable', + height: Lib.getTableHeight(), cellMinWidth: 100, - method : 'post', - even:true, - size:"lg", - url : Common.ctxPath + '/jlw/resourcesCompetition/list.json' // 数据接口 - ,page : Lib.tablePage // 开启分页 - ,limit : 10, - cols : [ [ // 表头 + method: 'post', + even: true, + size: "lg", + url: Common.ctxPath + '/jlw/resourcesCompetition/list.json' // 数据接口 + , page: Lib.tablePage // 开启分页 + , limit: 10, + cols: [[ // 表头 { - type : 'checkbox', + type: 'checkbox', }, - { - field : 'resourcesCompetitionName', - title : '竞赛案例名称',align:"center" - }, - { - field : 'courseInfoParentName', - title : '归属课程',align:"center" - }, - { - field : 'courseInfoName', - title : '归属章节',align:"center" - }, - { - field : 'userId',title : '操作',align:"center", templet: function (d) { - var htm = ''; - htm += ''; - htm += ''; - return htm; + { + field: 'resourcesCompetitionName', + title: '编程竞赛案例名称', align: "center" + }, + { + field: 'courseInfoParentName', + title: '归属课程', align: "center" + }, + { + field: 'courseInfoName', + title: '归属章节', align: "center" + }, + { + field: 'questionStatus', width: 80, + title: '状态', align: "center", templet: function (d) { + return d.questionStatus === '1' + ? '已上架' + : '已下架' + } + }, + { + field: 'userId', title: '操作', align: "center", templet: function (d) { + var htm = '上架'; + htm += '下架'; + htm += '编辑'; + htm += '添加步骤'; + htm += '删除'; + return htm; + } } - } - ] ] + ]] - }); + }); - table.on('checkbox(resourcesCompetitionTable)', function(obj){ + table.on('checkbox(resourcesCompetitionTable)', function (obj) { var resourcesCompetition = obj.data; - if(obj.checked){ + if (obj.checked) { //按钮逻辑Lib.buttonEnable() - }else{ + } else { } }) }, - initSearchForm:function(){ - Lib.initSearchForm( $("#searchForm"),resourcesCompetitionTable,form); + initSearchForm: function () { + Lib.initSearchForm($("#searchForm"), resourcesCompetitionTable, form); }, - initToolBar:function(){ + initToolBar: function () { toolbar = { - add : function() { // 获取选中数据 + add: function () { // 获取选中数据 var url = "/jlw/resourcesCompetition/add.do"; - Common.openDlg(url,"竞赛案例管理/新增竞赛案例"); + Common.openDlg(url, "编程竞赛案例管理/新增竞赛案例"); }, refresh: function () {//刷新 searchForm.reset(); Lib.doSearchForm($("#searchForm"), resourcesCompetitionTable, 1); }, - search:function () { + search: function () { Lib.doSearchForm($("#searchForm"), resourcesCompetitionTable, 1); } - }; - $('.ext-toolbar').on('click', function() { + }; + $('.ext-toolbar').on('click', function () { var type = $(this).data('type'); toolbar[type] ? toolbar[type].call(this) : ''; }); }, initTableTool: table.on('tool(resourcesCompetitionTable)', function (obj) { var data = obj.data; if (obj.event === 'edit') { - var url = "/jlw/resourcesCompetition/add.do?resourcesCompetitionId="+data.resourcesCompetitionId; - Common.openDlg(url,"竞赛案例管理/编辑竞赛案例"); - }else if(obj.event === 'editStep') { - var url = "/jlw/resourcesCompetition/add.do?resourcesCompetitionId="+data.resourcesCompetitionId+"&sign=1"; - Common.openDlg(url,"竞赛案例管理/编辑竞赛案例"); - }else if(obj.event === "del"){ + var url = "/jlw/resourcesCompetition/add.do?resourcesCompetitionId=" + data.resourcesCompetitionId; + Common.openDlg(url, "编程竞赛案例管理/编辑竞赛案例"); + } else if (obj.event === 'editStep') { + var url = "/jlw/resourcesCompetition/add.do?resourcesCompetitionId=" + data.resourcesCompetitionId + "&sign=1"; + Common.openDlg(url, "编程竞赛案例管理/编辑竞赛案例"); + } else if (obj.event === "del") { layer.confirm('是否确定删除该信息?', function (index) { var ret = Common.postAjax("/jlw/resourcesCompetition/delete.json", {ids: data.resourcesCompetitionId}); layer.msg(ret.code == 0 ? "删除成功!" : ret.msg, { @@ -104,12 +114,25 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) { } }); }); - }else if(obj.event === "addStep"){//添加步骤 - var url = "/jlw/resourcesCompetitionStep/add.do?resourcesCompetitionId="+data.resourcesCompetitionId; - Common.openDlg(url,""); + } else if (obj.event === "addStep") {//添加步骤 + var url = "/jlw/resourcesCompetitionStep/add.do?resourcesCompetitionId=" + data.resourcesCompetitionId; + Common.openDlg(url, ""); + } else if (obj.event === "up") { + alert('up') + } else if (obj.event === "down") { + alert('down') } }) - } - exports('index',view); + }; + //选择归属课程 并且根据选择的课程查询章节 resourcesQuestionIdsIsNotNull:查询题目不为空的章节 + form.on('select(select_courseInfoIds)', function (obj) { + Lib.getCourseInfo($("select[name='courseInfoId_1']"), obj.value, 1); + }); + + //选择归属课程 并且根据选择的课程查询章节 + form.on('select(select_courseInfoIds_)', function (obj) { + Lib.getCourseInfo($("select[name='courseInfoId_2']"), obj.value); + }); + exports('index', view); }); \ No newline at end of file diff --git a/web/src/main/resources/static/js/jlw/resourcesTraining/index.js b/web/src/main/resources/static/js/jlw/resourcesTraining/index.js index f3bcc13d..5382dc76 100644 --- a/web/src/main/resources/static/js/jlw/resourcesTraining/index.js +++ b/web/src/main/resources/static/js/jlw/resourcesTraining/index.js @@ -30,7 +30,7 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) { { field : 'resourcesTrainingName', - title : '案例名称',align:"center" + title : '编程实训案例名称',align:"center" }, { field : 'courseInfoParentName', @@ -39,12 +39,22 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) { { field : 'courseInfoName', title : '归属章节',align:"center" - } - ,{ + }, + { + field: 'questionStatus', width: 80, + title: '状态', align: "center", templet: function (d) { + return d.questionStatus === '1' + ? '已上架' + : '已下架' + } + }, + { field : 'userId',title : '操作',align:"center", templet: function (d) { - var htm = ''; - htm += ''; - htm += ''; + var htm = '上架'; + htm += '下架'; + htm += '编辑'; + htm += '添加步骤'; + htm += '删除'; return htm; } } @@ -105,9 +115,25 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) { } }); }); + } else if (obj.event === "addStep") {//添加步骤 + var url = "/jlw/resourcesCompetitionStep/add.do?resourcesCompetitionId=" + data.resourcesCompetitionId; + Common.openDlg(url, ""); + } else if (obj.event === "up") { + alert('up') + } else if (obj.event === "down") { + alert('down') } }) - } + }; + //选择归属课程 并且根据选择的课程查询章节 resourcesQuestionIdsIsNotNull:查询题目不为空的章节 + form.on('select(select_courseInfoIds)', function (obj) { + Lib.getCourseInfo($("select[name='courseInfoId_1']"), obj.value, 1); + }); + + //选择归属课程 并且根据选择的课程查询章节 + form.on('select(select_courseInfoIds_)', function (obj) { + Lib.getCourseInfo($("select[name='courseInfoId_2']"), obj.value); + }); exports('index',view); }); \ No newline at end of file diff --git a/web/src/main/resources/templates/jlw/resourcesCompetition/add.html b/web/src/main/resources/templates/jlw/resourcesCompetition/add.html index db836972..7a7ad607 100644 --- a/web/src/main/resources/templates/jlw/resourcesCompetition/add.html +++ b/web/src/main/resources/templates/jlw/resourcesCompetition/add.html @@ -96,7 +96,7 @@ ondrop="jQuery(this).removeClass('uploader-dragover');"> - + diff --git a/web/src/main/resources/templates/jlw/resourcesCompetition/index.html b/web/src/main/resources/templates/jlw/resourcesCompetition/index.html index c9139c81..c57f9664 100644 --- a/web/src/main/resources/templates/jlw/resourcesCompetition/index.html +++ b/web/src/main/resources/templates/jlw/resourcesCompetition/index.html @@ -1,30 +1,51 @@
+
+
+
+
+
+
+
+
+
+
+
- 搜索
- 新增
- 批量删除
- 刷新
+
+ 新增
+
+ 批量删除
+
+ 刷新
+
+
+
+
+
+
+
+
+
+
+
+
- 搜索
+
新增
- 批量删除
+ 批量删除
刷新