diff --git a/src/App.vue b/src/App.vue index 2e7b0db5..21bd6685 100644 --- a/src/App.vue +++ b/src/App.vue @@ -41,7 +41,7 @@ export default defineComponent({ const store = useStore(); const isLogin = ref(false); // console.log("router", router.getRoutes(), route); - console.log("版本0.06------------"); + console.log("版本0.08------------"); const routes = computed(() => { return router.getRoutes().filter((e) => e.meta?.isLink); }); diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue index 6f76a740..b9664ae0 100644 --- a/src/views/courselibrary/CoursewareManage.vue +++ b/src/views/courselibrary/CoursewareManage.vue @@ -3735,12 +3735,15 @@ export default defineComponent({ //渲染学员管理操作 const getTableDate2 = async () => { // let data2 = state.tableData7; - let res = await studentList({ + let obj = { pageNo: state.currentPage3, pageSize: state.pageSize3, offcoursePlanId: state.offcoursePlanId, name: state.xygl_inputV1, - }); + }; + // console.log("获取学员信息", obj); + let res = await studentList(obj); + // console.log("获取学员列表", res); const { rows, total } = res.data.data; state.tableDataTotal3 = total; rows.forEach((item, index) => { @@ -4822,6 +4825,7 @@ export default defineComponent({ .then((res) => { console.log("添加学员成功", res); message.success("添加学员成功"); + getTableDate2(); }) .catch((err) => { console.log("添加学员失败", err); diff --git a/src/views/learningpath/LearningPath.vue b/src/views/learningpath/LearningPath.vue index 549e1e36..c3d17fef 100644 --- a/src/views/learningpath/LearningPath.vue +++ b/src/views/learningpath/LearningPath.vue @@ -1654,7 +1654,9 @@ export default { console.log("获取字典成功", res); if (res.status === 200) { if (param === "pathmapPic") { - state.imgData = res.data.data.rows; + if (res.data.data.rows.length > 0) { + state.imgData = [res.data.data.rows[0]]; + } } } }) diff --git a/src/views/learningpath/LevelAddDetail.vue b/src/views/learningpath/LevelAddDetail.vue index 953cd96f..2b62dc46 100644 --- a/src/views/learningpath/LevelAddDetail.vue +++ b/src/views/learningpath/LevelAddDetail.vue @@ -862,7 +862,7 @@ -
+ @@ -1089,18 +1089,18 @@ export default { }, ], tableData: [ - { - key: 1, - lei: "在线", - routerTaskId: 0, - // state: "已发布", - creater: "管理者课程", - // pubtime: "2022-07-20 14:00:03", - cretime: "60分钟", - haspub: false, - checked1: false, - checkedd: false, - }, + // { + // key: 1, + // lei: "在线", + // routerTaskId: 0, + // // state: "已发布", + // creater: "管理者课程", + // // pubtime: "2022-07-20 14:00:03", + // cretime: "60分钟", + // haspub: false, + // checked1: false, + // checkedd: false, + // }, ], tableData2: [ { @@ -1495,7 +1495,6 @@ export default { }); }; - const showAddStu = () => { state.AddSvisible = true; }; diff --git a/src/views/projectcenter/ProjectAdd.vue b/src/views/projectcenter/ProjectAdd.vue index 17fd68c6..0a68eba9 100644 --- a/src/views/projectcenter/ProjectAdd.vue +++ b/src/views/projectcenter/ProjectAdd.vue @@ -486,6 +486,14 @@ export default { if (param === "projectSys") { classifyList4.value = res.data.data.rows; } + if ( + classifyList.value && + imageUrl.value && + classifyList3.value && + classifyList4.value + ) { + getDictInfo(); + } } }) .catch((err) => { @@ -497,6 +505,26 @@ export default { getDictList("projectLevel"); getDictList("projectSys"); //获取分类、封面图、项目级别、培训分类---------------字典配置--------------------------- + //分类、封面图、项目级别、培训分类回显 + const getDictInfo = () => { + if (routers.query.projectId) { + // console.log("classifyList", classifyList.value, state.projectType); + // //分类 + // let arr=classifyList.value + // for(let i=0;i
-
+
diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue index 2dd6467a..2856265c 100644 --- a/src/views/projectcenter/TaskPage.vue +++ b/src/views/projectcenter/TaskPage.vue @@ -1852,7 +1852,7 @@ export default { checkedBOEU: false, //是否BOEU实施 radioV1: "", radioV2: "", - activeKey: "4", //1:概览 2.任务... + activeKey: "1", //1:概览 2.任务... activeKey1: "8", //8:学员管理 9：小组管理 activeKey2: "3", activeKeyNotice: "11", diff --git a/src/views/projectcenter/temTask.vue b/src/views/projectcenter/temTask.vue index 942d2c85..2ce548bf 100644 --- a/src/views/projectcenter/temTask.vue +++ b/src/views/projectcenter/temTask.vue @@ -433,7 +433,6 @@ v-model:chooseStageId="chooseStageId" v-model:projectTaskId="projectTaskId" v-model:EditVoteId="EditVoteId" - v-model:ballotId="ballotId" />
@@ -702,7 +701,7 @@
-
+
@@ -1351,7 +1350,7 @@ export default { ? "投票" : "-", creater: value.name, - cretime: Number(value.duration)>0 ? value.duration : "-", + cretime: Number(value.duration) > 0 ? value.duration : "-", checked1: value.flag ? true : false, checked: false, //是否选中类型 courseId: value.courseId, @@ -1711,28 +1710,27 @@ export default { message.destroy(); return message.warning("请输入阶段名称"); } - let obj = { - name: state.valuesname, - projectTemplateId: localStorage.getItem("projectTemplateId"), - remark: state.valuesnotice, - stageId: state.updateStageID || 0, - }; - api - .editStage(obj) - .then((res) => { - console.log("修改阶段成功", res); - state.valuesname = ""; - state.valuesnotice = ""; - closeModal(); - state.updateStageID = null; - message.destroy(); - message.success("修改阶段成功"); - getTask(); - }) - .catch((err) => { - console.log("添加阶段失败", err); - }); - + let obj = { + name: state.valuesname, + projectTemplateId: localStorage.getItem("projectTemplateId"), + remark: state.valuesnotice, + stageId: state.updateStageID || 0, + }; + api + .editStage(obj) + .then((res) => { + console.log("修改阶段成功", res); + state.valuesname = ""; + state.valuesnotice = ""; + closeModal(); + state.updateStageID = null; + message.destroy(); + message.success("修改阶段成功"); + getTask(); + }) + .catch((err) => { + console.log("添加阶段失败", err); + }); }; //打开删除阶段弹窗 @@ -1779,7 +1777,7 @@ export default { }; const showDrawerFaceteach = (id, eleId) => { state.addfaceteachvisible = true; - console.log("id==========",id); + console.log("id==========", id); state.EditFaceId = id; state.projectTaskId = eleId; }; @@ -1809,7 +1807,7 @@ export default { state.addrefvisible = true; }; const showDrawerAddDiscuss = (id, eleId) => { - console.log("projectTemplateId========",state.projectTemplateId); + console.log("projectTemplateId========", state.projectTemplateId); state.EditDiscussId = id; state.projectTaskId = eleId; state.adddiscussvisible = true; @@ -1933,8 +1931,8 @@ export default { flag: ele.checked1, name: ele.creater, projectTemplateId: ele.projectTemplateId, - projectTaskId:ele.id, - stageId:ele.stageId, + projectTaskId: ele.id, + stageId: ele.stageId, type: ele.type, }; api @@ -1982,7 +1980,7 @@ export default { showDrawerAddTest(id, eleId); } else if (type == "在线") { showDrawerOnline(id, eleId); - }else if (type == "面授") { + } else if (type == "面授") { showDrawerFaceteach(id, eleId); } }; @@ -2007,7 +2005,6 @@ export default { state.unlockModeVisible = true; }; - //暂存 const temporaryStorage = () => { message.success("暂存成功"); @@ -2081,8 +2078,7 @@ export default { showModeVisible, - - temporaryStorage, + temporaryStorage, submitStorage, cancelStorage, };