默认记载分页数据

# Conflicts:
#	src/views/hotforum/Index.vue

package.json

@@ -16,6 +16,7 @@
   },
   "dependencies": {
     "axios": "^0.21.4",
+    "BOE-Online": "file:",
     "core-js": "^3.6.5",
     "driver.js": "^0.9.8",
     "echarts": "^5.3.0",

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/api/modules/teacher.js

@@ -1,5 +1,5 @@
 import ajax from '@/utils/xajax.js'
-
+import ajax2 from '../unionAjax.js';
 
 /**
  * 按名称查询
@@ -9,7 +9,9 @@ const findByName = function(name) {
     return ajax.get('/xboe/teacher/name?name=' + name);
 }
 
-
+const findByNameNew = function(name) {
+    return ajax2.get('/manageApi/admin/teacher/selectTeacher?name=' + name);
+}
 const updateTeacher=function(data){
     return ajax.postJson('/xboe/teacher/update-teacher',data);
 }
@@ -217,7 +219,7 @@ export default {
     update,
     del,
     detail,
-    findByName,
+    findByNameNew,
     updateSysId,
 	has,
 	start,

src/components/Course/choice.vue

@@ -13,7 +13,7 @@
         </el-input>
         <div class="choice-box" v-if="teacherDownList.length>0">
            <ul>
-            <li v-for="te in teacherDownList" :key="te.key" @click="changeTeachers(te)">{{te.teacherName + te.teacherCode}}</li>
+            <li v-for="te in teacherDownList" :key="te.key" @click="changeTeachers(te)">{{te.teacherName + '(' + te.teacherCode + ')'}}</li>
            </ul>
         </div>
      <!-- <el-select
@@ -88,15 +88,15 @@
           if (this.teacherValues !== '') {
             this.loading = true;
             try {
-            const { result, message, status } = await apiTeacher.findByName(this.teacherValues);
+            const { data, message, code } = await apiTeacher.findByNameNew(this.teacherValues);
             this.loading = false;
-            if (status === 200) {
+            if (code === 200) {
                 let list = [];
-                result.forEach(item => {
+                data.forEach(item => {
                 list.push({
                     teacherId: item.id,
                     teacherName: item.name,
-                    teacherCode: item.code
+                    teacherCode: item.mobile
                 });
                 });
                 this.teacherDownList = list;

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/components/VideoPlayer/index.vue

@@ -272,7 +272,7 @@ export default {
     },
     isDrag:{
       type: Boolean,
-      default: null,
+      default: true,
     },
     isCrowd:{
       type: Boolean,

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/lecturer/CoachingPage.vue

@@ -22,14 +22,14 @@ export default {
   },
   methods:{
     getTeacherList() {
-      addTeacher({pageNo:1,pageSize:100,userNo:''}).then(res=>{
+      addTeacher({pageNo:1,pageSize:20,keyword:''}).then(res=>{
         this.options = res.data.map(item => {
           return { value: item.realName, label: item.realName };
         });
       })
     },
     getCoachingTeacher(val){
-      addTeacher({pageNo:1,pageSize:20,userNo:val}).then(res=>{
+      addTeacher({pageNo:1,pageSize:20,keyword:val}).then(res=>{
         this.options = res.data.map(item => {
           return { value: item.realName, label: item.realName };
         });

src/views/lecturer/OnlineLearning.vue

@@ -64,16 +64,17 @@ export default {
       getProgress({teacherId:id}).then(res=>{
         this.progressData=res.data
         if ( res.data.length>=1 ){
-          res.data.forEach((item,index)=>{
+          const isAll = true;
-            if (item.progress==100 && index==res.data.length-1){
+          res.data.some(item => {
-              this.disabled=false
+            if (item.progress != 100) {
-            }else if (item.progress==100) {
+              this.disabled = true;
-            }else {
+              isAll = false;
-              this.disabled=true
+              return true;
-              return
+            }
+          });
+          if (isAll) {
+            this.disabled = false;
           }
-          })
-
         }
       })
     },

src/views/lecturer/TwoCoaching.vue

@@ -25,14 +25,14 @@ export default {
   },
   methods:{
     getTeacherList() {
-      addTeacher({pageNo:1,pageSize:100,userNo:''}).then(res=>{
+      addTeacher({pageNo:1,pageSize:20,keyword:''}).then(res=>{
         this.options = res.data.map(item => {
           return { value: item.realName, label: item.realName };
         });
       })
     },
     getCoachingTeacher(val){
-      addTeacher({pageNo:1,pageSize:20,userNo:val}).then(res=>{
+      addTeacher({pageNo:1,pageSize:20,keyword:val}).then(res=>{
         this.options = res.data.map(item => {
           return { value: item.realName, label: item.realName };
         });

src/views/portal/case/Index.vue

@@ -826,6 +826,7 @@ export default {
     if (this.refId) {
       this.queryCondition.type = 'recommend'
     }
+    this.searchPageView();
     this.loadTypeData();//加载分类
     this.getAnkingData();
     this.searchterm();
@@ -1507,7 +1508,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);

src/views/study/Courses.vue

@@ -253,7 +253,7 @@ 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)
               }
               if(item.source==2){