Merge branch 'feat-registration' of http://gogs.seec.seecoder.cn/FanYanPeng/EAIFrontend into feat-registration

src/apis/assignment.ts

@@ -19,7 +19,6 @@ const assignmentApis = {
         })
     },
     createAssignment(courseId:number, assignmentDTO: AssignmentDTO){
-        console.log(assignmentDTO)
         return axiosInstance.post(`${ASSIGNMENT_PREFIX}`, assignmentDTO, {
             params: {
                 courseId

src/components/WordEditor/WordEditor.vue

@@ -63,7 +63,7 @@
     editorConfig: {
       lang: 'zh-CN',
       //不要用localhost和127.0.0.1访问，用局域网IP访问
-      callbackUrl: '/api/onlyoffice/callback',
+      callbackUrl: 'https://air.seec.seecoder.cn/api/onlyoffice/callback',
       customization: {
         autosave: false,
         comments: false,

src/views/CorrectPage/CorrectAssignmentPage.vue

@@ -198,7 +198,6 @@ import {useFormatDate} from "@/hooks/useFormatDate";
           Object.assign(assignmentInfo, {
             ...res.data.data
           })
-          console.log("assignment", assignmentInfo)
         })
         .catch((err:any) => {
           console.log("错误信息", err)
@@ -238,7 +237,6 @@ import {useFormatDate} from "@/hooks/useFormatDate";
     // fetchHomeworkListByUserId()
     fetchAssignmentInfo()
     fetchData()
-    console.log(route.query)
   })
 
   let status = ref('')

src/views/CoursePage/CoursePage.vue

@@ -228,7 +228,6 @@
     apis.getAllCourse(query, queryInfo.pageNow, queryInfo.pageSize)
         .then((res: any) => {
           let data = res.data.data
-          console.log(data)
           Object.assign(pageInfo, {...data})
         })
         .catch((err: any) => {
@@ -241,8 +240,6 @@
   const handleSubmit = () => {
     newCourse.endTime = formatDate(newCourse.endTime)
     newCourse.startTime = formatDate(newCourse.startTime)
-    uploadRef.value.submit()
-    console.log(newCourse)
     apis.createCourse(newCourse)
         .then((res:any) => {
           if(res.data.code===200) {

src/views/CourseSquare/component/AllCourse/MoreCourse.vue

@@ -36,9 +36,9 @@
             <img :src="item.courseImages[0]" :alt="item.courseName" class="course-item-img">
           </div>
           <div class="course-item-content">
-            <div style="font-weight: bold">{{item.courseName}}</div>
-            <div>{{item.description}}</div>
-            <div>{{item.teacherIds.join("\n")}}</div>
+            <div style="font-weight: bold; font-size: 16px; margin: 5px 0">{{item.courseName}}</div>
+            <div style="line-height: 1.5" class="collapsed" ><span style="color: rgba(0, 0, 0, 0.6)">课程描述：</span>{{item.description}}</div>
+            <div style="line-height: 1.5; margin-top: 5px" class="collapsed" ><span  style="color: rgba(0, 0, 0, 0.6)">任课教师：</span>{{item.teacherIds.join(",")}}</div>
           </div>
         </el-card>
 

src/views/Home/component/Dictionaries/index.vue

@@ -54,7 +54,7 @@
       to: chinesePattern.test(content.value) ? 'zh-cn' : 'en'
     }, 1, store.user.id)
         .then((response:any) => {
-          console.log('requestDictionary', response)
+          // console.log('requestDictionary', response)
           res.value = response.data.data
           loading.value = false
         })

src/views/Home/component/Edit/index.vue

@@ -90,7 +90,6 @@
     if (!data.isModified && data.hasModified) {
       apis.engagementSubmit(store.user.id, props.engagement.assignmentId)
           .then((_res: any) => {
-            console.log(_res);
             success(_res.data.data);
             router.push("/home/myHomework")
           })
@@ -112,7 +111,6 @@
     if (!data.isModified && data.hasModified) {
       apis.engagementStage(store.user.id, props.engagement.assignmentId)
           .then((_res: any) => {
-            console.log(_res);
             success(_res.data.data);
           })
           .catch((error: any) => {
@@ -120,9 +118,9 @@
             error('暂存失败');
           });
     } else if (data.isModified) {
-      error('编辑内容未保存，请保存后提交！');
-    // } else if (!data.hasModified) {
-    //   error('尚未编辑，不可提交！');
+      error('编辑内容未保存，请保存后暂存！');
+    } else if (!data.hasModified) {
+      error('尚未编辑，不可暂存！');
     } else {
       error('未知错误！');
     }

src/views/Home/component/Remark/Remark.vue

@@ -62,7 +62,6 @@ export default defineComponent({
         //这有两个.data，老是漏掉
         correction.value.score = res.data.data.score;     
         correction.value.remark = res.data.data.remark;
-        console.log(correction);    
       } else {  
         ElMessage.error("获取批改异常" + res.data.msg);  
       }  

src/views/Home/component/Silder/index.vue

@@ -119,7 +119,6 @@ import {useRoute} from "vue-router";
   const fetchData = () => {
     apis.getAssignmentById(assignmentId).then((res: any) => {
       data.assignment = res.data.data;
-      console.log(res.data.data, "获取作业信息")
     });
   };
 

src/views/Home/component/StudentEssay/StudentEssay.vue

@@ -52,7 +52,6 @@ const fetchDocxUrl = async (studentId: number, assignmentId: number) => {
         .then(_res => {
             if (_res.data.code === 200 && _res.data.data.fileUrl)
                 data.docxUrl = _res.data.data.fileUrl
-            console.log(data)
         }).catch(_err => {
             console.log(_err)
         }).finally(() => {

src/views/LoginPage/component/Login.vue

@@ -114,7 +114,7 @@
   const getCode = () => {
     start();
     props.onCode?.();
-    console.log('获取验证码');
+    // console.log('获取验证码');
   };
 
   let assignmentId = ref(1)
@@ -123,7 +123,6 @@
       officialNumber: data.officialNumber,
       password: data.password
     }).then((_res:any) => {
-      console.log(_res);
       const data = _res.data.data
       if (_res.data.code === 200) {
         store.setUser(data);
@@ -132,17 +131,22 @@
         localStorage.setItem('User', data);
         // router.push("/")
         router.push(`/home`)
-      } else {
-        console.log("登陆失败")
+      } else if(_res.data.code === 400){
+        ElMessage({
+          message: '用户名或密码错误',
+          type: 'error',
+        })
       }
     }).catch((_err:any) => {
+      ElMessage({
+        message: '网络错误',
+        type: 'error',
+      })
       console.log("登陆失败", _err)
     })
   };
-// TODO：注册按钮未实现 UserController.java
   const onClickSign = () => {
     router.push('/register');
-    console.log("注册")
   };
 
 </script>