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) diff --git a/src/assets/images/project/finish.png b/src/assets/images/project/finish.png new file mode 100644 index 00000000..a82b31ea Binary files /dev/null and b/src/assets/images/project/finish.png differ diff --git a/src/assets/images/project/reviewrecall.png b/src/assets/images/project/reviewrecall.png new file mode 100644 index 00000000..d7e7c004 Binary files /dev/null and b/src/assets/images/project/reviewrecall.png differ diff --git a/src/assets/images/project/reviewsubmit.png b/src/assets/images/project/reviewsubmit.png new file mode 100644 index 00000000..a9ad5186 Binary files /dev/null and b/src/assets/images/project/reviewsubmit.png differ diff --git a/src/views/projectcenter/LibraryAdd.vue b/src/views/projectcenter/LibraryAdd.vue index 9e70b9a5..652a32ee 100644 --- a/src/views/projectcenter/LibraryAdd.vue +++ b/src/views/projectcenter/LibraryAdd.vue @@ -2,7 +2,7 @@
- +
{{ projectInfo.name || "-" }}
@@ -310,9 +310,9 @@ />
 
-
+
-
发布
+
发布
@@ -497,7 +497,7 @@
@@ -581,12 +581,12 @@
上传共享文档
- +
@@ -833,6 +833,8 @@ export default defineComponent({ seven1: null, seven2: null, edit: true, + fileList:[], + attachSwitch:true, // 共享文档列表 docList: [ { @@ -936,35 +938,35 @@ 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.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; + 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), @@ -991,8 +993,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, @@ -1136,25 +1136,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 +1187,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 +1288,7 @@ export default defineComponent({ editRule, handleChange2, scoresum, + checkedClose }; }, }); diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue index c08707e7..c17ff298 100644 --- a/src/views/projectcenter/TaskPage.vue +++ b/src/views/projectcenter/TaskPage.vue @@ -17,31 +17,33 @@ @click="showCodeModel2()" />
+ - - -
+ + + + + - {{ act }} -
- -
- {{ act }} -
+ class="img2" + src="../../assets/images/project/reviewrecall.png" + /> + +
{{ act }}
+ +
+ {{ act }} +
+ +
+ {{ act }} +
+ +
+ {{ act }} +
+
取消
-
+
确定
@@ -1725,7 +1755,37 @@
- + + +
+
+
+
+
+ 提示 +
+
+
+ 您确定要撤回审核吗 +
+
+
+
+
取消
+
+
+
确定
+
+
+
+
+
{ + const submitReviewProject = () => { let obj = { projectId: state.projectId, type: 3, @@ -2887,6 +2948,8 @@ export default { message.success("提交成功"); state.reviewModal = false; getTaskInfo(); + // getTask(); + reget(); }) .catch((err) => { console.log("提交失败", err); @@ -3802,6 +3865,7 @@ export default { getTask({ projectId: state.projectId, }).then((res) => { + console.log("获取项目状态", res); state.action = res.data.data.projectInfo.status; state.act = state.action == 2 @@ -3809,7 +3873,9 @@ export default { : state.action == 0 ? "提交审核" : state.action == 1 - ? "撤回" + ? "撤回审核" + : state.action == 3 + ? "撤回发布" : state.action == -1 ? "" : "-"; @@ -3852,9 +3918,10 @@ export default { console.log("点击发布"); let obj = { projectId: state.releaseProjectId, + type: 4, }; apiproj - .releaseProject(obj) + .handleProject(obj) .then((res) => { console.log("发布成功", res); message.destroy(); @@ -3878,7 +3945,7 @@ export default { const recallProject = () => { let obj = { projectId: state.projectId, - type: 0, + type: -4, }; apiproj .handleProject(obj) @@ -3893,6 +3960,36 @@ export default { console.log("撤回失败", err); }); }; + + //打开撤回审核弹窗 + const showRecallReviewModal = () => { + state.recallReviewModal = true; + }; + //确认撤回审核 + const recallReviewProject = () => { + let obj = { + projectId: state.projectId, + type: -3, + }; + console.log("撤回成功obj", obj); + apiproj + .handleProject(obj) + .then((res) => { + console.log("撤回成功", res); + message.destroy(); + message.success("撤回成功"); + state.recallReviewModal = false; + reget(); + }) + .catch((err) => { + console.log("撤回成功", err); + }); + }; + //关闭提交审核弹窗 + const closeRecallReviewModal = () => { + state.recallReviewModal = false; + }; + //关闭结束弹窗 const closeStopModal = () => { state.stopModal = false; @@ -4162,7 +4259,10 @@ export default { checkedClose, submitExamine, closeReviewModal, + showRecallReviewModal, recallReviewProject, + closeRecallReviewModal, + submitReviewProject, showCodeModel, showCodeModel2, checkType, 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")