Selaa lähdekoodia

阅卷模块多语系

liqk 4 vuotta sitten
vanhempi
commit
f6f94faa8d

+ 56 - 21
TEAMModelOS/ClientApp/src/locale/lang/en-US/learnActivity.js

@@ -22,7 +22,7 @@ export default{
         autoTips2:'此功能仅用于展示情景快速模拟教师评分数据,且分数为随机生成,仅供参考!',
         autoScore:'一键评分',
         autoAnswer:'一键作答',
-        evSubject:'测试科:',
+        evSubject:'测试科:',
         returnTop:'返回顶部',
         mockOk:'模拟成功',
         mockErr:'模拟失败',
@@ -56,7 +56,7 @@ export default{
         evType:'评测类型',
         examType:'考试类别',
         courseType:'课程类别',
-        cusLabel1:'校课程',
+        cusLabel1:'校课程',
         cusLabel2:'个人课程',
         evTarget:'施测对象',
         publishType:'发布方式',
@@ -65,7 +65,7 @@ export default{
         endTime:'结束时间',
         eTimeHolder:'请选择结束时间',
         addSubject:'添加学科',
-        noSubject:'暂无科,请添加科',
+        noSubject:'暂无科,请添加科',
         noSubject1:'* 请先选择测试学段',
         papersLabel:'试卷库',
         perviewLabel:'试卷预览',
@@ -87,13 +87,13 @@ export default{
         formWarning:'请先完善评测基础信息!',
         paperWarning:'请挑选或导入试卷!',
         paperWarning1:'还没有试卷,请挑选或导入试卷!',
-        pdWarning:'请添加测试科!',
+        pdWarning:'请添加测试科!',
         publishOk:'评测发布成功!',
         togglePeriod:'切换学段',
         togglePdTip1:'您已添加',
-        togglePdTip2:'的测试科,如果现在切换学段会清空已选科,确定切换学段吗?',
+        togglePdTip2:'的测试科,如果现在切换学段会清空已选科,确定切换学段吗?',
         toggleOkText:'切换',
-        delPdTitle:'删除科',
+        delPdTitle:'删除科',
         delPdContent:'是否确认删除',
         delOk:'删除成功',
         pdTips:'请先选择测试学段!',
@@ -103,12 +103,12 @@ export default{
     manual:{
         source:'来源:',
         sourceP:'个人试卷库',
-        sourceS:'校试卷库',
+        sourceS:'校试卷库',
         pdLabel:'学段:',
         subjectLabel:'学科:',
         gradeLabel:'年级:',
         fitPd:'适用学段:',
-        fitSubject:'适用科:',
+        fitSubject:'适用科:',
         quCount:'题量:',
         useCount:'使用次数:',
         stdPaper:'已选试卷',
@@ -213,19 +213,11 @@ export default{
     },
 
     mark:{
-        baseSetting:'基础设置',
-        markMode:'阅卷模式',
-        full:'完整阅卷',
-        question:'指定题目',
         markNum:'阅卷次数',
-        allocation:'分配方式',
-        random:'随机分配',
-        class:'按班分配',
-        scoreDiff:'分差',
         markRole:'阅卷角色',
-        errRole:'异常处理',
-        arb:'仲裁教师',
-        markRole:'阅卷教师',
+        errRole:'异常处理',
+        arb:'仲裁教师',
+        markRole:'阅卷教师',
         noTea:'暂无教师',
         remove:'移除',
         addTea:'添加阅卷老师',
@@ -252,7 +244,7 @@ export default{
         unassigned:'未分配',
         teaProgress:'教师阅卷进度',
         schedule:'调度',
-        subject:'科',
+        subject:'科',
         stuNum:'考试人数',
         scanProg:'扫描进度',
         assignStatus:'阅卷分配',
@@ -264,6 +256,49 @@ export default{
         progress:'进度',
         action:'操作',
         addTeaTitle:'添加阅卷老师',
-        markNum:'阅卷量'
+        markNum:'阅卷量',
+        //ByqU.vue & ByStu.vue
+        quit:'退出阅卷',
+        examName:'考试名称:',
+        reviewType:'阅卷方式:',
+        byQu:'按题阅卷',
+        byStu:'按人阅卷',
+        stuId:'学生Id',
+        score:'分数:',
+        curQu:'当前题号:',
+        quProg:'题目进度',
+        exception:'异常申报',
+        move:'移动',
+        text:'文字',
+        brush:'画笔',
+        arrow:'箭头',
+        oval:'椭圆',
+        rect:'方框',
+        seal:'印章',
+        clear:'清除批注',
+        marked:'已阅',
+        unmark:'未阅',
+        fullScore:'满分',
+        zeroScore:'零分',
+        submit:'提交分数',
+        setting1:'打分自动切换学生',
+        setting2:'完成批阅自动弹出切换',
+        setting3:'打分自动切换题目',
+        setting4:'完成阅卷自动获取新学生',
+        toggleQu:'切换题目',
+        toggleStu:'切换学生',
+        saveErr:'保存失败',
+        noSocreErr:'请先打分',
+        completeQu:'当前题目已阅完,请切换题目',
+        completeStu:'当前完成当前学生评分,如果继续评分,请切换学生',
+        noAnswer:'未作答',
+        stuInfoErr:'学生信息异常',
+        ummarkQu:'未阅题目',
+        unmarkContent:'题目尚未评分,是否跳转到对应题目继续评分?',
+        finished:'已阅完',
+        noUnMarkStu:'已无未阅学生,请挑选进行中的学生继续阅卷。',
+        completeTask:'您已完成阅卷任务',
+        // ProgPie.vue
+        marking:'进行中'
     }
 }

+ 10 - 0
TEAMModelOS/ClientApp/src/locale/lang/en-US/task.js

@@ -13,4 +13,14 @@ export default {
     mLabel6:'人數',    
     markProg:'批閱進度',    
     mark:'批閱',
+    objectiveQu:'客观题已由系统自动完成评分。',
+    lastLabel1:'还剩',
+    lastLabel2:'人未阅,',
+    continue:'继续阅卷',
+    totalLabel1:'阅卷总量',
+    totalLabel2:'人,',
+    start:'开始阅卷',
+    noUnmark:'暂无未阅学生',
+    noMarking:'暂无进行中学生',
+    noMarked:'暂无已阅学生',
 }

+ 46 - 10
TEAMModelOS/ClientApp/src/locale/lang/zh-CN/learnActivity.js

@@ -12,7 +12,8 @@ export default{
         finish:'已结束',
         endTime:'结束时间:',
         stop:'立即结束',
-        evType:'测试类型:',
+        evType:'评测类型:',
+        evMode:'评测模式:',
         stuCount:'施测人数:',
         nodata:'暂无评测',
         tab1:'评测数据',
@@ -212,15 +213,7 @@ export default{
     },
 
     mark:{
-        baseSetting:'基础设置',
-        markMode:'阅卷模式',
-        full:'完整阅卷',
-        question:'指定题目',
         markNum:'阅卷次数',
-        allocation:'分配方式',
-        random:'随机分配',
-        class:'按班分配',
-        scoreDiff:'分差',
         markRole:'阅卷角色',
         errRole:'异常处理',
         arb:'仲裁教师',
@@ -263,6 +256,49 @@ export default{
         progress:'进度',
         action:'操作',
         addTeaTitle:'添加阅卷老师',
-        markNum:'阅卷量'
+        markNum:'阅卷量',
+        //ByqU.vue & ByStu.vue
+        quit:'退出阅卷',
+        examName:'考试名称:',
+        reviewType:'阅卷方式:',
+        byQu:'按题阅卷',
+        byStu:'按人阅卷',
+        stuId:'学生Id',
+        score:'分数:',
+        curQu:'当前题号:',
+        quProg:'题目进度',
+        exception:'异常申报',
+        move:'移动',
+        text:'文字',
+        brush:'画笔',
+        arrow:'箭头',
+        oval:'椭圆',
+        rect:'方框',
+        seal:'印章',
+        clear:'清除批注',
+        marked:'已阅',
+        unmark:'未阅',
+        fullScore:'满分',
+        zeroScore:'零分',
+        submit:'提交分数',
+        setting1:'打分自动切换学生',
+        setting2:'完成批阅自动弹出切换',
+        setting3:'打分自动切换题目',
+        setting4:'完成阅卷自动获取新学生',
+        toggleQu:'切换题目',
+        toggleStu:'切换学生',
+        saveErr:'保存失败',
+        noSocreErr:'请先打分',
+        completeQu:'当前题目已阅完,请切换题目',
+        completeStu:'当前完成当前学生评分,如果继续评分,请切换学生',
+        noAnswer:'未作答',
+        stuInfoErr:'学生信息异常',
+        ummarkQu:'未阅题目',
+        unmarkContent:'题目尚未评分,是否跳转到对应题目继续评分?',
+        finished:'已阅完',
+        noUnMarkStu:'已无未阅学生,请挑选进行中的学生继续阅卷。',
+        completeTask:'您已完成阅卷任务',
+        // ProgPie.vue
+        marking:'进行中'
     }
 }

+ 10 - 0
TEAMModelOS/ClientApp/src/locale/lang/zh-CN/task.js

@@ -13,4 +13,14 @@ export default {
     mLabel6:'人数',
     markProg:'批阅进度',
     mark:'批阅',
+    objectiveQu:'客观题已由系统自动完成评分。',
+    lastLabel1:'还剩',
+    lastLabel2:'人未阅,',
+    continue:'继续阅卷',
+    totalLabel1:'阅卷总量',
+    totalLabel2:'人,',
+    start:'开始阅卷',
+    noUnmark:'暂无未阅学生',
+    noMarking:'暂无进行中学生',
+    noMarked:'暂无已阅学生',
 }

+ 44 - 9
TEAMModelOS/ClientApp/src/locale/lang/zh-TW/learnActivity.js

@@ -213,15 +213,7 @@ export default {
     },
 
     mark: {
-        baseSetting: '基礎設定',
-        markMode: '閱卷模式',
-        full: '完整閱卷',
-        question: '指定題目',
         markNum: '閱卷次數',
-        allocation: '分配方式',
-        random: '隨機分配',
-        class: '按班分配',
-        scoreDiff: '分差',
         markRole: '閱卷職務',
         errRole: '異常處理:',
         arb: '仲裁教師:',
@@ -264,6 +256,49 @@ export default {
         progress: '進度',
         action: '操作',
         addTeaTitle: '增加閱卷老師',
-        markNum: '閱卷量'
+        markNum: '閱卷量',
+        //ByqU.vue & ByStu.vue
+        quit:'退出閱卷',
+        examName:'考試名稱:',
+        reviewType:'閱卷方式:',
+        byQu:'按題閱卷',
+        byStu:'按人閱卷',
+        stuId:'學生Id',
+        score:'分數:',
+        curQu:'當前題號:',
+        quProg:'題目進度',
+        exception:'異常申報',
+        move:'移動',
+        text:'文字',
+        brush:'畫筆',
+        arrow:'箭頭',
+        oval:'橢圓',
+        rect:'方框',
+        seal:'印章',
+        clear:'清除批註',
+        marked:'已閱',
+        unmark:'未閱',
+        fullScore:'滿分',
+        zeroScore:'零分',
+        submit:'提交分數',
+        setting1:'打分自動切換學生',
+        setting2:'完成批閱自動彈出切換',
+        setting3:'打分自動切換題目',
+        setting4:'完成閱卷自動獲取新學生',
+        toggleQu:'切換題目',
+        toggleStu:'切換學生',
+        saveErr:'保存失敗',
+        noSocreErr:'請先打分',
+        completeQu:'當前題目已閱完,請切換題目',
+        completeStu:'當前完成當前學生評分,如果繼續評分,請切換學生',
+        noAnswer:'未作答',
+        stuInfoErr:'學生信息異常',
+        ummarkQu:'未閱題目',
+        unmarkContent:'題目尚未評分,是否跳轉到對應題目繼續評分? ',
+        finished:'已閱完',
+        noUnMarkStu:'已無未閱學生,請挑選進行中的學生繼續閱卷。 ',
+        completeTask:'您已完成閱卷任務',
+        // ProgPie.vue
+        marking:'進行中'
     }
 }

+ 10 - 0
TEAMModelOS/ClientApp/src/locale/lang/zh-TW/task.js

@@ -13,4 +13,14 @@ export default {
     mLabel6:'人數',    
     markProg:'批閱進度',    
     mark:'批閱',
+    objectiveQu:'客觀題已由系統自動完成評分。 ',
+    lastLabel1:'還剩',
+    lastLabel2:'人未閱,',
+    continue:'繼續閱卷',
+    totalLabel1:'閱卷總量',
+    totalLabel2:'人,',
+    start:'開始閱卷',
+    noUnmark:'暫無未閱學生',
+    noMarking:'暫無進行中學生',
+    noMarked:'暫無已閱學生',
 }

+ 10 - 10
TEAMModelOS/ClientApp/src/router/routes.js

@@ -91,11 +91,11 @@ export const routes = [
 		path: '/joinclass',
 		component: resolve => require(['@/view/joinclass/JoinClass.vue'], resolve)
 	},
-	{
-		path: '/MarkView',
-		name:'FullMarkView',
-		component: resolve => require(['@/view/learnactivity/markpaper/MarkView.vue'], resolve)
-	},
+	// {
+	// 	path: '/MarkView',
+	// 	name:'FullMarkView',
+	// 	component: resolve => require(['@/view/learnactivity/markpaper/MarkView.vue'], resolve)
+	// },
 	{
 		path: '/schoolList',
 		component: Home,
@@ -238,11 +238,11 @@ export const routes = [
 			]
 		},
 		//废弃 阅卷和批注代码混合,不方便维护
-		{
-			path: 'MarkView',
-			name:'MarkView',
-			component: resolve => require(['@/view/learnactivity/markpaper/MarkView.vue'], resolve)
-		},
+		// {
+		// 	path: 'MarkView',
+		// 	name:'MarkView',
+		// 	component: resolve => require(['@/view/learnactivity/markpaper/MarkView.vue'], resolve)
+		// },
 		// 按人阅卷
 		{
 			path: 'ByStu',

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 1364
TEAMModelOS/ClientApp/src/view/learnactivity/markpaper/MarkView.vue


+ 39 - 29
TEAMModelOS/ClientApp/src/view/task/mark/ByQu.vue

@@ -4,23 +4,23 @@
         <!-- 头部基础信息 -->
         <div class="mark-header">
             <span class="quit-marking-text">
-                <Icon type="ios-arrow-back" class="quit-marking-icon" title="退出阅卷" @click="quit" />
+                <Icon type="ios-arrow-back" class="quit-marking-icon" :title="$t('learnActivity.mark.quit')" @click="quit" />
             </span>
-            <span class="info-label">考试名称:</span>
+            <span class="info-label">{{$t('learnActivity.mark.examName')}}</span>
             <span class="info-value">{{taskInfo.name}}</span>
-            <span class="info-label">阅卷方式:</span>
-            <span class="info-value">按题阅卷</span>
-            <span class="info-label">当前题号:</span>
+            <span class="info-label">{{$t('learnActivity.mark.reviewType')}}</span>
+            <span class="info-value">{{$t('learnActivity.mark.byQu')}}</span>
+            <span class="info-label">{{$t('learnActivity.mark.curQu')}}</span>
             <span class="info-value cur-qu-index" v-if="childIndex > -1">{{`${quIndex + 1}-${childIndex + 1}`}}</span>
             <span class="info-value cur-qu-index" v-else>{{quIndex + 1}}</span>
-            <span class="info-label">题目进度:</span>
+            <span class="info-label">{{$t('learnActivity.mark.quProg')}}</span>
             <span class="info-value stu-id-info">{{curProg}}</span>
-            <span class="info-label">学生:</span>
+            <span class="info-label">{{$t('learnActivity.mark.stuId')}}</span>
             <span class="info-value stu-id-info">{{stusInfo[stuIndex] ? stusInfo[stuIndex].stuId : ''}}</span>
             <div class="btn-wrap">
                 <span class="action-btn" @click="toggleStatus = !toggleStatus">
                     <Icon type="md-shuffle" class="action-btn-icon" />
-                    切换题目
+                    {{$t('learnActivity.mark.toggleQu')}}
                 </span>
                 <!-- <span class="action-btn">
                     <Icon type="md-refresh" class="action-btn-icon" />
@@ -28,26 +28,26 @@
                 </span> -->
                 <span class="action-btn"  @click="exception">
                     <Icon custom="iconfont icon-exception" class="action-btn-icon" />
-                    异常申报
+                    {{$t('learnActivity.mark.exception')}}
                 </span>
             </div>
         </div>
         <div class="mark-main">
             <!-- 工具条 -->
             <div class="mark-tools-wrap">
-                <Icon custom="iconfont icon-move" class="tool-icon" title="移动" @click="mouseStatus = 'move'" />
-                <Icon custom="iconfont icon-text" class="tool-icon" title="文字批注" @click="mouseStatus = 'text'" />
-                <Icon custom="iconfont icon-mark" class="tool-icon" title="画笔" @click="mouseStatus = 'line'" />
-                <Icon custom="iconfont icon-arrow-mark" class="tool-icon" title="箭头" @click="mouseStatus = 'arrow'" />
-                <Icon custom="iconfont icon-oval" class="tool-icon" title="椭圆" @click="mouseStatus = 'oval'" />
-                <Icon custom="iconfont icon-rect" class="tool-icon" title="方框" @click="mouseStatus = 'rect'" />
+                <Icon custom="iconfont icon-move" class="tool-icon" :title="$t('learnActivity.mark.move')" @click="mouseStatus = 'move'" />
+                <Icon custom="iconfont icon-text" class="tool-icon" :title="$t('learnActivity.mark.text')" @click="mouseStatus = 'text'" />
+                <Icon custom="iconfont icon-mark" class="tool-icon" :title="$t('learnActivity.mark.brush')" @click="mouseStatus = 'line'" />
+                <Icon custom="iconfont icon-arrow-mark" class="tool-icon" :title="$t('learnActivity.mark.arrow')" @click="mouseStatus = 'arrow'" />
+                <Icon custom="iconfont icon-oval" class="tool-icon" :title="$t('learnActivity.mark.oval')" @click="mouseStatus = 'oval'" />
+                <Icon custom="iconfont icon-rect" class="tool-icon" :title="$t('learnActivity.mark.rect')" @click="mouseStatus = 'rect'" />
                 <Poptip transfer placement="right">
-                    <Icon custom="iconfont icon-smile" class="tool-icon" title="图标" />
+                    <Icon custom="iconfont icon-smile" class="tool-icon" :title="$t('learnActivity.mark.seal')" />
                     <div slot="content" class="expression-box">
                         <img v-for="(item,index) in imgs" :key="index" :src="item" alt="" class="expression-img" @click="drawImg(index)">
                     </div>
                 </Poptip>
-                <Icon custom="iconfont icon-fresh" class="tool-icon" title="清除批注" @click="clear" />
+                <Icon custom="iconfont icon-fresh" class="tool-icon" :title="$t('learnActivity.mark.clear')" @click="clear" />
                 <!-- <Icon :custom="isFull ? 'iconfont icon-cancel-full' : 'iconfont icon-full-screen'" class="tool-icon" :title="isFull ? '取消全屏' : '全屏'" @click="togglefull" /> -->
             </div>
             <div class="mark-stage">
@@ -56,12 +56,16 @@
             <!-- 打分部分 -->
             <div class="score-wrap">
                 <div class="quick-score-box score-input-box">
-                    <span>分数:</span>
+                    <span>{{$t('learnActivity.mark.score')}}</span>
                     <InputNumber style="flex:1" :max="10" :min="1" v-model="score" @on-change="setScore"></InputNumber>
                 </div>
                 <div class="quick-score-box">
-                    <Button size="small" type="info" style="margin-right:8px" ghost @click="score = quScoreArr.length - 1">满分</Button>
-                    <Button size="small" type="error" ghost @click="score = 0">零分</Button>
+                    <Button size="small" type="info" style="margin-right:8px" ghost @click="score = quScoreArr.length - 1">
+                        {{$t('learnActivity.mark.fullScore')}}
+                    </Button>
+                    <Button size="small" type="error" ghost @click="score = 0">
+                        {{$t('learnActivity.mark.zeroScore')}}
+                    </Button>
                     <Icon :type="isShowNum ? 'md-eye-off' : 'md-eye'" class="toggle-num-status" @click="isShowNum = !isShowNum" />
                     <div :class="['score-key-box', isShowNum ? '':'hind-key-box']">
                         <vuescroll>
@@ -71,14 +75,20 @@
                         </vuescroll>
                     </div>
                 </div>
-                <Button type="success" class="submit-score" @click="submit()">提交分数</Button>
+                <Button type="success" class="submit-score" @click="submit()">
+                    {{$t('learnActivity.mark.submit')}}
+                </Button>
                 <div class="score-setting-wrap">
                     <div class="score-setting-item">
-                        <span>打分自动切换学生</span>
+                        <span>
+                            {{$t('learnActivity.mark.setting1')}}
+                        </span>
                         <i-switch v-model="autoStu" size="small" />
                     </div>
                     <div class="score-setting-item">
-                        <span>完成整题批阅自动弹出切换</span>
+                        <span>
+                            {{$t('learnActivity.mark.setting2')}}
+                        </span>
                         <i-switch v-model="autoQu" size="small" />
                     </div>
                 </div>
@@ -86,7 +96,7 @@
         </div>
         <!-- 用来单独渲染学生作答数据,提高tocanvas 的效率 -->
         <iframe id="markIframe1" :srcdoc="curAnswer" v-if="curAnswer"></iframe>
-        <Modal v-model="toggleStatus" title="切换题目" :width="800" footer-hide>
+        <Modal v-model="toggleStatus" :title="$t('learnActivity.mark.toggleQu')" :width="800" footer-hide>
             <div class="qu-prog-wrap" style="height:600px">
                 <vuescroll>
                     <QuProg :paperData="paperData" :stusData="stusInfo" :total="taskInfo.count || 1" @getQuIndex="setQuIndex"></QuProg>
@@ -213,11 +223,11 @@ export default {
                         this.getDefStu()
                     },
                     err => {
-                        this.$Message.error('保存失败')
+                        this.$Message.error(this.$t('learnActivity.mark.saveErr'))
                     }
                 )
             } else {
-                this.$Message.warning('请先打分')
+                this.$Message.warning(this.$t('learnActivity.mark.noSocreErr'))
             }
         },
         quit() {
@@ -268,7 +278,7 @@ export default {
                 if (this.autoQu) {
                     this.toggleStatus = true
                 } else {
-                    this.$Message.warning('当前题目已阅完,请切换题目')
+                    this.$Message.warning(this.$t('learnActivity.mark.completeQu'))
                 }
             } else if (!has && this.stusInfo.length < this.taskInfo.count) {
                 //当前学生数据已阅,需要继续随机获取学生进行阅卷
@@ -348,10 +358,10 @@ export default {
                 if (this.stusInfo[this.stuIndex].info.answer) {
                     return this.stusInfo[this.stuIndex].info.answer[this.getScoreIndex(this.quIndex, this.childIndex)]
                 } else {
-                    return this.stusInfo[this.stuIndex].stuId + '未作答'
+                    return this.stusInfo[this.stuIndex].stuId + this.$t('learnActivity.mark.noAnswer')
                 }
             } else {
-                return '学生信息异常'
+                return this.$t('learnActivity.mark.stuInfoErr')
             }
         },
         /**当期题目分数数组 */

+ 45 - 37
TEAMModelOS/ClientApp/src/view/task/mark/ByStu.vue

@@ -4,23 +4,23 @@
         <!-- 头部基础信息 -->
         <div class="mark-header">
             <span class="quit-marking-text">
-                <Icon type="ios-arrow-back" class="quit-marking-icon" title="退出阅卷" @click="quit" />
+                <Icon type="ios-arrow-back" class="quit-marking-icon" :title="$t('learnActivity.mark.quit')" @click="quit" />
             </span>
-            <span class="info-label">考试名称:</span>
+            <span class="info-label">{{$t('learnActivity.mark.examName')}}</span>
             <span class="info-value">{{taskInfo.name}}</span>
-            <span class="info-label">阅卷方式:</span>
-            <span class="info-value">按人阅卷</span>
-            <span class="info-label">学生id:</span>
+            <span class="info-label">{{$t('learnActivity.mark.reviewType')}}</span>
+            <span class="info-value">{{$t('learnActivity.mark.byStu')}}</span>
+            <span class="info-label">{{$t('learnActivity.mark.stuId')}}</span>
             <span class="info-value stu-id-info">{{stuId}}</span>
-            <span class="info-label">分数:</span>
+            <span class="info-label">{{$t('learnActivity.mark.score')}}</span>
             <span class="info-value score-info">{{totalScore}}</span>
-            <span class="info-label">当前题号:</span>
+            <span class="info-label">{{$t('learnActivity.mark.curQu')}}</span>
             <span class="info-value cur-qu-index" v-if="childIndex > -1">{{`${quIndex + 1}-${childIndex + 1}`}}</span>
             <span class="info-value cur-qu-index" v-else>{{quIndex + 1}}</span>
             <div class="btn-wrap">
                 <span class="action-btn" @click="toggleStatus = !toggleStatus">
                     <Icon type="md-shuffle" class="action-btn-icon" />
-                    切换学生
+                    {{$t('learnActivity.mark.toggleStu')}}
                 </span>
                 <!-- <span class="action-btn">
                     <Icon type="md-refresh" class="action-btn-icon" />
@@ -28,26 +28,26 @@
                 </span> -->
                 <span class="action-btn" @click="exception">
                     <Icon custom="iconfont icon-exception" class="action-btn-icon"/>
-                    异常申报
+                    {{$t('learnActivity.mark.exception')}}
                 </span>
             </div>
         </div>
         <div class="mark-main">
             <!-- 工具条 -->
             <div class="mark-tools-wrap">
-                <Icon custom="iconfont icon-move" class="tool-icon" title="移动" @click="mouseStatus = 'move'" />
-                <Icon custom="iconfont icon-text" class="tool-icon" title="文字批注" @click="mouseStatus = 'text'" />
-                <Icon custom="iconfont icon-mark" class="tool-icon" title="画笔" @click="mouseStatus = 'line'" />
-                <Icon custom="iconfont icon-arrow-mark" class="tool-icon" title="箭头" @click="mouseStatus = 'arrow'" />
-                <Icon custom="iconfont icon-oval" class="tool-icon" title="椭圆" @click="mouseStatus = 'oval'" />
-                <Icon custom="iconfont icon-rect" class="tool-icon" title="方框" @click="mouseStatus = 'rect'" />
+                <Icon custom="iconfont icon-move" class="tool-icon" :title="$t('learnActivity.mark.move')" @click="mouseStatus = 'move'" />
+                <Icon custom="iconfont icon-text" class="tool-icon" :title="$t('learnActivity.mark.text')" @click="mouseStatus = 'text'" />
+                <Icon custom="iconfont icon-mark" class="tool-icon" :title="$t('learnActivity.mark.brush')" @click="mouseStatus = 'line'" />
+                <Icon custom="iconfont icon-arrow-mark" class="tool-icon" :title="$t('learnActivity.mark.arrow')" @click="mouseStatus = 'arrow'" />
+                <Icon custom="iconfont icon-oval" class="tool-icon" :title="$t('learnActivity.mark.oval')" @click="mouseStatus = 'oval'" />
+                <Icon custom="iconfont icon-rect" class="tool-icon" :title="$t('learnActivity.mark.rect')" @click="mouseStatus = 'rect'" />
                 <Poptip transfer placement="right">
-                    <Icon custom="iconfont icon-smile" class="tool-icon" title="图标" />
+                    <Icon custom="iconfont icon-smile" class="tool-icon" :title="$t('learnActivity.mark.seal')" />
                     <div slot="content" class="expression-box">
                         <img v-for="(item,index) in imgs" :key="index" :src="item" alt="" class="expression-img" @click="drawImg(index)">
                     </div>
                 </Poptip>
-                <Icon custom="iconfont icon-fresh" class="tool-icon" title="清除批注" @click="clear" />
+                <Icon custom="iconfont icon-fresh" class="tool-icon" :title="$t('learnActivity.mark.clear')" @click="clear" />
                 <!-- <Icon :custom="isFull ? 'iconfont icon-cancel-full' : 'iconfont icon-full-screen'" class="tool-icon" :title="isFull ? '取消全屏' : '全屏'" @click="togglefull" /> -->
             </div>
             <div class="mark-stage">
@@ -56,10 +56,10 @@
                 <div class="qu-index-box">
                     <div class="qu-tips-box">
                         <span class="qu-tips-tag">
-                            已阅
+                            {{$t('learnActivity.mark.marked')}}
                         </span>
                         <span class="qu-tips-tag">
-                            未阅
+                            {{$t('learnActivity.mark.unmark')}}
                         </span>
                     </div>
                     <div>
@@ -81,12 +81,16 @@
             <!-- 打分部分 -->
             <div class="score-wrap">
                 <div class="quick-score-box score-input-box">
-                    <span>分数:</span>
+                    <span>{{$t('learnActivity.mark.score')}}</span>
                     <InputNumber style="flex:1" :max="10" :min="1" v-model="score" @on-change="setScore"></InputNumber>
                 </div>
                 <div class="quick-score-box">
-                    <Button size="small" type="info" style="margin-right:8px" ghost @click="score = 10">满分</Button>
-                    <Button size="small" type="error" ghost @click="score = 0">零分</Button>
+                    <Button size="small" type="info" style="margin-right:8px" ghost @click="score = 10">
+                        {{$t('learnActivity.mark.fullScore')}}
+                    </Button>
+                    <Button size="small" type="error" ghost @click="score = 0">
+                        {{$t('learnActivity.mark.zeroScore')}}
+                    </Button>
                     <Icon :type="isShowNum ? 'md-eye-off' : 'md-eye'" class="toggle-num-status" @click="isShowNum = !isShowNum" />
                     <div :class="['score-key-box', isShowNum ? '':'hind-key-box']">
                         <vuescroll>
@@ -96,14 +100,20 @@
                         </vuescroll>
                     </div>
                 </div>
-                <Button type="success" class="submit-score" @click="submit()">提交分数</Button>
+                <Button type="success" class="submit-score" @click="submit()">
+                    {{$t('learnActivity.mark.submit')}}
+                </Button>
                 <div class="score-setting-wrap">
                     <div class="score-setting-item">
-                        <span>打分自动切换题目</span>
+                        <span>
+                            {{$t('learnActivity.mark.setting3')}}
+                        </span>
                         <i-switch v-model="autoQu" size="small" />
                     </div>
                     <div class="score-setting-item">
-                        <span>完成阅卷自动获取新学生</span>
+                        <span>
+                            {{$t('learnActivity.mark.setting4')}}
+                        </span>
                         <i-switch v-model="autoStu" size="small" />
                     </div>
                 </div>
@@ -111,7 +121,7 @@
         </div>
         <!-- 用来单独渲染学生作答数据,提高tocanvas 的效率 -->
         <iframe id="markIframe" :srcdoc="curAnswer"></iframe>
-        <Modal v-model="toggleStatus" title="切换学生" :width="800" footer-hide>
+        <Modal v-model="toggleStatus" :title="$t('learnActivity.mark.toggleStu')" :width="800" footer-hide>
             <StuProg @getStuId="toByStuView" class="light-stu-prog" :total="taskInfo.count" :stusData="stusData"></StuProg>
         </Modal>
     </div>
@@ -260,17 +270,16 @@ export default {
                 }
                 this.$api.mark.saveScore(requstData).then(
                     res => {
-                        this.$Message.success('保存成功')
                         // 按人阅卷自动跳转下一题
                         this.nextQuestion()
                         this.ansToImg()
                     },
                     err => {
-                        this.$Message.error('保存失败')
+                        this.$Message.error(this.$t('learnActivity.mark.saveErr'))
                     }
                 )
             } else {
-                this.$Message.warning('请先打分')
+                this.$Message.warning(this.$t('learnActivity.mark.noSocreErr'))
             }
         },
         nextQuestion() {
@@ -279,7 +288,7 @@ export default {
                 if (this.autoStu) {
                     this.toggleStatus = true
                 } else {
-                    this.$Message.warning('当前完成当前学生评分,如果继续评分,请切换学生')
+                    this.$Message.warning(this.$t('learnActivity.mark.completeStu'))
                 }
                 return
             }
@@ -356,21 +365,20 @@ export default {
                         }
                         qu = childIndex > -1 ? `${(quIndex + 1)}-${(childIndex + 1)}` : quIndex
                         this.$Modal.confirm({
-                            title: '未阅题目',
-                            content: `${qu}题目尚未评分,是否跳转到对应题目继续评分?`,
+                            title: this.$t('learnActivity.mark.ummarkQu'),
+                            content: `${qu}${this.$t('learnActivity.mark.unmarkContent')}`,
                             onOk: () => {
                                 this.quIndex = quIndex
                                 this.childIndex = childIndex
                             }
                         })
                     } else {
-                        this.$Message.success('已阅完')
+                        this.$Message.success(this.$t('learnActivity.mark.finished'))
                         if (this.autoStu) {
                             //TODE 随机获取下一位学生
                             this.toggleStatus = true
                         }
                     }
-
                 }
             }
             this.score = this.stuScore[this.getScoreIndex(this.quIndex, this.childIndex)] == -1 ? null : this.stuScore[this.getScoreIndex(this.quIndex, this.childIndex)]
@@ -409,10 +417,10 @@ export default {
                         return item.info.score.includes(-1)
                     })
                     if (res.length) {
-                        this.$Message.warning('已无未阅学生,请挑选进行中的学生继续阅卷。')
+                        this.$Message.warning(this.$t('learnActivity.mark.noUnMarkStu'))
                         this.toggleStatus = true
                     } else {
-                        this.$Message.success('您已完成阅卷任务')
+                        this.$Message.success(this.$t('learnActivity.mark.completeTask'))
                     }
 
                 } else {
@@ -505,7 +513,7 @@ export default {
                 this.score = this.stuScore[index] == -1 ? null : this.stuScore[index]
                 return this.stuAnswer[index]
             } else {
-                return this.stuId + '未作答'
+                return this.stuId + this.$t('learnActivity.mark.noAnswer')
             }
 
         },

+ 8 - 4
TEAMModelOS/ClientApp/src/view/task/mark/ProgPie.vue

@@ -34,7 +34,11 @@ export default {
                     itemWidth: 10,
                     itemHeight: 10,
                     left: 'center',
-                    data: ['已阅', '进行中', '未阅'],
+                    data: [
+                        this.$t('learnActivity.mark.marked'),
+                        this.$t('learnActivity.mark.marking'),
+                        this.$t('learnActivity.mark.unmark')
+                    ],
                     textStyle: {
                         color: '#ddd',
                         fontSize: 11,
@@ -49,21 +53,21 @@ export default {
                         data: [
                             {
                                 value: 0,
-                                name: '已阅',
+                                name: this.$t('learnActivity.mark.marked'),
                                 itemStyle: {
                                     color: "#9ff080"
                                 },
                             },
                             {
                                 value: 0,
-                                name: '进行中',
+                                name: this.$t('learnActivity.mark.marking'),
                                 itemStyle: {
                                     color: "#5c7bd9"
                                 },
                             },
                             {
                                 value: 0,
-                                name: '未阅',
+                                name: this.$t('learnActivity.mark.unmark'),
                                 itemStyle: {
                                     color: "#ffdc60"
                                 },

+ 2 - 2
TEAMModelOS/ClientApp/src/view/task/mark/QuProg.vue

@@ -11,7 +11,7 @@
                         <Progress :percent="objectiveQu.includes(childItem.type) ? 100 : byQuPct[getScoreIndex(index,childIndex)]" />
                         <!-- <Progress :percent="byQuPct[getScoreIndex(index,childIndex)]" /> -->
                         <p v-if="objectiveQu.includes(childItem.type)" class="prog-tips" style="color: #19be6b">
-                            客观题已由系统自动完成评分。
+                            {{$t('task.objectiveQu')}}
                         </p>
                         <p v-else class="prog-tips">
                             <span style="margin-right:10px">
@@ -38,7 +38,7 @@
                     <Progress :percent="objectiveQu.includes(item.type) ? 100 : byQuPct[getScoreIndex(index)]" />
                     <!-- <Progress :percent="byQuPct[getScoreIndex(index)]" /> -->
                     <p v-if="objectiveQu.includes(item.type)" class="prog-tips" style="color: #19be6b">
-                        客观题已由系统自动完成评分。
+                        {{$t('task.objectiveQu')}}
                     </p>
                     <p v-else>
                         <span style="margin-right:10px">

+ 13 - 9
TEAMModelOS/ClientApp/src/view/task/mark/StuProg.vue

@@ -18,26 +18,30 @@
                 <div class="stu-wrap">
                     <div class="stu-list-wrap no-stu-wrap" v-show="tabIndex == 0">
                         <p class="no-mark-text" v-if="unmarked > 0 && unmarked < total">
-                            还剩
+                            {{$t('task.lastLabel1')}}
                             <span class="no-mark-count">{{unmarked}}</span>
-                            人未阅,
-                            <span class="continue-mark" @click="toByStuView()">继续阅卷</span>
+                            {{$t('task.lastLabel2')}}
+                            <span class="continue-mark" @click="toByStuView()">
+                                {{$t('task.continue')}}
+                            </span>
                         </p>
                         <p class="no-mark-text" v-else-if="unmarked > 0">
-                            阅卷总量
+                            {{$t('task.totalLabel1')}}
                             <span class="no-mark-count">{{unmarked}}</span>
-                            人,
-                            <span class="continue-mark" @click="toByStuView()">开始阅卷</span>
+                            {{$t('task.totalLabel2')}}
+                            <span class="continue-mark" @click="toByStuView()">
+                                {{$t('task.start')}}
+                            </span>
                         </p>
-                        <EmptyData v-else textContent="暂无未阅学生"></EmptyData>
+                        <EmptyData v-else :textContent="$t('task.noUnmark')"></EmptyData>
                     </div>
                     <div class="stu-list-wrap" v-show="tabIndex == 1">
                         <span class="stu-name" v-for="(item,index) in marking" :key="index" @click="toByStuView(item.stuId)">{{item.stuId}}</span>
-                        <EmptyData textContent="暂无进行中学生" v-show="!marking.length"></EmptyData>
+                        <EmptyData :textContent="$t('task.noMarking')" v-show="!marking.length"></EmptyData>
                     </div>
                     <div class="stu-list-wrap" v-show="tabIndex == 2">
                         <span class="stu-name" v-for="(item,index) in marked" :key="index" @click="toByStuView(item.stuId)">{{item.stuId}}</span>
-                        <EmptyData :top="0" textContent="暂无已阅学生" v-show="!marked.length"></EmptyData>
+                        <EmptyData :top="0" :textContent="$t('task.noMarked')" v-show="!marked.length"></EmptyData>
                     </div>
                 </div>
             </div>