From 091992ae2d6bfae33092849996b5fcb07ba1502f Mon Sep 17 00:00:00 2001 From: kclf <1195754634@qq.com> Date: Wed, 7 Dec 2022 18:08:17 +0800 Subject: [PATCH 1/9] t --- .../courselibrary/components/shoukeModal.vue | 8357 +++++++++++++++++ src/views/research/ResearchManage.vue | 2 +- 2 files changed, 8358 insertions(+), 1 deletion(-) create mode 100644 src/views/courselibrary/components/shoukeModal.vue diff --git a/src/views/courselibrary/components/shoukeModal.vue b/src/views/courselibrary/components/shoukeModal.vue new file mode 100644 index 00000000..f6cb0dd5 --- /dev/null +++ b/src/views/courselibrary/components/shoukeModal.vue @@ -0,0 +1,8357 @@ + + + + diff --git a/src/views/research/ResearchManage.vue b/src/views/research/ResearchManage.vue index 19d107a4..18e34e1f 100644 --- a/src/views/research/ResearchManage.vue +++ b/src/views/research/ResearchManage.vue @@ -44,7 +44,7 @@
-
创建评估2
+
创建评估
From 359188e63a4e1ff8d08e0ee445b5b1fa5d23b749 Mon Sep 17 00:00:00 2001 From: kclf <1195754634@qq.com> Date: Wed, 7 Dec 2022 18:08:37 +0800 Subject: [PATCH 2/9] t --- .../courselibrary/components/shoukeModal.vue | 8357 ----------------- 1 file changed, 8357 deletions(-) delete mode 100644 src/views/courselibrary/components/shoukeModal.vue diff --git a/src/views/courselibrary/components/shoukeModal.vue b/src/views/courselibrary/components/shoukeModal.vue deleted file mode 100644 index f6cb0dd5..00000000 --- a/src/views/courselibrary/components/shoukeModal.vue +++ /dev/null @@ -1,8357 +0,0 @@ - - - - From 99a255009733d20565ba491bd933e6a9c0dc1a90 Mon Sep 17 00:00:00 2001 From: kclf <1195754634@qq.com> Date: Wed, 7 Dec 2022 18:21:24 +0800 Subject: [PATCH 3/9] t --- src/views/courselibrary/CoursewareManage.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue index f6cb0dd5..d9e6ea6c 100644 --- a/src/views/courselibrary/CoursewareManage.vue +++ b/src/views/courselibrary/CoursewareManage.vue @@ -3407,8 +3407,8 @@ const columns6 = [ }, { title: "创建人", - dataIndex: "name", - key: "name", + dataIndex: "createName", + key: "createName", width: "10%", align: "center", ellipsis: true, @@ -4527,7 +4527,7 @@ export default defineComponent({ let obj = { pageNo: state.currentPage222, pageSize: state.pageSize222, - name: state.kk_inputV1, + createName: state.kk_inputV1, teacher: state.kk_inputV2, beginTime: parseInt(new Date(state.selectTime).getTime() / 1000), offcourseId: state.offcourseId, From 66c2fc66d2919c0d15aa740df859983e5befe098 Mon Sep 17 00:00:00 2001 From: kclf <1195754634@qq.com> Date: Wed, 7 Dec 2022 18:22:34 +0800 Subject: [PATCH 4/9] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/courselibrary/courseModal.vue | 8357 +++++++++++++++++++++++ 1 file changed, 8357 insertions(+) create mode 100644 src/views/courselibrary/courseModal.vue diff --git a/src/views/courselibrary/courseModal.vue b/src/views/courselibrary/courseModal.vue new file mode 100644 index 00000000..f6cb0dd5 --- /dev/null +++ b/src/views/courselibrary/courseModal.vue @@ -0,0 +1,8357 @@ + + + + From 8c22691c79d5f382ce044e55075bdaf192314c8e Mon Sep 17 00:00:00 2001 From: wyx <51903@qq.com> Date: Wed, 7 Dec 2022 19:15:45 +0800 Subject: [PATCH 5/9] =?UTF-8?q?fix:=E5=A2=9E=E5=8A=A0=E6=A8=A1=E6=9D=BF?= =?UTF-8?q?=E5=BA=93=E5=85=B1=E4=BA=AB=E6=96=87=E6=A1=A3=E4=B8=8A=E4=BC=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/projectcenter/LibraryAdd.vue | 89 +++++++++++++++----------- 1 file changed, 53 insertions(+), 36 deletions(-) diff --git a/src/views/projectcenter/LibraryAdd.vue b/src/views/projectcenter/LibraryAdd.vue index 9e70b9a5..044810a4 100644 --- a/src/views/projectcenter/LibraryAdd.vue +++ b/src/views/projectcenter/LibraryAdd.vue @@ -581,12 +581,12 @@
上传共享文档
- +
@@ -833,6 +833,8 @@ export default defineComponent({ seven1: null, seven2: null, edit: true, + fileList:[], + attachSwitch:true, // 共享文档列表 docList: [ { @@ -936,30 +938,25 @@ export default defineComponent({ state.taskSyllabus = []; console.log(res); state.projectInfo.name = res.data.data.projectTemplateInfo.name; - state.projectInfo.beginTime = - res.data.data.projectTemplateInfo.beginTime; + state.projectInfo.beginTime = res.data.data.projectTemplateInfo.beginTime; state.projectInfo.endTime = res.data.data.projectTemplateInfo.endTime; state.projectInfo.manager = res.data.data.projectTemplateInfo.manager; state.projectInfo.notice = res.data.data.projectTemplateInfo.notice; - state.projectInfo.sourceBelongId = - res.data.data.projectTemplateInfo.sourceBelongId; - state.projectInfo.managerId = - res.data.data.projectTemplateInfo.managerId; + state.projectInfo.sourceBelongId = res.data.data.projectTemplateInfo.sourceBelongId; + state.projectInfo.managerId = res.data.data.projectTemplateInfo.managerId; state.projectInfo.remark = res.data.data.projectTemplateInfo.remark; - state.projectInfo.courseSyncFlag = - res.data.data.projectTemplateInfo.courseSyncFlag; + state.projectInfo.courseSyncFlag = res.data.data.projectTemplateInfo.courseSyncFlag; state.projectInfo.level = res.data.data.projectTemplateInfo.level; - state.projectInfo.systemId = - res.data.data.projectTemplateInfo.systemId; + state.projectInfo.systemId = res.data.data.projectTemplateInfo.systemId; state.projectInfo.boeFlag = res.data.data.projectTemplateInfo.boeFlag; - state.projectInfo.noticeFlag = - res.data.data.projectTemplateInfo.noticeFlag; + state.projectInfo.noticeFlag = res.data.data.projectTemplateInfo.noticeFlag; state.projectInfo.remark = res.data.data.projectTemplateInfo.remark; state.projectInfo.status = res.data.data.projectTemplateInfo.status; state.projectInfo.picUrl = res.data.data.projectTemplateInfo.picUrl; state.projectInfo.attach = res.data.data.projectTemplateInfo.attach; - state.projectInfo.category = - res.data.data.projectTemplateInfo.category; + state.projectInfo.category = res.data.data.projectTemplateInfo.category; + state.fileList = JSON.parse(res.data.data.projectTemplateInfo.attach); + state.attachSwitch = res.data.data.projectTemplateInfo.attachSwitch == 1 ? true : false let data = res.data.data.stageList; console.log("data=====", data); for (let i in data) { @@ -1136,25 +1133,23 @@ export default defineComponent({ let str = JSON.stringify(fileList); console.log("str", str); console.table({ - name: state.projectInfo.name, - category: state.projectInfo.category, - picUrl: state.projectInfo.picUrl, - beginTime: new Date(state.projectInfo.beginTime).getTime() / 1000, - endTime: new Date(state.projectInfo.endTime).getTime() / 1000, - manager: state.projectInfo.manager, - managerId: state.projectInfo.managerId || 0, - sourceBelongId: state.projectInfo.sourceBelongId, - level: state.projectInfo.level, - systemId: state.projectInfo.systemId, - boeFlag: state.projectInfo.boeFlag ? 1 : 0, - courseSyncFlag: state.projectInfo.courseSyncFlag ? 1 : 0, - notice: state.projectInfo.notice, - noticeFlag: state.projectInfo.noticeFlag, - projectTemplateId: Number(localStorage.getItem("projectTemplateId")), - remark: state.projectInfo.remark, - status: state.projectInfo.status, - attach: str, - }); + name: state.projectInfo.name, + category: state.projectInfo.category, + picUrl: state.projectInfo.picUrl, + manager: state.projectInfo.manager, + managerId: state.projectInfo.managerId || 0, + sourceBelongId: state.projectInfo.sourceBelongId, + level: state.projectInfo.level, + systemId: state.projectInfo.systemId, + boeFlag: state.projectInfo.boeFlag ? 1 : 0, + courseSyncFlag: state.projectInfo.courseSyncFlag ? 1 : 0, + notice: state.projectInfo.notice, + noticeFlag: state.projectInfo.noticeFlag, + projectTemplateId: localStorage.getItem("projectTemplateId"), + remark: state.projectInfo.remark, + status: state.projectInfo.status, + attach: str, + }); //要编辑项目 api .templateEdit({ @@ -1189,6 +1184,27 @@ export default defineComponent({ message.error(`${file.name} 文件上传失败.`); } }; + + // 设置上传图片开关 + const checkedClose = (data, a) => { + console.log(data, a); + state.attachSwitch = data; + + // 更新开关状态 + api + .templateEdit({ + sourceBelongId: state.projectInfo.sourceBelongId, + projectTemplateId: localStorage.getItem("projectTemplateId"), + attachSwitch: state.attachSwitch?1:-1 + }) + .then((res) => { + console.log("开关更新成功", res); + }) + .catch((err) => { + console.log("开关更新失败", err); + }); + }; + //设置积分规则 const editRule = () => { let obj = { @@ -1269,6 +1285,7 @@ export default defineComponent({ editRule, handleChange2, scoresum, + checkedClose }; }, }); From 4274e6ce0d855cf18ede92b97030d5b026f5ba46 Mon Sep 17 00:00:00 2001 From: wyx <51903@qq.com> Date: Wed, 7 Dec 2022 20:33:30 +0800 Subject: [PATCH 6/9] =?UTF-8?q?fix:=E5=BE=85=E5=AE=A1=E6=A0=B8=E8=AF=BE?= =?UTF-8?q?=E7=A8=8B=E5=88=9B=E5=BB=BA=E6=97=B6=E9=97=B4=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/indexAudit.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/api/indexAudit.js b/src/api/indexAudit.js index 4ce63f8a..e86bc277 100644 --- a/src/api/indexAudit.js +++ b/src/api/indexAudit.js @@ -1,7 +1,8 @@ import http from "./config"; //获取待审核面授课列表 -export const list = (obj) => http.post('/admin/offcourse/list', obj) +export const list = (obj) => http.post('/admin/offcourse/listToBeReviewed', obj) +// export const list = (obj) => http.post('/admin/offcourse/list', obj) //获取待审核项目列表 export const projlist = (obj) => http.post('/admin/project/list', obj) From 48a4a67089fba431cb6aeb373e9e15311b8deb41 Mon Sep 17 00:00:00 2001 From: wyx <51903@qq.com> Date: Wed, 7 Dec 2022 21:04:32 +0800 Subject: [PATCH 7/9] =?UTF-8?q?fix:=E6=A8=A1=E6=9D=BF=E5=BA=93=E9=83=A8?= =?UTF-8?q?=E5=88=86=E6=98=BE=E7=A4=BA=E5=88=A4=E6=96=AD=EF=BC=8C=E6=97=A0?= =?UTF-8?q?=E9=98=B6=E6=AE=B5=E6=98=BE=E7=A4=BA=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/projectcenter/LibraryAdd.vue | 8 ++++++-- src/views/projectcenter/temTask.vue | 13 ++++++++++--- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/src/views/projectcenter/LibraryAdd.vue b/src/views/projectcenter/LibraryAdd.vue index 044810a4..9b71d705 100644 --- a/src/views/projectcenter/LibraryAdd.vue +++ b/src/views/projectcenter/LibraryAdd.vue @@ -955,13 +955,17 @@ export default defineComponent({ state.projectInfo.picUrl = res.data.data.projectTemplateInfo.picUrl; state.projectInfo.attach = res.data.data.projectTemplateInfo.attach; state.projectInfo.category = res.data.data.projectTemplateInfo.category; - state.fileList = JSON.parse(res.data.data.projectTemplateInfo.attach); + try{ + state.fileList = JSON.parse(res.data.data.projectTemplateInfo.attach); + }catch{ + state.fileList = []; + } state.attachSwitch = res.data.data.projectTemplateInfo.attachSwitch == 1 ? true : false let data = res.data.data.stageList; console.log("data=====", data); for (let i in data) { console.log("what ------ > ", i, data); - state.taskSyllabus.push({ text: data[i].name, children: [] }); + state.taskSyllabus.push({ text: data[i].name?data[i].name:'无阶段任务', children: [] }); for (let j in data[i].taskList) { state.taskSyllabus[i].children.push({ course: checkType(data[i].taskList[j].type), diff --git a/src/views/projectcenter/temTask.vue b/src/views/projectcenter/temTask.vue index 16edf221..7d014940 100644 --- a/src/views/projectcenter/temTask.vue +++ b/src/views/projectcenter/temTask.vue @@ -148,7 +148,7 @@ - +
{ @@ -1525,11 +1531,12 @@ export default { api .templateDetail(localStorage.getItem("projectTemplateId")) .then((res) => { + console.log('获取的任务列表信息',res) if (res.status == 200) { console.log("22222", res.data.data.stageList); state.projectTitle = res.data.data.projectTemplateInfo.name; state.picUrl = res.data.data.projectTemplateInfo.picUrl; - let leng = res.data.data.stageList.length; + let leng = res.data.data.stageList[0].name!==null ?res.data.data.stageList.length:0; if (leng > 0) { let stage = localStorage.getItem("templateStageId") ? localStorage.getItem("templateStageId") From 472eb3c01958060ccfd9151c5990f2d756138978 Mon Sep 17 00:00:00 2001 From: wyx <51903@qq.com> Date: Wed, 7 Dec 2022 21:07:19 +0800 Subject: [PATCH 8/9] =?UTF-8?q?fix:=E6=A8=A1=E6=9D=BF=E5=BA=93=E5=85=AC?= =?UTF-8?q?=E5=91=8A=E5=8F=91=E5=B8=83=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 | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/views/projectcenter/LibraryAdd.vue b/src/views/projectcenter/LibraryAdd.vue index 9b71d705..9d2c61d7 100644 --- a/src/views/projectcenter/LibraryAdd.vue +++ b/src/views/projectcenter/LibraryAdd.vue @@ -310,9 +310,9 @@ />
 
-
+
-
发布
+
发布
@@ -992,8 +992,6 @@ export default defineComponent({ name: state.projectInfo.name, category: state.projectInfo.category, picUrl: state.projectInfo.picUrl, - beginTime: new Date(state.projectInfo.beginTime).getTime(), - endTime: new Date(state.projectInfo.endTime).getTime(), manager: state.projectInfo.manager, managerId: state.projectInfo.managerId || 0, sourceBelongId: state.projectInfo.sourceBelongId, From 3f7f89eaea10fdffdd87b9e2cc7d0e7c745851f5 Mon Sep 17 00:00:00 2001 From: wyx <51903@qq.com> Date: Wed, 7 Dec 2022 21:11:59 +0800 Subject: [PATCH 9/9] =?UTF-8?q?fix:=E6=A8=A1=E6=9D=BF=E5=BA=93=E5=9F=BA?= =?UTF-8?q?=E7=A1=80=E4=BF=A1=E6=81=AF=E5=B1=95=E7=A4=BA=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 | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/views/projectcenter/LibraryAdd.vue b/src/views/projectcenter/LibraryAdd.vue index 9d2c61d7..652a32ee 100644 --- a/src/views/projectcenter/LibraryAdd.vue +++ b/src/views/projectcenter/LibraryAdd.vue @@ -2,7 +2,7 @@
- +
{{ projectInfo.name || "-" }}
@@ -497,7 +497,7 @@
@@ -953,6 +953,7 @@ export default defineComponent({ state.projectInfo.remark = res.data.data.projectTemplateInfo.remark; state.projectInfo.status = res.data.data.projectTemplateInfo.status; state.projectInfo.picUrl = res.data.data.projectTemplateInfo.picUrl; + state.picUrl = res.data.data.projectTemplateInfo.picUrl; state.projectInfo.attach = res.data.data.projectTemplateInfo.attach; state.projectInfo.category = res.data.data.projectTemplateInfo.category; try{