diff --git a/src/pages/checkhomework/index.jsx b/src/pages/checkhomework/index.jsx index 6b73a118ceb22b9c6f30da76af834a91517221c3..253035f367cf4d40311604e3b715ec2983713fe7 100644 --- a/src/pages/checkhomework/index.jsx +++ b/src/pages/checkhomework/index.jsx @@ -255,6 +255,15 @@ function Checkhomework() { colProps: { span: 24 }, valueType: "digit", }, + { + title: "评è¯", + dataIndex: "comment", + key: "comment", + valueType: "textarea", + colProps: { + span: 24, + }, + }, ]} defaultFormValue={{ examineResult: "1" }} onFinish={(val, extra) => { @@ -319,6 +328,13 @@ function Checkhomework() { title: "分数", dataIndex: "score", key: "score", + span:2 + }, + { + title: "评è¯", + dataIndex: "comment", + key: "comment", + span: 3 }, ], ]} @@ -364,20 +380,26 @@ function Checkhomework() { variant: "contained", onClick: async (e) => { e.stopPropagation(); - if(active === "1"){ - let formval = formRef?.current.getFieldsValue() + if (active === "1") { + let formval = formRef?.current.getFieldsValue(); const params = { ...formval, - type:active - } - await doFetch({url:"/studentExperiment/exportByLoginTeacher",params}); - }else{ + type: active, + }; + await doFetch({ + url: "/studentExperiment/exportByLoginTeacher", + params, + }); + } else { let formval = formRefs?.current.getFieldsValue(); const params = { ...formval, - type:active - } - await doFetch({url:"/studentExperiment/exportByLoginTeacher",params}); + type: active, + }; + await doFetch({ + url: "/studentExperiment/exportByLoginTeacher", + params, + }); } }, }} diff --git a/src/pages/myrecord/index.jsx b/src/pages/myrecord/index.jsx index b8eeb0a4515472fe6a855bf35eb97320363b3cad..cea8cef7b5724de5cbb3f3708ccf517524128b62 100644 --- a/src/pages/myrecord/index.jsx +++ b/src/pages/myrecord/index.jsx @@ -23,6 +23,19 @@ function Record() { })); }; const detailcolumns = [ + { + title: "分数", + dataIndex: "score", + key: "score", + hideInSearch: true, + span: 2, + }, + { + title: "评è¯", + dataIndex: "comment", + key: "comment", + span: 2, + }, { title: "å¦ç”Ÿå§“å", dataIndex: "studentName", key: "studentName" }, { title: "å¦ç”Ÿè´¦å·", dataIndex: "studentAccount", key: "studentAccount" }, { title: "课程åç§°", dataIndex: "courseName", key: "courseName" }, @@ -33,8 +46,6 @@ function Record() { dataIndex: "testTime", key: "testTime", }, - - { title: "分数", dataIndex: "score", key: "score", hideInSearch: true }, { title: "æƒé‡", dataIndex: "weight", key: "weight", hideInSearch: true }, { title: "分数", dataIndex: "scoreWeight", key: "scoreWeight" }, {