Merge branch 'master' of ssh://111.61.77.35:15/gengdidi/zhengyuan-danger-chemistry-manage

danger-manage-system/src/main/java/com/zehong/system/service/impl/TTrainCourseServiceImpl.java

@@ -207,7 +207,7 @@ public class TTrainCourseServiceImpl implements ITTrainCourseService
     public List<UserCourseVo> userCourseList(Long userId,Integer type){
         List<UserCourseVo> list = tTrainCourseMapper.userCourseList(userId,type,1);
         for (UserCourseVo v :list){
-            if(v.getTestEndTime()!=null&&v.getTestEndTime().getTime()<new Date().getTime()){
+            if(v.getTestEndTime()!=null&&v.getTestEndTime().getTime()<new Date().getTime()&&v.getState()!=2){
                 v.setState(3);
             }
             if(v.getTestStartTime()!=null&&v.getTestStartTime().getTime()>new Date().getTime()){

danger-manage-web/src/views/educationPlanExam/lessonsProgram/components/Lesson.vue

@@ -172,7 +172,7 @@ export default {
         enclosure: "",
         isVeriftyFace: "2"
       },
-      fileType: ["doc", "docx", "xls", "xlsx", "ppt", "txt", "pdf"],
+      fileType: ["pdf"],
       fileListVideo: [],
       fileListFile: [],
       readOnly: false,

danger-manage-web/src/views/educationPlanExam/myLessons/CheckLesson/index.vue

@@ -84,7 +84,7 @@
         </div>
       </div>
 
-      <div v-if="state == 2" class="bt flex fz14">
+      <div v-if="state == 2&&lessonData.topicNum!=0" class="bt flex fz14">
         <div class="a">考试结果</div>
         <div style="color: #1d84ff" class="b flex">
           已完成学习，课后测试得分{{ fenshu }}，成绩合格！
@@ -108,6 +108,7 @@
       @jj="jj"
     />
     <el-dialog :visible.sync="iframeVisible" width="80%">
+      <!--<div v-if="userlessonData.state!=3" class="gotime2">{{minute}}:{{calculation(second)}}/{{parseInt(lessonData.duration/60)}}:{{calculation(lessonData.duration%60)}}</div>-->
       <iframe style="width: 100%; height: 600px" :src="ky"></iframe>
     </el-dialog>
   </div>
@@ -367,12 +368,23 @@ export default {
   justify-content:flex-start;
 }
   .gotime{
-    background: #1c84c6;
-    width: 80px;
-    text-align: center;
-    line-height: 22px;
-    color: white;
-    margin-left: 40px;
-    border-radius: 10px;
-  }
+       background: #1c84c6;
+       width: 80px;
+       text-align: center;
+       line-height: 22px;
+       color: white;
+       margin-left: 40px;
+       border-radius: 10px;
+     }
+.gotime2{
+  background: #1c84c6;
+  width: 80px;
+  text-align: center;
+  line-height: 22px;
+  color: white;
+  margin-left: 20px;
+  border-radius: 10px;
+  position: absolute;
+  top: 20px;
+}
 </style>

danger-manage-web/src/views/educationPlanExam/myLessons/components/LearnItem.vue

@@ -18,7 +18,7 @@
     </div>
     <div class="time">发布时间：{{ itemData.createTime }}</div>
     <div class="bottom flex">
-      <div v-if="!itemData.state===4 || !(itemData.state===3 && itemData.dataKind==='1')"  @click="click" class="btn" :class="{ again: yesOrNo }">
+      <div v-if="itemData.state!=4 && !(itemData.state===3 && itemData.dataKind==='1')"  @click="click" class="btn" :class="{ again: yesOrNo }">
         {{ yesOrNo  }}
       </div>
     </div>
@@ -71,9 +71,9 @@ export default {
         if( this.itemData.state === 0){
           return '开始学习'
         }else if(this.itemData.state === 1){
-          return '重新考试'
+          return '查看课程'
         }else if(this.itemData.state === 2){
-          return '重新考试'
+          return '查看课程'
         }else if(this.itemData.state === 3){
           return '开始学习'
         }else if(this.itemData.state === 4){