Merge branch 'zcwy-master' into pingcode-20240615

# Conflicts:
#	src/views/study/coursenew.vue

src/views/exam/ExamList.vue

@@ -499,7 +499,7 @@
               </el-table-column>
               <el-table-column label="状态">
                 <template slot-scope="scope">
-                  {{ scope.row.status == 9 ? '已完成' : '未开始' }}
+                  {{ scope.row.status == 9 ? '已完成' : scope.row.status == 1?'进行中':'未开始' }}
                 </template>
               </el-table-column>
               <el-table-column label="完成时间" prop="lastTime">

src/views/study/coursenew.vue

@@ -182,7 +182,7 @@
                       <el-submenu :index="item.section.id">
                         <template slot="title">
                           <div style="display: flex;justify-content: space-between;">
-                            <span style="font-weight: 700;font-size: 16px;" :title="item.section.name">{{item.section.name.slice(0, 15)+(item.section.name.length > 15 ? '...' : '')}}</span>
+                            <div style="width: 240px;font-weight: 700;font-size: 16px;overflow: hidden;white-space: nowrap;text-overflow: ellipsis;" :title="item.section.name">{{item.section.name}}</div>
                             <div style="margin-right: 23px;font-weight: 700;font-size: 16px;">({{ item.children.filter(item=>item.status == 9).length }}/{{ item.children.length }})</div>
                           </div>
                         </template>
@@ -190,7 +190,7 @@
                           <div class="units-info" :class="{'units-active':contentData.id == ele.id}" @click="showRes(ele,i,index,item)">
                             <el-menu-item :index="ele.id" style="padding: 0;padding-left: 10px;">
                               <div style="display: flex;justify-content: space-between;">
-                                <div style="font-size: 16px;" :title="ele.contentName">{{i+1}}. {{ ele.contentName.slice(0, 15)+(ele.contentName.length > 15 ? '...' : '') }}</div>
+                                <div style="width: 200px;font-size: 16px;overflow: hidden;white-space: nowrap;text-overflow: ellipsis;" :title="ele.contentName">{{i+1}}. {{ ele.contentName }}</div>
                                 <div>
                                   <span v-if="contentData.id == ele.id" style="color: #387DF7;font-size: 14px;margin-right: 4px;">学习中</span>
                                   <img v-if="contentData.id == ele.id" :src="`${webBaseUrl}/images/playicon.png`" alt="">
@@ -858,7 +858,7 @@
         }
         this.changePlayRes(r,item);
         console.log('r, i, index,item::',r, i, index,item)
-        this.videoIndex = i 
+        this.videoIndex = i
         this.blobId = r.id
       },
       loadScorePraiseAndTrample() {
@@ -1157,7 +1157,7 @@
             postData.progressVideo = arr[this.blobId]
             postData.contentId = this.contentList[this.videoIndex].id
             postData.courseId = this.contentList[this.videoIndex].courseId
-          }  
+          }
         }
         apiStudy.studyVideoTime(postData).then(rs => {
           if (rs.status != 200) {
@@ -1504,7 +1504,7 @@
           }
         });
       },
-      progress(val) { 
+      progress(val) {
         const progressValue = parseFloat(val) * 100;
         this.sendEventProgress = Number(progressValue.toFixed(2));
        },