Kaynağa Gözat

还未到打印时间

y595705120 2 yıl önce
ebeveyn
işleme
faa0ed5600

+ 12 - 5
src/containers/center/home/index.vue

@@ -35,19 +35,23 @@
           <p class="fl">最近学习课程</p>
         </div>
         <div class="clear mt10">
-          <div class="m-history-course fl ng-scope" v-for="item in list" :key="item.courseId" style="width:464px; margin-left:8px;cursor:pointer">
+          <div class="m-history-course fl ng-scope" v-for="item in list" :key="item.courseId"
+            style="width:460px; margin-left:8px;cursor:pointer">
             <a  class="course-img" @click="gotoPlay(item.courseId)">
               <img :src="item.tb">
               <span class="p-ico2"></span>
             </a>
             <div class="history-course-bd" style="width:276px">
-              <p class="tit ng-binding">{{item.name}}</p>
-              <div class="info">课程进度
+              <p class="tit ng-binding">{{item.name}}[{{item.nd}}]</p>
+              <div class="info" v-if="curDate>=item.endDate" >课程进度
                 <span class="num ml10 ng-binding">{{getPercent(item)}}</span>
                 <span class="t-b">%</span>
               </div>
-              <div class="info">最近一次学习
-                <span>{{item.endDate}}</span>
+              <div class="info" v-else >课程进度
+                <span class="p10 t-b">学习时间未到</span>
+              </div>
+              <div class="info" >最近一次学习
+                <span>{{item.endDate>curDate?curDate:item.endDate}}</span>
               </div>
             </div>
           </div>
@@ -64,6 +68,7 @@
     httpServer
   } from "@/components/httpServer/httpServer.js";
   import setting from '@/setting';
+  import {curDate} from '@/utils/date.js'
   export default {
     name: "Index",
     data() {
@@ -72,6 +77,7 @@
         size: 6,
         total: 1,
         media: {},
+        curDate:curDate(),
         list: [],
         setting
       };
@@ -87,6 +93,7 @@
         this.$router.push(route);
       },
       getPercent(item) {
+
         if (item.getXs > item.totalXs) {
           return 100
         } else {

+ 7 - 7
src/containers/center/play/components/iCourseInfoXsExtra.vue

@@ -40,25 +40,25 @@
         </p>
         <p class="mt5">
           <span style="width:240px;margin: 0px;padding: 0px;">
-            全真模拟1: 最高<strong style="color: red;"> {{extraXs.score1}}</strong>分
+            全真模拟1: 最高<strong style="color: red;"> {{extraXs.score1||0}}</strong>分
           </span>
-          <el-button @click="startExam(7)" type="text" v-if="extraXs.score1<60">开始考试</el-button>
+          <el-button @click="startExam(7)" type="text" v-if="!extraXs.score1||extraXs.score1<60">开始考试</el-button>
           <el-button v-else>考试通过</el-button>
         </p>
 
         <p class="mt5">
           <span style="width:240px;margin: 0px;padding: 0px;">
-            全真模拟2: 最高<strong style="color: red;"> {{extraXs.score2}}</strong>分
+            全真模拟2: 最高<strong style="color: red;"> {{extraXs.score2||0}}</strong>分
           </span>
-          <el-button v-if="extraXs.score2<60" @click="startExam(8)" type="text">开始考试</el-button>
+          <el-button v-if="!extraXs.score2||extraXs.score2<60" @click="startExam(8)" type="text">开始考试</el-button>
           <el-button v-else>考试通过</el-button>
         </p>
 
         <p class="mt5">
           <span style="width:240px;margin: 0px;padding: 0px;">
-            全真模拟3: 最高<strong style="color: red;"> {{extraXs.score3}}</strong>分
+            全真模拟3: 最高<strong style="color: red;"> {{extraXs.score3||0}}</strong>分
           </span>
-          <el-button v-if="extraXs.score3<60" @click="startExam(9)" type="text">开始考试</el-button>
+          <el-button v-if="!extraXs.score3||extraXs.score3<60" @click="startExam(9)" type="text">开始考试</el-button>
           <el-button v-else>考试通过</el-button>
         </p>
         <p class="mt5">
@@ -110,7 +110,7 @@
         return toDate( val )
       },
       testCount(val){
-        return val.index1+val.index2+val.index3+val.index4
+        return val.index1+val.index2+val.index3+val.index4 ||0
       }
     },
     methods: {