Merge branch 'develop5.0-tmd' of http://106.12.23.251:10080/TEAMMODEL/TEAMModelOS into develop5.0-tmd

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

@@ -25,6 +25,7 @@ import system from './system'
 import cusMgt from './cusMgt'
 import home from './home'
 import updModal from './updModal'
+import task from './task'
 
 export default {
   schoolBaseInfo,
@@ -55,6 +56,7 @@ export default {
   home,
   learnActivity,
   updModal,
+  task,
   formConfigP: {
     input: 'Please Enter ',
     select: 'Please Sele',

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

@@ -0,0 +1,16 @@
+export default {
+    markTask:'閱卷任務',
+    markStatus1:'進行中',    
+    markStatus2:'已完成',    
+    markStatus3:'已結束',    
+    markMode1:'按題閱卷',    
+    markMode2:'按人閱卷',    
+    mLabel1:'人數',    
+    mLabel2:'已閱',    
+    mLabel3:'未閱',    
+    mLabel4:'進行中',    
+    mLabel5:'題量',    
+    mLabel6:'人數',    
+    markProg:'批閱進度',    
+    mark:'批閱',
+}

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

@@ -31,6 +31,7 @@ import updModal from './updModal'
 import http from './http'
 import utils from './utils'
 import knowledge from './knowledge'
+import task from './task'
 export default {
   schoolBaseInfo,
   classMgmt,
@@ -65,6 +66,7 @@ export default {
   http,
   utils,
   knowledge,
+  task,
   test: '测试',
   formConfigP: {
     input: '请输入',

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

@@ -0,0 +1,16 @@
+export default {
+    markTask:'阅卷任务',
+    markStatus1:'进行中',
+    markStatus2:'已完成',
+    markStatus3:'已结束',
+    markMode1:'按题阅卷',
+    markMode2:'按人阅卷',
+    mLabel1:'人数',
+    mLabel2:'已阅',
+    mLabel3:'未阅',
+    mLabel4:'进行中',
+    mLabel5:'题量',
+    mLabel6:'人数',
+    markProg:'批阅进度',
+    mark:'批阅',
+}

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

@@ -31,6 +31,7 @@ import updModal from './updModal'
 import http from './http'
 import utils from './utils'
 import knowledge from './knowledge'
+import task from './task'
 export default {
   
   schoolBaseInfo,
@@ -66,6 +67,7 @@ export default {
   http,
   utils,
   knowledge,
+  task,
   test: '測試',
   formConfigP: {
     input: '請輸入',

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

@@ -0,0 +1,16 @@
+export default {
+    markTask:'閱卷任務',
+    markStatus1:'進行中',    
+    markStatus2:'已完成',    
+    markStatus3:'已結束',    
+    markMode1:'按題閱卷',    
+    markMode2:'按人閱卷',    
+    mLabel1:'人數',    
+    mLabel2:'已閱',    
+    mLabel3:'未閱',    
+    mLabel4:'進行中',    
+    mLabel5:'題量',    
+    mLabel6:'人數',    
+    markProg:'批閱進度',    
+    mark:'批閱',
+}

TEAMModelOS/ClientApp/src/view/task/index.vue

@@ -11,14 +11,14 @@
                 <div class="ev-list" slot="left">
                     <div class="ev-list-header">
                         <span>
-                            阅卷任务
+                            {{$t('task.markTask')}}
                         </span>
                     </div>
                     <vuescroll class="ev-list-content">
                         <div :class="['ev-item','block-bg',index == curEvIndex ? 'block-bg-active':'']" v-for="(item,index) in evList" :key="index" @click="selectEvaluation(index)">
                             <p class="ev-name">
                                 <span>{{item.name}}</span>
-                                <span class="mark-status-tag">进行中</span>
+                                <span class="mark-status-tag">{{$t('task.markStatus1')}}</span>
                             </p>
                             <p class="ev-info">
                                 <Icon type="md-time" style="margin-right:5px;" size="16" />
@@ -34,10 +34,10 @@
                 <div slot="right" class="ev-mark-info">
                     <div class="ev-mark-header">
                         <span :class="curBarIndex == 0 ? 'task-bar-item line-bottom-active line-bottom':'task-bar-item line-bottom'" @click="selectBar(0)">
-                            按题阅卷
+                            {{$t('task.markMode1')}}
                         </span>
                         <span :class="curBarIndex == 1 ? 'task-bar-item line-bottom-active line-bottom':'task-bar-item line-bottom'" @click="selectBar(1)">
-                            按人阅卷
+                            {{$t('task.markMode2')}}
                         </span>
                     </div>
                     <!-- 按题批阅 -->
@@ -50,21 +50,21 @@
                                     <p class="count-num">12</p>
                                     <p class="count-label">
                                         <Icon type="ios-paper" class="count-icon" size="16" />
-                                        题量
+                                        {{$t('task.mLabel5')}}
                                     </p>
                                 </div>
                                 <div class="count-wrap">
                                     <p class="count-num">1</p>
                                     <p class="count-label">
                                         <Icon type="ios-star" class="count-icon" size="16" />
-                                        已阅
+                                        {{$t('task.mLabel2')}}
                                     </p>
                                 </div>
                                 <div class="count-wrap">
                                     <p class="count-num">2</p>
                                     <p class="count-label">
                                         <Icon type="ios-star-outline" class="count-icon" size="16" />
-                                        未阅
+                                        {{$t('task.mLabel3')}}
                                     </p>
                                 </div>
                                 <div class="count-wrap to-mark-view">
@@ -73,31 +73,32 @@
                                     </p>
                                     <p class="count-label">
                                         <Icon custom="iconfont icon-scanning" class="count-icon" size="16" />
-                                        进行中
+                                        {{$t('task.mLabel4')}}
                                     </p>
                                 </div>
                             </div>
                         </div>
                         <!-- 批阅进度 -->
                         <div class="setting-block">
-                            <p class="block-title">批阅进度</p>
+                            <p class="block-title">{{$t('task.markProg')}}</p>
                             <div class="setting-content">
-                                <div class="qu-info-item" v-for="(item,index) in quCount" :key="index"> 
+                                <div class="qu-info-item" v-for="(item,index) in quCount" :key="index">
                                     <span class="qu-index">
                                         {{index + 1}}
                                     </span>
                                     <div class="progress-wrap">
                                         <Progress :percent="25" />
                                         <p>
-                                            <span>已阅：4</span>
-                                            <span>未阅：8</span>
+                                            <span>{{$t('task.mLabel2')}}:4</span>
+                                            <span>{{$t('task.mLabel3')}}:8</span>
                                         </p>
                                     </div>
                                     <div class="to-mark">
-                                        <Button type="primary" shape="circle" size="small" style="width:120px" @click="toMarkView">批阅</Button>
+                                        <Button type="primary" shape="circle" size="small" style="width:120px" @click="toMarkView">
+                                            {{$t('task.mark')}}
+                                        </Button>
                                     </div>
                                 </div>
-                                
                             </div>
                         </div>
                     </vuescroll>
@@ -111,21 +112,21 @@
                                     <p class="count-num">12</p>
                                     <p class="count-label">
                                         <Icon type="ios-paper" class="count-icon" size="16" />
-                                        人数
+                                        {{$t('task.mLabel1')}}
                                     </p>
                                 </div>
                                 <div class="count-wrap">
                                     <p class="count-num">1</p>
                                     <p class="count-label">
                                         <Icon type="ios-star" class="count-icon" size="16" />
-                                        已阅
+                                        {{$t('task.mLabel2')}}
                                     </p>
                                 </div>
                                 <div class="count-wrap">
                                     <p class="count-num">2</p>
                                     <p class="count-label">
                                         <Icon type="ios-star-outline" class="count-icon" size="16" />
-                                        未阅
+                                        {{$t('task.mLabel3')}}
                                     </p>
                                 </div>
                                 <div class="count-wrap to-mark-view">
@@ -134,30 +135,30 @@
                                     </p>
                                     <p class="count-label">
                                         <Icon custom="iconfont icon-scanning" class="count-icon" size="16" />
-                                        进行中
+                                        {{$t('task.mLabel4')}}
                                     </p>
                                 </div>
                             </div>
                         </div>
                         <!-- 批阅进度 -->
                         <div class="setting-block">
-                            <p class="block-title">批阅进度</p>
+                            <p class="block-title">{{$t('task.markProg')}}</p>
                             <div class="setting-content">
                                 <div>
-                                    <Progress :percent="60" stroke-color="#1cc0f3" :stroke-width="4" >
+                                    <Progress :percent="60" stroke-color="#1cc0f3" :stroke-width="4">
                                         <span style="color:white">60%</span>
                                     </Progress>
                                 </div>
                                 <div class="stu-wrap">
                                     <div class="filter-tab-wrap">
                                         <span :class="['filter-tab-item', tabIndex == 0 ? 'filter-tab-item-active':'']" @click="tabIndex = 0">
-                                            未阅
+                                            {{$t('task.mLabel3')}}
                                         </span>
                                         <span :class="['filter-tab-item', tabIndex == 1 ? 'filter-tab-item-active':'']" @click="tabIndex = 1">
-                                            进行中
+                                            {{$t('task.mLabel4')}}
                                         </span>
                                         <span :class="['filter-tab-item', tabIndex == 2 ? 'filter-tab-item-active':'']" @click="tabIndex = 2">
-                                            已阅
+                                            {{$t('task.mLabel2')}}
                                         </span>
                                     </div>
                                     <div class="stu-list-wrap">
@@ -184,7 +185,7 @@ export default {
             evList: [],
             curEvIndex: 0,
             names: [],
-            quCount:[]
+            quCount: []
         }
     },
     methods: {
@@ -247,7 +248,7 @@ export default {
     },
     created() {
         this.findEvaluation()
-        this.quCount = Array.from(new Array(13).keys()) 
+        this.quCount = Array.from(new Array(13).keys())
         this.names = Array.from(new Array(46).keys())
     }
 }