caichengyu hace 1 año
padre
commit
57f8cb3110

+ 1 - 1
src/utils/request.js

@@ -20,7 +20,7 @@ const service = axios.create({
   timeout: 600000
 })
 // request拦截器
-service.interceptors.request.use(config => {
+service.interceptors.request.use(config => { 
   // 是否需要设置 token
   const isToken = (config.headers || {}).isToken === false
   if (getToken() && !isToken) {

+ 3 - 2
src/views/classHoursReview/component/LessonTable.vue

@@ -30,7 +30,8 @@
                 </el-image>
                 <div class="abos">一寸头像图</div>
               </li>
-              <li class="liImgs" v-if="scope.row.videoUrl">
+              <template  v-for="(its, inds) in scope.row.userStudyRecordPhotoList">
+                <li class="liImgs" v-if="scope.row.videoUrl&&$methodsTools.onlyForma(its.createTime)>scope.row.videoTime&&(inds==0||$methodsTools.onlyForma(scope.row.userStudyRecordPhotoList[inds-1].createTime)<=scope.row.videoTime)" key="i0101">
                 <video
                   controls
                   preload
@@ -43,7 +44,6 @@
                 </div>
               </li>
               <li
-                v-for="(its, inds) in scope.row.userStudyRecordPhotoList"
                 :key="inds"
                 class="liImgs"
               >
@@ -57,6 +57,7 @@
                   {{ $methodsTools.onlyForma(its.createTime) }}
                 </div>
               </li>
+              </template>
               <div style="clear: both"></div>
             </ul>
             <p v-else style="text-align: center; width: 100%">暂无拍照数据</p>

+ 5 - 6
src/views/education/classManageMent/classHoursReview/component/LessonTable.vue

@@ -24,7 +24,8 @@
                 scope.row.userStudyRecordPhotoList.length
               "
             >
-              <li class="liImgs" v-if="scope.row.videoUrl">
+              <template  v-for="(its, inds) in scope.row.userStudyRecordPhotoList">
+              <li class="liImgs" v-if="scope.row.videoUrl&&$methodsTools.onlyForma(its.createTime)>scope.row.videoTime&&(inds==0||$methodsTools.onlyForma(scope.row.userStudyRecordPhotoList[inds-1].createTime)<=scope.row.videoTime)" key="i0101">
                 <video
                   controls
                   preload
@@ -36,11 +37,7 @@
                   {{ scope.row.videoTime }}
                 </div>
               </li>
-              <li
-                v-for="(its, inds) in scope.row.userStudyRecordPhotoList"
-                :key="inds"
-                class="liImgs"
-              >
+                <li class="liImgs"  :key="inds">
                 <el-image
                   style="width: 100%; height: 100%"
                   :src="$methodsTools.splitImgHost(its.photo)"
@@ -62,6 +59,8 @@
                   {{ $methodsTools.onlyForma(its.createTime) }}
                 </div>
               </li>
+              </template>
+              
               <div style="clear: both"></div>
             </ul>
             <p v-else style="text-align: center; width: 100%">暂无拍照数据</p>