From 3000423281d5d696c9271df97df9922cdf3fc838 Mon Sep 17 00:00:00 2001 From: wyx Date: Thu, 16 Feb 2023 16:32:39 +0800 Subject: [PATCH 1/2] =?UTF-8?q?style:=E9=9D=A2=E6=8E=88=E8=AF=BE=E6=9F=A5?= =?UTF-8?q?=E7=9C=8B=E7=AD=94=E5=8D=B7=E5=A2=9E=E5=8A=A0=E6=9F=A5=E7=9C=8B?= =?UTF-8?q?=E7=AD=94=E5=8D=B7=E5=BC=B9=E6=A1=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../drawers/project/ProjectFaceTaskManage.vue | 19 ++++++++++++------- .../drawers/router/RouterFaceTeachManage.vue | 18 ++++++++++++------ 2 files changed, 24 insertions(+), 13 deletions(-) diff --git a/src/components/drawers/project/ProjectFaceTaskManage.vue b/src/components/drawers/project/ProjectFaceTaskManage.vue index 7a5e9528..f28bab44 100644 --- a/src/components/drawers/project/ProjectFaceTaskManage.vue +++ b/src/components/drawers/project/ProjectFaceTaskManage.vue @@ -169,8 +169,10 @@ /> + - + { + customRender: (text, {record:{examStatus,workStatus}}) => { return (examStatus || workStatus) && (
{ - state.CQvisible = true; + state.datasource = text.record; + state.CAvisible = true; }} > 查看答卷 diff --git a/src/components/drawers/router/RouterFaceTeachManage.vue b/src/components/drawers/router/RouterFaceTeachManage.vue index 97147a0f..bd26191c 100644 --- a/src/components/drawers/router/RouterFaceTeachManage.vue +++ b/src/components/drawers/router/RouterFaceTeachManage.vue @@ -147,7 +147,9 @@ - + + + { @@ -452,9 +457,9 @@ export default { class="operation" style="cursor:pointer;margin-right:10px;color: rgba(56, 125, 247, 1)" onClick={() => { - state.CQvisible = true; - }} - > + state.datasource = value; + state.CAvisible = true; + }}> 查看答卷 }
) @@ -526,6 +531,7 @@ export default { newData.push(res.data.data.records[i]); } state.tabledata = newData; + state.tabledata = [{name:'小星星',workStatus:1}]; ListOpera(); state.tableDataTotal = res.data.data.total; state.tableDataTotal2 = res.data.data.total; From 5591a98e336e19ab85b760bd649bd32d873f1709 Mon Sep 17 00:00:00 2001 From: wyx Date: Thu, 16 Feb 2023 16:55:55 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=E6=9B=B4=E6=96=B0=E8=B0=83=E8=AF=95?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E3=80=81=E5=AD=A6=E4=B9=A0=E8=B7=AF=E5=BE=84?= =?UTF-8?q?=E5=9B=BE=E5=85=B1=E4=BA=AB=E6=96=87=E6=A1=A3=E7=BC=96=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/indexLearningPath.js | 5 ++++- src/api/indexTaskadd.js | 2 ++ src/views/learningpath/LevelAdd.vue | 14 +++++++------- src/views/projectcenter/TaskPage.vue | 8 ++++---- 4 files changed, 17 insertions(+), 12 deletions(-) diff --git a/src/api/indexLearningPath.js b/src/api/indexLearningPath.js index 8de427ef..75b4be64 100644 --- a/src/api/indexLearningPath.js +++ b/src/api/indexLearningPath.js @@ -4,4 +4,7 @@ import http from "./config"; export const getRouterOverview = (routerId) => http.get(`/admin/router/overview?routerId=${routerId}`) //新建或编辑路径图 -export const editRoutered = (obj) => http.post('/admin/router/edit', obj) \ No newline at end of file +export const editRoutered = (obj) => http.post('/admin/router/edit', obj) + +// 新建或编辑路径图共享文档 +export const editRouteredDoc = (obj) => http.post('/admin/router/editShareRouter', obj) \ No newline at end of file diff --git a/src/api/indexTaskadd.js b/src/api/indexTaskadd.js index 6289413c..802997a2 100644 --- a/src/api/indexTaskadd.js +++ b/src/api/indexTaskadd.js @@ -13,6 +13,8 @@ export const deleteTask = (obj) => http.delete('/admin/project/deleteTask', { pa //新建或编辑项目 export const editProj = (obj) => http.post('/admin/project/edit', obj) +//编辑项目共享文档 +export const editProjDoc = (obj) => http.post('/admin/project/editShareAttach', obj) //路径图里的新建或编辑关卡任务 export const editTask = (obj) => http.post('/admin/router/editTask', obj) diff --git a/src/views/learningpath/LevelAdd.vue b/src/views/learningpath/LevelAdd.vue index 9c10f2e7..85b2789c 100644 --- a/src/views/learningpath/LevelAdd.vue +++ b/src/views/learningpath/LevelAdd.vue @@ -1374,7 +1374,7 @@ import { getRouterOverview } from "@/api/indexLearningPath"; import { handleLearnPath } from "../../api/index1"; import { GetRouterDetail } from "@/api/indexTask"; import * as api from "../../api/index1"; -import { editRoutered } from "../../api/indexLearningPath"; +import { editRouteredDoc } from "../../api/indexLearningPath"; import TwoDimensionalCode from "../../components/TwoDimensionalCode.vue"; import TableStudent from "@/components/student/TableStudent"; import { getStuPage, moveStudent } from "@/api/index1"; @@ -2255,12 +2255,12 @@ export default { attachSwitch: data ? 1 : -1, }); // 更新开关状态 - editRoutered({ + editRouteredDoc({ attach: JSON.stringify(state.fileList), name: state.styTitle, picUrl: state.picUrl, remark: state.remark, - routerId: state.routerId, + id: state.routerId, status: state.action, attachSwitch: data ? 1 : -1, }) @@ -2355,12 +2355,12 @@ export default { let str = JSON.stringify(list); console.log(str); //要编辑路径图 - editRoutered({ + editRouteredDoc({ attach: str, name: state.styTitle, picUrl: state.picUrl, remark: state.remark, - routerId: state.routerId, + id: state.routerId, status: state.action, attachSwitch: state.docChecked ? 1 : -1, }) @@ -2480,12 +2480,12 @@ export default { state.fileList.splice(index, 1); let str = JSON.stringify(state.fileList); //要编辑路径图 - editRoutered({ + editRouteredDoc({ attach: str, name: state.styTitle, picUrl: state.picUrl, remark: state.remark, - routerId: state.routerId, + id: state.routerId, status: state.action, }) .then((res) => { diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue index 761c2810..2a48672d 100644 --- a/src/views/projectcenter/TaskPage.vue +++ b/src/views/projectcenter/TaskPage.vue @@ -2175,7 +2175,7 @@ import { import { message, Modal } from "ant-design-vue"; import * as apitl from "../../api/index"; import { getTask } from "../../api/indexTaskadd"; -import { editProj } from "../../api/indexTaskadd"; +import { editProjDoc } from "../../api/indexTaskadd"; import { toDate } from "../../api/method"; import projSet from "../../components/Modals/projSet"; import { overview } from "../../api/indexProjStu"; @@ -4213,7 +4213,7 @@ export default { state.docChecked = data; state.switchopen = data; // 更新开关状态 - editProj({ + editProjDoc({ attachSwitch: state.switchopen ? 1 : -1, boeFlag: state.boeFlag, category: state.category, @@ -4275,7 +4275,7 @@ export default { templateId: state.templateId || 0, type: state.type, }); - editProj({ + editProjDoc({ attachSwitch: state.switchopen ? 1 : -1, attach: str, boeFlag: state.boeFlag, @@ -4548,7 +4548,7 @@ export default { }); state.fileList.splice(index, 1); let str = JSON.stringify(state.fileList); - editProj({ + editProjDoc({ attach: str, beginTime: state.tstartTime.slice(0, 10), // beginTime:1668643200,