Merge branch 'develop' of http://52.130.252.100:10000/TEAMMODEL/TEAMModelOS into develop

TEAMModelOS/ClientApp/src/view/evaluation/components/BaseExerciseList.vue

@@ -288,7 +288,7 @@
 				typeSummaryInfo: {},
 				scoreCol: [
 					{
-						title: "题号",
+						title: this.$t('answerSheet.tip1'),
 						key: "no",
 						render: (h, params) => {
 							let isGroup = params.row.isGroup;
@@ -306,17 +306,17 @@
 						width: 100
 					},
 					{
-						title: "难度",
+						title: this.$t('evaluation.filter.diff'),
 						key: "diff",
 						width: 150
 					},
 					{
-						title: "题干",
+						title: this.$t('evaluation.newExercise.stem'),
 						key: "question",
 						tooltip: true
 					},
 					{
-						title: "配分",
+						title: this.$t('totalAnalysis.ta_table_text4'),
 						width: 150,
 						key: "score",
 						render: (h, params) => {

TEAMModelOS/ClientApp/src/view/signupActivity/infoComponent/skContent.vue

@@ -475,19 +475,19 @@ export default {
                     align: 'center',
                     filters: [
                         {
-                            label: '已邀请',
+                            label: this.$t('activity.invited'),
                             value: 1
                         },
                         {
-                            label: '已报名',
+                            label: this.$t('activity.registered'),
                             value: 2
                         },
                         {
-                            label: '未报名',
+                            label: this.$t('activity.notSign'),
                             value: 3
                         },
                         {
-                            label: '未分配',
+                            label: this.$t('activity.unassigned'),
                             value: 4
                         },
                     ],
@@ -536,13 +536,13 @@ export default {
                     // width: 100,
                 },
                 {
-                    title: '已评审/已分配',
+                    title: `${this.$t('activity.reviewed')}/${this.$t('learnActivity.mark.assigned')}`,
                     slot: 'reviewNum',
                     align: 'center'
                     // width: 100,
                 },
                 {
-                    title: '评审分数',
+                    title: this.$t('activity.reviewScore'),
                     key: 'uploadContestScore',
                     slot: 'uploadContestScore',
                     align: 'center',
@@ -1138,7 +1138,7 @@ export default {
         /* 导出表格 */
         exportTable() {
             const params = {
-                title: [this.$t('assessment.header1'), this.$t('cusMgt.tmIDType'), this.$t('answerSheet.dp.school'), this.$t('activity.timeList.enroll'), this.$t('jyzx.common.loadTime'), this.$t('learnActivity.mark.assigned'), this.$t('activity.reviewed'), '评审分数'],
+                title: [this.$t('assessment.header1'), this.$t('cusMgt.tmIDType'), this.$t('answerSheet.dp.school'), this.$t('activity.timeList.enroll'), this.$t('jyzx.common.loadTime'), this.$t('learnActivity.mark.assigned'), this.$t('activity.reviewed'), this.$t('activity.reviewScore')],
                 key: ['name', 'id', 'schoolName', 'joinTime', 'uploadTime', 'reviewNum', 'scoreNum', 'uploadContestScore'],
                 data: this.applicationList.map(i => {
                     return {
@@ -1155,7 +1155,7 @@ export default {
                     }
                 }),
                 autoWidth: true,
-                filename: `【${this.actInfo.name}】报名表`
+                filename: `【${this.actInfo.name}】${this.$t('activity.regForm')}`
             }
             this.$tools.exportTable(params)
         },