默认记载分页数据

2025-12-09 02:46:44 +08:00 · 2025-01-18 01:01:36 +08:00
43 changed files with 1545 additions and 15452 deletions
--- a/.env.development
+++ b/.env.development
@@ -41,7 +41,6 @@ VUE_APP_PUBLIC_PATH='/pc'
 VUE_APP_MANAGER_PATH='/manage'
 VUE_APP_STUDENT_PATH='/fe-student'
 VUE_APP_MANAGER_API_PATH='/manageApi'
-VUE_APP_GROWTH_API_PATH=''

 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true
--- a/.env.preview
+++ b/.env.preview
@@ -37,7 +37,6 @@ VUE_APP_PUBLIC_PATH='/pc-release'
 VUE_APP_MANAGER_PATH='/manage-release'
 VUE_APP_STUDENT_PATH='/fe-student-release'
 VUE_APP_MANAGER_API_PATH='/manageApi-release'
-VUE_APP_GROWTH_API_PATH='/growth'

 # 登录地址
 VUE_APP_LOGIN_URL='https://u.boe.com/web-release/'
--- a/.env.production
+++ b/.env.production
@@ -37,7 +37,6 @@ VUE_APP_PUBLIC_PATH='/pc'
 VUE_APP_MANAGER_PATH='/manage'
 VUE_APP_STUDENT_PATH='/fe-student'
 VUE_APP_MANAGER_API_PATH='/manageApi'
-VUE_APP_GROWTH_API_PATH='/growth'

 # 登录地址
 VUE_APP_LOGIN_URL='https://u.boe.com/web/'
--- a/.env.testing
+++ b/.env.testing
@@ -36,7 +36,6 @@ VUE_APP_PUBLIC_PATH='/pc'
 VUE_APP_MANAGER_PATH='/manage'
 VUE_APP_STUDENT_PATH='/fe-student'
 VUE_APP_MANAGER_API_PATH='/manageApi'
-VUE_APP_GROWTH_API_PATH='/growth'

 # 登录地址
 VUE_APP_LOGIN_URL='https://u-pre.boe.com/web/'
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/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",
--- a/src/api/boe/courseRecord.js
+++ b/src/api/boe/courseRecord.js
@@ -62,62 +62,15 @@ 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}&pageNo=${data.pageNo}&pageSize=${data.pageSize}`);
-}
-
-/**
- * 导出授课记录
- *
- * @param {Object} data
- */
-const courseRecordExport2 = function(data) {
-  return axios.request({
-    baseURL: "/manageApi",
-    url: '/admin/export/exportInTeacherRecord',
-    method: 'get',
-    data:data,
-    headers:{'Content-Type':'application/json;charset=utf-8'},
-    responseType: 'blob'
-  })
-}
-
-/**
- * 导出课程下的学员信息
- *
- */
-const exportStudentOfCourse2 = function(courseId,courseType) {
-  return axios.request({
-    baseURL: "/manageApi",
-    url: '/admin/export/exportTeacherRecordStudentInfo?courseId='+courseId+'&courseType='+courseType,
-    method: 'get'
-    // headers:{'Content-Type':'application/json;charset=utf-8'},
-    // responseType: 'blob'
-  })
-}
-
-/**
- * 导出教师下的所有授课记录下的学员信息
- *
- */
-const exportStudentOfTearcher2 = function(userId) {
-  return axios.request({
-    baseURL: "/manageApi",
-    url: '/b1/system/teacher/teacher-course-student-export?userId='+userId,
-    method: 'post',
-    headers:{'Content-Type':'application/json;charset=utf-8'},
-    responseType: 'blob'
-  })
+  return ajax2.get('/manageApi',`/admin/teacherRecord/getListByToken?courseName=${data.courseName}&page=${data.page}&pageSize=${data.pageSize}`);
 }


 export default {
    courseRecordExport,
-    courseRecordExport2,
    courseRecordList,
    getListByToken,
    exportStudentOfCourse,
-    exportStudentOfCourse2,
-    exportStudentOfTearcher,
-    exportStudentOfTearcher2,
+    exportStudentOfTearcher

 }
--- a/src/api/growth/growthpath.js
+++ b/src/api/growth/growthpath.js
@@ -1,8 +0,0 @@
-// import ajax from '@/utils/xajax.js'
-import ajax from '../ajax';
-// const baseURL = process.env.VUE_APP_GROWTH_API_PATH;
-const baseURL = '/growth';
-// 查询专业力必修列表
-export const listData = (obj) => ajax.get(baseURL, '/professional/student/studentGrowthList', { params: obj })
-// 查询专业力统计
-export const getTotalGrowthTaskDetail = (obj) => ajax.get(baseURL, '/professional/student/getTotalGrowthTaskDetail', { params: obj })
--- a/src/assets/images/growth/growth-bg-icon.png
+++ b/src/assets/images/growth/growth-bg-icon.png
--- a/src/assets/images/growth/growth-bg.png
+++ b/src/assets/images/growth/growth-bg.png
--- a/src/assets/images/hotforum/2024.png
+++ b/src/assets/images/hotforum/2024.png
--- a/src/assets/images/hotforum/2025.png
+++ b/src/assets/images/hotforum/2025.png
--- a/src/assets/images/hotforum/2501.jpg
+++ b/src/assets/images/hotforum/2501.jpg
--- a/src/assets/images/hotforum/2502.png
+++ b/src/assets/images/hotforum/2502.png
--- a/src/assets/images/hotforum/2503.png
+++ b/src/assets/images/hotforum/2503.png
--- a/src/assets/images/hotforum/back25.png
+++ b/src/assets/images/hotforum/back25.png
--- a/src/assets/images/hotforum/line.png
+++ b/src/assets/images/hotforum/line.png
--- a/src/assets/images/jindu.jpg
+++ b/src/assets/images/jindu.jpg
--- a/src/assets/images/myGrowth.jpg
+++ b/src/assets/images/myGrowth.jpg
--- a/src/assets/images/shuoming.jpg
+++ b/src/assets/images/shuoming.jpg
--- a/src/components/Course/exam.vue
+++ b/src/components/Course/exam.vue
@@ -329,8 +329,6 @@ export default {
      apiExamPaper.newPaperContent(this.info.id).then(res=>{
        if(!res.error&&res.result != ''){
          if(this.info.paperType==2){
-            //TODO1
-            console.log("调用开始考试 if paperType == 2")
            this.examPaper.json=res.result;
            let qitems=this.convertToItems(this.examPaper.json);
            this.paper ={items:qitems};
@@ -338,11 +336,9 @@ export default {
            this.curItem=qitems[this.curIndex];
            this.startTime=new Date();//记录开始时间
            this.timerValue=this.info.testDuration;
-            this.content.status=1;
            this.timer=setInterval(this.changeTimer,60000);
            this.testStart=true;
          }else{
-            console.log("调用开始考试 else paperType != 2")
            let paper= {items:res.result};
            paper.items.forEach(item=>{
              if(item.type==101){
@@ -586,15 +582,8 @@ export default {
      apiStudy.saveExam(postData).then(res=>{
        this.thisTrue = true
         if(res.status == 200) {
-            console.log("获取数据结果 考试 res ==>",res)
            this.records.push(res.result);
-            //TODO 评分更改 最终完成
-            if(res.result.score > res.result.passLine){
            this.content.status=9;//表已学习完，判断上级的章是否已完成
-            }else{
-              this.content.status=1;
-            }
-
            this.studyItemId=res.result.studyItemId;//第一次保存时是没有的，所以这里要赋值
            this.$alert('您本次考试得分：'+this.lastScore, '考试成绩', {
                  confirmButtonText: '确定',
--- a/src/components/Study/manager.vue
+++ b/src/components/Study/manager.vue
@@ -13,7 +13,7 @@
    </div>
    <!-- <div style="color: red;">下面的表格标题及内容需要调整完善</div> -->
    <div>
-      <el-tabs style="width: 100%;" v-model="tabName" @tab-click="handleTabClick">
+      <el-tabs v-model="tabName" @tab-click="handleTabClick">
        <el-tab-pane label="报名管理" name="second">
          <!-- <div>已报名{{study.list.length}}人，共有0人报名未成功，共有{{study.list.length}}人通过审核</div> -->
          <el-row style="margin: 20px 0;" :gutter="20">
@@ -863,19 +863,4 @@ export default {
  height: 400px;
  overflow: auto;
 }
-
-.el-tabs__nav-wrap::after {
-  display: none; /* 隐藏滚动条轨道 */
-}
-
-.el-tabs__nav-scroll {
-  overflow: hidden; /* 隐藏滚动条滑块 */
-}
-
-/* 隐藏垂直滚动条 */
-.el-table .el-table__body-wrapper::-webkit-scrollbar {
-  display: none; /* Chrome, Safari, Opera*/
-}
-
-
 </style>
--- a/src/components/UserCenter/menu.vue
+++ b/src/components/UserCenter/menu.vue
@@ -14,7 +14,7 @@
        :default-active="activeMenu"
        router
        active-text-color="#3379FB"
-        :default-openeds="['manageTodo','manageFinish','teacherTodo','teacherFinish','lecturer','myqa','notice','mystudy','myGrowth', 'course', 'exam', 'u001', 'u002', 'u003', 'u004','mylecnotes','mycaseRecord']"
+        :default-openeds="['manageTodo','manageFinish','teacherTodo','teacherFinish','lecturer','myqa','notice','mystudy', 'course', 'exam', 'u001', 'u002', 'u003', 'u004','mylecnotes','mycaseRecord']"
        class="el-menu-vertical"
        @open="handleOpen"
        @close="handleClose"
@@ -242,20 +242,6 @@
          <svg-icon :icon-class="activeMenu == '/user/medal'?'myxunzhang-active':'myxunzhang'"></svg-icon>
          <span slot="title">我的勋章</span>
      </el-menu-item>
-        <template v-if="showGrowthNav">
-          <el-submenu index="myGrowth" v-show="curIdentity == 1">
-            <template slot="title">
-              <!-- <i class="el-icon-s-grid"></i> -->
-              <img src="../../assets/images/myGrowth.jpg" style="width: 1em;height: 1em;margin-right: 8px;"></img>
-              <span>我的必修</span>
-            </template>
-            <el-menu-item index="/growth/growthPage">
-              <!-- <i class="el-icon-menu"></i> -->
-              <span slot="title" class="study textl">专业力必修</span>
-            </el-menu-item>
-          </el-submenu>
-        </template>
-
        <el-submenu index="mystudy" v-show="curIdentity == 1">
          <template slot="title">
            <!-- <i class="el-icon-s-grid"></i> -->
@@ -399,7 +385,6 @@ import { mapGetters } from 'vuex';
 import apicourseStudy from "../../api/modules/courseStudy.js"
 import {pageList} from "@/api/modules/lecturer"
 import courseImage from "@/components/Course/courseImage.vue"
-import { listData } from "@/api/growth/growthpath"
 import testUser from '@/utils/testUsers.js'
 export default {
  name: 'UcMenu',
@@ -428,8 +413,7 @@ export default {
      isCollapse: false,
      lastStudy:{},
      overlayShow: false,
-      instructor:0,
-      showGrowthNav: false
+      instructor:0
    };
  },
  created() {
@@ -438,11 +422,6 @@ export default {
    this.getLastStudy();
    //获取讲师认证中条数
    this.instructorCertification()
-    console.log(this.userInfo,'userInfouserInfo')
-    //如果专业力必修没有学习任务则隐藏“我的必修按钮”
-    listData().then(res => {
-      this.showGrowthNav = !!res.data.length
-    })
  },
  mounted() {
    //console.log(this.userInfo.loginName,'this.userInfo.loginName');
--- a/src/components/VideoPlayer/index.vue
+++ b/src/components/VideoPlayer/index.vue
@@ -18,6 +18,7 @@
      @keydown.right.prevent="forwardCurrentTime"
      @keydown.up.prevent="increaseVolume"
      @keydown.down.prevent="lowerVolume"
+      @keydown.esc.prevent="toggleFullScreen"
      tabindex="0"
      width="100%"
      height="100%"
@@ -384,26 +385,9 @@ export default {
      console.log('\x1b[31m%s\x1b[0m','*****************加载失败**********')
    })
    // 监听全屏事件的变化，保存数据
-    window.addEventListener("F", () => {
+    window.addEventListener("fullscreenchange", () => {
      this.isFullscreen = this.isFullScreen();
    });
-    document.addEventListener('fullscreenchange',this.handleFullscreenChange);
-    document.addEventListener('webkitfullscreenchange',this.handleFullscreenChange );
-    // this.videoDom.addEventListener('keydown', function(e){
-    //   //console.log('\x1b[31m%s\x1b[0m','*****************加载失败**********')
-    //   console.log("video is exit");
-    //   if(e.key === "Escape"){
-    //     console.log("按键 退出全屏 执行")
-    //   }
-    // })
-
-    // this.videoDom.addEventListener("keydown", (e) => {
-    //   console.log("是否监听到");
-    //   if(e.keyCode == 27){
-    //     console.log("是否监听到 esc");
-    //     this.toggleFullScreen();
-    //   }
-    // });
  },
  methods: {
    //当视频由于需要缓冲下一帧而停止，解决一直计时的问题
@@ -506,13 +490,6 @@ export default {
    updateProgressBySetTime(newCurrentTime) {
      this.currentProgress = newCurrentTime / this.videoDom.duration;
    },
-    /* 点击进度条更新视频播放进度2
-    */
-    updateProgressByClickBar2(newCurrentTime,progressVideo) {
-      this.currentProgress = progressVideo;
-      this.barrageTimelineStart = newCurrentTime;
-      this.videoDom.currentTime = newCurrentTime;
-    },
    /* 提高视频音量
     */
    increaseVolume() {
@@ -563,7 +540,6 @@ export default {
    /* 切换“全屏”和“非全屏”模式
     */
    toggleFullScreen() {
-      console.log("toggleFullScreen 执行 ",this.isFullScreen())
      let element = this.$refs.area;
      if (!this.isFullScreen()) {
        if (element.requestFullscreen) {
@@ -620,24 +596,6 @@ export default {
      const currentTime = this.$refs.video.currentTime;
      this.$emit('onTimeUpdate', currentTime);
    },
-    /**
-     * 监听全屏变化
-     */
-    handleFullscreenChange() {
-      console.log("handleFullscreenChange gx this.isFullScreen()",this.isFullScreen())
-      console.log("handleFullscreenChange gx this.isFullscreen",this.isFullscreen)
-
-      if(this.isFullscreen){
-        this.isFullscreen = !!document.fullscreenElement;
-        if (!this.isFullscreen) {
-          // 退出全屏后的逻辑（如暂停视频、更新 UI 等）
-          console.log('ESC 已退出全屏 handleFullscreenChange',this.isFullscreen);
-          this.$emit('onFullscreen',false);//全屏
-        }
-      }
-
-
-    }
  },
  watch: {
    currentVolume: function () {
--- a/src/data/pages.js
+++ b/src/data/pages.js
@@ -82,9 +82,6 @@ export const pages=[
    {title:'学习路径图',path:'path',component:'study/StudyPath',hidden:false},
    {title:'学习项目',path:'project',component:'study/StudyProject',hidden:false}
  ]},
-  {title:'我的必修',path:'/growth',hidden:false,children:[
-    {title:'专业力必修',path:'growthPage',component:'growth/index',hidden:false},
-  ]},
  {title:'个人中心',path:'/uc',hidden:false,children:[
    {title:'首页',path:'index',component:'StudyIndex',hidden:false}
  ]},
--- a/src/layout/components/AppMain.vue
+++ b/src/layout/components/AppMain.vue
@@ -6,10 +6,7 @@
        <!-- <div style="height: 20px;"></div> -->
      </div>
      <!-- width: 990px; -->
-      <div class="main-body" :style="{
-             backgroundColor: bgColor,
-             padding
-            }" style="flex:1; margin-left: 20px;">
+      <div class="main-body" style="padding: 30px 20px;flex:1; background-color: #fff;margin-left: 20px;">
        <!-- <div style="margin-bottom: 10px;padding:10px; border-bottom: 1px solid #dbdbdb;"> -->
          <!-- <el-breadcrumb separator-class="el-icon-arrow-right">
            <el-breadcrumb-item :to="{ path: '/uc/index' }"><i class="el-icon-arrow-right"></i>个人中心</el-breadcrumb-item>
@@ -18,9 +15,7 @@
        <!-- </div> -->
        <transition name="fade-transform" mode="out-in">
          <keep-alive :include="cachedViews">
-            <div :style="{
-             backgroundColor: bgColor
-            }" style="min-height: 600px;padding-bottom: 50px;">
+            <div style="background-color: #FFFFFF;min-height: 600px;padding-bottom: 50px;">
            <router-view :key="key" />
            </div>
          </keep-alive>
@@ -44,14 +39,7 @@ export default {
      return this.$route.meta.title;
    },
    key() {
-      console.log(this.$route)
      return this.$route.path
-    },
-    bgColor() {
-     return this.$route.path === "/growth/growthPage" ? "rgba(0,0,0,0)" : "#fff";
-    },
-    padding(){
-      return this.$route.path === "/growth/growthPage" ? "0" : "30px 20px";
    }
  }
 }
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -341,13 +341,6 @@ export const constantRoutes = [{
    name: 'hotforum',
    meta: {title: '热点论坛', icon: 'dashboard', noCache: true, affix: true},
  },
-  {
-    path: '/lexiang',
-    hidden: true,
-    component: (resolve) => require(['@/views/sso/lexiang'], resolve),
-    name: 'lexiang',
-    meta: {title: '单点登录', icon: 'dashboard', noCache: true, affix: true},
-  },
  {
    path: '/404',
    component: (resolve) => require(['@/views/error/404'], resolve),
--- a/src/views/Forward.vue
+++ b/src/views/Forward.vue
@@ -2,7 +2,7 @@
  <div class="box" :class="{ incl: url.includes('projectdetails') }">
    <portal-header style="background: #387DF7;" :hideSearch="true" textColor="#ffffff"></portal-header>
        <iframe :src="url" style="width: 100%;height: 100%;" frameborder="0" ref="iframe"></iframe>
-    <portal-footer v-if="isShowFooter"></portal-footer>
+    <portal-footer></portal-footer>
  </div>
 </template>
 <script>
@@ -16,8 +16,7 @@ import portalFooter from "@/components/PortalFooter.vue";
    data(){
      return {
       url: "",
-       boeUrl:process.env.VUE_APP_BOE_WEB_URL,
-       isShowFooter:true
+       boeUrl:process.env.VUE_APP_BOE_WEB_URL
      }
    },
    mounted() {
@@ -25,10 +24,6 @@ import portalFooter from "@/components/PortalFooter.vue";
      let to = this.$route.query.to;//跳转的地址，以 /开头的地址
      let urlPre=window.location.protocol+'//'+window.location.host;
      this.url=urlPre+to
-
-      if(to.includes('growthList')){
-        this.isShowFooter = false
-      }
      if(params){
         this.url=this.url+'?'+params;
      }
--- a/src/views/Login.vue
+++ b/src/views/Login.vue
@@ -1,4 +1,3 @@
-<!--
 <template>
  <div class="login" :style="`background: url(${webBaseUrl}/temp/background.jpg) no-repeat`">
    <el-form :model="form" ref="form" :rules="rules">
@@ -25,7 +24,7 @@
      <el-form-item>
        <section>
          <el-checkbox v-model="rememberMe">记住密码</el-checkbox>
-          &lt;!&ndash; <span>忘记密码</span> &ndash;&gt;
+          <!-- <span>忘记密码</span> -->
        </section>
      </el-form-item>
      <el-form-item><el-button type="primary" @click="loginSubmit">点击登录</el-button></el-form-item>
@@ -195,4 +194,3 @@
  }
 }
 </style>
-->
--- a/src/views/course/ManageList.vue
+++ b/src/views/course/ManageList.vue
@@ -195,15 +195,7 @@
      </template>
    </el-dialog>
    <!--课程管理-->
-    <el-dialog
-        custom-class="g-dialog"
-        title="课程学习管理"
-        width="900px"
-        height="900px"
-        :visible.sync="manageStudy.dlgShow"
-        :close-on-click-modal="false"
-
-        >
+    <el-dialog custom-class="g-dialog" title="课程学习管理" width="900px" :visible.sync="manageStudy.dlgShow" :close-on-click-modal="false">
      <manager :manageStudyData="manageStudyData" :isShowDialog="manageStudy.dlgShow"></manager>
      <template #footer>
        <el-button @click="manageStudy.dlgShow = false">关闭</el-button>
@@ -676,10 +668,8 @@ export default {
      }
      apiCourse.pageList(this.params).then(rs=>{
          if(rs.status==200){
-            this.pageData = rs.result.list ? rs.result.list : [];
-            // this.pageData = rs.result.list;
+            this.pageData = rs.result.list;
            this.page.count = rs.result.count;
-            this.page.pageSize = rs.result.pageSize;
          }else{
            return this.$message.error(rs.message);
          }
@@ -949,8 +939,4 @@ export default {
    }
  }
 }
-
-.el-dialog__body {
-  overflow: hidden;
-}
 </style>
--- a/src/views/course/Mylecnotes.vue
+++ b/src/views/course/Mylecnotes.vue
@@ -2,23 +2,11 @@
  <div style="padding: 12px 32px 10px 12px;">
   <div style="display: flex;justify-content: flex-start;">

-      <div>
-        <el-input v-model="keyword" placeholder="输入课程名称搜索" clearable></el-input>
-      </div>
-      <div style="padding-left: 10px;">
-        <el-button @click="recordList()" type="primary" icon="el-icon-search">搜索</el-button>
-      </div>
-      <div style="padding: 0px 5px;">
-        <el-button icon="el-icon-refresh-right" @click="keyword = ''" type="primary">重置</el-button>
-      </div>
-      <div style="padding: 0px 5px;">
-        <el-button type="primary" @click="exportFile()" icon="el-icon-search" size="small" round>导出</el-button>
-      </div>
-<!--      <div style="padding: 0px 5px;">-->
-<!--        <el-button type="primary" @click="exportStudentOfTearcher()" icon="el-icon-search" size="small" round>-->
-<!--          导出学员信息-->
-<!--        </el-button>-->
-<!--      </div>-->
+     <div><el-input v-model="keyword" placeholder="输入课程名称搜索" clearable></el-input></div>
+     <div style="padding-left: 10px;"><el-button @click="recordList()" type="primary" icon="el-icon-search">搜索</el-button></div>
+     <div style="padding: 0px 5px;"><el-button icon="el-icon-refresh-right" @click="keyword = ''" type="primary" >重置</el-button></div>
+     <div style="padding: 0px 5px;"><el-button type="primary" @click="exportFile()" icon="el-icon-search" size="small" round>导出</el-button></div>
+     <div style="padding: 0px 5px;"><el-button type="primary" @click="exportStudentOfTearcher()" icon="el-icon-search" size="small" round>导出学员信息</el-button></div>
   </div>
   <div class="Export">
     <!-- <div style="padding-left: 10px;"><el-button type="primary" @click="exportFile()" icon="el-icon-search" size="small" round>导出</el-button></div> -->
@@ -27,21 +15,8 @@
   <div style="margin-top:20px;">
     <el-table :data="pageData" border stripe>
         <el-table-column
-          label="序号"
-          prop="index"
-          width="100px">
-          <template v-slot="scope">
-            <span>{{ scope.$index + 1 }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column
-          label="讲师工号"
-          prop="userNo"
-          width="100px">
-        </el-table-column>
-        <el-table-column
-          label="讲师姓名"
-          prop="teacherName"
+         label="课程时间"
+         prop="courseTime"
         width="200px">
         </el-table-column>
         <el-table-column
@@ -50,77 +25,38 @@
         width="200px">
         </el-table-column>
         <el-table-column
-          label="培训发生组织"
-          prop="trainOrgName"
-          width="200px">
-        </el-table-column>
-        <el-table-column label="课程类型" prop="type" width="120px">
-          <template v-slot="scope">
-                <span>{{
-                    {
-                      "0": "在线课",
-                      "1": "面授课",
-                      "2": "课程开发",
-                      "3": "作业员入模培训",
-                      "4": "其他",
-                    }[scope.row.type + '']
-                  }}</span>
-          </template>
+         label="开课场地"
+         prop="address"
+         width="240px">
         </el-table-column>
         <el-table-column
-          label="授课/课程日期"
-          prop="teachingDate"
-          width="200px">
-        </el-table-column>
-
-        <el-table-column
-          label="内容分类"
-          prop="courseTypeName"
-          width="200px">
-        </el-table-column>
-        <el-table-column label="开课状态" width="100px" prop="courseStatus">
-          <template v-slot="scope">
-                <span>{{
-                    {
-                      "0": "未开课",
-                      "1": "已开课",
-                    }[scope.row.courseStatus + '']
-                  }}</span>
-          </template>
+         label="所属课程"
+         prop="parentCourse"
+         width="120px">
         </el-table-column>
         <el-table-column
-          label="授课时长(分钟)"
-          prop="teaching"
-          width="120px"
+         label="所属项目"
+         prop="parentProject"
         ></el-table-column>
         <el-table-column
-          label="参训人数"
-          prop="studys"
-          width="120px"
+         label="所属路径"
+         prop="parentRoute"
+         width="200px"
+         ></el-table-column>
+         <el-table-column
+         label="学习总人数"
+         prop="studentNumber"
+         width="100px"
+         ></el-table-column>
+         <el-table-column
+         label="时长(分钟)"
+         width="100px"
+         prop="period"
         ></el-table-column>
         <el-table-column
         label="评分"
+         width="100px"
         prop="score"
-          width="100px"
-        ></el-table-column>
-        <el-table-column
-          label="是否生成讲师费"
-          prop="createdFee"
-          width="100px"
-        >
-          <template v-slot="scope">
-                <span>{{
-                    {
-                      "0": "否",
-                      "1": "是",
-                    }[scope.row.createdFee + '']
-                  }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column
-          label="备注"
-          width="200px"
-          prop="remark"
          ></el-table-column>
         <el-table-column
         label="操作"
@@ -130,9 +66,7 @@
         fixed="right"
          >
          <template v-slot="scope">
-            <el-button type="text" @click="exportStudentOfCourse(scope.row.courseId, scope.row.type)"
-                       size="small">导出学员信息
-            </el-button>
+           <el-button type="text" @click="exportStudentOfCourse(scope.row.courseId)" size="small">导出学员信息</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -156,73 +90,35 @@

 <script>
 import apiCourse from '../../api/boe/courseRecord.js';
-import {mapGetters} from 'vuex';
-
+import { mapGetters } from 'vuex';
 export default {
-  data() {
+data(){
 return {
-      pageData: [],
-      keyword: '',
-      pageInfo: {
-        pageIndex:1,
-        pageSize:10,
-      },
+     pageData:[],
+     keyword:'',
+     pageInfo:{},
 }
-  },
-  mounted() {
-    this.recordList();
-  },
-  computed: {
+},
+
+mounted() {
+ this.recordList(1);
+
+},
+computed: {
 ...mapGetters(['userInfo'])
-  },
-  methods: {
+},
+
+methods: {
+
   // 导出所有记录
-    exportFile() {
-      // let req = {
-      // }
-      // apiCourse.courseRecordExport2(req).then(res => {
-      //   const link = document.createElement('a');// 创建a标签
-      //   let blob = new Blob([res.data], {type: 'application/vnd.ms-excel'}); // 设置文件类型
-      //   link.style.display = "none";
-      //   link.href = URL.createObjectURL(blob); // 创建URL
-      //   link.setAttribute("download", "授课记录.xls");
-      //   document.body.appendChild(link);
-      //   link.click();
-      //   document.body.removeChild(link);
-      // })
-      // 取pageData记录第一条
-      if (this.pageData.length > 0) {
-        let teacherId = this.pageData[0].teacherId;
-        window.open(
-          `/manageApi/admin/export/exportInTeacherRecord?teacherId=${teacherId}`
-        );
+   exportFile(){
+     let req = {
+       userId: this.userInfo.sysId
+       // userId:"70F80F4E-34BA-10AB-894A-8FA812B19637"
     }
-    },
-
-    // 导出课程下的学员信息
-    exportStudentOfCourse(courseId, courseType) {
-      // apiCourse.exportStudentOfCourse2(courseId, courseType).then(res => {
-      //   const link = document.createElement('a');// 创建a标签
-      //   let blob = new Blob([res.data], {type: 'application/vnd.ms-excel'}); // 设置文件类型
-      //   link.style.display = "none";
-      //   link.href = URL.createObjectURL(blob); // 创建URL
-      //   link.setAttribute("download", "授课记录.xls");
-      //   document.body.appendChild(link);
-      //   link.click();
-      //   document.body.removeChild(link);
-      // })
-
-      window.open(
-        `/manageApi/admin/export/exportTeacherRecordStudentInfo?courseId=${courseId}&courseType=${courseType}`
-      );
-    },
-
-    // 导出教师下的所有授课记录下的学员信息
-    exportStudentOfTearcher() {
-      let userId = this.userInfo.sysId;
-      apiCourse.exportStudentOfTearcher2(userId).then(res => {
+     apiCourse.courseRecordExport(req).then(res=>{
         const link = document.createElement('a');// 创建a标签
-        let blob = new Blob([res.data], {type: 'application/vnd.ms-excel'}); // 设置文件类型
+         let blob = new Blob([res.data],{type: 'application/vnd.ms-excel'}); // 设置文件类型
         link.style.display = "none";
         link.href = URL.createObjectURL(blob); // 创建URL
         link.setAttribute("download", "授课记录.xls");
@@ -232,18 +128,51 @@ export default {
     })
   },

-    recordList() {
+
+   // 导出课程下的学员信息
+   exportStudentOfCourse(courseId){
+     let userId = this.userInfo.sysId;
+     apiCourse.exportStudentOfCourse(userId,courseId).then(res=>{
+         const link = document.createElement('a');// 创建a标签
+         let blob = new Blob([res.data],{type: 'application/vnd.ms-excel'}); // 设置文件类型
+         link.style.display = "none";
+         link.href = URL.createObjectURL(blob); // 创建URL
+         link.setAttribute("download", "授课记录.xls");
+         document.body.appendChild(link);
+         link.click();
+         document.body.removeChild(link);
+     })
+   },
+
+   // 导出教师下的所有授课记录下的学员信息
+   exportStudentOfTearcher(){
+     let userId = this.userInfo.sysId;
+     // let userId = '5D36C207-64F4-C512-312D-C9598257695C';
+     apiCourse.exportStudentOfTearcher(userId).then(res=>{
+         const link = document.createElement('a');// 创建a标签
+         let blob = new Blob([res.data],{type: 'application/vnd.ms-excel'}); // 设置文件类型
+         link.style.display = "none";
+         link.href = URL.createObjectURL(blob); // 创建URL
+         link.setAttribute("download", "授课记录.xls");
+         document.body.appendChild(link);
+         link.click();
+         document.body.removeChild(link);
+     })
+   },
+
+
+   recordList(pageIndex){
     let req = {
-        courseName: this.keyword,
-        pageNo: this.pageInfo.pageIndex,
-        pageSize: this.pageInfo.pageSize
+     //     userId:"6B049FAF-C314-7CCF-0D28-0D23F4C42531",
+         userId: this.userInfo.sysId,
+         keyword:this.keyword,
+         page:pageIndex,
+         pageSize:10
     }
-      apiCourse.getListByToken(req).then(res => {
-        if (res.status == 200) {
-          this.pageData = res.data.records;
-          this.pageInfo.pageSize = Number(res.data.size);
-          this.pageInfo.total = Number(res.data.total);
-          this.pageInfo.page = Number(res.data.current);
+     apiCourse.courseRecordList(req).then(res=>{
+       if(res.status == 200) {
+         this.pageData = res.result.list;
+         this.pageInfo = res.result.pageInfo;
       } else {
          this.$message({
           type: 'error',
@@ -254,23 +183,24 @@ export default {
   },

   // 每页显示的条数事件
-    handleSizeChange(val) {
-      this.pageInfo.pageIndex = 1;
+   handleSizeChange(val){
     this.pageInfo.pageSize = val;
-      this.recordList();
+     this.recordList(1);
   },
   // 显示制定页的数据
-    handleCurrentChange(val) {
+   handleCurrentChange(val){
     this.pageInfo.pageIndex = val;
     this.recordList(this.pageInfo.pageIndex);
   },
-  },
+
+},
+
 }
 </script>

 <style lang="scss" scoped>
-.Export {
-  display: flex;
-  padding-top: 10px;
+.Export{
+display: flex;
+padding-top: 10px;
 }
 </style>
--- a/src/views/growth/index.vue
+++ b/src/views/growth/index.vue
@@ -1,390 +0,0 @@
-<template>
-  <div class="growth" v-loading="loading" id="scrollContainer">
-    <div class="growth-left">
-      <div class="navbar">
-        <div style="display: flex; flex: 1">
-          <div class="nav-title">我的专业力必修</div>
-        </div>
-      </div>
-
-      <div class="growth-item" v-for="item of list" :id="item.id">
-        <div class="growth-nav">
-          <div class="growth-name">{{ item.growthName }}</div>
-          <div class="f-a-c">
-            <div
-              class="growth-state"
-              :style="{
-                color:
-                  item.learningState === 0
-                    ? '#999999'
-                    : item.learningState === 1
-                    ? '#6ba158'
-                    : '#F2903D',
-              }"
-            >
-              {{
-                item.learningState === 0
-                  ? "未开始"
-                  : item.learningState === 1
-                  ? "已完成"
-                  : "进行中"
-              }}
-            </div>
-            <div class="growth-btn" @click="jumpRouter(item)">去学习</div>
-          </div>
-        </div>
-        <template v-if="item.description">
-          <div class="tip-title">说明</div>
-          <div class="tip-content">
-            {{ item.description || "暂无说明" }}
-          </div>
-        </template>
-
-        <div class="progress-title">学习进度</div>
-
-        <div class="progress-content">
-          <div class="f-j-b" style="margin-bottom: 10px">
-            <div class="f-a-c">
-              <div style="font-size: 16px; color: #333333">必修进度</div>
-              <div style="font-size: 18px; color: #999999; margin-left: 12px">
-                {{ item.requiredTaskCompletedNum }}/{{ item.requiredTaskNum }}
-              </div>
-            </div>
-            <div style="font-size: 18px; color: #0077ec">
-              {{ requiredTaskCompletionRate(item) }}%
-            </div>
-          </div>
-          <el-progress
-            :stroke-width="6"
-            :show-text="false"
-            :percentage="requiredTaskCompletionRate(item)"
-            color="#0077EC"
-          ></el-progress>
-        </div>
-        <template v-if="item.electiveTaskNum !== 0">
-          <div class="progress-content">
-            <div class="f-j-b" style="margin-bottom: 10px">
-              <div class="f-a-c">
-                <div style="font-size: 16px; color: #333333">选修进度</div>
-                <div style="font-size: 18px; color: #999999; margin-left: 12px">
-                  {{ item.electiveTaskCompletedNum }}/{{ item.electiveTaskNum }}
-                </div>
-                <el-tooltip
-                  class="item"
-                  effect="light"
-                  :content="`还需完成${item.electivePoorNum}个选修任务`"
-                  placement="top-start"
-                >
-                  <i class="el-icon-question"></i>
-                </el-tooltip>
-              </div>
-              <div style="font-size: 18px; color: #0077ec">
-                {{ electiveTaskCompletionRate(item) }}%
-              </div>
-            </div>
-            <el-progress
-              :stroke-width="6"
-              :show-text="false"
-              color="#0077EC"
-              :percentage="electiveTaskCompletionRate(item)"
-            ></el-progress>
-          </div>
-        </template>
-        <div class="progress-content">
-          <div class="f-j-b" style="margin-bottom: 10px">
-            <div class="f-a-c">
-              <div style="font-size: 16px; color: #333333">总进度</div>
-              <div style="font-size: 18px; color: #999999; margin-left: 12px">
-                {{ item.totalTaskCompletedNum }}/{{ item.totalTaskNum }}
-              </div>
-            </div>
-            <div style="font-size: 18px; color: #0077ec">
-              {{ totalTaskCompletionRate(item) }}%
-            </div>
-          </div>
-          <el-progress
-            :stroke-width="6"
-            :show-text="false"
-            color="#0077EC"
-            :percentage="totalTaskCompletionRate(item)"
-          ></el-progress>
-        </div>
-        <div class="growth-bg-icon">
-          <img src="@/assets/images/growth/growth-bg-icon.png" />
-        </div>
-      </div>
-      <template v-if="!list.length">
-        <div class="empty">
-          <el-empty :image-size="200"></el-empty>
-        </div>
-      </template>
-    </div>
-    <!-- <template v-if="!list || list.length < 2">
-      <div class="growth-right">
-        <div class="title">专业力必修</div>
-        <div
-          :key="item.id"
-          class="item-growth"
-          :class="activeItem.id == item.id ? 'active' : ''"
-          v-for="item of list"
-        >
-          <div class="icon"></div>
-          <div @click="handlerAnchor(item)">
-            {{ item.growthName }}
-          </div>
-        </div>
-      </div>
-    </template> -->
-  </div>
-</template>
-<script>
-import { listData, getTotalGrowthTaskDetail } from "@/api/growth/growthpath";
-export default {
-  data() {
-    return {
-      list: [],
-      loading: false,
-      totalData: {},
-      activeItem: {},
-    };
-  },
-  computed: {
-    // 完成进度
-    totalTaskCompletionRate() {
-      return (item) => {
-        if (item.totalTaskCompletedNum && item.totalTaskNum) {
-          let num = item.totalTaskCompletedNum / item.totalTaskNum;
-          num = num * 100;
-          num = num.toFixed(0);
-          return Number(num);
-        } else {
-          return 0;
-        }
-      };
-    },
-    // 选修进度
-    electiveTaskCompletionRate() {
-      return (item) => {
-        if (item.electiveTaskCompletedNum && item.electiveTaskNum) {
-          let num = item.electiveTaskCompletedNum / item.electiveTaskNum;
-          num = num * 100;
-          num = num.toFixed(0);
-          return Number(num);
-        } else if (item.electiveTaskNum == 0) {
-          return 100;
-        } else {
-          return 0;
-        }
-      };
-    },
-    // 必修进度
-    requiredTaskCompletionRate() {
-      return (item) => {
-        if (item.requiredTaskCompletedNum && item.requiredTaskNum) {
-          let num = item.requiredTaskCompletedNum / item.requiredTaskNum;
-          num = num * 100;
-          num = num.toFixed(0);
-          return Number(num);
-        } else {
-          return 0;
-        }
-      };
-    },
-  },
-  methods: {
-    select(item) {},
-    jumpRouter(item) {
-      let studentPath = process.env.VUE_APP_STUDENT_PATH;
-      let params = encodeURIComponent("routerId=" + item.id);
-      this.$router.push(
-        "/forward?to=" + studentPath + "/growthList&params=" + params
-      );
-    },
-
-    handlerAnchor(item, index) {
-      this.activeItem = item;
-      let dom = document.getElementById(`${item.id}`);
-      dom.classList.add("handler-add-padding");
-      dom.scrollIntoView({ behavior: "smooth" });
-    },
-  },
-  created() {
-    this.loading = true;
-    listData().then((res) => {
-      this.activeItem = res.data[0];
-      this.list = res.data;
-      this.loading = false;
-    });
-    getTotalGrowthTaskDetail().then((res) => {
-      this.totalData = res.data;
-    });
-    // 处理滚动事件的代码
-    let that = this;
-    window.addEventListener("scroll", function () {
-      let dom = document.getElementById(`${that.activeItem.id}`);
-      if (dom) {
-        dom.classList.remove("handler-add-padding");
-      }
-    });
-  },
-};
-</script>
-<style lang="less" scoped>
-.f-a-c {
-  display: flex;
-  align-items: center;
-}
-.f-j-b {
-  display: flex;
-  justify-content: space-between;
-}
-.f-j-c {
-  display: flex;
-  justify-content: center;
-}
-.growth {
-  .empty {
-    height: 600px;
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    background-color: #ffffff;
-  }
-  .el-icon-question {
-    color: #387df7;
-    font-size: 16px;
-    margin-left: 5px;
-  }
-  .handler-add-padding {
-    padding: 100px 38px 66px 40px !important;
-    margin-top: -80px;
-  }
-  display: flex;
-  .growth-left {
-    margin-right: 10px;
-
-    flex: 1;
-    .growth-item {
-      background: #ffffff;
-      padding: 30px 38px 66px 40px;
-      margin-bottom: 35px;
-      position: relative;
-      .growth-bg-icon {
-        position: absolute;
-        right: 92px;
-        bottom: 0;
-      }
-      .progress-title {
-        // font-weight: 700;
-        font-size: 18px;
-        color: #000000;
-        margin: 28px 0 20px 0;
-      }
-      .progress-content {
-        margin-bottom: 28px;
-      }
-      .tip-title {
-        // font-weight: 700;
-        font-size: 18px;
-        color: #000000;
-        margin: 30px 0 10px 0;
-      }
-      .tip-content {
-        font-size: 16px;
-        color: #333333;
-        line-height: 30px;
-      }
-      .growth-nav {
-        display: flex;
-        justify-content: space-between;
-        align-items: center;
-        padding-bottom: 28px;
-        border-bottom: 2px solid #f5f5f5;
-      }
-      .growth-name {
-        font-weight: bold;
-        font-size: 18px;
-        color: #0071ed;
-      }
-      .growth-state {
-        font-size: 15px;
-        margin-right: 18px;
-      }
-      .growth-btn {
-        display: flex;
-        justify-content: center;
-        align-items: center;
-        width: 120px;
-        height: 36px;
-        background: #f2903d;
-        border-radius: 4px;
-        font-size: 16px;
-        color: #ffffff;
-        cursor: pointer;
-      }
-    }
-    .navbar {
-      display: flex;
-      align-items: center;
-      height: 90px;
-      padding-left: 40px;
-      margin-bottom: 10px;
-      color: #ffffff;
-      background-image: url(../../assets/images/growth/growth-bg.png);
-      background-size: 100% 100%;
-      .nav-title {
-        font-weight: 700;
-        font-size: 18px;
-        margin-right: 10%;
-      }
-      .nav-total {
-        // margin-left: 15%;
-        width: 20%;
-      }
-      .total-num {
-        font-weight: bold;
-        font-size: 22px;
-      }
-    }
-  }
-  .growth-right {
-    width: 30%;
-    max-width: 464px;
-    margin-bottom: 35px;
-    background-color: #ffffff;
-    padding: 35px 20px 20px 30px;
-    .title {
-      font-size: 18px;
-      color: #000000;
-      font-weight: 700;
-      margin-bottom: 30px;
-      overflow: hidden;
-      white-space: nowrap;
-      text-overflow: ellipsis;
-    }
-    .item-growth {
-      display: flex;
-      align-items: center;
-      border-radius: 5px;
-      font-size: 14px;
-      color: #666666;
-      padding: 10px 20px 10px 8px;
-      cursor: pointer;
-    }
-    .icon {
-      width: 4px;
-      height: 4px;
-      background: #4c5564;
-      border-radius: 50%;
-      margin-right: 10px;
-    }
-    .active {
-      background: #e3edfe;
-      color: #000;
-      .icon {
-        background: #0077ec;
-      }
-    }
-  }
-}
-</style>
--- a/src/views/hotforum/Index-bak.vue
+++ b/src/views/hotforum/Index-bak.vue
@@ -1,179 +0,0 @@
-<template>
-  <div class="hot">
-    <div>
-      <div class="center">
-        <div class="item" :style="{marginRight:(i%2==0||i==0)?'49px':'0'}" v-for="item,i in imgData" :key="i">
-          <img class="img" @click="goLearn(item.url)" :src="require(`../../assets/images/hotforum/${item.img}.png`)" alt="">
-        </div>
-      </div>
-      <div style="display: flex;justify-content: center;margin-bottom: 52px;">
-        <img src="../../assets/images/hotforum/foot.png" alt="">
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-  export default {
-    name: "hotforum",
-    data() {
-      return {
-        imgData:[
-          {img:'01',url:'1265897142383042560'},
-          {img:'02',url:'1265697724606210048'},
-          {img:'003',url:'1280185851054231552'},
-          {img:'04',url:'1321778585966247936'},
-        ],
-      }
-    },
-    methods: {
-      goLearn(item){
-        if(item){
-          // this.$router.push({path:'/course/detail',query:{id:item}})
-          window.open(`https://u.boe.com/pc/course/detail?id=${item}`)
-        }
-      },
-    },
-  }
-</script>
-
-<style lang="scss" scoped>
-.hot{
-  width: 100%;
-  // max-width: 1920px;
-  min-height: 100%;
-  // min-height: 1373px;
-  background: url("../../assets/images/hotforum/back.jpg") no-repeat;
-  background-size: 100% 100%;
-  display: flex;
-  justify-content: center;
-  .center{
-    max-width: 1270px;
-    max-height: 700px;
-    margin-bottom: 5%;
-    margin-top: 22%;
-    display: flex;
-    flex-wrap: wrap;
-    .item{
-      width: 610px;
-      height: 330px;
-      background: url("../../assets/images/hotforum/border.png") no-repeat;
-      background-size: 100%;
-      padding: 14px;
-      padding-top: 31px;
-      margin-bottom: 59px;
-      cursor: pointer;
-      .img{
-        width: 581px;
-        height: 283px;
-      }
-    }
-  }
-  /* 当窗口宽度大于3068px时的样式 */
-}
-@media (min-width: 3000px) {
-.hot{
-  width: 100%;
-  // max-width: 1920px;
-  min-height: 100%;
-  // min-height: 1373px;
-  background: url("../../assets/images/hotforum/back.jpg") no-repeat;
-  background-size: 100% 100%;
-  display: flex;
-  justify-content: center;
-  .center {
-    max-width: 2560px;
-    max-height: 1300px;
-    margin-bottom: 5%;
-    margin-top: 30vh;
-    display: flex;
-    flex-wrap: wrap;
-
-    .item {
-      width: 1220px;
-      height: 660px;
-      background: url("../../assets/images/hotforum/border.png") no-repeat;
-      background-size: 100%;
-      padding: 28px;
-      padding-top: 62px;
-      margin-bottom: 59px;
-
-      .img {
-        width: 100%; // 图片宽度占满item宽度
-        height: auto; // 自动调整高度
-      }
-    }
-  }
-}
-}
-@media (min-height: 1500px) {
-.hot{
-  width: 100%;
-  // max-width: 1920px;
-  min-height: 100%;
-  // min-height: 1373px;
-  background: url("../../assets/images/hotforum/back.jpg") no-repeat;
-  background-size: 100% 100%;
-  display: flex;
-  justify-content: center;
-  .center {
-    max-width: 1068px;
-    max-height: 580px;
-    margin-bottom: 5%;
-    margin-top: 30vh;
-    display: flex;
-    flex-wrap: wrap;
-
-    .item {
-      width: 500px;
-      height: 271px;
-      background: url("../../assets/images/hotforum/border.png") no-repeat;
-      background-size: 100%;
-      padding: 14px;
-      padding-top: 26px;
-      margin-bottom: 30px;
-
-      .img {
-        width: 100%; // 图片宽度占满item宽度
-        height: auto; // 自动调整高度
-      }
-    }
-  }
-}
-}
-@media (min-width: 1928px) and (max-width: 3000px) {
-.hot{
-  width: 100%;
-  // max-width: 1920px;
-  min-height: 100%;
-  // min-height: 1373px;
-  background: url("../../assets/images/hotforum/back.jpg") no-repeat;
-  background-size: 100% 100%;
-  display: flex;
-  justify-content: center;
-  .center {
-    max-width: 1800px;
-    max-height: 1100px;
-    margin-bottom: 5%;
-    margin-top: 35vh;
-    display: flex;
-    flex-wrap: wrap;
-
-    .item {
-      width: 860px;
-      height: 466px;
-      background: url("../../assets/images/hotforum/border.png") no-repeat;
-      background-size: 100%;
-      padding: 28px;
-      padding-top: 48px;
-      margin-bottom: 70px;
-
-      .img {
-        width: 100%; // 图片宽度占满item宽度
-        height: auto; // 自动调整高度
-      }
-    }
-  }
-}
-}
-</style>
--- a/src/views/hotforum/Index.vue
+++ b/src/views/hotforum/Index.vue
@@ -1,24 +1,7 @@
 <template>
-  <div class="hot25">
+  <div class="hot">
    <div>
-      <div class="title25" style="">
-          <img class="img" src="../../assets/images/hotforum/2025.png" alt="">
-      </div>
-      <div class="center" style="margin-top: 60px;">
-        <div class="item" style="margin-right: 49px;">
-          <img class="img" @click="goLearn('1351506180295131136')" src="../../assets/images/hotforum/2501.jpg" alt="">
-        </div>
-        <div class="item">
-          <img class="img" @click="goLearn('1375146833375027200')" src="../../assets/images/hotforum/2503.png" alt="">
-        </div>
-      </div>
-      <div class="line" style="margin: 0 auto;margin-top: 60px;width: 100%;text-align: center;">
-        <img class="img" src="../../assets/images/hotforum/line.png" alt="">
-      </div>
-      <div class="title24" style="margin: 0 auto;margin-top: 60px;width: 100%;text-align: center;">
-        <img class="img" src="../../assets/images/hotforum/2024.png" alt="">
-      </div>
-      <div class="center" style="margin-top: 60px;">
+      <div class="center">
        <div class="item" :style="{marginRight:(i%2==0||i==0)?'49px':'0'}" v-for="item,i in imgData" :key="i">
          <img class="img" @click="goLearn(item.url)" :src="require(`../../assets/images/hotforum/${item.img}.png`)" alt="">
        </div>
@@ -28,12 +11,11 @@
      </div>
    </div>
  </div>
-
 </template>

 <script>
  export default {
-    name: "hotforumNew",
+    name: "hotforum",
    data() {
      return {
        imgData:[
@@ -42,10 +24,6 @@
          {img:'003',url:'1280185851054231552'},
          {img:'04',url:'1321778585966247936'},
        ],
-        imgData25:[
-          {img:'2501',url:'1351506180295131136'},
-          {img:'2503',url:'1375146833375027200'},
-        ],
      }
    },
    methods: {
@@ -60,22 +38,20 @@
 </script>

 <style lang="scss" scoped>
-.hot25{
+.hot{
  width: 100%;
  // max-width: 1920px;
  min-height: 100%;
  // min-height: 1373px;
-  background: url("../../assets/images/hotforum/back25.png") no-repeat;
-  background-size: cover;
+  background: url("../../assets/images/hotforum/back.jpg") no-repeat;
+  background-size: 100% 100%;
  display: flex;
  justify-content: center;
-  .title25{
-    margin: 0 auto;margin-top: 100px;width: 100%;text-align: center;
-  }
  .center{
    max-width: 1270px;
    max-height: 700px;
    margin-bottom: 5%;
+    margin-top: 22%;
    display: flex;
    flex-wrap: wrap;
    .item{
@@ -95,109 +71,109 @@
  }
  /* 当窗口宽度大于3068px时的样式 */
 }
-// @media (min-width: 3000px) {
-// .hot{
-//   width: 100%;
-//   // max-width: 1920px;
-//   min-height: 100%;
-//   // min-height: 1373px;
-//   background: url("../../assets/images/hotforum/back.jpg") no-repeat;
-//   background-size: 100% 100%;
-//   display: flex;
-//   justify-content: center;
-//   .center {
-//     max-width: 2560px;
-//     max-height: 1300px;
-//     margin-bottom: 5%;
-//     margin-top: 30vh;
-//     display: flex;
-//     flex-wrap: wrap;
+@media (min-width: 3000px) {
+.hot{
+  width: 100%;
+  // max-width: 1920px;
+  min-height: 100%;
+  // min-height: 1373px;
+  background: url("../../assets/images/hotforum/back.jpg") no-repeat;
+  background-size: 100% 100%;
+  display: flex;
+  justify-content: center;
+  .center {
+    max-width: 2560px;
+    max-height: 1300px;
+    margin-bottom: 5%;
+    margin-top: 30vh;
+    display: flex;
+    flex-wrap: wrap;

-//     .item {
-//       width: 1220px;
-//       height: 660px;
-//       background: url("../../assets/images/hotforum/border.png") no-repeat;
-//       background-size: 100%;
-//       padding: 28px;
-//       padding-top: 62px;
-//       margin-bottom: 59px;
+    .item {
+      width: 1220px;
+      height: 660px;
+      background: url("../../assets/images/hotforum/border.png") no-repeat;
+      background-size: 100%;
+      padding: 28px;
+      padding-top: 62px;
+      margin-bottom: 59px;

-//       .img {
-//         width: 100%; // 图片宽度占满item宽度
-//         height: auto; // 自动调整高度
-//       }
-//     }
-//   }
-// }
-// }
-// @media (min-height: 1500px) {
-// .hot{
-//   width: 100%;
-//   // max-width: 1920px;
-//   min-height: 100%;
-//   // min-height: 1373px;
-//   background: url("../../assets/images/hotforum/back.jpg") no-repeat;
-//   background-size: 100% 100%;
-//   display: flex;
-//   justify-content: center;
-//   .center {
-//     max-width: 1068px;
-//     max-height: 580px;
-//     margin-bottom: 5%;
-//     margin-top: 30vh;
-//     display: flex;
-//     flex-wrap: wrap;
+      .img {
+        width: 100%; // 图片宽度占满item宽度
+        height: auto; // 自动调整高度
+      }
+    }
+  }
+}
+}
+@media (min-height: 1500px) {
+.hot{
+  width: 100%;
+  // max-width: 1920px;
+  min-height: 100%;
+  // min-height: 1373px;
+  background: url("../../assets/images/hotforum/back.jpg") no-repeat;
+  background-size: 100% 100%;
+  display: flex;
+  justify-content: center;
+  .center {
+    max-width: 1068px;
+    max-height: 580px;
+    margin-bottom: 5%;
+    margin-top: 30vh;
+    display: flex;
+    flex-wrap: wrap;

-//     .item {
-//       width: 500px;
-//       height: 271px;
-//       background: url("../../assets/images/hotforum/border.png") no-repeat;
-//       background-size: 100%;
-//       padding: 14px;
-//       padding-top: 26px;
-//       margin-bottom: 30px;
+    .item {
+      width: 500px;
+      height: 271px;
+      background: url("../../assets/images/hotforum/border.png") no-repeat;
+      background-size: 100%;
+      padding: 14px;
+      padding-top: 26px;
+      margin-bottom: 30px;

-//       .img {
-//         width: 100%; // 图片宽度占满item宽度
-//         height: auto; // 自动调整高度
-//       }
-//     }
-//   }
-// }
-// }
-// @media (min-width: 1928px) and (max-width: 3000px) {
-// .hot{
-//   width: 100%;
-//   // max-width: 1920px;
-//   min-height: 100%;
-//   // min-height: 1373px;
-//   background: url("../../assets/images/hotforum/back.jpg") no-repeat;
-//   background-size: 100% 100%;
-//   display: flex;
-//   justify-content: center;
-//   .center {
-//     max-width: 1800px;
-//     max-height: 1100px;
-//     margin-bottom: 5%;
-//     margin-top: 35vh;
-//     display: flex;
-//     flex-wrap: wrap;
+      .img {
+        width: 100%; // 图片宽度占满item宽度
+        height: auto; // 自动调整高度
+      }
+    }
+  }
+}
+}
+@media (min-width: 1928px) and (max-width: 3000px) {
+.hot{
+  width: 100%;
+  // max-width: 1920px;
+  min-height: 100%;
+  // min-height: 1373px;
+  background: url("../../assets/images/hotforum/back.jpg") no-repeat;
+  background-size: 100% 100%;
+  display: flex;
+  justify-content: center;
+  .center {
+    max-width: 1800px;
+    max-height: 1100px;
+    margin-bottom: 5%;
+    margin-top: 35vh;
+    display: flex;
+    flex-wrap: wrap;

-//     .item {
-//       width: 860px;
-//       height: 466px;
-//       background: url("../../assets/images/hotforum/border.png") no-repeat;
-//       background-size: 100%;
-//       padding: 28px;
-//       padding-top: 48px;
-//       margin-bottom: 70px;
+    .item {
+      width: 860px;
+      height: 466px;
+      background: url("../../assets/images/hotforum/border.png") no-repeat;
+      background-size: 100%;
+      padding: 28px;
+      padding-top: 48px;
+      margin-bottom: 70px;

-//       .img {
-//         width: 100%; // 图片宽度占满item宽度
-//         height: auto; // 自动调整高度
-//       }
-//     }
-//   }
-// }
-// }
+      .img {
+        width: 100%; // 图片宽度占满item宽度
+        height: auto; // 自动调整高度
+      }
+    }
+  }
+}
+}
 </style>
--- a/src/views/portal/case/Detail.vue
+++ b/src/views/portal/case/Detail.vue
@@ -651,9 +651,6 @@ export default {
      });
    },
    getCaseData() {
-      // 清空pdf数据
-      this.pdfPath = '';
-
      let $this = this;
      apiCase.details(this.resolveId, true).then(res => {
        if (res.status == 200) {
--- a/src/views/portal/case/Index.vue
+++ b/src/views/portal/case/Index.vue
@@ -185,11 +185,11 @@
          <div class="back_num" v-if="numIsFalse">
            <div class="search_div_num">
              当前已检索 <span style="color:#FF4040 ;">
-                {{ this.caseList.count }}</span> 条数据
+                {{ caseList.count }}</span> 条数据
            </div>
          </div>
          <div class="data-content">
-            <div v-for="item in this.caseList.list" :key="isTimeData?item.browsingHistoryId : item.id" class="case-list">
+            <div v-for="item in caseList.list" :key="isTimeData?item.browsingHistoryId : item.id" class="case-list">
              <div class="case-info">
                <div class="case-info-cont">
                  <!-- <router-link :to="'/case/detail?id=' + item.id"> -->
@@ -270,7 +270,7 @@
                </div>
              </div>
            </div>
-            <div v-if="this.caseList.showPagCount > queryCondition.pageSize">
+            <div v-if="caseList.showPagCount > queryCondition.pageSize">
              <pagination :size="queryCondition.pageSize" :total="caseList.count" :page="queryCondition.pageIndex"
                layout="total, prev, pager, next, jumper" @change-page="currentChange"></pagination>
            </div>
@@ -279,7 +279,7 @@
            <!-- <span class="pag-text" @click="loadMore()" v-if="moreState == 1">加载更多</span>
            <span class="pag-text-msg" v-else-if="moreState == 2">数据加载中</span>
            <span class="pag-text-msg" v-else-if="moreState == 3">没有更多数据了</span> -->
-            <span class="notcoures" v-if="this.caseList.list.length == 0">
+            <span class="notcoures" v-if="caseList.list.length == 0">
              <img :src="`${webBaseUrl}/images/nocase.png`" alt="">
              <h5>暂无案例，请优先学习其它案例吧～</h5>
            </span>
@@ -555,7 +555,7 @@ export default {
        name: '',
        years: [],
        // 随机
-        // notInIds: [],//重复的id
+        notInIds: [],//重复的id
        orderField: "id",
        orderAsc: false,//排序
        sysType1:'',
@@ -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);
@@ -1562,7 +1563,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);
@@ -1599,17 +1600,12 @@ export default {
          } else {
            this.moreState = 3;
          }
-          if(res.result.list.length ===0){
-            this.moreState = 3;
-            this.isSeach = false;
-          }
-          console.log(res?.result?.list ,'有没有数据1');
+          // console.log(res?.result?.list ,'有没有数据');
          res.result.list.forEach(item=>{
-            item.viewRankTags = item.viewRankTags?.slice(0,2)||[]
+            item.viewRankTags = item.viewRankTags.slice(0,2)
          })
-          console.log(res?.result?.list ,'有没有数据2');
          this.caseList.list = res.result.list
-          // this.getCaseUserData(res.result.list);
+          this.getCaseUserData(res.result.list);
          // 给所有的赋值
          this.caseList.count = res.result.count;
          this.caseList.showPagCount = res.result.count;
--- a/src/views/sso/lexiang.vue
+++ b/src/views/sso/lexiang.vue
@@ -1,53 +0,0 @@
-<template>
-  <div>
-    <p v-if="loading">正在跳转，请稍候...</p>
-    <p v-if="error" class="error">{{ errorMessage }}</p>
-  </div>
-</template>
-
-<script>
-import axios from 'axios'
-
-export default {
-  data() {
-    return {
-      loading: true,
-      error: false,
-      errorMessage: ''
-    }
-  },
-  created() {
-    this.fetchCode()
-  },
-  methods: {
-    async fetchCode() {
-      try {
-        // 替换为你的实际API地址
-        const response = await axios.post('/userbasic/sso/getCode', {})
-        const code = response.data.result
-        if (code) {
-          // 替换为你的目标外部链接，并确保参数名称正确
-          const redirectUrl = `https://lexiangla.com?company_from=d1f3b156e9ed11ef9dc9720f77c5afa9&login_way=sso&sso_auth_code=${encodeURIComponent(code)}`
-          window.location.href = redirectUrl
-        } else {
-          this.handleError('未获取到有效code')
-        }
-      } catch (error) {
-        this.handleError(`请求失败: ${error.message}`)
-      }
-    },
-    handleError(message) {
-      this.loading = false
-      this.error = true
-      this.errorMessage = message
-    }
-  }
-}
-</script>
-
-<style>
-.error {
-  color: red;
-  font-weight: bold;
-}
-</style>
--- a/src/views/study/Courses.vue
+++ b/src/views/study/Courses.vue
@@ -254,7 +254,7 @@ export default {
            let localCourseIds=[];//本地在线课程的id集合
            res.result.list.forEach(item=>{
              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);
--- a/src/views/study/coursenew.vue
+++ b/src/views/study/coursenew.vue
@@ -167,6 +167,7 @@
            </div>
            <!-- 课程单元  -->
            <div class="course-units" v-if="tab == 1">
+
              <div :style="`height: ${controlHeight}px;overflow-y: auto;`">
                <div class="catalog" v-if="courseInfo.type == 20">
                  <div  v-for="(item, index) in catalogTree" :key="index" :name="index">
@@ -291,8 +292,7 @@
                    <!-- <span style="font-size: 12px; color:#666666 ;">( {{cutOrgNamePath(item.authorInfo.orgInfo)}} )</span> -->
                </div>
                <!-- <div class="teacher-remark" v-html="item.authorInfo.sign"></div> -->
-                <div v-if="item.teacherType === 1 " class="teacher-remark">{{cutOrgNamePath(item.authorInfo.orgInfo)}}</div>
-                <div v-else>{{item.supplier}}</div>
+                <div class="teacher-remark">{{cutOrgNamePath(item.authorInfo.orgInfo)}}</div>
              </div>
              <div  style="padding-top:15px;width:70px;">
                <followButton v-if="item.teacherName!=='BOE教师'" :auto="true" size="small" :aid="item.teacherId"></followButton>
@@ -802,11 +802,6 @@


        this.$nextTick(function(){
-            if(this.contentData.progressVideo){
-              this.$refs.myVideoPlayer.updateProgressByClickBar2(this.contentData.lastStudyTime,this.contentData.progressVideo);
-              // $this.notePlay = this.contentData.lastStudyTime;
-            }
-
            //let h0=document.getElementById('id_course_player').offsetHeight;
            let h=$this.$refs.coursePlayer.offsetHeight;
            //let h1=$this.$refs.coursePlayer.clientHeight;
@@ -1145,8 +1140,6 @@
        //   }
        // }
        this.playerBoxShow = false;
-        // this.onPlayerPlayFullscreen()
-        // this.$watermark.set(this.userInfo.name + this.userInfo.loginName);
        let $this = this;
        //这里有些不准备，如果文件未能加载，这个事件就是错误的
        this.isAppendTime=true;
@@ -1164,7 +1157,6 @@
        //   }
        // }
      },
-
      onFullscreen(full) {
        let divId = 'videowatermark';
        var div = document.getElementById('myVideoPlayer')
@@ -1184,11 +1176,8 @@
            "position:absolute;pointer-events: none; width: 100%;height: 100%;top:0;left:0;bottom: 0;right: 0; display: flex;justify-content: center;flex-wrap: wrap;overflow: hidden; opacity:0.3;padding-top:10px";
          div.appendChild(div3);
        } else {
-          console.log("去除水印 ---- gx ----");
          var markDiv = div.querySelector("#" + divId);
-          console.log("去除水印 ---- gx markDiv ----",markDiv);
          if (markDiv) {
-              console.log("执行去除水印 ---- gx markDiv ----",markDiv);
      	     div.removeChild(markDiv);
          }
        }
@@ -1453,7 +1442,6 @@
              }
              //console.log(scon.contentId,con.id);
              con.lastStudyTime = scon.lastStudyTime;
-              con.progressVideo = scon.progressVideo;
              //以下判断是为了兼容之前的问题，学习状态
              if (scon.status) {
                con.status = scon.status;
--- a/src/views/user/ranking.vue
+++ b/src/views/user/ranking.vue
@@ -380,19 +380,15 @@ export default {
    getExperience() {//经验值
      let data = {
        aid:this.userInfo.aid,// #用户id
-        statType:20, // #统计类型  10学习时长 11 学习天数 20表经验值 30表u币 40表获取天数
+        statType:21, // #统计类型  10学习时长 11 学习天数 20表经验值 30表u币 40表获取天数
        field:this.experience.field,// #统计周期 todays-当天,weeks-周,months-月,years-年 total-总计
        num:10,//  #显示的条数
      }
      if(data.field == 'now'){
-        data.statType = 20
-        data.field = 'years'
-        this.experience.field = 'years'
-        this.isNow = true
-      }else{
        data.statType = 20
        data.field = 'total'
        this.experience.field = 'total'
+        this.isNow = true
      }
      apiStat.getRanking(data).then(res=>{
        if(res.status==200){
@@ -406,15 +402,12 @@ export default {
            }
            this.getUserData([res.result.currentUserRankingData.aid],[res.result.currentUserRankingData])
            this.experience.data = res.result.currentUserRankingData;
-            this.currentUserRankingTotalData.rankNo = res.result.currentUserRankingData.rankingNo;
-            this.currentUserRankingTotalData.endValue = this.current.endValue;
-            if(data.field == 'total') {
+            if(this.experience.field == 'total') {
              this.current = this.experienceValue(res.result.currentUserRankingData.total);
+              this.currentUserRankingTotalData.rankNo = res.result.currentUserRankingData.rankingNo;
              this.currentUserRankingTotalData.rankValue = res.result.currentUserRankingData.total;
-            }else if(data.field == 'years'){
-              this.currentUserRankingTotalData.rankValue = res.result.currentUserRankingData.years;
+              this.currentUserRankingTotalData.endValue = this.current.endValue;
            }
-
          }
          this.current.total=res.result.currentUserRankingData.total;//当前用户的经验值是固定的
          const ids= [];
@@ -441,15 +434,9 @@ export default {
                  }
                });
              });
-              if(data.field == 'total') {
              this.experience.list = listData.sort((a,b)=>{
                return b.total-a.total
              }).slice(0,5);
-              }else if(data.field == 'years'){
-                this.experience.list = listData.sort((a,b)=>{
-                  return b.years-a.years
-                }).slice(0,5);
-              }
            } else {
              this.$message.error(res.message);
            }
@@ -460,19 +447,15 @@ export default {
    getDuration() {//学习时长
      let data = {
        aid:this.userInfo.aid,// #用户id
-        statType:10, // #统计类型  10学习时长 11 学习天数 20表经验值 30表u币 40表获取天数
+        statType:12, // #统计类型  10学习时长 11 学习天数 20表经验值 30表u币 40表获取天数
        field:this.learningDuration.field,// #统计周期 todays-当天,weeks-周,months-月,years-年 total-总计
        num:10,//  #显示的条数
      }
      if(data.field == 'now'){
-        data.statType = 10;
-        data.field = 'years';
-        this.learningDuration.field = 'years';
-        this.isStudyTime = true;
-      }else{
-        data.statType = 10;
-        data.field = 'total';
-        this.learningDuration.field = 'total';
+        data.statType = 10
+        data.field = 'total'
+        this.learningDuration.field = 'total'
+        this.isStudyTime = true
      }
      apiStat.getRanking(data).then(res=>{
        if(res.status==200){
@@ -486,11 +469,9 @@ export default {
            }
            this.getUserData([res.result.currentUserRankingData.aid],[res.result.currentUserRankingData])
            this.learningDuration.data = res.result.currentUserRankingData;
-            this.learningDurationTotalData.rankNo = res.result.currentUserRankingData.rankingNo;
            if(data.field == 'total'){
+              this.learningDurationTotalData.rankNo = res.result.currentUserRankingData.rankingNo;
              this.learningDurationTotalData.rankValue = res.result.currentUserRankingData.total;
-            } else if(data.field == 'years'){
-              this.learningDurationTotalData.rankValue = res.result.currentUserRankingData.years;
            }
          }

@@ -519,16 +500,9 @@ export default {
                  }
                });
              });
-              if(data.field == 'total'){
              this.learningDuration.list = listData.sort((a,b)=>{
                return b.total-a.total
-                }).slice(0,5)
-              } else if(data.field == 'years'){
-                this.learningDuration.list = listData.sort((a,b)=>{
-                  return b.years-a.years
-                }).slice(0,5)
-              }
-              ;
+              }).slice(0,5);
            } else {
              this.$message.error(res.message);
            }
--- a/vue.config.js
+++ b/vue.config.js
@@ -124,17 +124,6 @@ module.exports = {
    // 114.115.162.187 测试环境
    // 192.168.0.107 晋宇
    proxy: {
-      // "/professional": {
-      //   // target: 'https://u-pre.boe.com',
-      //   // target: 'http://192.168.86.195:32002',
-      //   target: 'http://192.168.68.211:32002',
-      //   changeOrigin: true,
-      // },
-      "/growth": {
-        target: 'https://u-pre.boe.com',
-        // target: 'http://192.168.86.195:32002',
-        changeOrigin: true,
-      },
      '/manageApi': {
        // 目标代理服务器地址
        target: 'https://u-pre.boe.com',