From 1cb28b8dc56ed6cc7a55f5500f5121122c6bd1a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A7=9A=E4=B8=B9ab?= <1421553879@qq.com>
Date: Thu, 13 Jul 2023 17:11:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../resources/static/js/jlw/handsOn/add.js | 4 +++
.../resources/static/js/jlw/handsOn/index.js | 35 +++++++++++--------
.../static/js/jlw/resourcesInfo/add.js | 2 +-
.../resources/templates/jlw/handsOn/add.html | 2 +-
4 files changed, 26 insertions(+), 17 deletions(-)
diff --git a/web/src/main/resources/static/js/jlw/handsOn/add.js b/web/src/main/resources/static/js/jlw/handsOn/add.js
index 4a3a3acc..90cb148f 100644
--- a/web/src/main/resources/static/js/jlw/handsOn/add.js
+++ b/web/src/main/resources/static/js/jlw/handsOn/add.js
@@ -84,7 +84,11 @@ layui.define(['form', 'laydate', 'table','laytpl','upload','layedit', 'handsOnAp
}
param.handsOnRecommend = layedit.getContent(one);
handsOnId = $("#addForm input[name='handsOnId']").val();
+
var url = "/jlw/handsOn/add.json";
+ if($.isEmpty(handsOnId)){
+ param.handsOnStatus = 1;
+ }
if (!$.isEmpty(handsOnId)) {
url = "/jlw/handsOn/edit.json";
}
diff --git a/web/src/main/resources/static/js/jlw/handsOn/index.js b/web/src/main/resources/static/js/jlw/handsOn/index.js
index 1ebac967..8905e2c0 100644
--- a/web/src/main/resources/static/js/jlw/handsOn/index.js
+++ b/web/src/main/resources/static/js/jlw/handsOn/index.js
@@ -101,11 +101,15 @@ layui.define(['form', 'laydate', 'table'], function (exports) {
templet: function (d) {
var css = isAdmin? "" : "display: none;";
var htm = '<div style="text-align:left">';
- if(d.handsOnStatus === 1){
- htm+= '<a class="layui-table-link" lay-event="drown" data-item="${JSON.stringify(d)}" style="color: #bebebe!important">下架</a>';
- }else if (d.handsOnStatus === 2) {
- htm += '<a class="layui-table-link" lay-event="up" data-item="${JSON.stringify(d)}" >上架</a>';
+
+ if(!(!isAdmin && d.dataType == 'ADMIN_ADD')){
+ if(d.handsOnStatus === 1){
+ htm+= '<a class="layui-table-link" lay-event="drown" data-item="${JSON.stringify(d)}" style="color: #bebebe!important">下架</a>';
+ }else if (d.handsOnStatus === 2) {
+ htm += '<a class="layui-table-link" lay-event="up" data-item="${JSON.stringify(d)}" >上架</a>';
+ }
}
+
// htm += '<a class="layui-table-link" lay-event="edit"style="' + css + '">编辑</a>';
htm += '<a class="layui-table-link" lay-event="edit">'+ ((d.dataType == 'FACULTY_ADD' && !isAdmin)||(d.dataType == 'ADMIN_ADD' && isAdmin)?'编辑':'查看')+'</a>';
if((d.dataType == 'FACULTY_ADD' && !isAdmin)||(d.dataType == 'ADMIN_ADD' && isAdmin)){
@@ -129,11 +133,11 @@ layui.define(['form', 'laydate', 'table'], function (exports) {
/*btnDrown.addClass("button-disabled");
btnUp.addClass("button-disabled");*/
btnDell.addClass("button-disabled");
- Common.info("禁止 '删除' 系统内置的课程实训案例");
+ Common.info("禁止 '删除' 院校添加的课程实训案例");
}
if(!isAdmin&& handsOn.dataType == "ADMIN_ADD"){
btnDell.addClass("button-disabled");
- Common.info("禁止 '删除' 院校添加的课程实训案例");
+ Common.info("禁止 '删除' 系统内置的课程实训案例");
}
} else {
var isFalse = true;
@@ -148,13 +152,7 @@ layui.define(['form', 'laydate', 'table'], function (exports) {
})
}
if(isFalse){
- if(isAdmin){
- btnDrown.removeClass("button-disabled");
- btnUp.removeClass("button-disabled");
- btnDell.removeClass("button-disabled");
- }else {
- btnDell.removeClass("button-disabled");
- }
+ btnDell.removeClass("button-disabled");
}
}
})
@@ -204,7 +202,7 @@ layui.define(['form', 'laydate', 'table'], function (exports) {
}
});
if(isFalse && !isAdmin){
- Common.openConfirm("确认要删除这些教师开课-课程实操?",function(){
+ Common.openConfirm("确认要删除这些教师开课-课程实训?",function(){
var ids = Common.concatBatchId(data,"handsOnId");
Common.post("/jlw/teacherOpenCourseHandsOn/delete.json",{"ids":ids},function(){
Common.info("删除成功");
@@ -281,7 +279,14 @@ layui.define(['form', 'laydate', 'table'], function (exports) {
Common.openDlg(url, "实操成绩管理>编辑");
} else if (obj.event === "del") {
layer.confirm('是否确定删除该信息？', function (index) {
- var ret = Common.postAjax("/jlw/handsOn/delete.json", {ids: data.handsOnId});
+ var url = "";
+ var param ={ids: data.handsOnId};
+ if(data.dataType=="ADMIN_ADD"){
+ url = "/jlw/handsOn/delete.json";
+ }else if(data.dataType == "FACULTY_ADD"){
+ url = "/jlw/teacherOpenCourseHandsOn/manageDelete.json";
+ }
+ var ret = Common.postAjax(url, param);
layer.msg(ret.code == 0 ? "删除成功！" : ret.msg, {
offset: ['50%'],
icon: ret.code == 0 ? 1 : 2,
diff --git a/web/src/main/resources/static/js/jlw/resourcesInfo/add.js b/web/src/main/resources/static/js/jlw/resourcesInfo/add.js
index 34833e57..6f20c605 100644
--- a/web/src/main/resources/static/js/jlw/resourcesInfo/add.js
+++ b/web/src/main/resources/static/js/jlw/resourcesInfo/add.js
@@ -38,7 +38,7 @@ layui.define([ 'form', 'laydate', 'table','element','upload','resourcesInfoApi',
var chapterId = $("select[name='courseInfoId_1']").val();//章ID
var courseInfoId = $("select[name='courseInfoId_2']").val();//节ID
var resourcesInfoId = $("input[name='resourcesInfoId']").val();
- var resourcesInfoType = $("select[name='resourcesInfoType']").val(); // 资源类型(详细见数据字典，resources_info_type)
+ var resourcesInfoType = $("select[name='resourcesInfoType']").val(); //资源类型(详细见数据字典，resources_info_type)
var sourceType = 2;
var ret = "";
diff --git a/web/src/main/resources/templates/jlw/handsOn/add.html b/web/src/main/resources/templates/jlw/handsOn/add.html
index 2166eba7..59c372c1 100644
--- a/web/src/main/resources/templates/jlw/handsOn/add.html
+++ b/web/src/main/resources/templates/jlw/handsOn/add.html
@@ -154,7 +154,7 @@
<div class="layui-row" id="handsOnSimulationTasks" style="${handsOn.handsOnId != null?'':'display: none;'}">
<div>
<label class="layui-form-label">实训任务：</label>
- <div class="layui-input-block">
+ <div class="layui-input-block" style="display:none;">
<button type="button" class="layui-btn bg_button button_add" style="float: left"><i class="layui-icon"></i>
</button>
</div>