From 65d05b38cda7730e66d3f08fc986e1c794bb4630 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A7=9A=E4=B8=B9ab?= <1421553879@qq.com>
Date: Wed, 28 Jun 2023 00:51:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../resources/static/js/jlw/handsOn/index.js | 4 +-
.../static/js/jlw/resourcesInfo/index.js | 43 +++++++++----------
2 files changed, 22 insertions(+), 25 deletions(-)
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 87857dc5..2af35ce4 100644
--- a/web/src/main/resources/static/js/jlw/handsOn/index.js
+++ b/web/src/main/resources/static/js/jlw/handsOn/index.js
@@ -87,9 +87,9 @@ layui.define(['form', 'laydate', 'table'], function (exports) {
width: 260,
templet: function (d) {
var css = isAdmin? "" : "display: none;";
- var htm = '';
+ var htm = '<div style="text-align:left">';
if(d.dataType == 'ADMIN_ADD'){
- htm += '<div style="text-align:left"><a class="layui-table-link" lay-event="up" data-item="${JSON.stringify(d)}" >上架</a>'
+ htm += '<a class="layui-table-link" lay-event="up" data-item="${JSON.stringify(d)}" >上架</a>'
+ '<a class="layui-table-link" lay-event="drown" data-item="${JSON.stringify(d)}" style="color: #bebebe!important">下架</a>';
}
diff --git a/web/src/main/resources/static/js/jlw/resourcesInfo/index.js b/web/src/main/resources/static/js/jlw/resourcesInfo/index.js
index 8a760318..622e39b9 100644
--- a/web/src/main/resources/static/js/jlw/resourcesInfo/index.js
+++ b/web/src/main/resources/static/js/jlw/resourcesInfo/index.js
@@ -34,20 +34,18 @@ layui.define(['form', 'laydate', 'table'], function (exports) {
courseInfoParentId: courseInfoId,
courseInfoType:courseInfoType,
sourceType:sourceType
- }).data;//获取课程数据
+ }).data;//获取课程章节数据
return data
}
currentAuthCourseInfoDetails.forEach(function(e,i){
- if(e.sourceType == 2 && isAdmin){
- if(e.courseLabelType == '考证课程类'){
- textualResearchCourseList.push(e);
- }else if(e.courseLabelType == '理论课程类'){
- theoryCourseList.push(e);
- }else if(e.courseLabelType == '应用课程类'){
- applicationCourseList.push(e);
- }
- }else if(e.sourceType == 1&&!isAdmin){
+ if(e.courseLabelType == '考证课程类'){
+ textualResearchCourseList.push(e);
+ }else if(e.courseLabelType == '理论课程类'){
+ theoryCourseList.push(e);
+ }else if(e.courseLabelType == '应用课程类'){
+ applicationCourseList.push(e);
+ }else if (e.courseLabelType == '院校'){
openCourseList.push(e)
}
});
@@ -72,7 +70,7 @@ layui.define(['form', 'laydate', 'table'], function (exports) {
selectList += htmY + '</optgroup>' + htmK + '</optgroup>' + htmL + '</optgroup>' + "</select>";
//console.log($("#isUser").val())
}else {
- selectList+= htmO + '</optgroup>' + "</select>";
+ selectList+= htmL + '</optgroup>' + htmO + '</optgroup>' + "</select>";
}
/*$.each(courseLabelTypes, function (key, value) {
@@ -108,12 +106,8 @@ layui.define(['form', 'laydate', 'table'], function (exports) {
type: 'checkbox'
},
{
- field: 'resourcesInfoName', title: '资源名称', align: "center", style: "text-align: left;",
- templet:function (d) {
- var htm = '<div style="overflow: hidden;text-overflow:ellipsis;">'+d.resourcesInfoName+'</div>';
- return htm;
-
- }
+ field: 'resourcesInfoName', title: '资源名称', align: "center",
+ style: "text-align: left;overflow: hidden;text-overflow:ellipsis;",
},
{
field: 'courseInfoParentParentName',
@@ -122,13 +116,14 @@ layui.define(['form', 'laydate', 'table'], function (exports) {
if((d.sourceType == 1 && !isAdmin)||(d.sourceType == 2 && isAdmin)){
return selectList; //一级
}else {
- var htm = '<div style="text-align: center;">'+d.courseInfoParentParentName||""+'</div>';
+ var htm = '<div style="text-align: center;overflow: hidden;text-overflow: ellipsis; white-space: nowrap;">'+d.courseInfoParentParentName||""+'</div>';
return htm;
}
}
},{
field: 'courseInfoParentName',
title: '归属章节',
+ style: "text-align: left;",
align: "center",
templet: function (d) {
if((d.sourceType == 1 && !isAdmin)||(d.sourceType == 2 && isAdmin)){
@@ -152,16 +147,17 @@ layui.define(['form', 'laydate', 'table'], function (exports) {
return htm + "</select>"; //二级
}
}else{
- var value = '';
+ var value = '<div style="overflow: hidden;text-overflow:ellipsis;">';
if(!$.isEmpty(d.courseInfoParentParentId)){
- value = d.courseInfoParentName||"";
+ value += d.courseInfoParentName||"";
}
+ value += "</div>"
return value;
}
}
},
{
- field: 'courseInfoName', title: '归属小节', align: "center", width: 200, templet: function (d) {
+ field: 'courseInfoName', title: '归属小节', align: "center", width: 200, style: "text-align: left;", templet: function (d) {
if((d.sourceType == 1 && !isAdmin)||(d.sourceType == 2 && isAdmin)){
var htm = "<select lay-filter='select_courseInfoIds_2'><option value=''>请选择</option>";
if (!$.isEmpty(d.courseInfoId)&&!$.isEmpty(d.courseInfoParentParentId)) {
@@ -184,10 +180,11 @@ layui.define(['form', 'laydate', 'table'], function (exports) {
return htm + "</select>"; //三级
}
}else{
- var value = '';
+ var value = '<div style="overflow: hidden;text-overflow:ellipsis;">';
if(!$.isEmpty(d.courseInfoParentParentId)){
- value = d.courseInfoName||"";
+ value += d.courseInfoName||"";
}
+ value += "</div>"
return value;
}
}