考试整理1

.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

.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/'

.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/'

.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/'

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
 
 }

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 })

src/api/modules/course.js

@@ -1,7 +1,7 @@
 /**
  * 课程的操作，课程的添加，修改，列表查询，课程的审核发布等操作。
  * 针对于管理员，教师的功能
- *
+ * 
  **/
 import ajax from '@/utils/xajax.js'
 
@@ -170,9 +170,7 @@ const updateContentOrders = function(cid,items) {
 const detail = function(id) {
     return ajax.get('/xboe/m/course/manage/detail?id=' + id);
 }
-const getDictIds = function(pid,type) {
-  return ajax.get(`/xboe/m/course/manage/getDictIds?pid=${pid}&type=${type}`);
-}
+
 /**
  * 更新内容的名称
  * @param {Object} data
@@ -276,7 +274,7 @@ const countWaitAudit = function() {
 }
 
 /**
- * [已用courseAudit中的hrbpAuditList替换]
+ * [已用courseAudit中的hrbpAuditList替换]
  * 当前用户需要审核的课程列表
  * @param {Object} query 同pageList
  */
@@ -285,9 +283,9 @@ const auditList = function(query) {
 }
 
 
-/**
- * 【已移到courseAudit中】
- * 教师需要审核的课程列表
+/**
+ * 【已移到courseAudit中】
+ * 教师需要审核的课程列表
  */
 const teacherAuditList = function(query) {
     return ajax.post('/xboe/m/course/audit/teacher-course', query);
@@ -448,7 +446,6 @@ export default {
     findUpdateLogs,
     getUpdateLog,
     detail,
-    getDictIds,
     saveContent,
     pageList,
     setEnabled,

src/api/modules/courseStudy.js

@@ -114,10 +114,6 @@ const studyVideoTime = function(data) {
   return ajax.post('/xboe/school/study/course/study-video-time',data);
 }
 
-const updateStudyVideoTime = function(data) {
-  return ajax.post('/xboe/school/study/course/updateStudyVideoTime',data);
-}
-
 /**
  * 获取上一次的学习内容
  * @returns
@@ -412,7 +408,6 @@ export default {
   studyIndex,
   studyInfo,
   studyVideoTime,
-  updateStudyVideoTime,
   lastStudy,
   studyContent,
   appendStudyTime,

src/api/modules/teacher.js

@@ -38,7 +38,7 @@ const detailTeacher=function (id){
  * tlevelId级别
  * salaryId发薪地
  * tsystemId
-
+ 
  * } query
  * @returns
  */

src/components/Course/courseForm.vue

@@ -141,7 +141,6 @@
               <el-radio style="margin-right: 10px;" v-model="courseInfo.device" :label="1">PC端可见</el-radio>
               <el-radio style="margin-right: 10px;" v-model="courseInfo.device" :label="2">移动端可见</el-radio>
               <el-radio style="margin-right: 10px;" v-model="courseInfo.device" :label="3">多端可见</el-radio>
-              <el-radio style="margin-right: 10px;" v-model="courseInfo.device" v-if="isPermission" :label="4">仅内网访问</el-radio>
             </el-form-item>
             <el-form-item v-if="!weike.onlyRequired" label="课程来源">
               <el-radio-group v-model="courseInfo.source">
@@ -306,7 +305,6 @@
                 <el-radio v-model="courseInfo.device" :label="1">PC端可见</el-radio>
                 <el-radio v-model="courseInfo.device" :label="2">移动端可见</el-radio>
                 <el-radio v-model="courseInfo.device" :label="3">多端可见</el-radio>
-                <el-radio style="margin-right: 10px;" v-model="courseInfo.device" v-if="isPermission" :label="4">仅内网访问</el-radio>
               </el-col>
               <el-col :span="10">
                 <el-form-item label="课程来源">
@@ -490,8 +488,6 @@ export default {
         refType:''
       },
       visibleShow:false,
-      isPermission:false,
-      dicts:[],
       extendRefId:'',
       extendRefType:'',
       courseTeachers: [], //课程的老师
@@ -531,11 +527,7 @@ export default {
         dlgShow: false
       },
       rightTypeId: {},
-      catalogSortDialogShow: false,
-      selectedOrg: {
-        orgId: null,
-        name: ''
-      }
+      catalogSortDialogShow: false
     };
   },
   created() {
@@ -560,18 +552,14 @@ export default {
   },
   watch: {
     courseInfo: {
-      handler(newVal, oldVal) {
-        // 需要保存
+      handler(newVal) {
+        //需要保存
         this.requireSaveCourse = true;
-
-        console.log("--- watch比较 = ", oldVal.orgId, newVal.orgId);
-        this.checkOrgPermission(newVal.orgId);
       },
       deep: true
     }
   },
   mounted() {
-    this.getDictIds();
     let extendFlag=this.$route.query.f; //是否是管理端过来的
     this.extendRefId=this.$route.query.refId;
     this.extendRefType=this.$route.query.refType;
@@ -593,19 +581,6 @@ export default {
     this.loadUserGroup();
   },
   methods: {
-    // 检查机构权限
-    checkOrgPermission(orgId) {
-      console.log("--- 监测组织id orgId  = ",orgId)
-      console.log("--- this.isPermission  = ",this.isPermission)
-      console.log("--- device  = ",this.courseInfo.device)
-      if (!orgId) {
-        this.isPermission = false;
-        return;
-      }
-      console.log("--- this.dicts  = ",this.dicts)
-      this.isPermission = this.dicts.includes(orgId);
-      console.log("--- 监听结束 this.isPermission  = ",this.isPermission)
-    },
     // 关键字的更改
     changeKeywords(option){
       if(option.target.value){
@@ -910,27 +885,11 @@ export default {
       this.courseCoverurl = '';
       this.courseInfo.coverImg = '';
     },
-    //获取字典信息
-    async getDictIds() {
-      console.log("--- 获取字典信息 1  = ", this.dicts);
-      try {
-        const response = await apiCourse.getDictIds(637, 1); // 确保返回 Promise
-        console.log("--- 获取字典信息 2 result= ", response);
-
-        if (response.status === 200) {
-          this.dicts = response.result.dicts; // 正确提取 dicts
-          console.log("--- 获取字典信息 3 = ", this.dicts);
-        }
-      } catch (error) {
-        console.error("获取字典信息失败：", error);
-      }
-    },
     //获取课程信息
     async getDetail(id) {
       this.curCourseId = id;
       this.orgName='';
-      this.isPermission = false;
-        let $this = this;
+      let $this = this;
       try {
         const { result, status } = await apiCourse.detail(id);
         if (status === 200) {
@@ -947,10 +906,7 @@ export default {
           this.contentInfo.list = result.contents;
           this.sectionInfo.list = result.sections;
           this.courseTeachers = result.teachers; //课程的老师信息
-          this.isPermission = result.isPermission; //课程的老师信息
-          this.dicts = result.dicts; //课程的老师信息
-          console.log("--- 编辑查看 this.isPermission  = ",this.isPermission)
-          console.log("--- 编辑查看 this.dicts  = ",this.dicts)
+
           if(!this.courseInfo.orgId){
             //根据课程创建者获取机构id
             apiUser.getOrgSimpleByUserId(result.course.sysCreateAid).then(ors=>{

src/components/Course/courseImage.vue

@@ -48,13 +48,17 @@ export default {
       let name = '';
       if (this.course && this.course.name && this.course.name !== '') {
         name = this.course.name.replace('color:#FF0000', 'color:#fff');
+        console.log("name gengxindata1 : ",name)
       }
       if (this.course && this.course.courseName && this.course.courseName !== '') {
         name = this.course.courseName.replace('color:#FF0000', 'color:#fff');
+        console.log("name gengxindata2 : ",name)
       }
       if (this.course && this.course.title && this.course.title !== '') {
         name = this.course.title.replace('color:#FF0000', 'color:#fff');
+        console.log("name gengxindata3 : ",name)
       }
+      console.log("name gengxindata4 : ",name)
       return name;
       // course.name || course.courseName || course.title
     },

src/components/Course/homework.vue

@@ -109,7 +109,7 @@ export default {
          if(res.status==200){
              this.info=res.result;
              //检查是否过期
-            if(res.result.deadTime!='' && res.result.deadTime != null){
+            if(res.result.deadTime!=''){
                var d = new Date(res.result.deadTime);
                var now=new Date();
                if(now.getTime() > d.getTime()){

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');

src/components/VideoPlayer/index.vue

@@ -317,7 +317,7 @@ export default {
     }
 
     setInterval(() => {
-          console.log('当前状态:',this.currentProgress,this.isDrag,this.videoDom.currentTime , this.videoDom.duration)
+          //console.log('this.currentProgress::',this.currentProgress,this.isDrag,this.videoDom.currentTime , this.videoDom.duration)
           // 视频播放时本地记录视频实时播放时长,视频设置了禁止拖动时执行
           if(!this.isDrag){
             var time = localStorage.getItem('videoProgressData')
@@ -364,11 +364,6 @@ export default {
       }
       // 根据视频的readyState判断下一帧是否已加载，并控制loading的显示
       this.isShowLoading = this.videoDom.readyState < 3;
-      console.log("当前缓存:"+this.videoDom.readyState)
-      if (this.videoDom.readyState < 3){
-        console.log("详细信息",this.videoDom)
-        console.log("卡了",this.videoDom.readyState)
-      }
       //if()
       //console.log(this.videoDom.readyState,'this.videoDom.readyState');
     }, 1000);
@@ -511,14 +506,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;
-      this.updateProgressText();
-    },
     /* 提高视频音量
      */
     increaseVolume() {
@@ -632,7 +619,7 @@ export default {
     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) {
@@ -642,7 +629,7 @@ export default {
         }
       }
 
-
+     
     }
   },
   watch: {

src/components/VideoPlayer/progress-bar.vue

@@ -37,6 +37,7 @@ export default {
     },
     isDrag:{
       type: Boolean,
+      default: true,
     },
     blobId:{
       type: String,

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}
   ]},

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,12 +15,10 @@
         <!-- </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> 
+          </keep-alive>
         </transition>
       </div>
     </div>
@@ -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";
     }
   }
 }

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),

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;
       }

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>
--->

src/views/course/ManageList.vue

@@ -195,14 +195,14 @@
       </template>
     </el-dialog>
     <!--课程管理-->
-    <el-dialog
-        custom-class="g-dialog"
-        title="课程学习管理"
+    <el-dialog 
+        custom-class="g-dialog" 
+        title="课程学习管理" 
         width="900px"
-        height="900px"
-        :visible.sync="manageStudy.dlgShow"
+        height="900px" 
+        :visible.sync="manageStudy.dlgShow" 
         :close-on-click-modal="false"
-
+        
         >
       <manager :manageStudyData="manageStudyData" :isShowDialog="manageStudy.dlgShow"></manager>
       <template #footer>
@@ -676,10 +676,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);
           }

src/views/course/Mylecnotes.vue

@@ -1,276 +1,206 @@
 <template>
   <div style="padding: 12px 32px 10px 12px;">
-    <div style="display: flex;justify-content: flex-start;">
+   <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>
-    <div class="Export">
-      <!-- <div style="padding-left: 10px;"><el-button type="primary" @click="exportFile()" icon="el-icon-search" size="small" round>导出</el-button></div> -->
-      <!-- <div style="padding: 0px 5px;"><el-button icon="el-icon-refresh-right" type="primary" size="small" round>导出学员信息</el-button></div> -->
-    </div>
-    <div style="margin-top:20px;">
-      <el-table :data="pageData" border stripe>
-        <el-table-column
-          label="序号"
-          prop="index"
-          width="100px">
+     <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> -->
+     <!-- <div style="padding: 0px 5px;"><el-button icon="el-icon-refresh-right" type="primary" size="small" round>导出学员信息</el-button></div> -->
+   </div>
+   <div style="margin-top:20px;">
+     <el-table :data="pageData" border stripe>
+         <el-table-column
+         label="课程时间"
+         prop="courseTime"
+         width="200px">
+         </el-table-column>
+         <el-table-column
+         label="课程名称"
+         prop="courseName"
+         width="200px">
+         </el-table-column>
+         <el-table-column
+         label="开课场地"
+         prop="address"
+         width="240px">
+         </el-table-column>
+         <el-table-column
+         label="所属课程"
+         prop="parentCourse"
+         width="120px">
+         </el-table-column>
+         <el-table-column
+         label="所属项目"
+         prop="parentProject"
+         ></el-table-column>
+         <el-table-column
+         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"
+          ></el-table-column>
+         <el-table-column
+         label="操作"
+         align="center"
+         width="150px"
+         prop="cz"
+         fixed="right"
+          >
           <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"
-          width="200px">
-        </el-table-column>
-        <el-table-column
-          label="课程名称"
-          prop="courseName"
-          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>
-        </el-table-column>
-        <el-table-column
-          label="授课/课程日期"
-          prop="teachingDate"
-          width="200px">
-        </el-table-column>
+           <el-button type="text" @click="exportStudentOfCourse(scope.row.courseId)" size="small">导出学员信息</el-button>
+         </template>
+       </el-table-column>
+     </el-table>
+   </div>
 
-        <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>
-        </el-table-column>
-        <el-table-column
-          label="授课时长(分钟)"
-          prop="teaching"
-          width="120px"
-        ></el-table-column>
-        <el-table-column
-          label="参训人数"
-          prop="studys"
-          width="120px"
-        ></el-table-column>
-        <el-table-column
-          label="评分"
-          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="操作"
-          align="center"
-          width="150px"
-          prop="cz"
-          fixed="right"
-        >
-          <template v-slot="scope">
-            <el-button type="text" @click="exportStudentOfCourse(scope.row.courseId, scope.row.type)"
-                       size="small">导出学员信息
-            </el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-    </div>
+ <div style="text-align: center; margin-top:57px">
+  <el-pagination
+   background
+     @size-change="handleSizeChange"
+     @current-change="handleCurrentChange"
+     :current-page="pageInfo.page"
+     :page-sizes="[10, 20, 30, 40]"
+     :page-size="pageInfo.pageSize"
+     layout="total, sizes, prev, pager, next, jumper"
+     :total="pageInfo.total"
+   ></el-pagination>
+   </div>
 
-    <div style="text-align: center; margin-top:57px">
-      <el-pagination
-        background
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"
-        :current-page="pageInfo.page"
-        :page-sizes="[10, 20, 30, 40]"
-        :page-size="pageInfo.pageSize"
-        layout="total, sizes, prev, pager, next, jumper"
-        :total="pageInfo.total"
-      ></el-pagination>
-    </div>
-
-  </div>
+ </div>
 </template>
 
 <script>
 import apiCourse from '../../api/boe/courseRecord.js';
-import {mapGetters} from 'vuex';
-
+import { mapGetters } from 'vuex';
 export default {
-  data() {
-    return {
-      pageData: [],
-      keyword: '',
-      pageInfo: {
-        pageIndex:1,
-        pageSize:10,
-      },
-    }
-  },
-  mounted() {
-    this.recordList();
-  },
-  computed: {
-    ...mapGetters(['userInfo'])
-  },
-  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}`
-        );
-      }
-    },
+data(){
+ return {
+     pageData:[],
+     keyword:'',
+     pageInfo:{},
+ }
+},
 
-    // 导出课程下的学员信息
-    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);
-      // })
+mounted() {
+ this.recordList(1);
 
-      window.open(
-        `/manageApi/admin/export/exportTeacherRecordStudentInfo?courseId=${courseId}&courseType=${courseType}`
-      );
-    },
+},
+computed: {
+ ...mapGetters(['userInfo'])
+},
 
-    // 导出教师下的所有授课记录下的学员信息
-    exportStudentOfTearcher() {
-      let userId = this.userInfo.sysId;
-      apiCourse.exportStudentOfTearcher2(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);
-      })
-    },
+methods: {
 
-    recordList() {
-      let req = {
-        courseName: this.keyword,
-        pageNo: this.pageInfo.pageIndex,
-        pageSize: this.pageInfo.pageSize
-      }
-      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);
-        } else {
+   // 导出所有记录
+   exportFile(){
+     let req = {
+       userId: this.userInfo.sysId
+       // userId:"70F80F4E-34BA-10AB-894A-8FA812B19637"
+     }
+     apiCourse.courseRecordExport(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);
+     })
+   },
+
+
+   // 导出课程下的学员信息
+   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 = {
+     //     userId:"6B049FAF-C314-7CCF-0D28-0D23F4C42531",
+         userId: this.userInfo.sysId,
+         keyword:this.keyword,
+         page:pageIndex,
+         pageSize:10
+     }
+     apiCourse.courseRecordList(req).then(res=>{
+       if(res.status == 200) {
+         this.pageData = res.result.list;
+         this.pageInfo = res.result.pageInfo;
+       } else {
           this.$message({
-            type: 'error',
-            message: res.message
-          });
-        }
-      })
-    },
+           type: 'error',
+           message: res.message
+         });
+       }
+     })
+   },
+
+   // 每页显示的条数事件
+   handleSizeChange(val){
+     this.pageInfo.pageSize = val;
+     this.recordList(1);
+   },
+   // 显示制定页的数据
+   handleCurrentChange(val){
+     this.pageInfo.pageIndex = val;
+     this.recordList(this.pageInfo.pageIndex);
+   },
+
+},
 
-    // 每页显示的条数事件
-    handleSizeChange(val) {
-      this.pageInfo.pageIndex = 1;
-      this.pageInfo.pageSize = val;
-      this.recordList();
-    },
-    // 显示制定页的数据
-    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>

src/views/exam/ExamList.vue

@@ -954,7 +954,7 @@ export default {
     },
     findPapers() {
       let params={
-        pageSize:10000,
+        pageSize:200,
         name:''
       }
       apiPaper.querypaper(params).then((res) => {

src/views/grateful/GratefulHomePage.vue

@@ -5,8 +5,8 @@
         <!-- 当轮播图等于一张时 -->
         <swiper :options="swiperOptiontwo">
           <swiper-slide style="margin: 0 auto" v-for="(item, idx) in resonimg" :key="'a' + idx"
-            class="swiper-slide games pointer"  >
-            <div class="bannbox" @click="handleCarouselClick(item)" :style="{
+            class="swiper-slide games pointer">
+            <div class="bannbox" :style="{
               background: `url(${fileBaseUrl + item.image
                 }) center center no-repeat`,
             }"></div>
@@ -17,8 +17,8 @@
       <div id="container" style="z-index: 99" v-else>
         <swiper :options="swiperOption" ref="mySwiper" v-if="resonimg.length > 1">
           <swiper-slide style="margin: 0 auto" v-for="(item, idx) in resonimg" :key="'b' + idx"
-            class="swiper-slide games pointer"  >
-            <div class="bannbox" @click="handleCarouselClick(item)"  :style="{
+            class="swiper-slide games pointer">
+            <div class="bannbox" :style="{
               background: `url(${fileBaseUrl + item.image
                 })  center center no-repeat`,
             }"></div>
@@ -220,7 +220,7 @@ export default {
         autoplay: false,
         // noSwiping: true,
       },
-      // resonimg: [],
+      resonimg: [],
       swiperOption: {
         autoplay: {
           delay: 2000,
@@ -249,13 +249,6 @@ export default {
     this.getToolData()
   },
   methods: {
-    // 添加点击轮播图跳转的方法
-    handleCarouselClick(item) {
-      if (item.url) {
-        window.open(item.url, '_blank');
-      }
-    },
-
     downTool(toolInfo) {
       console.log(toolInfo);
       window.open(`/activityApi/xboe/m/boe/tools/url/download?urlStr=${process.env.VUE_APP_BOE_WEB_URL}/upload${toolInfo.filePath}&fileName=${toolInfo.name}`)

src/views/grateful/TeacherOpinion.vue

@@ -8,7 +8,7 @@
           <div class="navTop">
             <div>
               <router-link to="/grateful" class="nav">首页</router-link>&nbsp;>&nbsp;
-              <span style="cursor: pointer;" class="nav">认证讲师库</span>
+              <span style="cursor: pointer;" class="nav">认证讲师库（2023）</span>
             </div>
             <div style="position: relative;">
               <el-input class="portal-input" placeholder="请输入课程名称" style="border-radius: 20px !important; "

src/views/grateful/index.vue

@@ -5,7 +5,7 @@
     <!-- </div> -->
     <!-- 底部 -->
     <div class="grateful">
-      <img src="../../assets/images/grateful/gratefulFooter20250613.png" alt="" />
+      <img src="../../assets/images/grateful/gratefulFooter.png" alt="" />
     </div>
   </div>
 </template>

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>

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>

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>

src/views/portal/case/Detail.vue

@@ -20,7 +20,7 @@
               </div>
               <div class="label">
                 <author :aid="caseDetail.sysCreateAid" :onlyAvatar="true" :avatar="authorInfo.avatar"
-                  :sex="authorInfo.sex" :name="authorInfo.name"></author>
+                  :sex="authorInfo.sex"></author>
                 <span>案主：{{ authorInfo.name }} ({{ authorInfo.orgInfo }})</span>
                 <!-- <span>案主：{{ authorInfo.name }}</span>
                     <span>工号：{{ authorInfo.code }}</span>
@@ -651,9 +651,6 @@ export default {
       });
     },
     getCaseData() {
-      // 清空pdf数据
-      this.pdfPath = '';
-
       let $this = this;
       apiCase.details(this.resolveId, true).then(res => {
         if (res.status == 200) {

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:'',
@@ -1599,15 +1599,10 @@ 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)||[]
           })
-          console.log(res?.result?.list ,'有没有数据2');
           this.caseList.list = res.result.list
           this.getCaseUserData(res.result.list);
           // 给所有的赋值

src/views/portal/course/Micro.vue

@@ -225,7 +225,7 @@
               </el-card>
             </el-col>
           </el-row>
-
+        
     </div>
     <portal-footer></portal-footer>
   </div>
@@ -653,7 +653,7 @@ export default {
           itemId:this.coursewareInfo.studyItemId,
           videoTime:intTime
         }
-        apicourseStudy.updateStudyVideoTime(postData).then(rs=>{
+        apicourseStudy.studyVideoTime(postData).then(rs=>{
            if(rs.status!=200){
              console.log('记录播放时间错误');
            }
@@ -693,7 +693,7 @@ export default {
           itemId:this.coursewareInfo.studyItemId,
           videoTime:intTime
         }
-        apicourseStudy.updateStudyVideoTime(postData).then(rs=>{
+        apicourseStudy.studyVideoTime(postData).then(rs=>{
            if(rs.status!=200){
              console.log('记录播放时间错误');
            }

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>

src/views/study/TaskList.vue

@@ -140,6 +140,7 @@ export default {
         headers:{token:getToken(),}
       }).then((res) => {
         console.log('111',res.data.result)
+        console.log('111 gx2',res.data.result)
         // this.porcessData=response.data.data
         this.porcessData.course=Math.floor(res.data.result.course.total === 0 ? 0: (res.data.result.course.completion/res.data.result.course.total)*100)
         this.porcessData.project=Math.floor(res.data.result.project.total === 0 ? 0: (res.data.result.project.completion/res.data.result.project.total)*100)

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);
-              }
+              this.experience.list = listData.sort((a,b)=>{
+                return b.total-a.total
+              }).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)
-              }
-              ;
+              this.learningDuration.list = listData.sort((a,b)=>{
+                return b.total-a.total
+              }).slice(0,5);
             } else {
               this.$message.error(res.message);
             }

vue.config.js

@@ -85,28 +85,28 @@ module.exports = {
             .end()
           config
             .optimization.splitChunks({
-              chunks: 'all',
-              cacheGroups: {
-                libs: {
-                  name: 'chunk-libs',
-                  test: /[\\/]node_modules[\\/]/,
-                  priority: 10,
-                  chunks: 'initial' // only package third parties that are initially dependent
-                },
-                elementUI: {
-                  name: 'chunk-elementUI', // split elementUI into a single package
-                  priority: 20, // the weight needs to be larger than libs and app or it will be packaged into libs or app
-                  test: /[\\/]node_modules[\\/]_?element-ui(.*)/ // in order to adapt to cnpm
-                },
-                commons: {
-                  name: 'chunk-commons',
-                  test: resolve('src/components'), // can customize your rules
-                  minChunks: 3, //  minimum common number
-                  priority: 5,
-                  reuseExistingChunk: true
-                }
+            chunks: 'all',
+            cacheGroups: {
+              libs: {
+                name: 'chunk-libs',
+                test: /[\\/]node_modules[\\/]/,
+                priority: 10,
+                chunks: 'initial' // only package third parties that are initially dependent
+              },
+              elementUI: {
+                name: 'chunk-elementUI', // split elementUI into a single package
+                priority: 20, // the weight needs to be larger than libs and app or it will be packaged into libs or app
+                test: /[\\/]node_modules[\\/]_?element-ui(.*)/ // in order to adapt to cnpm
+              },
+              commons: {
+                name: 'chunk-commons',
+                test: resolve('src/components'), // can customize your rules
+                minChunks: 3, //  minimum common number
+                priority: 5,
+                reuseExistingChunk: true
               }
-            })
+            }
+          })
           config.optimization.runtimeChunk('single'), {
             from: path.resolve(__dirname, './public/robots.txt'), //防爬虫文件
             to: './', //到根目录下
@@ -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',