+
{{ item.complete }}
+
@@ -304,14 +321,32 @@ export default {
const setStageList = (tableData) => {
let data = tableData;
let array = [];
- data.map((value) => {
+ //无阶段任务
+ if(data?.length ==1 && data[0].stageId ==0){
+ data.map((value) => {
let obj = {
- stageName: value.stageName,
- stageId: value.stageId,
+ stageName:"无阶段任务",
+ stageId:0,
+ remark:value.remark,
taskProcessList: taskProcessList(value.taskProcessList),
};
array.push(obj);
});
+ }else{ //有阶段
+ data.map((value) => {
+ let obj = {
+ stageName: value.stageName,
+ stageId: value.stageId,
+ remark:value.remark,
+ taskProcessList: taskProcessList(value.taskProcessList),
+ };
+ if(value.stageId >0){
+ array.push(obj);
+ }
+
+ });
+ }
+
state.stageList = array;
};
const check = () => {
@@ -444,6 +479,14 @@ export default {
color: rgba(51, 51, 51, 1);
font-size: 16px;
}
+
+ }
+ .mainbox {
+ // height: 463px;
+ margin-right: 37px;
+ margin-top: 32px;
+ //border: 1px solid rgba(221, 238, 255, 1);
+ //border-radius: 6px;
.rowbox {
width: 64px;
height: 24px;
@@ -453,6 +496,7 @@ export default {
margin-left: 24px;
border: 1px solid rgba(64, 158, 255, 1);
background: rgba(64, 158, 255, 0.1);
+ margin-right: 480px;
cursor: pointer;
.shuom {
color: rgba(64, 158, 255, 1);
@@ -461,13 +505,6 @@ export default {
margin-right: 5px;
}
}
- }
- .mainbox {
- // height: 463px;
- margin-right: 37px;
- margin-top: 32px;
- //border: 1px solid rgba(221, 238, 255, 1);
- //border-radius: 6px;
.ant-collapse {
background-color: #ffffff;
border: 0;
diff --git a/src/components/drawers/SelFacet.vue b/src/components/drawers/SelFacet.vue
index 4029a5ea..7638f33c 100644
--- a/src/components/drawers/SelFacet.vue
+++ b/src/components/drawers/SelFacet.vue
@@ -420,7 +420,7 @@ export default {
const getClassData = (tabledata) => {
let data = tabledata;
let array = [];
- let options = state.options2222;
+ // let options = state.options2222;
data.map((value) => {
let obj = {
key: value.offcourseId,
@@ -430,30 +430,31 @@ export default {
creator: value.createName || "-",
time: value.publishTime,
categoryId: value.categoryId,
- category: "",
+ category: changeTreeSelectValue(String(value.categoryId)),
//需要判断content
};
console.log("obj", obj);
- var breaked = false;
+ // var breaked = false;
+ // obj.category = changeTreeSelectValue(String(value.categoryId))
- for (let i = 0; i < options.length; i++) {
- for (let j = 0; j < options[i].children.length; j++) {
- if (
- String(options[i].children[j].value) ===
- String(obj.categoryId)
- ) {
- obj.category = changeTreeSelectValue(String(obj.categoryId))
- // console.log("obj.categoryId", obj.categoryId);
- // obj.category = options[i].children[j].title;
- // console.log("obj. obj.category ", obj.category);
- breaked = true;
- break;
- }
- }
- if (breaked) {
- break;
- }
- }
+ // for (let i = 0; i < options.length; i++) {
+ // for (let j = 0; j < options[i].children.length; j++) {
+ // if (
+ // String(options[i].children[j].value) ===
+ // String(obj.categoryId)
+ // ) {
+ // obj.category = changeTreeSelectValue(String(obj.categoryId))
+ // // console.log("obj.categoryId", obj.categoryId);
+ // // obj.category = options[i].children[j].title;
+ // // console.log("obj. obj.category ", obj.category);
+ // breaked = true;
+ // break;
+ // }
+ // }
+ // if (breaked) {
+ // break;
+ // }
+ // }
if (!obj.category) {
obj.category = "-";
}
diff --git a/src/components/student/TableStudent.vue b/src/components/student/TableStudent.vue
index 643be4e9..ddb5cd51 100644
--- a/src/components/student/TableStudent.vue
+++ b/src/components/student/TableStudent.vue
@@ -165,9 +165,10 @@ const tablecolumns = ref([
title: "姓名",
dataIndex: "studentName",
key: "studentName",
- width: "8%",
+ width: "12%",
align: "left",
className: "h",
+ ellipsis: true,
customRender: ({record: {studentName, topFlag}}) => (topFlag ?
+
+

+
课程简介:
diff --git a/src/views/courselibrary/courseModal.vue b/src/views/courselibrary/courseModal.vue
index ce32c060..cd18ec5c 100644
--- a/src/views/courselibrary/courseModal.vue
+++ b/src/views/courselibrary/courseModal.vue
@@ -283,7 +283,7 @@
课程大纲
-
+
diff --git a/src/views/examine/CourseReviewed.vue b/src/views/examine/CourseReviewed.vue
index 3faade8f..2e921375 100644
--- a/src/views/examine/CourseReviewed.vue
+++ b/src/views/examine/CourseReviewed.vue
@@ -217,7 +217,7 @@ export default {
width: "10%",
ellipsis: true,
customRender: (time) => {
- return
{time.record.time}
;
+ return
{time.record.time}
;
},
},
{
diff --git a/src/views/learningpath/LevelAddDetail.vue b/src/views/learningpath/LevelAddDetail.vue
index 93ce3488..67519f48 100644
--- a/src/views/learningpath/LevelAddDetail.vue
+++ b/src/views/learningpath/LevelAddDetail.vue
@@ -1490,7 +1490,8 @@ export default {
state.deleteModal = false;
})
.catch((err) => {
- message.error(err);
+ console.log(err)
+ // message.error(err);
});
};
@@ -1697,6 +1698,7 @@ export default {
deleteStudyTask({ routerTaskIds: state.deleteID })
.then((res) => {
state.deleteModal = false;
+ message.destroy();
message.success("删除成功");
state.selectRow = []; //选择行
state.selectAll = 0; //0:未选择,1:全选,2:部分选择
@@ -1704,6 +1706,7 @@ export default {
console.log("删除成功", res);
})
.catch((err) => {
+ message.destroy();
message.error("删除失败");
console.log(err);
});