diff --git a/src/App.vue b/src/App.vue index 1836c14e..ed41e2ed 100644 --- a/src/App.vue +++ b/src/App.vue @@ -44,7 +44,7 @@ export default defineComponent({ const store = useStore(); const isLogin = ref(false); // console.log("router", router.getRoutes(), route); - console.log("版本0.9.7------------"); + console.log("版本0.9.8------------"); const routes = computed(() => { return router.getRoutes().filter((e) => e.meta?.isLink); }); diff --git a/src/api/config.js b/src/api/config.js index 773efa21..f766c84b 100644 --- a/src/api/config.js +++ b/src/api/config.js @@ -2,7 +2,7 @@ * @Author: lixg lixg@dongwu-inc.com * @Date: 2022-11-21 14:32:52 * @LastEditors: lixg lixg@dongwu-inc.com - * @LastEditTime: 2022-12-08 15:47:05 + * @LastEditTime: 2022-12-09 14:39:01 * @FilePath: /fe-manage/src/api/config.js * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE */ 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/AddFaceteach.vue b/src/components/drawers/AddFaceteach.vue index 4e3f9e45..4f88e2d7 100644 --- a/src/components/drawers/AddFaceteach.vue +++ b/src/components/drawers/AddFaceteach.vue @@ -212,6 +212,7 @@ + +
现场参与： @@ -393,7 +396,7 @@ import { getMemberInfo } from "@/api/index1"; import { debounce } from "lodash-es"; import { queryFaceDetailById, editPlan } from "../../api/indexFace"; import dayjs from "dayjs"; -import AssessmentList from "../drawers/ AssessmentList.vue"; +import AssessmentList from "@/components/drawers/AssessmentList.vue"; // import { toDate } from "../../api/method";、 import { addTempTask } from "../../api/indexTaskadd"; diff --git a/src/components/drawers/AddInvist.vue b/src/components/drawers/AddInvist.vue index 847c115c..a650c0a4 100644 --- a/src/components/drawers/AddInvist.vue +++ b/src/components/drawers/AddInvist.vue @@ -104,10 +104,10 @@ 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"; +import AssessmentList from "@/components/drawers/AssessmentList.vue"; export default { name: "AddInvist", components: { @@ -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/components/drawers/AddLive.vue b/src/components/drawers/AddLive.vue index 9c3da18d..0361e649 100644 --- a/src/components/drawers/AddLive.vue +++ b/src/components/drawers/AddLive.vue @@ -335,7 +335,8 @@ import { addTempTask } from "../../api/indexTaskadd"; import { getMemberInfo } from "@/api/index1"; import dayjs from "dayjs"; import { fileUp } from "../../api/indexEval"; -import AssessmentList from "../drawers/ AssessmentList.vue"; +//import AssessmentList from "./AssessmentList.vue"; +import AssessmentList from "@/components/drawers/AssessmentList.vue"; import { debounce } from "lodash-es"; import ProjectManager from "@/components/project/ProjectManagerNew"; import { queryAppraiseDetailById } from "../../api/indexInvist"; diff --git a/src/components/drawers/AddTest.vue b/src/components/drawers/AddTest.vue index e7573cb8..e838c5b7 100644 --- a/src/components/drawers/AddTest.vue +++ b/src/components/drawers/AddTest.vue @@ -98,7 +98,7 @@ alt="" />
- + - 选择考试 + 选择试卷 + + + diff --git a/src/components/drawers/SelectTest.vue b/src/components/drawers/SelectTest.vue index 87ff0335..0d66c3cf 100644 --- a/src/components/drawers/SelectTest.vue +++ b/src/components/drawers/SelectTest.vue @@ -8,7 +8,7 @@ >
-
选择考试
+
选择试卷
-
新建考试
+
新建试卷
@@ -115,7 +115,7 @@