解衝突

TEAMModelContest/contest.client/src/locale/lang/en-US.js

@@ -79,11 +79,11 @@ const enUS = {
             needReview: "Required review",
         },
         ruleInfo: {
-            detailScore: "细项得分",
+            detailScore: "Sub item score",
             rule: "Rules",
             describe: "Description",
             score: "Total Point",
-            workScore: "作品分数",
+            workScore: "Work score",
         },
         returnList: "Back to Activity List",
         signup: "Registration",
@@ -99,27 +99,27 @@ const enUS = {
         },
         tmdAccount: "TEAM Model Account",
         screen: "Filter",
-        tmdName: "醍摩豆姓名",
+        tmdName: "TMID Name",
         me: "me",
-        noPermission: "无权限",
+        noPermission: "No permission",
         action: "Operation",
         delete: "Delete",
         quit: "Exit",
         preview: "Preview",
         download: "Download",
         cancel: "Cancel",
-        startUpload: "开始上传",
+        startUpload: "Start uploading",
         expert: "Expert",
-        author: "作者",
+        author: "Author",
         period: "School system",
         subject: "Subject",
         previous: "Previous",
-        next: "下一位",
+        next: "Next",
         totalScore: "Total Score",
         submit: "Submit",
         name: "Name",
         achievement: "Score",
-        scoring: "进行打分",
+        scoring: "Goto score",
         phoneNum: "Cell phone number",
         email: "Email",
         school: "School",

TEAMModelContest/contest.client/src/locale/lang/zh-TW.js

@@ -79,11 +79,11 @@ const zhTW = {
             needReview: "需評審",
         },
         ruleInfo: {
-            detailScore: "细项得分",
+            detailScore: "細項得分",
             rule: "規則",
             describe: "描述",
             score: "分值",
-            workScore: "作品分数",
+            workScore: "作品分數",
         },
         returnList: "返回活動列表",
         signup: "報名",
@@ -101,14 +101,14 @@ const zhTW = {
         screen: "篩選",
         tmdName: "醍摩豆姓名",
         me: "我",
-        noPermission: "无权限",
+        noPermission: "無權限",
         action: "操作",
         delete: "刪除",
         quit: "退出",
         preview: "預覽",
         download: "下載",
         cancel: "取消",
-        startUpload: "开始上传",
+        startUpload: "開始上傳",
         expert: "專家",
         author: "作者",
         period: "學制",
@@ -119,7 +119,7 @@ const zhTW = {
         submit: "提交",
         name: "姓名",
         achievement: "成績",
-        scoring: "进行打分",
+        scoring: "進行打分",
         phoneNum: "手機號碼",
         email: "電子信箱",
         school: "學校",

TEAMModelOS/ClientApp/public/lang/zh-CN.js

@@ -8193,6 +8193,8 @@ const LANG_ZH_CN = {
         reviewManage: '评审管理',
         reviewNum: '评审次数',
         workAllocation: '作品分配',
+        reviewScore: '评审分数',
+        regForm: '报名表',
         reviewMethod: {
             title: '评审方式',
             text1: '对细项评分',

TEAMModelOS/ClientApp/public/lang/zh-TW.js

@@ -8192,6 +8192,8 @@ const LANG_ZH_TW = {
         reviewManage: '評審管理',
         reviewNum: '評審次數',
         workAllocation: '作品分配',
+        reviewScore: '評審分數',
+        regForm: '報名表',
         reviewMethod: {
             title: '評審方式',
             text1: '對細項評分',

TEAMModelOS/ClientApp/src/view/classrecord/eventchart/DataCount.vue

@@ -171,10 +171,15 @@ export default {
     margin: 10px 0;
 }
 .data-item {
-    min-width: 21%;
+    /* min-width: 21%;
     width: fit-content;
     padding: 10px;
+    text-align: center; */
+
+    width: 150px;
+    padding: 10px;
     text-align: center;
+    margin-bottom: 30px;
 }
 .data-value {
     font-size: 40px;

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/mycourse/record/Record.vue

@@ -22,18 +22,15 @@
         </div>
         <template v-if="batchOpera">
           <div style="margin-left: 35px; cursor: pointer;" @click="batchFun('collect')">
-            <Icon type="md-heart-outline" :size="16"
-                :title="$t('cusMgt.shareToStu')" />
+            <Icon type="md-heart-outline" :size="16" />
             {{ $t('cusMgt.fvt') }}
           </div>
           <div style="margin-left: 35px; cursor: pointer;" @click="batchFun('decollect')">
-            <Icon type="md-heart" :size="16" color="#ed4014"
-                :title="$t('cusMgt.shareToStu')" />
+            <Icon type="md-heart" :size="16" color="#ed4014" />
             {{ $t('cusMgt.unfvt') }}
           </div>
           <div style="margin-left: 35px; cursor: pointer;" @click="delBatchRecord()">
-            <Icon type="md-trash" :size="16"
-                :title="$t('cusMgt.delRcd')" />
+            <Icon type="md-trash" :size="16" />
             {{ $t('cusMgt.delRcd') }}
           </div>
         </template>
@@ -186,7 +183,7 @@
           class="confirm-btn">{{ $t('syllabus.confirm') }}</Button>
       </div>
     </Modal>
-    <Modal v-model="openFilter" className="ed-name-modal" :mask-closable="false">
+    <Modal v-model="openFilter" className="ed-name-modal" :mask-closable="false" width="700">
       <div slot="header">
         {{ $t('cusMgt.recordFilter') }}
       </div>
@@ -197,7 +194,7 @@
           </Checkbox>
           <!-- <div> -->
             <span class="clean-item-name">{{ item.name }}</span>
-            <Select v-model="item.type" style="width:120px;margin: 0 20px;">
+            <Select v-model="item.type" style="width:190px; margin: 0 20px;">
               <Option value=">=">{{ $t('lessonRecord.over') }}</Option>
               <Option value="<=">{{ $t('lessonRecord.less') }}</Option>
             </Select>

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)
         },