diff --git a/src/api/indexTask.js b/src/api/indexTask.js index 10353d60..3edb30c3 100644 --- a/src/api/indexTask.js +++ b/src/api/indexTask.js @@ -16,3 +16,6 @@ export const ProjectDeleteTask = (obj) => http.delete('/admin/project/deleteTask export const IsExistence = (obj) => http.post('/admin/router/queryTaskDoesItExist',obj); // 判断当前在线课是否已经添加到该项目下 export const IsExistenceProject = (obj) => http.post('/admin/project/queryTaskDoesItExistForProject',obj); +// 判断当前在线课是否已经添加到该模板库下 +export const IsExistenceProjectTemplate = (obj) => http.post('/admin/project/template/queryTaskDoesItExistForTemplate',obj); + diff --git a/src/components/common/FJUpload.vue b/src/components/common/FJUpload.vue index 5701585b..574747db 100644 --- a/src/components/common/FJUpload.vue +++ b/src/components/common/FJUpload.vue @@ -24,7 +24,9 @@
- {{ item.name }} + + {{ item.name.indexOf('-')!==-1?item.name.slice(0,item.name.indexOf('-')) + item.name.slice(item.name.indexOf('.')) :item.name }} +
@@ -35,6 +37,7 @@ :class="`${{uploading: 'updatacolor3', done: 'updatacolor' ,error: 'updatacolor2'}[item.status] || 'updatacolor'}`" :style="{width:`${item.status==='uploading'?parseInt(item.percent):100}%`}">
{{ {uploading: '正在上传', done: '上传完成', error: '上传失败'}[item.status] || '' }}
diff --git a/src/components/drawers/AddInvist.vue b/src/components/drawers/AddInvist.vue index 847c115c..b8a200ad 100644 --- a/src/components/drawers/AddInvist.vue +++ b/src/components/drawers/AddInvist.vue @@ -105,7 +105,7 @@ import { reactive, toRefs } from "vue"; import * as apiTask from "../../api/indexTaskadd"; import { message } from "ant-design-vue"; import AssessmentList from "./ AssessmentList.vue"; -import { RouterEditTask } from "@/api/indexTask"; +import { RouterEditTask, IsExistence, IsExistenceProject} from "@/api/indexTask"; import * as api from "../../api/indexInvist"; import { addTempTask } from "../../api/indexTaskadd"; export default { @@ -222,43 +222,99 @@ export default { return message.warning("请选择评估"); } if (props.isLevel == 1) { - RouterEditTask({ - chapterId: props.isactive, + IsExistence({ + chapterId: Number(props.isactive), courseId: state.assessment.assessmentId, - name: state.assessment.name, routerId: props.routerId, - routerTaskId: props.routerTaskId || 0, type: 11, }) - .then(() => { - message.destroy(); - message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`); - ctx.emit("changeData", false); - closeDrawer(); - state.addLoading = false; + .then((res) => { + console.log('shifouchongfu',res) + console.log("路径图中是否包含此评估了", res); + if (res.data.data.length) { + let strdata = res.data.data; + let tipStr = ""; + for (let i = 0; i < strdata.length; i++) { + if (i == strdata.length - 1) { + tipStr += strdata[i].courseName; + } else { + tipStr += strdata[i].courseName + "/"; + } + } + message.destroy(); + message.warning("评估(" + tipStr + ")重复添加"); + return; + } else { + RouterEditTask({ + chapterId: props.isactive, + courseId: state.assessment.assessmentId, + name: state.assessment.name, + routerId: props.routerId, + routerTaskId: props.routerTaskId || 0, + type: 11, + }) + .then(() => { + message.destroy(); + message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`); + ctx.emit("changeData", false); + closeDrawer(); + state.addLoading = false; + }) + .catch(() => { + message.destroy(); + message.error(`${props.edit ? "编辑" : "新增"}关卡任务失败`); + }); + } + }).catch(err=>{ + console.log(err) }) - .catch(() => { - message.destroy(); - message.error(`${props.edit ? "编辑" : "新增"}关卡任务失败`); - }); + + } else if (props.isLevel == 2) { - apiTask - .addTask({ - courseId: state.assessment.assessmentId, - name: state.assessment.name, - projectId: props.projectId, - projectTaskId: props.projectTaskId || 0, - stageId: props.chooseStageId || 0, - type: 11, - }) - .then(() => { - message.success(`${props.edit ? "编辑" : "新增"}任务成功`); - ctx.emit("changeData", false); - closeDrawer(); - }) - .catch(() => { - message.error(`${props.edit ? "编辑" : "新增"}任务失败`); - }); + IsExistenceProject({ + courseId: state.assessment.assessmentId, + projectId: props.projectId, + stageId: props.chooseStageId || 0, + type: 11, + }).then(res=>{ + console.log(res) + console.log("项目中是否包含此评估了", res); + if (res.data.data.length) { + let strdata = res.data.data; + let tipStr = ""; + for (let i = 0; i < strdata.length; i++) { + if (i == strdata.length - 1) { + tipStr += strdata[i].courseName; + } else { + tipStr += strdata[i].courseName + "/"; + } + } + message.destroy(); + message.warning("评估(" + tipStr + ")重复添加"); + return; + } else { + apiTask + .addTask({ + courseId: state.assessment.assessmentId, + name: state.assessment.name, + projectId: props.projectId, + projectTaskId: props.projectTaskId || 0, + stageId: props.chooseStageId || 0, + type: 11, + }) + .then(() => { + message.success(`${props.edit ? "编辑" : "新增"}任务成功`); + ctx.emit("changeData", false); + closeDrawer(); + }) + .catch(() => { + message.error(`${props.edit ? "编辑" : "新增"}任务失败`); + }); + } + }).catch(err=>{ + console.log(err) + }) + } else if (props.isLevel == 3) { addTempTask({ courseId: state.assessment.assessmentId, diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue index 93ad5b99..b0922ebd 100644 --- a/src/views/courselibrary/CoursewareManage.vue +++ b/src/views/courselibrary/CoursewareManage.vue @@ -75,10 +75,10 @@
重置
- +
新建课程
@@ -629,6 +629,9 @@ +
+ {{ item.slice(item.lastIndexOf('/')+1) }} +
+
+ {{ item.slice(item.lastIndexOf('/')+1) }} +
+ + {{ item.indexOf('-')!==-1?item.slice(item.lastIndexOf('/')+1,item.indexOf('-')) + item.slice(item.lastIndexOf('.')) :item }} +
-
上传完成
+
上传完成
100% @@ -642,21 +646,21 @@ export default defineComponent({ .updataxq { position: absolute; - right: 2px; + right: -62px; top: -30px; color: #57c887; } .updataxq2 { position: absolute; - right: 2px; + right: -62px; top: -30px; color: #ff7474; } .updataxq3 { position: absolute; - right: 2px; + right: -62px; top: -30px; color: #388be1; } diff --git a/src/views/learningpath/LevelAdd.vue b/src/views/learningpath/LevelAdd.vue index bfedfe65..f960acdf 100644 --- a/src/views/learningpath/LevelAdd.vue +++ b/src/views/learningpath/LevelAdd.vue @@ -854,6 +854,7 @@
- {{ + {{ item.name }} 删除 @@ -2660,8 +2661,9 @@ export default { .docListStyle { display: flex; - width: 300px !important; - justify-content: space-around; + width: 500px !important; + align-items: center; + justify-content: space-between; } .del_btnbox { diff --git a/src/views/projectcenter/LibraryAdd.vue b/src/views/projectcenter/LibraryAdd.vue index ca4e5bc3..48010f77 100644 --- a/src/views/projectcenter/LibraryAdd.vue +++ b/src/views/projectcenter/LibraryAdd.vue @@ -641,11 +641,11 @@ " alt="" /> - {{ + {{ item.name }} 删除 @@ -1962,8 +1962,9 @@ export default defineComponent({ } .docListStyle { display: flex; - width: 300px !important; - justify-content: space-around; + width: 500px !important; + align-items: center; + justify-content: space-between; } .taskBox { .onerow { diff --git a/src/views/projectcenter/TaskAdd.vue b/src/views/projectcenter/TaskAdd.vue index 55e2a5b2..4c0bb277 100644 --- a/src/views/projectcenter/TaskAdd.vue +++ b/src/views/projectcenter/TaskAdd.vue @@ -5,11 +5,11 @@
阶段 - - - - - +
@@ -880,13 +880,13 @@
- 您确定要取消阶段吗 + 您确定要删除所有阶段吗?
取消
-
+
确定
@@ -1020,7 +1020,7 @@
- 您确定要删除此阶段 + {{level.length==1?"当前阶段为第一阶段,删除后任务将被移出,为无阶段模式,确认删除阶段吗?":"您确定要删除此阶段"}}
@@ -1680,6 +1680,7 @@ export default { const showDeleteStage = (id) => { state.deleteStageId = id; state.deleteStageModal = true; + console.log(state.level) }; //关闭删除阶段弹窗 const closeDeleteStage = () => { @@ -1815,6 +1816,39 @@ export default { getTableData(final.taskList); }; + // 删除所有阶段 + const removeAllLevel = () => { + // state.cancelModal = false; + console.log(state.level) + let removeArr = state.level; + for(let i=0;i { + console.log("删除阶段成功", res); + if(removeArr.length-1==i){ + message.destroy(); + message.success("删除全部阶段成功"); + closeDeleteStage(); + localStorage.setItem("stageId", ""); + getTask(); + state.cancelModal = false; + } + }) + .catch((err) => { + if(removeArr.length-1==i){ + console.log("删除阶段失败", err); + message.destroy(); + message.success("删除全部阶段失败"); + state.cancelModal = false; + } + }); + } + } + //选择单个任务 const changeRow = (e) => { //selectRow:已经选择的任务的id数组 @@ -2019,6 +2053,7 @@ export default { temporaryStorage, submitStorage, cancelStorage, + removeAllLevel }; }, }; diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue index 8ffc471c..e95626e9 100644 --- a/src/views/projectcenter/TaskPage.vue +++ b/src/views/projectcenter/TaskPage.vue @@ -1236,6 +1236,7 @@
- {{ + {{ item.name }}