From 8dde4dd9e50f8c70d7fef5d1f456e37b6e98ec13 Mon Sep 17 00:00:00 2001 From: wyx <51903@qq.com> Date: Sat, 3 Dec 2022 12:53:35 +0800 Subject: [PATCH 01/24] =?UTF-8?q?fix(BUG:103):=E5=AD=A6=E4=B9=A0=E8=B7=AF?= =?UTF-8?q?=E5=BE=84=E5=9B=BE=E6=B7=BB=E5=8A=A0=E8=AF=84=E4=BC=B0=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/drawers/ AssessmentList.vue | 23 ++++++++++++++++++++-- src/components/drawers/AddInvist.vue | 5 ++++- src/views/projectcenter/TaskPage.vue | 13 +++++++----- 3 files changed, 33 insertions(+), 8 deletions(-) diff --git a/src/components/drawers/ AssessmentList.vue b/src/components/drawers/ AssessmentList.vue index 1ebebd8d..0be19b7f 100644 --- a/src/components/drawers/ AssessmentList.vue +++ b/src/components/drawers/ AssessmentList.vue @@ -47,7 +47,11 @@ expandRowByClick="true" @expand="expandTable" :pagination="false" - :row-selection="rowSelection" + :row-selection="{ + selectedRowKeys: selectedRowKeys, + onChange: onSelectChange, + type: 'radio', + }" filterMultiple:false /> @@ -101,9 +105,10 @@ export default { tableDataTotal: 0, tableData: [], selectedRowKeys: [], - assessmentId:null, + assessmentId:null }); const closeDrawer = () => { + state.selectedRowKeys = []; ctx.emit("update:assessmentVisible", false); ctx.emit("update:titleTag", true); @@ -165,6 +170,19 @@ export default { // state.selectedRowKeys = selectedRowKeys; // }; + const onSelectChange = (selectedRowKeys, selectRow) => { + console.log("selectedRowKeys changed: ", selectedRowKeys, selectRow); + state.selectedRowKeys = selectedRowKeys; + state.selectedRows = selectRow; + console.log(selectRow) + state.assessment =selectRow[0]; + state.assessmentId = selectRow[0].assessmentId; + ctx.emit("checkedAss", state.assessment); + ctx.emit("update:assessmentId", state.assessmentId); + state.selectedRowKeys = []; + closeDrawer(); + }; + const handelChangePage = (page, pageSize) => { state.currentPage = page; state.pageSize = pageSize; @@ -222,6 +240,7 @@ export default { getAllInvistText, resetInvist, handelChangePage, + onSelectChange }; }, }; diff --git a/src/components/drawers/AddInvist.vue b/src/components/drawers/AddInvist.vue index 231130af..0755793f 100644 --- a/src/components/drawers/AddInvist.vue +++ b/src/components/drawers/AddInvist.vue @@ -54,7 +54,7 @@ > 名称： - {{ assessment1.createName }} + {{ assessment1.assessmentName }} 题数： @@ -184,6 +184,8 @@ export default { const closeDrawer = () => { ctx.emit("update:addinvistVisible", false); ctx.emit("update:edit", false); + state.assessment = null; + state.assessment1 = null; state.inputV1 = ""; // ctx.emit("changeData", false); localStorage.setItem("stageId", props.chooseStageId); @@ -205,6 +207,7 @@ export default { api .queryAppraiseDetailById({ assessmentId: props.EditInvistId }) .then((res) => { + console.log(res) //更新讨论信息 state.assessment1 = res.data.data; }) diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue index fb000e45..e0d43355 100644 --- a/src/views/projectcenter/TaskPage.vue +++ b/src/views/projectcenter/TaskPage.vue @@ -427,11 +427,11 @@
开始时间
-
{{ item.createTime }}
+
{{item.createTime?toDate(Number(item.createTime),"Y-M-D"):'---'}}
- {{ item.finishStuCnt }}/{{ item.totalStuCnt }}人 + {{ item.finishStuCnt&&item.finishStuCnt!==null?item.finishStuCnt:0 }}/{{ item.totalStuCnt&&item.totalStuCnt!==null?item.totalStuCnt:0 }}人
{{ - (item.finishStuCnt / item.totalStuCnt) * 100 + (item.finishStuCnt&&item.finishStuCnt!==null?item.finishStuCnt:0 / item.totalStuCnt&&item.totalStuCnt!==null?item.totalStuCnt:0) * 100 }}%
@@ -3248,8 +3248,10 @@ export default { }).then((res) => { console.log("get task", res.data.data); let info = res.data.data.projectInfo; - let start = toDate(info.beginTime / 1000, "Y-M-D h:m"); - let end = toDate(info.endTime / 1000, "Y-M-D h:m"); + // let start = toDate(info.beginTime / 1000, "Y-M-D h:m"); + let start = info.beginTime + // let end = toDate(info.endTime / 1000, "Y-M-D h:m"); + let end = info.endTime state.tstartTime = info.beginTime; state.tendTime = info.endTime; state.tsourceBelong = info.sourceBelongId; @@ -3823,6 +3825,7 @@ export default { templateProject, changeGrouped, deFile, + toDate }; }, }; From fa6e9bc85fb291e8a4c50fc2a0bd1b00d6e88139 Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Sat, 3 Dec 2022 13:03:57 +0800 Subject: [PATCH 02/24] =?UTF-8?q?--=20bug=20=E6=8E=88=E8=AF=BE=E6=95=99?= =?UTF-8?q?=E5=B8=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/drawers/AddFaceteach.vue | 7 +++++-- src/components/project/ProjectManager.vue | 23 ++++++++++++++++------- src/views/projectcenter/ProjectAdd.vue | 2 +- src/views/projectcenter/ProjectManage.vue | 2 +- 4 files changed, 23 insertions(+), 11 deletions(-) diff --git a/src/components/drawers/AddFaceteach.vue b/src/components/drawers/AddFaceteach.vue index f9a553eb..c1891108 100644 --- a/src/components/drawers/AddFaceteach.vue +++ b/src/components/drawers/AddFaceteach.vue @@ -61,8 +61,9 @@ 授课教师：
- + + +
@@ -278,6 +279,7 @@ import dayjs from "dayjs"; import AssessmentList from "../drawers/ AssessmentList.vue"; // import { toDate } from "../../api/method";、 import {addTempTask} from "../../api/indexTaskadd"; +import ProjectManager from "@/components/project/ProjectManager"; export default { name: "AddFaceteach", @@ -286,6 +288,7 @@ export default { AddHomework, AddTest, AssessmentList, + ProjectManager, }, props: { addfaceteachVisible: { diff --git a/src/components/project/ProjectManager.vue b/src/components/project/ProjectManager.vue index e3d8fee3..d86f700e 100644 --- a/src/components/project/ProjectManager.vue +++ b/src/components/project/ProjectManager.vue @@ -1,13 +1,13 @@