From 57d2fbfb12c7f89108e91823c99abc3ce3f190d5 Mon Sep 17 00:00:00 2001 From: fooperage Date: Mon, 13 Feb 2023 09:57:42 +0800 Subject: [PATCH 1/3] =?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 2/3] --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 3/3] --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 @@