7.17提出bug修正2

RuoYi-Vue-fast-master/src/main/java/com/ruoyi/project/business/domain/train/TtTrainTarget.java

@@ -49,11 +49,11 @@ public class TtTrainTarget extends BaseEntity {
     @Excel(name = "是否考核完成", readConverterExp = "0=：未完成,1=：已完成")
     private String assessCompleteFlag;
 
-    /**
-     * 是否考核通过（0：未通过  1：通过）
-     */
-    @Excel(name = "是否考核通过", readConverterExp = "0=：未通过,1=：通过")
-    private String passFlag;
+//    /**
+//     * 是否考核通过（0：未通过  1：通过）
+//     */
+//    @Excel(name = "是否考核通过", readConverterExp = "0=：未通过,1=：通过")
+//    private String passFlag;
 
     /**
      * 删除标记（0：未删除  1：已删除）

ruoyi-ui-vue2/src/utils/fileFormart.js

@@ -7,7 +7,7 @@ const SUPPORT_AUDIO_FORMAT = new Set(['mp3', 'wav', 'wma', 'ogg', 'ape', 'acc',
 // 支持的文件格式汇总
 const SUPPORT_FILE_FORMAT = new Set(
   [
-    'pdf', 'docx', 'xlsx', 'xls',
+    'pdf','ppt','pptx','doc', 'docx', 'xlsx', 'xls',
     ...SUPPORT_IMAGE_FORMAT,
     ...SUPPORT_VIDEO_FORMAT,
     ...SUPPORT_AUDIO_FORMAT

ruoyi-ui-vue2/src/utils/lang/zh-cn.js

@@ -1126,6 +1126,7 @@
     terminate:"终止培训",
     isTerminate:"是否确认终止",
     fileTypeError:"文件格式不正确，请上传以下格式文件：.pdf、.doc、.docx、.xls、.xlsx、.ppt、.pptx、.mp3、.mp4",
+    finished:"培训已完成",
   },
   question: {
     questionContext:"题目名称",

ruoyi-ui-vue2/src/views/train/trainTarget/participateTrain/index.vue

@@ -24,10 +24,13 @@
       <!--</div>-->
 
       <el-button-group>
-        <el-button icon="el-icon-plus" v-show="row.trainCompleteFlag == 0 " type="primary" @click="handleCompleteTrain"
+        <el-button disabled v-show="row.trainCompleteFlag != 0 " type="primary"
+        >{{ $t('trainList.finished') }}
+        </el-button>
+        <el-button  icon="el-icon-plus" v-show="row.trainCompleteFlag == 0 " type="primary" @click="handleCompleteTrain"
         >{{ $t('trainTarget.completeTrain') }}
         </el-button>
-        <el-button icon="el-icon-plus" type="primary" @click="handleExam"
+        <el-button v-if="row.assessFlag == 1" icon="el-icon-plus" type="primary" @click="handleExam"
         >{{ $t('trainTarget.participateExam') }}
         </el-button>
       </el-button-group>