From e60415dc5030176a295bc4fd03b52dd46b69a834 Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Sun, 12 Feb 2023 20:01:39 +0800 Subject: [PATCH 01/16] --fix bug --- src/views/courselibrary/courseModal.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/courselibrary/courseModal.vue b/src/views/courselibrary/courseModal.vue index 32d6bde1..9ff30efe 100644 --- a/src/views/courselibrary/courseModal.vue +++ b/src/views/courselibrary/courseModal.vue @@ -563,7 +563,7 @@ export default defineComponent({ } const postData = { - offcourseId: state.offcourseId, //不传代表新增 + id: state.offcourseId, //不传代表新增 name: state.qdms_inputV1, picUrl: state.feng_mian_1, targetUser: state.qdms_inputV2, From 58238b986a7c2fdf8945c50c1a4cf5fedd8aa181 Mon Sep 17 00:00:00 2001 From: fooperage Date: Sun, 12 Feb 2023 20:15:46 +0800 Subject: [PATCH 02/16] .. --- src/api/index1.js | 3 +- src/components/drawers/UnlockMode.vue | 77 ++++---- src/views/learningpath/LearningPath.vue | 2 +- src/views/learningpath/LevelAdd.vue | 2 +- src/views/learningpath/LevelAddDetail.vue | 29 ++- src/views/projectcenter/TaskAdd.vue | 224 ++++++++++++---------- 6 files changed, 184 insertions(+), 153 deletions(-) diff --git a/src/api/index1.js b/src/api/index1.js index 9c103b32..88a02d8f 100644 --- a/src/api/index1.js +++ b/src/api/index1.js @@ -65,10 +65,11 @@ export const setConfig = (obj) => http.post("/admin/router/setConfig", obj); //获取学员列表 export const getStudent = (obj) => http.post("/admin/router/studentList", obj); //获取路径图详情-包含关卡及任务列表 -export const getRouterDetail = (routerId) => +export const getRouterDetail = (routerId,useTask) => http.get("/admin/router/detail", { params: { routerId: routerId, + useTask: useTask }, }); //添加学员 diff --git a/src/components/drawers/UnlockMode.vue b/src/components/drawers/UnlockMode.vue index e3827484..5a1a2b97 100644 --- a/src/components/drawers/UnlockMode.vue +++ b/src/components/drawers/UnlockMode.vue @@ -81,9 +81,8 @@ + + \ No newline at end of file From 9c8a89498843892f83fa7e8d5499072bb517fe27 Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Sun, 12 Feb 2023 21:13:52 +0800 Subject: [PATCH 06/16] --fix bug --- src/components/drawers/AddLive.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/components/drawers/AddLive.vue b/src/components/drawers/AddLive.vue index bd04ce35..37982c4f 100644 --- a/src/components/drawers/AddLive.vue +++ b/src/components/drawers/AddLive.vue @@ -615,7 +615,7 @@ export default { } RouterEditTask({ chapterId: props.isactive, - courseId: res.data.data.liveId, + courseId: res.data.data.id, duration: res.data.data.liveDuration, name: res.data.data.liveName, routerId: props.routerId, @@ -632,7 +632,7 @@ export default { } else if (props.isLevel == 2) { apiTask .addTask({ - courseId: res.data.data.liveId, + courseId: res.data.data.id, duration: res.data.data.liveDuration, name: res.data.data.liveName, projectId: props.projectId, @@ -650,7 +650,7 @@ export default { } else if (props.isLevel == 3) { console.log("props.projectTemplateId", props.projectTemplateId); addTempTask({ - courseId: res.data.data.liveId, + courseId: res.data.data.id, duration: res.data.data.liveDuration, name: res.data.data.liveName, projectTemplateId: props.projectTemplateId, @@ -736,7 +736,7 @@ export default { liveExplain: state.textV1, liveNotice: state.liveNotice, liveFlag: "", - liveId: props.edit ? Number(props.EditLiveId) : 0, + id: props.edit ? Number(props.EditLiveId) : 0, liveLink: state.inputV4, liveName: state.inputV1, livePlayback: state.switchC1 ? "1" : "0", From d11ac67f4ec78445c76ae16e7900d55ba6a17c14 Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Sun, 12 Feb 2023 21:34:40 +0800 Subject: [PATCH 07/16] --fix bug --- src/components/drawers/AddRef.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/components/drawers/AddRef.vue b/src/components/drawers/AddRef.vue index 275bc7ed..4f467503 100644 --- a/src/components/drawers/AddRef.vue +++ b/src/components/drawers/AddRef.vue @@ -189,7 +189,7 @@ export default { } RouterEditTask({ chapterId: props.isactive, - courseId: res.data.data.linkId, + courseId: res.data.data.id, name: res.data.data.linkName, routerId: props.routerId, routerTaskId: props.routerTaskId || 0, @@ -207,7 +207,7 @@ export default { } else if (props.isLevel == 2) { apiTask .addTask({ - courseId: res.data.data.linkId, + courseId: res.data.data.id, name: res.data.data.linkName, projectId: props.projectId, projectTaskId: props.projectTaskId || 0, @@ -225,7 +225,7 @@ export default { } else if (props.isLevel == 3) { addTempTask({ - courseId: res.data.data.linkId, + courseId: res.data.data.id, name: res.data.data.linkName, projectTemplateId:props.projectTemplateId, projectTaskId: props.projectTaskId || 0, @@ -265,7 +265,7 @@ export default { let obj = { linkAddress: state.inputV2, linkDescription: state.textV1, - linkId: props.edit ? props.EditRefId : 0, + id: props.edit ? props.EditRefId : 0, linkName: state.inputV1, }; if (props.edit) { From 423fc8da2c0de9959352c966be7ee35399a53bfe Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Sun, 12 Feb 2023 21:37:22 +0800 Subject: [PATCH 08/16] --fix bug --- src/components/drawers/AddDiscuss.vue | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/components/drawers/AddDiscuss.vue b/src/components/drawers/AddDiscuss.vue index cb1616d1..020507ca 100644 --- a/src/components/drawers/AddDiscuss.vue +++ b/src/components/drawers/AddDiscuss.vue @@ -178,8 +178,7 @@ export default { //更新讨论信息 state.inputV1 = res.data.data.discussName; state.textV1 = res.data.data.discussExplain; - state.checkedC1 = - res.data.data.discussSettings == "true" ? true : false; + state.checkedC1 = res.data.data.discussSettings == "true"; }) .catch(() => { }); @@ -199,7 +198,7 @@ export default { } await RouterEditTask({ chapterId: props.isactive, - courseId: res.data.data.discussId, + courseId: res.data.data.id, name: res.data.data.discussName, routerId: props.routerId, routerTaskId: props.routerTaskId || 0, @@ -214,7 +213,7 @@ export default { } else if (props.isLevel == 2) { await apiTask .addTask({ - courseId: res.data.data.discussId, + courseId: res.data.data.id, name: res.data.data.discussName, projectId: props.projectId, projectTaskId: props.projectTaskId || 0, @@ -230,7 +229,7 @@ export default { } else if (props.isLevel == 3) { console.log(""); addTempTask({ - courseId: res.data.data.discussId, + courseId: res.data.data.id, name: res.data.data.discussName, projectTemplateId: props.projectTemplateId, projectTaskId: props.projectTaskId || 0, From 9e7f85030d1254c0b8b52e26f0241c99ed011ddc Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Sun, 12 Feb 2023 21:41:18 +0800 Subject: [PATCH 09/16] --fix bug --- src/components/drawers/AddActive.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/components/drawers/AddActive.vue b/src/components/drawers/AddActive.vue index 976c579b..7bb814d5 100644 --- a/src/components/drawers/AddActive.vue +++ b/src/components/drawers/AddActive.vue @@ -397,7 +397,7 @@ export default { } await RouterEditTask({ chapterId: props.isactive, - courseId: res.data.data.activityId, + courseId: res.data.data.id, duration: res.data.data.activityDuration, name: res.data.data.activityName, routerId: props.routerId, @@ -413,7 +413,7 @@ export default { } else if (props.isLevel == 2) { await apiTask .addTask({ - courseId: res.data.data.activityId, + courseId: res.data.data.id, duration: res.data.data.activityDuration, name: res.data.data.activityName, projectId: props.projectId, @@ -430,7 +430,7 @@ export default { } else if (props.isLevel == 3) { await apiTask .addTempTask({ - courseId: res.data.data.activityId, + courseId: res.data.data.id, duration: res.data.data.activityDuration, name: res.data.data.activityName, projectTemplateId: props.projectTemplateId, From b08c758b2aa6a101b1ab5a926eeb14a8c9e66bb1 Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Sun, 12 Feb 2023 23:16:39 +0800 Subject: [PATCH 10/16] --fix bug --- src/components/drawers/AddEval.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/components/drawers/AddEval.vue b/src/components/drawers/AddEval.vue index eb7a63d8..8b698b0a 100644 --- a/src/components/drawers/AddEval.vue +++ b/src/components/drawers/AddEval.vue @@ -189,7 +189,7 @@ export default { } await RouterEditTask({ chapterId: props.isactive, - courseId: Number(value.evaluationId), + courseId: Number(value.id), name: value.evaluationName, routerId: props.routerId, routerTaskId: props.routerTaskId || 0, @@ -206,7 +206,7 @@ export default { .addTask({ duration: 0, flag: true, - courseId: Number(value.evaluationId), + courseId: Number(value.id), name: value.evaluationName, projectId: props.projectId, projectTaskId: props.projectTaskId || 0, @@ -223,7 +223,7 @@ export default { }); } else if (props.isLevel == 3) { await addTempTask({ - courseId: Number(value.evaluationId), + courseId: Number(value.id), name: value.evaluationName, projectTemplateId: Number(localStorage.getItem("projectTemplateId")), projectTaskId: props.projectTaskId || 0, @@ -331,7 +331,7 @@ export default { let obj = { evaluationName: state.inputV1, evaluationEndTime: state.time ? dayjs(state.time[1]).format("YYYY-MM-DD HH:mm") : "", - evaluationId: props.evaluationId, + evaluationId: props.id, evaluationStartTime: state.time ? dayjs(state.time[0]).format("YYYY-MM-DD HH:mm") : "", evaluationTypeId: state.evaluationTypeId, evaluationTypeName: state.evaluationTypeName, From 03ee4b7c13041b76ea071ed253d00f28c332db34 Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Sun, 12 Feb 2023 23:29:41 +0800 Subject: [PATCH 11/16] --fix bug --- src/views/research/ResearchManage.vue | 34 +++++++++++++-------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/src/views/research/ResearchManage.vue b/src/views/research/ResearchManage.vue index be5885b1..5aafc594 100644 --- a/src/views/research/ResearchManage.vue +++ b/src/views/research/ResearchManage.vue @@ -591,12 +591,12 @@ export default { state.newNext = true; }; const handleEditName = (item) => { - state.assessmentId = item.assessmentId; + state.id = item.id; state.assessmentName = item.assessmentName; state.newNext = true; }; const handleNext = async() => { - if (!state.assessmentId) { + if (!state.id) { if (!state.assessmentName) { message.destroy(); message.error("请输入评估名称"); @@ -606,7 +606,7 @@ export default { message.destroy(); return message.warning("该评估名称已存在"); } - const offName = await validateName({name: state.assessmentName, type:4, id:state.assessmentId}).then(res => { + const offName = await validateName({name: state.assessmentName, type:4, id:state.id}).then(res => { return res.data.data == 1; }); if(offName){ @@ -626,7 +626,7 @@ export default { return false; } editAssessmentName({ - assessmentId: state.assessmentId, + assessmentId: state.id, assessmentName: state.assessmentName, }).then((res) => { if (res.data.code === 200) { @@ -637,14 +637,14 @@ export default { } }; const handleCancel = () => { - state.assessmentId = ""; + state.id = ""; state.assessmentName = ""; // store.commit("SET_assessmentName", ""); state.newNext = false; }; const handleStatuts = (item, status) => { - state.assessmentId = item.assessmentId; + state.id = item.id; switch (status) { case "1": // 发布 @@ -664,12 +664,12 @@ export default { } }; const handleDel = (item) => { - state.assessmentId = item.assessmentId; + state.id = item.id; state.delete_hs = true; state.del_hs = true; }; const handleCopy = (item) => { - state.assessmentId = item.assessmentId; + state.id = item.id; state.copyItem = item; state.delete_hs = true; state.copy_hs = true; @@ -679,7 +679,7 @@ export default { // 发布 if (state.pub_hs) { editReleaseStatus({ - assessmentId: state.assessmentId, + assessmentId: state.id, releaseStatus: "2", }).then((res) => { console.log(res); @@ -690,7 +690,7 @@ export default { // 撤回 if (state.back_hs) { editReleaseStatus({ - assessmentId: state.assessmentId, + assessmentId: state.id, releaseStatus: "1", }).then((res) => { console.log(res); @@ -701,7 +701,7 @@ export default { // 结束 if (state.over_hs) { editReleaseStatus({ - assessmentId: state.assessmentId, + assessmentId: state.id, releaseStatus: "3", }).then((res) => { console.log(res); @@ -712,7 +712,7 @@ export default { // 删除 if (state.del_hs) { deleteResearch({ - assessmentId: Number(state.assessmentId), + assessmentId: Number(state.id), }).then((res) => { console.log(res); handleCancelModal(); @@ -735,7 +735,7 @@ export default { } }; const handleCancelModal = () => { - state.assessmentId = ""; + state.id = ""; state.delete_hs = false; state.del_hs = false; state.over_hs = false; @@ -745,15 +745,15 @@ export default { }; const handleToManagepage = (item, path) => { router.push({ - path: path + "/" + item.assessmentId, + path: path + "/" + item.id, }); }; const handleToResearchadd = (item, path) => { - // console.log("item.assessmentId"); - // console.log(item.assessmentId); + // console.log("item.id"); + // console.log(item.id); // console.log(item); router.push({ - path: path + "/" + item.assessmentId, + path: path + "/" + item.id, }); }; From d53b4c61ff3a1f581a37c922f514d7387d972729 Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Sun, 12 Feb 2023 23:41:20 +0800 Subject: [PATCH 12/16] --fix bug --- src/components/drawers/AssessmentAll.vue | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/components/drawers/AssessmentAll.vue b/src/components/drawers/AssessmentAll.vue index e33c9161..3f1cd7ff 100644 --- a/src/components/drawers/AssessmentAll.vue +++ b/src/components/drawers/AssessmentAll.vue @@ -198,7 +198,7 @@ export default { let num = n1 + n2 + n3 +n4; let obj = { - assessmentId: info.assessmentId, + assessmentId: info.id, name: info.assessmentName, num: num, creator: info.createUserName ? info.createUserName : "-", @@ -206,12 +206,11 @@ export default { }; //更新讨论信息 state.assessment = obj; - state.selectedRowKeys = [info.assessmentId]; + state.selectedRowKeys = [info.id]; // state.assessmentId = res.data.data.assessmentId; }) .catch(() => {}); } - // } }; const tableDataFunc = () => { @@ -256,10 +255,7 @@ export default { const onSelectChange = (selectedRowKeys, selectedRows) => { state.selectedRowKeys = selectedRowKeys; state.addOnlineList = selectedRows; - console.log(selectedRowKeys, selectedRows); state.assessment = selectedRows[0]; - console.log("selectedRows=======", state.assessment); - // ctx.emit("checkedAss", state.assessment); ctx.emit("update:assessmentId", state.assessment.assessmentId); ctx.emit("update:assessmentName", state.assessment.name); }; @@ -289,8 +285,8 @@ export default { let num = n1 + n2 + n3 +n4; let obj = { - key: value.assessmentId, - assessmentId: value.assessmentId, + key: value.id, + assessmentId: value.id, num: num, name: value.assessmentName ? value.assessmentName : "-", creator: value.createUserName ? value.createUserName : "-", From f896d6f3dd0ac5f6db28ad19aec67a9bda237ef6 Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Mon, 13 Feb 2023 00:59:54 +0800 Subject: [PATCH 13/16] --fix bug --- src/views/learningpath/LearningPath.vue | 45 ++++--------------------- src/views/learningpath/LevelAdd.vue | 14 +++----- 2 files changed, 11 insertions(+), 48 deletions(-) diff --git a/src/views/learningpath/LearningPath.vue b/src/views/learningpath/LearningPath.vue index ca668818..b4c1d3e0 100644 --- a/src/views/learningpath/LearningPath.vue +++ b/src/views/learningpath/LearningPath.vue @@ -717,7 +717,6 @@ import ProjCheckShip from "../../components/drawers/ProjCheckPower"; import * as api from "../../api/index1"; import * as apiStu from "../../api/index"; import { message } from "ant-design-vue"; -import { commonData } from "@/api/method"; import { storage } from "@/api/storage"; import { useStore } from "vuex"; import OrgClass from "@/components/project/OrgClass"; @@ -1220,49 +1219,19 @@ export default { return message.warning("项目名称重复，请重新填写"); } state.lpLoading = true; - let obj = { + api.createLearnPath({ name: state.pathName, remark: state.pathIntro, status: 0, organizationId: state.organizationSelectId, organizationName: state.organizationSelectName, picUrl: state.pathBg, - }; - api - .createLearnPath(obj) - .then((res) => { - console.log("创建学习路径成功", res); - if (res.data.code === 200) { - let chapterObj = { - name: "关卡一", - remark: "", - routerId: res.data.data.routerId, - }; - //创建关卡 - api - .editChapter(chapterObj) - .then((chapterRes) => { - console.log("关卡创建成功", chapterRes); - setTimeout(() => { - console.log("创建成功", res); - message.destroy(); - message.success("创建成功"); - state.lpLoading = false; - state.currentPage = 1; - router.push("/leveladd"); - storage.set("routerId", res.data.data.routerId); - // getLearnPath(); - }, commonData.timeout); - }) - .catch((chapterErr) => { - console.log("关卡创建失败", chapterErr); - }); - } + }).then(id => { + message.destroy(); + message.success("创建成功"); + state.lpLoading = false; + router.push( {path: "/leveladd",query:{routerId: id }}) }) - .catch((err) => { - console.log("创建失败", err); - // state.createLoading = false; - }); }; //获取学习路径列表 @@ -1536,8 +1505,8 @@ export default { function manage(id) { router.push({ path: "/leveladd", + query:{routerId:id} }); - storage.set("routerId", id); } const getLearnPathInfo = (id) => { diff --git a/src/views/learningpath/LevelAdd.vue b/src/views/learningpath/LevelAdd.vue index 160bd752..6f9febbf 100644 --- a/src/views/learningpath/LevelAdd.vue +++ b/src/views/learningpath/LevelAdd.vue @@ -1354,7 +1354,6 @@ import { ref, reactive, toRefs, onMounted, createVNode, watch } from "vue"; import { ExclamationCircleOutlined } from "@ant-design/icons-vue"; import { message, Modal } from "ant-design-vue"; -// import PathAddStu from "../../components/drawers/pathStuAdd"; import ProjCheckShip from "../../components/drawers/ProjCheckPower"; import ImpStu from "../../components/drawers/AddLevelImportStu"; import CheckStu from "../../components/drawers/CheckStu"; @@ -1365,20 +1364,15 @@ import TestManage from "../../components/drawers/TestManage"; import FaceManage from "../../components/drawers/FaceManage"; import WorkManage from "../../components/drawers/WorkManage"; import SeeStu from "../../components/drawers/SeeStu"; -import { useRouter } from "vue-router"; -// import { useStore } from "vuex"; -import { storage } from "../../api/storage"; +import { useRouter,useRoute } from "vue-router"; import { getRouterOverview } from "@/api/indexLearningPath"; import { handleLearnPath } from "../../api/index1"; import { GetRouterDetail } from "@/api/indexTask"; import * as api from "../../api/index1"; import { editRoutered } from "../../api/indexLearningPath"; -// import { codeUrl } from "../../api/method"; import TwoDimensionalCode from "../../components/TwoDimensionalCode.vue"; import TableStudent from "@/components/student/TableStudent"; -// import * as student from "@/api/student"; import { getStuPage, moveStudent } from "@/api/index1"; - import RouterFaceTeachManage from "../../components/drawers/router/RouterFaceTeachManage"; import RouterExaminationManage from "../../components/drawers/router/RouterExaminationManage"; import RouterExaminationExternalManage from "../../components/drawers/router/RouterExaminationExternalManage"; @@ -1417,15 +1411,15 @@ export default { }, setup() { const router = useRouter(); + const route = useRoute(); + // const store = useStore(); const state = reactive({ permissions: "", hasTask: false, stage: [], statess: [], - routerId: storage.get("routerId") - ? JSON.parse(storage.get("routerId")) - : null, //学习路径页面传的学习路径id + routerId: route.query.routerId, //学习路径页面传的学习路径id gatename: null, //关卡名称 gatenamee: null, //学员管理关卡名称 action: null, From 57d2fbfb12c7f89108e91823c99abc3ce3f190d5 Mon Sep 17 00:00:00 2001 From: fooperage Date: Mon, 13 Feb 2023 09:57:42 +0800 Subject: [PATCH 14/16] =?UTF-8?q?'=E9=9D=A2=E6=8E=88=E7=AE=A1=E7=90=86'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/drawers/ProjectAudit.vue | 3 +- src/views/courselibrary/CoursewareManage.vue | 85 ++++++++++---------- 2 files changed, 45 insertions(+), 43 deletions(-) diff --git a/src/components/drawers/ProjectAudit.vue b/src/components/drawers/ProjectAudit.vue index 88654a0a..fb1a8d15 100644 --- a/src/components/drawers/ProjectAudit.vue +++ b/src/components/drawers/ProjectAudit.vue @@ -437,8 +437,7 @@ export default { }); }; const getDictList = async (param) => - api1 - .getDict({ + api1.getDict({ pageNo: 1, pageSize: 20, setCode: param, diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue index 45fdfd80..2332f1b7 100644 --- a/src/views/courselibrary/CoursewareManage.vue +++ b/src/views/courselibrary/CoursewareManage.vue @@ -4146,55 +4146,58 @@ export default defineComponent({ if (type === "1") { return; } - state.offcourseId = itm.offcourseId; + // console.log(itm) + state.offcourseId = itm.id; - // const item = await detail({ - // offcourseId: Number(state.offcourseId), - // }).then((res) => { - // if (res.data.code === 200) return res.data.data; - // }); + const item = await detail({ + offcourseId: Number(state.offcourseId), + }).then((res) => { + if (res.data.code === 200) return res.data.data; + }); - // state.statusJuJue = Number(item.auditStatus) === -1 ? 1 : 0; + - // if (Number(item.auditStatus) === 2 && Number(item.status) === 1) { - // state.statusTingQi = 1; - // } - // if (Number(item.auditStatus) === 2 && Number(item.status) === 0) { - // state.statusTingQi = 0; - // } + state.statusJuJue = Number(item.auditStatus) === -1 ? 1 : 0; - // state.qdms_inputV1 = item.name; - // // state.imageUrl = item.picUrl; - // state.feng_mian_1 = item.picUrl; - // state.qdms_inputV2 = item.targetUser; - // state.qdms_inputV3 = item.meaning; - // state.fen_lei = String(item.categoryId); - // state.chang_jin = String(item.sceneId); - // state.tags_val = item.tips ? item.tips.split(",") : []; - // //state.qdms_inputV5 = item.teacherId; - // state.teacher = item.teacher; - // state.teacherId = item.teacherId; - // state.qdms_inputV6 = item.intro; - // state.member = { value: item.teacherId, name: item.teacher }; - // if (item.attach == "") { - // state.imgList = []; - // } else { - // if (item.attach.indexOf(",")) { - // const arr = item.attach.split(","); - // arr.forEach((item) => { - // state.imgList.push({ img: item }); - // }); - // } else { - // state.imgList = [{ img: item.attach }]; - // } - // } + if (Number(item.auditStatus) === 2 && Number(item.status) === 1) { + state.statusTingQi = 1; + } + if (Number(item.auditStatus) === 2 && Number(item.status) === 0) { + state.statusTingQi = 0; + } - // valueHtml.value = item.outline; + state.qdms_inputV1 = item.name; + // state.imageUrl = item.picUrl; + state.feng_mian_1 = item.picUrl; + state.qdms_inputV2 = item.targetUser; + state.qdms_inputV3 = item.meaning; + state.fen_lei = String(item.categoryId); + state.chang_jin = String(item.sceneId); + state.tags_val = item.tips ? item.tips.split(",") : []; + //state.qdms_inputV5 = item.teacherId; + state.teacher = item.teacher; + state.teacherId = item.teacherId; + state.qdms_inputV6 = item.intro; + state.member = { value: item.teacherId, name: item.teacher }; + if (item.attach == "") { + state.imgList = []; + } else { + if (item.attach.indexOf(",")) { + const arr = item.attach.split(","); + arr.forEach((item) => { + state.imgList.push({ img: item }); + }); + } else { + state.imgList = [{ img: item.attach }]; + } + } + + valueHtml.value = item.outline; // state.ft_hs = true; CourseModalRef.value.visibleOpen(state.offcourseId, null); state.ft_eidt = true; - getTea(); + // getTea(); }; // handleTagChange @@ -4242,7 +4245,7 @@ export default defineComponent({ if (type === "1") { return; } - state.offcourseId = item.offcourseId; + state.offcourseId = item.id; state.delete_hs = true; state.del_hs = true; From 8c73cfd46ef46f10c3e2b82f60f83bd5e3baeed5 Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Mon, 13 Feb 2023 10:21:38 +0800 Subject: [PATCH 15/16] --fix bug --- src/views/examine/CourseReviewed.vue | 33 +++---------------- src/views/examine/CourseReviewedN.vue | 42 +++---------------------- src/views/learningpath/LearningPath.vue | 1 - 3 files changed, 10 insertions(+), 66 deletions(-) diff --git a/src/views/examine/CourseReviewed.vue b/src/views/examine/CourseReviewed.vue index e54c911f..737b8880 100644 --- a/src/views/examine/CourseReviewed.vue +++ b/src/views/examine/CourseReviewed.vue @@ -14,24 +14,15 @@
- - import {reactive, toRefs, onMounted, computed} from "vue"; import { courseListView } from "../../api/indexAudit"; -import * as api1 from "@/api/index1"; import {useStore} from "vuex"; import dayjs from "dayjs"; @@ -422,11 +412,11 @@ export default { const store = useStore(); - const sysTypeOptions = computed(() => store.state.sysType); + const sysTypeOptions = computed(() => store.state.content_type); function findClassFullName(list,classify,name=''){ return list && list.length && list.map(e=>{ - return classify == e.dictCode ? name?name+'-'+e.dictName:e.dictName : findClassFullName(e.children,classify,name?name+'-'+e.dictName:e.dictName) + return classify == e.code ? name?name+'-'+e.name:e.name : findClassFullName(e.children,classify,name?name+'-'+e.name:e.name) }).filter(name=>name).join('') } @@ -503,22 +493,9 @@ export default { state.currentPage = pagina; getList(); }; - const getDictList = (param) => - api1 - .getDict({ - pageNo: 1, - pageSize: 20, - setCode: param, - }) - .then((res) => res.data.data.rows); onMounted(async () => { getList(); - //获取分类列表 - state.calssifyList = (await getDictList("faceclassClass")).map((e) => ({ - label: e.dictName, - value: e.dictCode, - })); }); // 显示审核 diff --git a/src/views/examine/CourseReviewedN.vue b/src/views/examine/CourseReviewedN.vue index ad442491..2190ab89 100644 --- a/src/views/examine/CourseReviewedN.vue +++ b/src/views/examine/CourseReviewedN.vue @@ -14,19 +14,11 @@
- - store.state.sysType); + const sysTypeOptions = computed(() => store.state.content_type); function findClassFullName(list,classify,name=''){ return list && list.length && list.map(e=>{ - return classify == e.dictCode ? name?name+'-'+e.dictName:e.dictName : findClassFullName(e.children,classify,name?name+'-'+e.dictName:e.dictName) + return classify == e.code ? name?name+'-'+e.name:e.name : findClassFullName(e.children,classify,name?name+'-'+e.name:e.name) }).filter(name=>name).join('') } @@ -435,20 +426,6 @@ export default { const sHX = (classify) => { return findClassFullName(sysTypeOptions.value,classify) || '-' } - - /* - * 获取字典列表 - * param faceclassPic | faceclassClass | faceclassScene - * */ - const getDictList = (param) => - api1 - .getDict({ - pageNo: 1, - pageSize: 20, - setCode: param, - }) - .then((res) => res.data.data.rows); - const getFaceList = () => { state.loading = true let objn = { @@ -462,10 +439,6 @@ export default { projectName: "", }; - console.log(objn); - // 测试数据先放下 - // setFaceData([{ name: "面授课审核", category_id: "8", scene_id: "8" }]); - list(objn) .then((res) => { console.log("获取面授列表成功", res); @@ -658,11 +631,6 @@ export default { }; onMounted(async () => { getFaceList(); - //获取分类列表 - state.calssifyList = (await getDictList("faceclassClass")).map((e) => ({ - label: e.dictName, - value: e.dictCode, - })); }); // 禁止用户编辑文本框内容 diff --git a/src/views/learningpath/LearningPath.vue b/src/views/learningpath/LearningPath.vue index b4c1d3e0..3129dad5 100644 --- a/src/views/learningpath/LearningPath.vue +++ b/src/views/learningpath/LearningPath.vue @@ -717,7 +717,6 @@ import ProjCheckShip from "../../components/drawers/ProjCheckPower"; import * as api from "../../api/index1"; import * as apiStu from "../../api/index"; import { message } from "ant-design-vue"; -import { storage } from "@/api/storage"; import { useStore } from "vuex"; import OrgClass from "@/components/project/OrgClass"; import NameInput from "@/components/project/NameInput"; From 27b1360410df91ad9c2153275ea46f9d1687c1e7 Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Mon, 13 Feb 2023 10:26:14 +0800 Subject: [PATCH 16/16] --fix bug --- .../courselibrary/components/seeModal.vue | 211 +----------------- 1 file changed, 3 insertions(+), 208 deletions(-) diff --git a/src/views/courselibrary/components/seeModal.vue b/src/views/courselibrary/components/seeModal.vue index d1d49b7c..c245233d 100644 --- a/src/views/courselibrary/components/seeModal.vue +++ b/src/views/courselibrary/components/seeModal.vue @@ -281,8 +281,7 @@