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

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

@@ -16,6 +16,7 @@ export default {
 		videoDimension5: '教學效果'
 	},
 	edit: {
+		limit:'需提交材料數量',
 		std: '實踐任務',
 		addStd: '添加任務',
 		editStd: '編輯實踐任務',

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

@@ -16,6 +16,7 @@ export default {
 		videoDimension5:'教学效果'
 	},
 	edit:{
+		limit:'需提交材料数量',
 		std:'实践任务',
 		addStd:'添加任务',
 		editStd:'编辑实践任务',

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

@@ -16,6 +16,7 @@ export default {
 		videoDimension5: '教學效果'
 	},
 	edit: {
+		limit:'需提交材料數量',
 		std: '實踐任務',
 		addStd: '添加任務',
 		editStd: '編輯實踐任務',

TEAMModelOS/ClientApp/src/view/ability/Review.vue

@@ -14,6 +14,7 @@
     <div class="unit-list">
       <div class="unit-item" v-for="(std,index) in data.stds" :key="index">
         <p class="unit-item-name">{{ index + 1 }}.{{ std.std }}</p>
+		 <!-- <span style="font-size: 14px;font-weight: bold;color: red;">( 需提交材料数量: {{ std.task[0].limit }} ) </span> -->
         <span class="task-radio-group" v-if="std.task.length > 1 && mode === 'self'">
           <span v-for="(radio,radioIndex) in std.task" :key="radioIndex" :class="[curTaskIndexArr[index] === radioIndex ? 'active' : '']" @click="onChangeTask(radioIndex,index)">{{ $t('ability.review.task') }} {{ radioIndex + 1 }}</span>
         </span>
@@ -22,7 +23,7 @@
             <p class="unit-item-des">{{ task.stddesc }}</p>
             <!-- 上传按钮 -->
             <div class="task-upload">
-              <Button type="info" icon="md-cloud-upload" class="upload-btn" @click="onUpload(std,index,task)" v-show="!stdFileArr[index].length && isSelfMode">{{ $t('ability.review.upload') }}</Button>
+              <Button type="info" icon="md-cloud-upload" class="upload-btn" @click="onUpload(std,index,task)" v-show="stdFileArr[index].length < task.limit && isSelfMode">{{ $t('ability.review.upload') }}</Button>
             </div>
             <!-- 文件清单 -->
             <div class="unit-item-files">
@@ -436,16 +437,13 @@ export default {
         }
       }
       this.getFinalResult()
-
-      // this.isAllNormal = !isAllGood && allNormalIds.every(i => curStdChooseIds.includes(i))
-      console.log(this.appraiseList[stdIndex]);
     },
     /* 获取能力点详情 */
     async getDetailById(id) {
       let abilityDetail = await this.$evTools.getAbilityDetailById(id)
       console.log(abilityDetail)
 	  // 如果是编辑状态 则需要把自评的结果回显
-      this.appraiseResultArr = this.mode === 'edit' ? this.reviewData.uploads.map(i => ['bad','normal','good'][i.score]) : abilityDetail.stds.map(i => 'bad')
+      this.appraiseResultArr = this.mode === 'edit' ? this.reviewData.uploads.map(i => ['bad','normal','good'][i.score > 0 ? i.score : 0]) : abilityDetail.stds.map(i => 'bad')
 	  // this.finalResult = this.mode === 'edit' ? this.reviewData.self : 0
 	  this.finalResult = 0
       this.appraiseList = abilityDetail.stds.map(i => [])
@@ -487,9 +485,7 @@ export default {
     },
 
     getFinalResult() {
-	  this.appraiseResultArr = this._.compact(this.appraiseResultArr)
       this.finalResult = this.appraiseResultArr.every(i => i === 'good') ? 2 : this.appraiseResultArr.some(i => i === 'bad') ? 0 : 1
-      console.log(this.appraiseResultArr)
       console.log(this.finalResult)
     }
 

TEAMModelOS/ClientApp/src/view/abilityMgmt/Index.vue

@@ -337,6 +337,9 @@
 								<Option v-for="item in $GLOBAL.STD_TYPES()" :value="item.code" :key="item.val">{{ item.val }}</Option>
 							</Select>
 						</FormItem>
+						<FormItem :label="$t('ability.edit.limit')" prop="limit">
+							<InputNumber :max="100" :min="1" v-model="curStd.task[0].limit"></InputNumber>
+						</FormItem>
 						<FormItem>
 							<Button type="success" @click="onConfirmStd" :loading="isAddLoading">{{ $t('syllabus.confirm') }}</Button>
 						</FormItem>