tianzeOrg
/
tianze-pro
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

课程实操-参数bug

Browse Source
beetlsql3-dev
姚丹ab 2 years ago
parent 9072b7385d
commit d652b741a3
5 changed files with 39 additions and 14 deletions
Show Stats Download Patch File Download Diff File

9
web/src/main/resources/static/js/jlw/handsOnSimulationTasks/add.js
Unescape Escape View File

@ -313,6 +313,13 @@ layui.define([ 'form','laytpl', 'laydate', 'table','element','handsOnSimulationT
});
});
resourcesQuestionTable= function(){
var isAdmin = '${user.get().isAdmin}'
var addType;
if(isAdmin){
addType = 'ADMIN_ADD';
}else {
addType = 'FACULTY_ADD';
}
resourcesQuestionTable1=table.render({
elem: '#resourcesQuestionTable',
cellMinWidth: 100,
@ -322,7 +329,7 @@ layui.define([ 'form','laytpl', 'laydate', 'table','element','handsOnSimulationT
url: Common.ctxPath + '/jlw/resourcesQuestion/list.json' // 数据接口
, page: Lib.tablePage // 开启分页
, limit: 8
, where: {"courseInfoParentId": courseInfoIds}
, where: {"courseInfoParentId": courseInfoIds,'addType':addType}
,cols: [[ // 表头
{
type: 'checkbox', align: "center"

4
web/src/main/resources/static/js/jlw/resourcesInfo/index.js
Unescape Escape View File

@ -215,9 +215,9 @@ layui.define(['form', 'laydate', 'table'], function (exports) {
}
// htm += '<a class="layui-table-link" lay-event="previewPage" >' + (d.resourcesInfoType == 3 ? '下载' : '预览') + '</a>';
if(d.resourcesInfoType == 4){
htm += '<a class="layui-table-link" href="'+d.resourcesInfoContent+'" target="_blank" >预览</a>';
htm += '<a class="layui-table-link" href="'+d.resourcesInfoContent+'" target="_blank" >查看</a>';
}else {
htm += '<a class="layui-table-link" lay-event="previewPage" >预览</a>';
htm += '<a class="layui-table-link" lay-event="previewPage" >查看</a>';
}
if((d.sourceType == 1 && !isAdmin)||(d.sourceType == 2 && isAdmin)){
htm += '<a class="layui-table-link" lay-event="del">删除</a>';

26
web/src/main/resources/static/js/jlw/resourcesQuestion/index.js
Unescape Escape View File

@ -49,7 +49,14 @@ layui.define(['form', 'laydate', 'table'], function (exports) {
},
{
field: 'addTypeText',
title: '题库来源', align: "center"
title: '题库来源', align: "center",
templet:function (d) {
var htm = d.addTypeText
if(!isAdmin && d.sourceType == "1"){
htm = "院校添加"
}
return htm;
}
},
/*{
field: 'orgIdText',
@ -66,23 +73,23 @@ layui.define(['form', 'laydate', 'table'], function (exports) {
{
field: 'userId', title: '操作', align: "center", width: 220, style:"text-align: left", templet: function (d) {
let htm = "";
/*if((d.sourceType == '2' && isAdmin) || (d.sourceType == '1' && !isAdmin)){
if(((d.sourceType == '2'||d.addType == 'ADMIN_ADD' ) && isAdmin) || ((d.sourceType == '1'||d.addType == 'FACULTY_ADD' ) && !isAdmin)){
htm +='<a class="layui-table-link" lay-event="up" data-item="${JSON.stringify(d)}" >上架</a>\n'
+'<a class="layui-table-link" lay-event="down" data-item="${JSON.stringify(d)}" style="color: #bebebe!important">下架</a>'
+'<a class="layui-table-link" lay-event="edit">编辑</a>\n'
+'<a class="layui-table-link" lay-event="del">删除</a>';
}else{
htm += '<a class="layui-table-link" lay-event="edit">查看</a>';
}*/
console.log(d.sourceType == '2' )
if(((d.sourceType == '2'||d.addType == 'ADMIN_ADD' ) && isAdmin)){
}
/*if(((d.sourceType == '2'||d.addType == 'ADMIN_ADD' ) && isAdmin)){
htm +='<a class="layui-table-link" lay-event="up" data-item="${JSON.stringify(d)}" >上架</a>\n'
+'<a class="layui-table-link" lay-event="down" data-item="${JSON.stringify(d)}" style="color: #bebebe!important">下架</a>'
+'<a class="layui-table-link" lay-event="edit">编辑</a>\n'
+'<a class="layui-table-link" lay-event="del">删除</a>';
}else if(((d.sourceType == '2'||d.addType == 'ADMIN_ADD') && !isAdmin)){
htm += '<a class="layui-table-link" lay-event="edit">查看</a>';
}
}*/
// TODO 上下架前端逻辑待开发
return htm;
@ -214,7 +221,12 @@ layui.define(['form', 'laydate', 'table'], function (exports) {
}, initTableTool: table.on('tool(resourcesQuestionTable)', function (obj) {
var data = obj.data;
if (obj.event === 'edit') {
var url = "/jlw/resourcesQuestion/add.do?resourcesQuestionId=" + data.resourcesQuestionId;
var url = '';
if((data.sourceType == '2'||data.addType == 'ADMIN_ADD' )){
url = "/jlw/resourcesQuestion/add.do?resourcesQuestionId=" + data.resourcesQuestionId;
}else if ((data.sourceType == '1'||data.addType == 'FACULTY_ADD' )) {
url = '/jlw/teacherOpenCourseMergeResourcesQuestion'
}
Common.openDlg(url, "题库管理/编辑题目");
} else if (obj.event === "del") {
allDelete(data.resourcesQuestionId);

8
web/src/main/resources/templates/jlw/courseInfo/index.html
Unescape Escape View File

@ -25,6 +25,12 @@ type="course_label.course_label_name.course_label_status=1,${user.get().isAdmin
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">课程来源：</label>
<div class="layui-input-inline">
<input type="text" name="userName" class="layui-input" >
</div>
</div>
<!--<div class="layui-inline">
<label class="layui-form-label">课程来源：</label>
<div class="layui-input-inline">
<select name="sourceType" lay-verify="required">
@ -33,7 +39,7 @@ type="course_label.course_label_name.course_label_status=1,${user.get().isAdmin
<option value="1">院校添加</option>
</select>
</div>
</div>
</div>-->
<!-- course_label.course_label_name.course_label_status=1-->
</layui:searchForm>

6
web/src/main/resources/templates/jlw/resourcesQuestion/index.html
Unescape Escape View File

@ -59,10 +59,10 @@
<div class="layui-inline">
<label class="layui-form-label">试题来源：</label>
<div class="layui-input-block">
<select name="addType" lay-filter="selectHandsOnFrom">
<select name="sourceType" lay-filter="selectHandsOnFrom">
<option value="">请选择</option>
<option value="ADMIN_ADD">系统内置</option>
<option value="FACULTY_ADD">院校添加</option>
<option value="2">系统内置</option>
<option value="1">院校添加</option>
</select>
</div>
</div>

Write Preview
Loading…
Cancel
Save