From b3e568176e7a4120a91e29896f499ccf57909dc4 Mon Sep 17 00:00:00 2001 From: zhangyc Date: Fri, 16 Dec 2022 00:01:56 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E6=90=9C=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/drawers/AddHomework.vue | 8 +- src/components/drawers/AddTest.vue | 2 +- src/views/courselibrary/CoursewareManage.vue | 64 +++++++++++- src/views/projectcenter/LibraryAdd.vue | 7 +- src/views/projectcenter/ProjectManage.vue | 13 +-- src/views/projectcenter/TaskAdd.vue | 68 +----------- src/views/projectcenter/temTask.vue | 103 ++++++++++++------- 7 files changed, 146 insertions(+), 119 deletions(-) diff --git a/src/components/drawers/AddHomework.vue b/src/components/drawers/AddHomework.vue index 98729780..ba5830b3 100644 --- a/src/components/drawers/AddHomework.vue +++ b/src/components/drawers/AddHomework.vue @@ -328,8 +328,8 @@ export default { // 新增任务 const updteHomeWork = () => { let obj = { - submitEndTime: dayjs(formState.choosedTime[1]).format("YYYY-MM-DD HH:mm:ss"), - submitStartTime: dayjs(formState.choosedTime[0]).format("YYYY-MM-DD HH:mm:ss"), + submitEndTime: dayjs(formState.choosedTime[1]).format("YYYY-MM-DD HH:mm"), + submitStartTime: dayjs(formState.choosedTime[0]).format("YYYY-MM-DD HH:mm"), workEnclosureAddress: state.workEnclosureAddress ? state.workEnclosureAddress : "", @@ -379,8 +379,8 @@ export default { formState.workName = res.data.data.workName; formState.workRequirement = res.data.data.workRequirement; formState.choosedTime = [ - dayjs(res.data.data.submitStartTime, "YYYY-MM-DD HH:mm:ss"), - dayjs(res.data.data.submitEndTime, "YYYY-MM-DD HH:mm:ss"), + dayjs(res.data.data.submitStartTime, "YYYY-MM-DD HH:mm"), + dayjs(res.data.data.submitEndTime, "YYYY-MM-DD HH:mm"), ]; state.addLoading = false; }) diff --git a/src/components/drawers/AddTest.vue b/src/components/drawers/AddTest.vue index 21af626c..ca1a2075 100644 --- a/src/components/drawers/AddTest.vue +++ b/src/components/drawers/AddTest.vue @@ -244,7 +244,7 @@
- 试题排序： + 作业要求：
+ +
+
+
+ + + + + {{ workName }} + + + + +
+
+
+
+
+ + + + + {{ testName }} + + + + +
+
-
- -
- +
diff --git a/src/components/drawers/AddTest.vue b/src/components/drawers/AddTest.vue index ca1a2075..9dd01806 100644 --- a/src/components/drawers/AddTest.vue +++ b/src/components/drawers/AddTest.vue @@ -244,7 +244,7 @@
- 作业要求： + 考试排序：
- +
{{ workName }} - +
- +
{{ testName }} - +
{ // return attrs.vnodes; @@ -3719,6 +3725,8 @@ export default defineComponent({ testName:null, assessmentName: "", assessmentVisible: false, + addhomeworkvisible:false, + addtestvisible:false, codevisible: false, //二维码弹窗 codeInfo: null, //二维码内容 codeUrl: codeUrl, @@ -4826,6 +4834,10 @@ export default defineComponent({ state.xjkkinputV4 = null; state.checked1 = false; state.checked4 = false; + state.EditTestId = null; + state.assessmentId = null; + state.EditWorkId = null; + removePG(); }; //保存开课 @@ -4852,6 +4864,8 @@ export default defineComponent({ endTime: endTime, evalFlag: state.checked4 ? 1 : 0, evaluateId: Number(state.assessmentId), + testId: state.EditTestId, + homeWorkId: state.EditWorkId, name: state.xjkkinputV1, signFlag: state.xjkkradioV1 === 0 ? 1 : 0, //是否允许未报名的签到:1是0否 // signWordFlag: state.xjkkradioV1 === 1 ? 1 : 0, //签到是否需要口令:1是0否 @@ -4895,15 +4909,25 @@ export default defineComponent({ if (res.data.code === 200) return res.data.data; }); - let obj = { - assessmentId: item.evaluateId, - }; + if(item.evaluateId){ api - .queryAppraiseDetailById(obj) + .queryAppraiseDetailById({assessmentId: item.evaluateId}) .then((res) => { state.assessmentName = res.data.data.assessmentName; }) .catch(); + } + if(item.homeWorkId){ + queryWorkDetailById({workId:item.homeWorkId}).then((res)=>{ + state.workName = res.data.data.workName; + }); + } + if(item.testId){ + queryExaminationDetailById({ examinationId: item.testId }).then((res)=>{ + state.testName = res.data.data.examinationName; + }); + } + console.log("res"); console.log("获取面授课详情", item); @@ -4922,6 +4946,8 @@ export default defineComponent({ item.completeType.split(",")[1] == "1" ? true : false), (state.checked4 = item.evalFlag === 1 ? true : false); state.assessmentId = String(item.evaluateId); + state.EditTestId = String(item.testId); + state.EditWorkId = String(item.homeWorkId); state.xjkkinputV1 = item.name; if (item.signFlag === 1) { //是否允许未报名的签到:1是0否 From e7a3d00140c566e7a364de22b3004072a4784014 Mon Sep 17 00:00:00 2001 From: zhangyc Date: Fri, 16 Dec 2022 01:21:02 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E5=90=8D=E3=80=81?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=90=8D=E7=A7=B0=E4=BF=AE=E6=94=B9=E6=8F=90?= =?UTF-8?q?=E7=A4=BA=E9=87=8D=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/project/NameInput.vue | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/components/project/NameInput.vue b/src/components/project/NameInput.vue index 753a9f78..e284d6d6 100644 --- a/src/components/project/NameInput.vue +++ b/src/components/project/NameInput.vue @@ -64,8 +64,13 @@ watch(modelV, () => { function validateProName() { emit('update:finished', false); props.value && validateName({name: props.value, type: props.type, id: props.id}).then(res => { - emit('update:validate', res.data.data !== 1) - emit('update:finished', true); + if(props.value==""){ + emit('update:validate', res.data.data === 1) + }else{ + emit('update:validate', res.data.data !== 1) + emit('update:finished', true); + } + }) } From e90aaf83e4f29e7ae51f0d64c2380e37a18d02f7 Mon Sep 17 00:00:00 2001 From: zhangyc Date: Fri, 16 Dec 2022 08:51:44 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E5=BD=92=E5=B1=9E=E7=BB=84=E7=BB=87?= =?UTF-8?q?=E6=89=93=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/drawers/MemberList.vue | 3 ++- src/components/project/OrgClass.vue | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/components/drawers/MemberList.vue b/src/components/drawers/MemberList.vue index cff40cee..cc7f3971 100644 --- a/src/components/drawers/MemberList.vue +++ b/src/components/drawers/MemberList.vue @@ -330,7 +330,8 @@ export default { gangw: value.userInfoBo.jobName, //岗位 completeStageCnt: value.completeStageCnt, //当前完成阶段数 totalStageCnt: value.totalStageCnt, //总阶段数 - progress: value.completeStageCnt + "/" + value.totalStageCnt, + //progress: value.completeStageCnt + "/" + value.totalStageCnt, TODO接口返回value.completeStageCnt值不对 + progress: 0 + "/" + value.totalStageCnt, stutime: toDate(value.beginStudyTime / 1000, "Y-M-D"), //开始学习时间 }; diff --git a/src/components/project/OrgClass.vue b/src/components/project/OrgClass.vue index 916f7cc2..5483e5a0 100644 --- a/src/components/project/OrgClass.vue +++ b/src/components/project/OrgClass.vue @@ -38,8 +38,9 @@ const options = computed(() => store.state.orgtreeList) const id = computed(() => { return props.value }) - +console.log("store.state.orgtreeList",store.state.orgtreeList); function change(key, obj) { + console.log(obj[0],key,props.value); emit('update:name', obj[0]) emit('update:value', key) } From 4622244be17af1cbd2e97356fdb8a42aebf4d1e0 Mon Sep 17 00:00:00 2001 From: zhangyc Date: Fri, 16 Dec 2022 09:16:18 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E5=BD=92=E5=B1=9E=E7=BB=84=E7=BB=87=E6=89=93=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/projectcenter/TaskPage.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue index 8e17fe23..1c7eda96 100644 --- a/src/views/projectcenter/TaskPage.vue +++ b/src/views/projectcenter/TaskPage.vue @@ -2647,6 +2647,7 @@ export default { // 输入接入 -- start -- // 资源归属 sourceBelongId 后续给接口 state.bum = computed(() => { + console.log("基础信息 store.state.orgtreeList",store.state.orgtreeList); return store.state.orgtreeList ? store.state.orgtreeList : []; }); From db5f335e1a27828462e9c434b8dbf9c6c83e26da Mon Sep 17 00:00:00 2001 From: zhangyc Date: Fri, 16 Dec 2022 09:22:29 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/App.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/App.vue b/src/App.vue index 01016e23..c8167e9a 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.14------------"); + console.log("版本0.9.15------------"); const routes = computed(() => { return router.getRoutes().filter((e) => e.meta?.isLink); });