From a730558682673a91066304bae35be3dab5927610 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E8=B6=85?= Date: Tue, 22 Nov 2022 18:07:43 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E5=90=84=E5=AE=A1=E6=A0=B8=E7=9A=84?= =?UTF-8?q?=E5=90=84=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/indexAudit.js | 13 + src/api/indexNotice.js | 2 +- src/components/drawers/ProjectAudit.vue | 412 +++++++++++++++++++++ src/views/examine/CourseReviewed.vue | 140 ++++++-- src/views/examine/CourseReviewedN.vue | 398 +++++++++++++++++++- src/views/examine/ProjectReviewed.vue | 453 ++++++++++++++++++++++- src/views/examine/ProjectReviewedN.vue | 459 +++++++++++++++++++++++- src/views/projectcenter/TaskPage.vue | 116 +++--- 8 files changed, 1892 insertions(+), 101 deletions(-) create mode 100644 src/api/indexAudit.js create mode 100644 src/components/drawers/ProjectAudit.vue diff --git a/src/api/indexAudit.js b/src/api/indexAudit.js new file mode 100644 index 00000000..c1b3b4db --- /dev/null +++ b/src/api/indexAudit.js @@ -0,0 +1,13 @@ +import http from "./config"; + +//获取待审核面授课列表 +export const list = (obj) => http.post('/admin/offcourse/list', obj) + +//获取待审核项目列表 +export const projlist = (obj) => http.post('/admin/project/list', obj) + +//获取已审核项目列表 +export const listView = (obj) => http.post('/admin/project/listView', obj) + +//获取面授课已审核列表 +export const courseListView = (obj) => http.post('/admin/offcourse/listReview', obj) \ No newline at end of file diff --git a/src/api/indexNotice.js b/src/api/indexNotice.js index c6eb8fa7..19a34f98 100644 --- a/src/api/indexNotice.js +++ b/src/api/indexNotice.js @@ -6,7 +6,7 @@ import http from "./config"; // projectId: projectId, // } // }); -export const noticeList = (projectId) => http.post(`http://localhost:8080/api/admin/project/noticeList?projectId=` + projectId + ``) +export const noticeList = (projectId) => http.post(`http://localhost:8080/manageApi/admin/project/noticeList?projectId=` + projectId + ``) //发布项目公告 export const publishNotice = (obj) => http.post('/admin/project/publishNotice', obj) diff --git a/src/components/drawers/ProjectAudit.vue b/src/components/drawers/ProjectAudit.vue new file mode 100644 index 00000000..e8c0b1c3 --- /dev/null +++ b/src/components/drawers/ProjectAudit.vue @@ -0,0 +1,412 @@ + + + + + + diff --git a/src/views/examine/CourseReviewed.vue b/src/views/examine/CourseReviewed.vue index 99a1c9c6..3a4855b4 100644 --- a/src/views/examine/CourseReviewed.vue +++ b/src/views/examine/CourseReviewed.vue @@ -16,7 +16,7 @@
@@ -48,11 +48,11 @@
-
+
搜索
-
+
重置
@@ -66,16 +66,31 @@ :loading="tableDataTotal === -1 ? true : false" expandRowByClick="true" @expand="expandTable" + :scroll="{ x: 1300 }" :pagination="false" />
+
+
+ +
+
\ No newline at end of file diff --git a/src/views/examine/ProjectReviewed.vue b/src/views/examine/ProjectReviewed.vue index d8cf1d7b..20882d2a 100644 --- a/src/views/examine/ProjectReviewed.vue +++ b/src/views/examine/ProjectReviewed.vue @@ -6,26 +6,471 @@ * @FilePath: /fe-manage/src/views/examine/ProjectReviewed.vue * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE --> - + \ No newline at end of file diff --git a/src/views/examine/ProjectReviewedN.vue b/src/views/examine/ProjectReviewedN.vue index 56931cc2..171c254c 100644 --- a/src/views/examine/ProjectReviewedN.vue +++ b/src/views/examine/ProjectReviewedN.vue @@ -6,26 +6,473 @@ * @FilePath: /fe-manage/src/views/examine/ProjectReviewedN.vue * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE --> - + \ No newline at end of file diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue index 10cc4022..d14ac5f7 100644 --- a/src/views/projectcenter/TaskPage.vue +++ b/src/views/projectcenter/TaskPage.vue @@ -1025,7 +1025,7 @@ {{ item.name }} - 删除 + 删除 @@ -3260,7 +3264,7 @@ export default { let luj = info.attach; console.log("lulj", luj); console.log("赚回来", JSON.parse(luj)); - state.fileList = JSON.parse(luj) + state.fileList = JSON.parse(luj); // state.fileList = luj } }); @@ -3369,33 +3373,23 @@ export default { }; //end---------项目概览 - const handleChange = (info) => { + const handleChange = ({ file, fileList }) => { let list = []; - if (info.file.status !== "uploading") { - console.log(info.file.response.data, info.fileList); - // info.fileList.map((item) => { - // //把地址放到list里 - // // list.push(item.response.data); - // // list.push(JSON.stringify(item)) - // state.fileList.push(item) - // }); - - state.fileList.push(info.file) - list = state.fileList + if (file.status !== "uploading") { + console.log("上传的list", fileList); + console.log(file); + list = state.fileList; console.log("list", list); - // let str = list.join(","); let str = JSON.stringify(list); - console.log("str", str); + console.log("str",str) //要编辑项目 editProj({ attach: str, beginTime: state.tstartTime.slice(0, 10), - // beginTime:1668643200, boeFlag: state.boeFlag, category: state.category, courseSyncFlag: state.courseSyncFlag, endTime: state.tendTime.slice(0, 10), - // endTime: 1668816000, level: state.tlevel, manager: state.manager, managerId: state.managerId, @@ -3420,10 +3414,10 @@ export default { }); } - if (info.file.status === "done") { - message.success(`${info.file.name} 文件上传成功`); - } else if (info.file.status === "error") { - message.error(`${info.file.name} 文件上传失败.`); + if (file.status === "done") { + message.success(`${file.name} 文件上传成功`); + } else if (file.status === "error") { + message.error(`${file.name} 文件上传失败.`); } }; @@ -3608,45 +3602,47 @@ export default { }); }; //删除文件 - const deFile=(id)=>{ - console.log(id) - let index = state.fileList.findIndex(item=>{item.uid==id}) - state.fileList.splice(index,1) - let str = JSON.stringify(state.fileList) + const deFile = (id) => { + console.log(id); + let index = state.fileList.findIndex((item) => { + item.uid == id; + }); + state.fileList.splice(index, 1); + let str = JSON.stringify(state.fileList); editProj({ - attach: str, - beginTime: state.tstartTime.slice(0, 10), - // beginTime:1668643200, - boeFlag: state.boeFlag, - category: state.category, - courseSyncFlag: state.courseSyncFlag, - endTime: state.tendTime.slice(0, 10), - // endTime: 1668816000, - level: state.tlevel, - manager: state.manager, - managerId: state.managerId, - name: state.name, - notice: state.notice, - noticeFlag: state.noticeFlag, - parentId: state.parentId, - picUrl: state.picUrl, - projectId: state.projectId, - remark: state.remark, - sourceBelongId: Number(state.tsourceBelong), - status: state.status, - systemId: state.tsystemId, - templateId: state.templateId || 0, - type: state.type, + attach: str, + beginTime: state.tstartTime.slice(0, 10), + // beginTime:1668643200, + boeFlag: state.boeFlag, + category: state.category, + courseSyncFlag: state.courseSyncFlag, + endTime: state.tendTime.slice(0, 10), + // endTime: 1668816000, + level: state.tlevel, + manager: state.manager, + managerId: state.managerId, + name: state.name, + notice: state.notice, + noticeFlag: state.noticeFlag, + parentId: state.parentId, + picUrl: state.picUrl, + projectId: state.projectId, + remark: state.remark, + sourceBelongId: Number(state.tsourceBelong), + status: state.status, + systemId: state.tsystemId, + templateId: state.templateId || 0, + type: state.type, + }) + .then((res) => { + console.log("上传成功", res); + message.destroy(); + return message.success("删除成功"); }) - .then((res) => { - console.log("上传成功", res); - message.destroy() - return message.success("删除成功") - }) - .catch((err) => { - console.log("上传失败了", err); - }); - } + .catch((err) => { + console.log("上传失败了", err); + }); + }; onMounted(() => { getStu(); getTaskList();