Merge branch 'develop6.0-tmd' of http://52.130.252.100:10000/TEAMMODEL/TEAMModelOS into develop6.0-tmd

TEAMModelOS/ClientApp/src/components/student-web/HomeView/newHomeView.vue

@@ -722,7 +722,7 @@ export default {
                 }
                 this.$api.studentWeb.getAddClass(req).then(res => {
                     if(res.status == 0) {
-                        // -1 课程编码错误，0加入成功，1参数异常，2重复加入
+                        // -1 课程编码错误，0加入成功，1参数异常，2重复加入，4表示个人名单未开放加入 
                         this.$Message.success(this.$t('studentWeb.courseType.success'))
                         this.addClassNo = ""
                         this.getActivityInfo()
@@ -731,6 +731,8 @@ export default {
                         this.$Message.warning(this.$t('studentWeb.courseType.warning'))
                     } else  if(res.status == -1){
                         this.$Message.warning(this.$t('studentWeb.courseType.error'))
+                    } else if(res.status === 4) {
+                        this.$Message.warning(this.$t('studentWeb.courseType.noAgree'))
                     } else {
                         this.$Message.error(this.$t('studentWeb.courseType.api'))
                     }

TEAMModelOS/ClientApp/src/locale/lang/en-US/studentWeb.js

@@ -192,6 +192,7 @@ export default {
         warning: "Join the course repeatedly!",
         error: "Failed to join the course",
         api: "API Error",
+        noAgree: "課程名單未開放加入",
     },
     coursesCardTitle: 'My Course List',
     newAddCourse: 'The latest addition',

TEAMModelOS/ClientApp/src/locale/lang/zh-CN/studentWeb.js

@@ -192,6 +192,7 @@ export default {
         warning: "重复加入课程！",
         error: "邀请码不存在，请重新输入",
         api: "API错误",
+        noAgree: "课程名单未开放加入",
     },
     coursesCardTitle: '我的课程清单',
     newAddCourse: '最新加入课程',
@@ -571,7 +572,7 @@ export default {
         smartComment: '智能点评',
         keypoint: '建议复习知识点：',
         chart: {
-            scoreDistribution: '评量成绩分布图',
+            scoreDistribution: '成绩分布图',
             participant: '应考人数：',
             student: '人',
             score: '分',

TEAMModelOS/ClientApp/src/locale/lang/zh-TW/studentWeb.js

@@ -192,6 +192,7 @@ export default {
         warning: "重複加入課程！",
         error: "課程加入失敗",
         api: "API錯誤",
+        noAgree: "課程名單未開放加入",
     },
     coursesCardTitle: '我的課程清單',
     newAddCourse: '最新加入課程',
@@ -571,7 +572,7 @@ export default {
         smartComment: '智慧點評',
         keypoint: '建議複習知識點：',
         chart: {
-            scoreDistribution: '評量成績分佈圖',
+            scoreDistribution: '成績分佈圖',
             participant: '應考人數：',
             student: '人',
             score: '分',