From 8011661732b386624acd12d1381d8339a797cac9 Mon Sep 17 00:00:00 2001 From: wyx <51903@qq.com> Date: Mon, 27 Mar 2023 19:50:23 +0800 Subject: [PATCH 1/5] style --- src/App.vue | 2 +- src/views/learningpath/LevelAddDetail.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/App.vue b/src/App.vue index 7564b5f1..b972f406 100644 --- a/src/App.vue +++ b/src/App.vue @@ -33,7 +33,7 @@ import {USER_PERMISSION} from "@/api/ThirdApi"; const store = useStore(); const isLogin = ref(false); -console.log("版本2.3.0------------"); +console.log("版本2.3.1------------"); // 监听关闭浏览器 let time1 = ref(0); diff --git a/src/views/learningpath/LevelAddDetail.vue b/src/views/learningpath/LevelAddDetail.vue index 4898a8ce..ad5fc5d4 100644 --- a/src/views/learningpath/LevelAddDetail.vue +++ b/src/views/learningpath/LevelAddDetail.vue @@ -60,7 +60,7 @@ - +
编辑/添加关卡
From 86cf7c602cf2010b11942cb38795f85c843d7dc3 Mon Sep 17 00:00:00 2001 From: wyx <51903@qq.com> Date: Mon, 27 Mar 2023 20:01:25 +0800 Subject: [PATCH 2/5] =?UTF-8?q?fix:=E6=A8=A1=E6=9D=BF=E5=BA=93=E6=97=A0?= =?UTF-8?q?=E9=98=B6=E6=AE=B5=E4=BB=BB=E5=8A=A1=E5=88=97=E8=A1=A8=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/projectcenter/LibraryAdd.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/projectcenter/LibraryAdd.vue b/src/views/projectcenter/LibraryAdd.vue index 785c8572..81dcc1df 100644 --- a/src/views/projectcenter/LibraryAdd.vue +++ b/src/views/projectcenter/LibraryAdd.vue @@ -1023,7 +1023,7 @@ export default defineComponent({ console.log("what ------ > ", i, data); // if (data[i].taskTemplateList.length !== 0) { if (!data[i].name) { - continue; + // continue; } state.taskSyllabus.push({ text: data[i].name ? data[i].name : "无阶段任务", From ab539a28f0451ef0ad580637f5db67ac98119a5b Mon Sep 17 00:00:00 2001 From: wyx <51903@qq.com> Date: Mon, 27 Mar 2023 21:14:32 +0800 Subject: [PATCH 3/5] =?UTF-8?q?fix:=E6=A8=A1=E6=9D=BF=E5=BA=93=E6=96=B0?= =?UTF-8?q?=E5=BB=BA=E4=BB=BB=E5=8A=A1=E7=BC=96=E8=BE=91=E7=AD=89=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/projectcenter/LibraryAdd.vue | 27 +++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/src/views/projectcenter/LibraryAdd.vue b/src/views/projectcenter/LibraryAdd.vue index 81dcc1df..0d7e12d2 100644 --- a/src/views/projectcenter/LibraryAdd.vue +++ b/src/views/projectcenter/LibraryAdd.vue @@ -60,7 +60,7 @@ { state.projectInfo.noticeFlag = state.checked ? 1 : 0; api @@ -999,7 +999,7 @@ export default defineComponent({ }); // 获取详情 const getDetail = () => { - api.templateEditDetail(projectTemplateId).then((res) => { + api.templateEditDetail(projectId).then((res) => { state.templateInfo = res.data.data state.taskSyllabus = []; state.projectInfo = res.data.data.projectTemplateInfo; @@ -1097,7 +1097,7 @@ export default defineComponent({ routered.push({ path: "/templateAdd", query: { - projectTemplateId: projectTemplateId, + projectTemplateId: projectId, }, }); }; @@ -1106,7 +1106,7 @@ export default defineComponent({ const stateEdit = () => { let obj = { name: "", - projectTemplateId: localStorage.getItem("projectTemplateId"), + projectTemplateId: projectId, remark: "", stageId: 0, }; @@ -1129,7 +1129,7 @@ export default defineComponent({ flag: true, name: "", projectTaskId: 0, - projectTemplateId: localStorage.getItem("projectTemplateId"), + projectTemplateId: projectId, stageId: 0, type: 0 }; @@ -1146,7 +1146,7 @@ export default defineComponent({ }; const getScoreRule = () => { scoreRule({ - projectId: projectTemplateId, + projectId: Number(projectId), }) .then((res) => { let result = res.data.data; @@ -1203,7 +1203,7 @@ export default defineComponent({ courseSyncFlag: state.projectInfo.courseSyncFlag ? 1 : 0, notice: state.projectInfo.notice, noticeFlag: state.projectInfo.noticeFlag, - projectTemplateId: localStorage.getItem("projectTemplateId"), + projectTemplateId: projectId, remark: state.projectInfo.remark, status: state.projectInfo.status, attach: str, @@ -1211,6 +1211,7 @@ export default defineComponent({ //要编辑项目 api .templateEdit({ + id: projectId, name: state.projectInfo.name, category: state.projectInfo.category, picUrl: state.projectInfo.picUrl, @@ -1223,7 +1224,7 @@ export default defineComponent({ courseSyncFlag: state.projectInfo.courseSyncFlag ? 1 : 0, notice: state.projectInfo.notice, noticeFlag: state.projectInfo.noticeFlag, - projectTemplateId: localStorage.getItem("projectTemplateId"), + projectTemplateId: projectId, remark: state.projectInfo.remark, status: state.projectInfo.status, attach: str, @@ -1255,7 +1256,7 @@ export default defineComponent({ api .templateEdit({ sourceBelongId: state.projectInfo.sourceBelongId, - projectTemplateId: localStorage.getItem("projectTemplateId"), + projectTemplateId: projectId, attach: str, }) .then((res) => { @@ -1275,7 +1276,7 @@ export default defineComponent({ // 设置上传图片开关 const checkedClose = (data, a) => { console.log(data, a); - console.log("模板id：" + projectTemplateId); + console.log("模板id：" + projectId); console.log("开关数据：" + JSON.stringify(data) + "====" + JSON.stringify(a)) state.attachSwitch = data; @@ -1283,7 +1284,7 @@ export default defineComponent({ api .templateEdit({ sourceBelongId: state.projectInfo.sourceBelongId, - projectTemplateId: projectTemplateId, + projectTemplateId: projectId, attachSwitch: state.attachSwitch ? 1 : -1, }) .then((res) => { @@ -1297,7 +1298,7 @@ export default defineComponent({ //设置积分规则 const editRule = () => { let obj = { - projectId: projectTemplateId, + projectId: projectId, datas:[ { "type": 1, From a25f2e669778ce308bdba7ef6f68f37b28045161 Mon Sep 17 00:00:00 2001 From: wyx <51903@qq.com> Date: Mon, 27 Mar 2023 21:19:30 +0800 Subject: [PATCH 4/5] =?UTF-8?q?fix:=E9=9D=A2=E6=8E=88=E8=AF=BE-=E5=BC=80?= =?UTF-8?q?=E8=AF=BE-=E5=AD=A6=E5=91=98=E7=AE=A1=E7=90=86-=E4=BD=9C?= =?UTF-8?q?=E4=B8=9A=E6=88=90=E7=BB=A9=E6=98=BE=E7=A4=BA=E8=B4=9F=E6=95=B0?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/courselibrary/CoursewareManage.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue index 92bb478c..70a29716 100644 --- a/src/views/courselibrary/CoursewareManage.vue +++ b/src/views/courselibrary/CoursewareManage.vue @@ -3885,7 +3885,7 @@ export default defineComponent({ customRender: ({ record }) => { return (
- {record.workScore === -2 ? ( + {record.workScore === -2 || record.workScore === -1 || record.workScore < 0? ( "-" ) : record.workScore ? ( {record.workScore} From 684cd0edb4439849536cc7b2c1875ee25224ec92 Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Mon, 27 Mar 2023 23:47:52 +0800 Subject: [PATCH 5/5] --fix bug --- src/views/courselibrary/CoursewareManage.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue index 70a29716..cb341a1c 100644 --- a/src/views/courselibrary/CoursewareManage.vue +++ b/src/views/courselibrary/CoursewareManage.vue @@ -3614,6 +3614,7 @@ export default defineComponent({ }; const createkk = () => { state.offcoursePlanId = null; + state.itemType = 3; state.member = {}; state.cstm_hs = true; };