Merge pull request #32 from Muxi-X/ysr

fix:修复多版本评论不对应，增加提交时间

Author: YYYSSSRRR

Dockerfile

@@ -1,5 +1,5 @@
 # 第一阶段：构建前端
-FROM node:18.16.1 AS builder
+FROM node:20-alpine AS builder
 
 WORKDIR /app
 COPY . .

src/pages/HomePage/HomePage.tsx

@@ -209,7 +209,7 @@ const ShowInfo = ({ changeEditState }: { changeEditState: () => void }) => {
           )}
         </div>
         <div className="change-info-btn" onClick={changeEditState}>
-          个人信息
+          修改
         </div>
       </div>
       <Modal

src/pages/homework/pages/adminMode/judge/index.less

@@ -13,10 +13,20 @@
     scroll-snap-type: y mandatory;
     box-shadow: @box-shadow;
   }
-  .select{
+  .header{
     position: absolute;
     z-index: 1;
-    left: 50%;
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    width: 60%;
+    left: 40%;
     top: 13%;
+    .time{
+      margin-right: 10px;
+      
+    }
   }
+  
+  
 }

src/pages/homework/pages/adminMode/judge/index.tsx

@@ -11,6 +11,7 @@ import { get, post } from '../../../../../fetch.ts';
 const HomeworkJudge: React.FC = () => {
   const [Comment, setComment] = useState<CommentType[]>([]);
   const [SubmitID, setSubmitID] = useState<string>('');
+  const [time,setTime]=useState<String>('');
   const nav = useNavigate();
   const [searchParams] = useSearchParams();
   const infoItem = JSON.parse(
@@ -37,7 +38,7 @@ const HomeworkJudge: React.FC = () => {
 
         setSubmissionInfo(res.data.submission_infos)
         setSubmitID(res.data.submission_infos.length>0?res.data.submission_infos[version-1].submission_id || "":"")
-        
+        setTime(res.data.submission_infos.length>0?res.data.submission_infos[version-1].time || "":"")
       }, null);
     }
 
@@ -64,6 +65,7 @@ const HomeworkJudge: React.FC = () => {
   function onChangeVersion(value:number){
     setVersion(value)
     setSubmitID(submissionInfo.length>0?submissionInfo[value-1].submission_id || "":"")
+    setTime(submissionInfo.length>0?submissionInfo[value-1].time || "":"")
   }
 
   var versionList=submissionInfo.map((_,index)=>{
@@ -76,7 +78,11 @@ const HomeworkJudge: React.FC = () => {
 
   return (
     <div className="judge-wrap">
-      <Select className='select' onChange={onChangeVersion} options={versionList} defaultValue={1}></Select>
+      <div className='header'>
+        <div className='time'>{time}</div>
+        <Select className='select' onChange={onChangeVersion} options={versionList} defaultValue={1}></Select>
+      </div>
+      
       <div className="preview">
         <HomePreview  info={infoItem} version={version} submissionInfo={submissionInfo}></HomePreview>
       </div>

src/pages/homework/pages/userMode/submit/index.less

@@ -17,13 +17,20 @@
 .user-submit-preview-small {
   width: 40vw;
   animation: smallerani 0.4s ease-in-out forwards;
-
-  .select-version{
-    position: relative;
-    left: 80%;
-    bottom: 76%;
-    width: 90px;
+  .select{
+    position: absolute;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    top: 0%;
+    right: 0;
+    justify-content: center;
+    .time{
+      margin-bottom: 10px;
+    }
   }
+
+  
 }
 .user-submit-comment {
   width: 30vw;

src/pages/homework/pages/userMode/submit/index.tsx

@@ -30,6 +30,7 @@ const HomeworkUserSubmit: React.FC = () => {
   const [defList, setdefList] = useState<Array<userTaskType>>([]);
   const [formData, setformData] = useState<string[]>(['']);
   const [selected, setselected] = useState<string>('');
+  const [submitTime,setSubmitTime]=useState<string>('')
   const [group, setGroup] = useState<dataType>({ key: '后端组', value: 'Backend' });
   const [Comment, setComment] = useState<CommentType[]>([]);
   const [currentSubmissionId, setCurrentSubmissionId] = useState<string>('');
@@ -81,6 +82,7 @@ const HomeworkUserSubmit: React.FC = () => {
                   setCurrentSubmissionId(
                     resp.data.submission_infos[version].submission_id || '',
                   );
+                  setSubmitTime(resp.data.submission_infos[version].time || '')
                   getComment(resp.data.submission_infos[version].submission_id || '');
                 }
               }, null);
@@ -95,14 +97,15 @@ const HomeworkUserSubmit: React.FC = () => {
 
   const handleVersionChange = (value: number) => {
     if (defList.length === 0) return;
-    console.log(value);
+    
     setCurrentSubmissionId(defList[value].submission_id || '');
     setVersion(value);
-    console.log(defList[value].urls);
+    setSubmitTime(defList[value].time || '')
+    getComment(defList[value].submission_id || '')
   };
 
   const handleSubmit = () => {
-    if (status != 2 && formData[0]) {
+    if (formData[0]) {
       console.log(formData);
       post(`/task/submitted`, {
         urls: formData,
@@ -148,6 +151,7 @@ const HomeworkUserSubmit: React.FC = () => {
               setVersion(0);
               setCurrentSubmissionId(resp.data.submission_infos[0].submission_id || '');
               getComment(resp.data.submission_infos[0].submission_id || '');
+              setSubmitTime(resp.data.submission_infos[0].time || '')
             } else {
               setdefList([]);
               setCurrentSubmissionId('');
@@ -197,12 +201,17 @@ const HomeworkUserSubmit: React.FC = () => {
           button_title="提交作业"
         >
           {selectList.length > 0 && (
-            <Select
-              options={selectList}
-              onChange={handleVersionChange}
-              value={selectList[version]?.value || selectList[0]?.value}
-              className="select-version"
-            ></Select>
+            <div className='select'>
+              <div className='time'>{submitTime}</div>
+              <Select
+                options={selectList}
+                onChange={handleVersionChange}
+                value={selectList[version]?.value || selectList[0]?.value}
+                className="select-version"
+              ></Select>
+              
+            </div>
+            
           )}
           <InputBox
             key={version}

src/pages/homework/types/index.ts

@@ -111,6 +111,7 @@ export type userTaskResponseType = {
 export type userTaskType = {
   urls: string[];
   submission_id?: string;
+  time:string
 };
 export type cmtType = {
   comments: CommentType[];