Ver Fonte

Merge branch 'refactor' of http://gogs.seec.seecoder.cn/FanYanPeng/EAIFrontend into refactor

XiaoYu há 1 ano atrás
pai
commit
e476bd5468

+ 1 - 1
src/views/CorrectPage/AssignmentPage.vue

@@ -40,7 +40,7 @@
       </template>
       <el-table-column type="index"/>
       <el-table-column prop="assignmentName" label="作业名称" width="400"/>
-      <el-table-column prop="description" label="描述" width="500"/>
+      <!-- <el-table-column prop="description" label="描述" width="500"/> -->
       <el-table-column prop="endTime" label="截止时间" sortable/>
       <el-table-column prop="status" label="状态" sortable/>
       <el-table-column label="操作">

+ 4 - 4
src/views/CorrectPage/CorrectAssignmentPage.vue

@@ -34,10 +34,10 @@
         暂无作业
       </template>
       <el-table-column type="index"/>
-      <el-table-column prop="statusName" label="状态" sortable width="150"/>
-      <el-table-column prop="studentName" label="学生姓名" width="150"/>
-      <el-table-column prop="score" label="得分" sortable width="150"/>
-      <el-table-column prop="remark" label="评价" width="750"/>
+      <el-table-column prop="statusName" label="状态" sortable />
+      <el-table-column prop="studentName" label="学生姓名" />
+      <el-table-column prop="score" label="得分" sortable />
+      <!-- <el-table-column prop="remark" label="评价" width="750"/> -->
       <el-table-column label="操作">
         <template #default="scope">
           <el-button @click="handleCorrect(scope.row.assignmentId, scope.row.studentId)" style="margin-right: 0; margin-left: 0;padding-left: 10px; padding-right: 10px" color="#597D3B">

+ 2 - 2
src/views/CorrectPage/CoursePage.vue

@@ -21,8 +21,8 @@
         暂无课程
       </template>
       <el-table-column type="index"/>
-      <el-table-column prop="courseName" label="课程名称" width="300"/>
-      <el-table-column prop="description" label="描述" width="600"/>
+      <el-table-column prop="courseName" label="课程名称" width="280"/>
+      <el-table-column prop="description" label="描述" width="420"/>
       <el-table-column prop="endTime" label="截止时间" sortable/>
 <!--      <el-table-column prop="endTime" label="状态" sortable/>-->
       <el-table-column label="操作">

+ 32 - 3
src/views/CoursePage/CoursePage.vue

@@ -20,8 +20,8 @@
         暂无课程
       </template>
       <el-table-column type="index"/>
-      <el-table-column prop="courseName" label="课程名称" width="300"/>
-      <el-table-column prop="description" label="描述" width="600"/>
+      <el-table-column prop="courseName" label="课程名称" width="280"/>
+      <el-table-column prop="description" label="描述" width="420"/>
       <el-table-column prop="endTime" label="截止时间" sortable/>
       <el-table-column label="操作">
         <template #default="scope">
@@ -49,7 +49,7 @@
 
   <el-dialog v-model="visible" title="新增课程">
     <el-form :model="newCourse">
-      <el-form-item label="课程名称">
+      <el-form-item label="课程名称" >
         <el-input v-model="newCourse.courseName" placeholder="请输入名称"></el-input>
       </el-form-item>
       <el-form-item label="面向年级">
@@ -238,6 +238,34 @@
   }
 
   const handleSubmit = () => {
+    if(newCourse.courseName === '') {
+      ElNotification({title: '课程名称不得为空',type: 'error',})
+      return
+    }
+    if(newCourse.targetGrade === '') {
+      ElNotification({title: '面向年级不得为空',type: 'error',})
+      return
+    }
+    if(newCourse.description === '') {
+      ElNotification({title: '描述不得为空',type: 'error',})
+      return
+    }
+    // if(newCourse.enrollCode === '') {
+    //   ElNotification({title: '选课码不得为空',type: 'error',})
+    //   return
+    // }
+    if(newCourse.startTime === '') {
+      ElNotification({title: '开始时间不得为空',type: 'error',})
+      return
+    }
+    if(newCourse.endTime === '') {
+      ElNotification({title: '结束时间不得为空',type: 'error',})
+      return
+    }
+    if(newCourse.startTime >= newCourse.endTime) {
+      ElNotification({title: '结束时间不得在起始时间之前',type: 'error',})
+      return
+    }
     newCourse.endTime = formatDate(newCourse.endTime)
     newCourse.startTime = formatDate(newCourse.startTime)
     if(new Date(newCourse.endTime) < new Date(newCourse.startTime)){
@@ -252,6 +280,7 @@
               title: '添加成功',
               type: 'success',
             })
+            fetchData()
           }else {
             console.log(res.data)
           }

+ 22 - 0
src/views/CourseSquare/component/CourseDetails/component/CourseHomeworkTable.vue

@@ -415,6 +415,28 @@ const openEditor = (url: string, title: string) => {
 
 
   const handleSubmit = async () => {
+
+    if(newAssignmentInfo.assignmentName === '') {
+      ElNotification({title: '作业名称不得为空',type: 'error',})
+      return
+    }
+    if(newAssignmentInfo.description === '') {
+      ElNotification({title: '作业描述不得为空',type: 'error',})
+      return
+    }
+
+    if(newAssignmentInfo.startTime === '') {
+      ElNotification({title: '开始时间不得为空',type: 'error',})
+      return
+    }
+    if(newAssignmentInfo.endTime === '') {
+      ElNotification({title: '结束时间不得为空',type: 'error',})
+      return
+    }
+    if(newAssignmentInfo.startTime >= newAssignmentInfo.endTime) {
+      ElNotification({title: '结束时间不得在起始时间之前',type: 'error',})
+      return
+    }
     // console.log("提交方法最开始",newAssignmentInfo)
     newAssignmentInfo.endTime = formatDate(newAssignmentInfo.endTime);
     newAssignmentInfo.startTime = formatDate(newAssignmentInfo.startTime);

+ 4 - 4
src/views/HomeworkPage/index.vue

@@ -30,10 +30,10 @@
         暂无作业
       </template>
       <el-table-column type="index"/>
-      <el-table-column prop="assignmentName" label="课程名称" width="300"/>
-      <el-table-column prop="description" label="描述" width="400"/>
-      <el-table-column prop="endTime" label="截止时间" sortable  width="200"/>
-      <el-table-column prop="status" label="状态" sortable width="150"/>
+      <el-table-column prop="assignmentName" label="课程名称" width="400"/>
+      <!-- <el-table-column prop="description" label="描述" width="400"/> -->
+      <el-table-column prop="endTime" label="截止时间" sortable/>
+      <el-table-column prop="status" label="状态" sortable/>
       <el-table-column label="操作" width="100">
         <template #default="scope">
           <el-button @click="handleShowDetail(scope.row.assignmentId)" style="margin-right: 0; margin-left: 0;padding-left: 10px; padding-right: 10px" color="#597D3B">