数据导致的报错

# Conflicts:
#	src/components/VideoPlayer/index.vue
#	src/components/VideoPlayer/progress-bar.vue
#	src/views/study/coursenew.vue

.env.production

@@ -16,19 +16,19 @@ VUE_APP_CESOURCE_BASE_API = '/socialApi'
 VUE_APP_STAT_BASE_API = '/statApi'
 
 # BOE系统网址
-VUE_APP_BOE_WEB_URL = 'https://u.boe.com'
+VUE_APP_BOE_WEB_URL = 'http://10.251.132.75'
 
 # BOE 移动端url
-VUE_APP_BOE_MOBILE_URL = 'https://u.boe.com'
+VUE_APP_BOE_MOBILE_URL = 'http://10.251.132.75'
 
 # File路径的基础url
-VUE_APP_FILE_BASE_URL='https://u.boe.com/upload'
+VUE_APP_FILE_BASE_URL='http://10.251.132.75/upload'
 
 # File路径的基础url的相对路径，加此项是为了不影响之前的路径配置
 VUE_APP_FILE_RELATIVE_PATH = '/upload'
 
 # 受众批量导入人员信息URL
-VUE_APP_AUDIENCE_IMPORT_URL = 'https://u.boe.com/userbasic/audience/import'
+VUE_APP_AUDIENCE_IMPORT_URL = 'http://10.251.132.75/userbasic/audience/import'
 
 
 
@@ -39,10 +39,10 @@ VUE_APP_STUDENT_PATH='/fe-student'
 VUE_APP_MANAGER_API_PATH='/manageApi'
 
 # 登录地址
-VUE_APP_LOGIN_URL='https://u.boe.com/web/'
+VUE_APP_LOGIN_URL='http://10.251.132.75/web/'
 
 # scorm课件的播放url地址
-VUE_APP_SCORM_URL = 'https://u.boe.com/newscorm/scorm-player'
+VUE_APP_SCORM_URL = 'http://10.251.132.75/newscorm/scorm-player'
 
 #案例组织领域类型
 VUE_APP_CASE_TYPE = '155'

src/api/boe/courseRecord.js

@@ -1,5 +1,6 @@
 /**我的授课记录*/
 import ajax from '@/api/boe/boeApiAjax.js'
+import ajax2 from '@/api/unionAjax.js'
 import axios from 'axios'
 import { getToken } from '@/utils/token'
 const baseURL = process.env.VUE_APP_BOE_BASE_API;
@@ -60,12 +61,15 @@ const exportStudentOfTearcher = function(userId) {
 const courseRecordList = function(data) {
     return ajax.postJson('/b1/system/teacher/teacher-course-list',data);
 }
-
+const getListByToken = function(data) {
+  return ajax2.get('/manageApi',`/admin/teacherRecord/getListByToken?courseName=${data.courseName}&page=${data.page}&pageSize=${data.pageSize}`);
+}
 
 
 export default {
     courseRecordExport,
     courseRecordList,
+    getListByToken,
     exportStudentOfCourse,
     exportStudentOfTearcher
 

src/components/Course/exam.vue

@@ -327,7 +327,7 @@ export default {
     },
     startTest(){
       apiExamPaper.newPaperContent(this.info.id).then(res=>{
-        if(res.error == ''&&res.result != ''){
+        if(!res.error&&res.result != ''){
           if(this.info.paperType==2){
             this.examPaper.json=res.result;
             let qitems=this.convertToItems(this.examPaper.json);

src/components/PortalHeader.vue

@@ -51,7 +51,8 @@
               <el-dropdown placement="bottom" @command="handleContributor">
                 <span class="el-dropdown-link" style="font-size:16px;cursor: pointer;" :style="{color:textColor}">贡献者大会</span>
                 <el-dropdown-menu slot="dropdown">
-                  <el-dropdown-item command="one">2023</el-dropdown-item>
+                  <el-dropdown-item command="three">2024</el-dropdown-item>
+                  <el-dropdown-item command="one" divided>2023</el-dropdown-item>
                   <el-dropdown-item command="two" divided>2022</el-dropdown-item>
                 </el-dropdown-menu>
               </el-dropdown>
@@ -246,6 +247,7 @@ export default {
       let obj = {
           one: urlPre + "/web/contributornew/index",
           two: urlPre + "/web/contributor/index",
+          three: urlPre + "/web/contributor_2024/index"
         };
         window.open(obj[val]);
     },

src/views/case/ManageList.vue

@@ -52,7 +52,7 @@
       <el-table-column label="操作">
         <template slot-scope="scope">
           <el-button-group>
-            <el-button style="margin:0 5px" type="text" v-if="scope.row.recommendRank === ''" @click="suggest(scope.row)" icon="el-icon-medal">榜单推荐</el-button>
+            <el-button style="margin:0 5px" type="text" v-if="scope.row.recommendRank === ''||scope.row.recommendRank === null" @click="suggest(scope.row)" icon="el-icon-medal">榜单推荐</el-button>
             <!-- <el-button type="text" @click="shareItem(scope.row)"  icon="el-icon-share" style="margin:0 5px">推荐</el-button> -->
             <el-button style="margin:0 5px" v-if="!scope.row.isTop && scope.row.confidentialityLevel == '内部'" type="text"
               @click="setTop(scope.row)" icon="el-icon-top">置顶</el-button>

src/views/course/Mylecnotes.vue

@@ -92,23 +92,23 @@
 import apiCourse from '../../api/boe/courseRecord.js';
 import { mapGetters } from 'vuex';
 export default {
-  data(){
+data(){
  return {
      pageData:[],
      keyword:'',
      pageInfo:{},
  }
-  },
+},
 
-  mounted() {
+mounted() {
  this.recordList(1);
 
-  },
+},
-  computed: {
+computed: {
  ...mapGetters(['userInfo'])
-  },
+},
 
-  methods: {
+methods: {
 
    // 导出所有记录
    exportFile(){
@@ -193,14 +193,14 @@ export default {
      this.recordList(this.pageInfo.pageIndex);
    },
 
-  },
+},
 
 }
 </script>
 
 <style lang="scss" scoped>
 .Export{
-  display: flex;
+display: flex;
-  padding-top: 10px;
+padding-top: 10px;
 }
 </style>

src/views/hotforum/Index.vue

@@ -22,7 +22,7 @@
           {img:'01',url:'1265897142383042560'},
           {img:'02',url:'1265697724606210048'},
           {img:'003',url:'1280185851054231552'},
-          {img:'4',url:''},
+          {img:'04',url:'1321778585966247936'},
         ],
       }
     },

src/views/portal/case/Index.vue

@@ -1507,7 +1507,7 @@ export default {
                 };
               });
               res.result.list.forEach(item=>{
-                item.viewRankTags = item.viewRankTags.slice(0,2)
+                item.viewRankTags = item.viewRankTags?.slice(0,2)||[]
               })
               this.caseList.list = res.result.list
               this.getCaseUserData(res.result.list);
@@ -1562,7 +1562,7 @@ export default {
                 };
               });
               res.result.list.forEach(item=>{
-                item.viewRankTags = item.viewRankTags.slice(0,2)
+                item.viewRankTags = item.viewRankTags?.slice(0,2)||[]
               })
               this.caseList.list = res.result.list
               this.getCaseUserData(res.result.list);
@@ -1601,7 +1601,7 @@ export default {
           }
           // console.log(res?.result?.list ,'有没有数据');
           res.result.list.forEach(item=>{
-            item.viewRankTags = item.viewRankTags.slice(0,2)
+            item.viewRankTags = item.viewRankTags?.slice(0,2)||[]
           })
           this.caseList.list = res.result.list
           this.getCaseUserData(res.result.list);

src/views/study/Courses.vue

@@ -253,8 +253,8 @@ export default {
         if(res.status==200){
             let localCourseIds=[];//本地在线课程的id集合
             res.result.list.forEach(item=>{
-              if(item.courseImage.startsWith('/upload')){
+              if(item.courseImage?.startsWith('/upload')){
-                 item.courseImage=$this.fileUrl+item.courseImage.substring(7)
+                 item.courseImage=$this.fileUrl+item.courseImage?.substring(7)
               }
               if(item.source==2){
                 localCourseIds.push(item.id);