增加乐享转向

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}`);
+  return ajax2.get('/manageApi',`/admin/teacherRecord/getListByToken?courseName=${data.courseName}&page=${data.page}&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'
-  })
 }
 
 
 export default {
     courseRecordExport,
-    courseRecordExport2,
     courseRecordList,
     getListByToken,
     exportStudentOfCourse,
-    exportStudentOfCourse2,
+    exportStudentOfTearcher
-    exportStudentOfTearcher,
-    exportStudentOfTearcher2,
 
 }

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

@@ -512,7 +512,6 @@ export default {
       this.currentProgress = progressVideo;
       this.barrageTimelineStart = newCurrentTime;
       this.videoDom.currentTime = newCurrentTime;
-      this.updateProgressText();
     },
     /* 提高视频音量
      */

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>
+     <div><el-input v-model="keyword" placeholder="输入课程名称搜索" clearable></el-input></div>
-        <el-input v-model="keyword" placeholder="输入课程名称搜索" clearable></el-input>
+     <div style="padding-left: 10px;"><el-button @click="recordList()" type="primary" icon="el-icon-search">搜索</el-button></div>
-      </div>
+     <div style="padding: 0px 5px;"><el-button icon="el-icon-refresh-right" @click="keyword = ''" type="primary" >重置</el-button></div>
-      <div style="padding-left: 10px;">
+     <div style="padding: 0px 5px;"><el-button type="primary" @click="exportFile()" icon="el-icon-search" size="small" round>导出</el-button></div>
-        <el-button @click="recordList()" type="primary" icon="el-icon-search">搜索</el-button>
+     <div style="padding: 0px 5px;"><el-button type="primary" @click="exportStudentOfTearcher()" icon="el-icon-search" size="small" round>导出学员信息</el-button></div>
-      </div>
+   </div>
-      <div style="padding: 0px 5px;">
+   <div class="Export">
-        <el-button icon="el-icon-refresh-right" @click="keyword = ''" type="primary">重置</el-button>
+     <!-- <div style="padding-left: 10px;"><el-button type="primary" @click="exportFile()" icon="el-icon-search" size="small" round>导出</el-button></div> -->
-      </div>
+     <!-- <div style="padding: 0px 5px;"><el-button icon="el-icon-refresh-right" type="primary" size="small" round>导出学员信息</el-button></div> -->
-      <div style="padding: 0px 5px;">
+   </div>
-        <el-button type="primary" @click="exportFile()" icon="el-icon-search" size="small" round>导出</el-button>
+   <div style="margin-top:20px;">
-      </div>
+     <el-table :data="pageData" border stripe>
-<!--      <div style="padding: 0px 5px;">-->
+         <el-table-column
-<!--        <el-button type="primary" @click="exportStudentOfTearcher()" icon="el-icon-search" size="small" round>-->
+         label="课程时间"
-<!--          导出学员信息-->
+         prop="courseTime"
-<!--        </el-button>-->
+         width="200px">
-<!--      </div>-->
+         </el-table-column>
-    </div>
+         <el-table-column
-    <div class="Export">
+         label="课程名称"
-      <!-- <div style="padding-left: 10px;"><el-button type="primary" @click="exportFile()" icon="el-icon-search" size="small" round>导出</el-button></div> -->
+         prop="courseName"
-      <!-- <div style="padding: 0px 5px;"><el-button icon="el-icon-refresh-right" type="primary" size="small" round>导出学员信息</el-button></div> -->
+         width="200px">
-    </div>
+         </el-table-column>
-    <div style="margin-top:20px;">
+         <el-table-column
-      <el-table :data="pageData" border stripe>
+         label="开课场地"
-        <el-table-column
+         prop="address"
-          label="序号"
+         width="240px">
-          prop="index"
+         </el-table-column>
-          width="100px">
+         <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>
+           <el-button type="text" @click="exportStudentOfCourse(scope.row.courseId)" size="small">导出学员信息</el-button>
-          </template>
+         </template>
-        </el-table-column>
+       </el-table-column>
-        <el-table-column
+     </el-table>
-          label="讲师工号"
+   </div>
-          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-table-column
+ <div style="text-align: center; margin-top:57px">
-          label="内容分类"
+  <el-pagination
-          prop="courseTypeName"
+   background
-          width="200px">
+     @size-change="handleSizeChange"
-        </el-table-column>
+     @current-change="handleCurrentChange"
-        <el-table-column label="开课状态" width="100px" prop="courseStatus">
+     :current-page="pageInfo.page"
-          <template v-slot="scope">
+     :page-sizes="[10, 20, 30, 40]"
-                <span>{{
+     :page-size="pageInfo.pageSize"
-                    {
+     layout="total, sizes, prev, pager, next, jumper"
-                      "0": "未开课",
+     :total="pageInfo.total"
-                      "1": "已开课",
+   ></el-pagination>
-                    }[scope.row.courseStatus + '']
+   </div>
-                  }}</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">
+ </div>
-      <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>
 </template>
 
 <script>
 import apiCourse from '../../api/boe/courseRecord.js';
-import {mapGetters} from 'vuex';
+import { mapGetters } from 'vuex';
-
 export default {
-  data() {
+data(){
-    return {
+ return {
-      pageData: [],
+     pageData:[],
-      keyword: '',
+     keyword:'',
-      pageInfo: {
+     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}`
-        );
-      }
-    },
 
-    // 导出课程下的学员信息
+mounted() {
-    exportStudentOfCourse(courseId, courseType) {
+ this.recordList(1);
-      // 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}`
+computed: {
-      );
+ ...mapGetters(['userInfo'])
-    },
+},
 
-    // 导出教师下的所有授课记录下的学员信息
+methods: {
-    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);
-      })
-    },
 
-    recordList() {
+   // 导出所有记录
-      let req = {
+   exportFile(){
-        courseName: this.keyword,
+     let req = {
-        pageNo: this.pageInfo.pageIndex,
+       userId: this.userInfo.sysId
-        pageSize: this.pageInfo.pageSize
+       // userId:"70F80F4E-34BA-10AB-894A-8FA812B19637"
-      }
+     }
-      apiCourse.getListByToken(req).then(res => {
+     apiCourse.courseRecordExport(req).then(res=>{
-        if (res.status == 200) {
+         const link = document.createElement('a');// 创建a标签
-          this.pageData = res.data.records;
+         let blob = new Blob([res.data],{type: 'application/vnd.ms-excel'}); // 设置文件类型
-          this.pageInfo.pageSize = Number(res.data.size);
+         link.style.display = "none";
-          this.pageInfo.total = Number(res.data.total);
+         link.href = URL.createObjectURL(blob); // 创建URL
-          this.pageInfo.page = Number(res.data.current);
+         link.setAttribute("download", "授课记录.xls");
-        } else {
+         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',
+           type: 'error',
-            message: res.message
+           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 {
+.Export{
-  display: flex;
+display: flex;
-  padding-top: 10px;
+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/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/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="">
+      <div class="center">
-          <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="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: url("../../assets/images/hotforum/back.jpg") no-repeat;
-  background-size: cover;
+  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) {
+@media (min-width: 3000px) {
-// .hot{
+.hot{
-//   width: 100%;
+  width: 100%;
-//   // max-width: 1920px;
+  // max-width: 1920px;
-//   min-height: 100%;
+  min-height: 100%;
-//   // min-height: 1373px;
+  // min-height: 1373px;
-//   background: url("../../assets/images/hotforum/back.jpg") no-repeat;
+  background: url("../../assets/images/hotforum/back.jpg") no-repeat;
-//   background-size: 100% 100%;
+  background-size: 100% 100%;
-//   display: flex;
+  display: flex;
-//   justify-content: center;
+  justify-content: center;
-//   .center {
+  .center {
-//     max-width: 2560px;
+    max-width: 2560px;
-//     max-height: 1300px;
+    max-height: 1300px;
-//     margin-bottom: 5%;
+    margin-bottom: 5%;
-//     margin-top: 30vh;
+    margin-top: 30vh;
-//     display: flex;
+    display: flex;
-//     flex-wrap: wrap;
+    flex-wrap: wrap;
 
-//     .item {
+    .item {
-//       width: 1220px;
+      width: 1220px;
-//       height: 660px;
+      height: 660px;
-//       background: url("../../assets/images/hotforum/border.png") no-repeat;
+      background: url("../../assets/images/hotforum/border.png") no-repeat;
-//       background-size: 100%;
+      background-size: 100%;
-//       padding: 28px;
+      padding: 28px;
-//       padding-top: 62px;
+      padding-top: 62px;
-//       margin-bottom: 59px;
+      margin-bottom: 59px;
 
-//       .img {
+      .img {
-//         width: 100%; // 图片宽度占满item宽度
+        width: 100%; // 图片宽度占满item宽度
-//         height: auto; // 自动调整高度
+        height: auto; // 自动调整高度
-//       }
+      }
-//     }
+    }
-//   }
+  }
-// }
+}
-// }
+}
-// @media (min-height: 1500px) {
+@media (min-height: 1500px) {
-// .hot{
+.hot{
-//   width: 100%;
+  width: 100%;
-//   // max-width: 1920px;
+  // max-width: 1920px;
-//   min-height: 100%;
+  min-height: 100%;
-//   // min-height: 1373px;
+  // min-height: 1373px;
-//   background: url("../../assets/images/hotforum/back.jpg") no-repeat;
+  background: url("../../assets/images/hotforum/back.jpg") no-repeat;
-//   background-size: 100% 100%;
+  background-size: 100% 100%;
-//   display: flex;
+  display: flex;
-//   justify-content: center;
+  justify-content: center;
-//   .center {
+  .center {
-//     max-width: 1068px;
+    max-width: 1068px;
-//     max-height: 580px;
+    max-height: 580px;
-//     margin-bottom: 5%;
+    margin-bottom: 5%;
-//     margin-top: 30vh;
+    margin-top: 30vh;
-//     display: flex;
+    display: flex;
-//     flex-wrap: wrap;
+    flex-wrap: wrap;
 
-//     .item {
+    .item {
-//       width: 500px;
+      width: 500px;
-//       height: 271px;
+      height: 271px;
-//       background: url("../../assets/images/hotforum/border.png") no-repeat;
+      background: url("../../assets/images/hotforum/border.png") no-repeat;
-//       background-size: 100%;
+      background-size: 100%;
-//       padding: 14px;
+      padding: 14px;
-//       padding-top: 26px;
+      padding-top: 26px;
-//       margin-bottom: 30px;
+      margin-bottom: 30px;
 
-//       .img {
+      .img {
-//         width: 100%; // 图片宽度占满item宽度
+        width: 100%; // 图片宽度占满item宽度
-//         height: auto; // 自动调整高度
+        height: auto; // 自动调整高度
-//       }
+      }
-//     }
+    }
-//   }
+  }
-// }
+}
-// }
+}
-// @media (min-width: 1928px) and (max-width: 3000px) {
+@media (min-width: 1928px) and (max-width: 3000px) {
-// .hot{
+.hot{
-//   width: 100%;
+  width: 100%;
-//   // max-width: 1920px;
+  // max-width: 1920px;
-//   min-height: 100%;
+  min-height: 100%;
-//   // min-height: 1373px;
+  // min-height: 1373px;
-//   background: url("../../assets/images/hotforum/back.jpg") no-repeat;
+  background: url("../../assets/images/hotforum/back.jpg") no-repeat;
-//   background-size: 100% 100%;
+  background-size: 100% 100%;
-//   display: flex;
+  display: flex;
-//   justify-content: center;
+  justify-content: center;
-//   .center {
+  .center {
-//     max-width: 1800px;
+    max-width: 1800px;
-//     max-height: 1100px;
+    max-height: 1100px;
-//     margin-bottom: 5%;
+    margin-bottom: 5%;
-//     margin-top: 35vh;
+    margin-top: 35vh;
-//     display: flex;
+    display: flex;
-//     flex-wrap: wrap;
+    flex-wrap: wrap;
 
-//     .item {
+    .item {
-//       width: 860px;
+      width: 860px;
-//       height: 466px;
+      height: 466px;
-//       background: url("../../assets/images/hotforum/border.png") no-repeat;
+      background: url("../../assets/images/hotforum/border.png") no-repeat;
-//       background-size: 100%;
+      background-size: 100%;
-//       padding: 28px;
+      padding: 28px;
-//       padding-top: 48px;
+      padding-top: 48px;
-//       margin-bottom: 70px;
+      margin-bottom: 70px;
 
-//       .img {
+      .img {
-//         width: 100%; // 图片宽度占满item宽度
+        width: 100%; // 图片宽度占满item宽度
-//         height: auto; // 自动调整高度
+        height: auto; // 自动调整高度
-//       }
+      }
-//     }
+    }
-//   }
+  }
-// }
+}
-// }
+}
 </style>

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

src/views/portal/course/Micro.vue

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

@@ -27,7 +27,7 @@ export default {
         const code = response.data.result
         if (code) {
           // 替换为你的目标外部链接，并确保参数名称正确
-          const redirectUrl = `https://lexiangla.com?company_from=d1f3b156e9ed11ef9dc9720f77c5afa9&login_way=sso&sso_auth_code=${encodeURIComponent(code)}`
+          const redirectUrl = `https://lexiangla.com?company_from=d1f3b156e9ed11ef9dc9720f77c5afa9&sso_auth_code=${encodeURIComponent(code)}`
           window.location.href = redirectUrl
         } else {
           this.handleError('未获取到有效code')

src/views/study/PortalIndex.vue

@@ -511,7 +511,7 @@ export default {
             videoTime: intTime
           };
           //console.log('记录播放时间')
-          apiStudy.updateStudyVideoTime(postData).then(rs => {
+          apiStudy.studyVideoTime(postData).then(rs => {
             if (rs.status != 200) {
               console.log('记录播放时间错误');
             }
@@ -551,7 +551,7 @@ export default {
           videoTime: intTime
         };
         //console.log('记录播放时间')
-        apiStudy.updateStudyVideoTime(postData).then(rs => {
+        apiStudy.studyVideoTime(postData).then(rs => {
           if (rs.status != 200) {
             console.log('记录播放时间错误');
           }

src/views/study/coursenew.vue

@@ -467,6 +467,7 @@
       this.stopStudyTime();//先关闭
       this.cleanAppendTime();//
       this.loadData();
+      //console.log(this.$xpage.constants.fileBaseUrl,'this.$xpage.constants.fileBaseUrl');
     },
     computed: {
       ...mapGetters(['userInfo']),
@@ -510,12 +511,14 @@
     },
     methods: {
       handleOpen(key,path){
+        // console.log(key,path,'handleOpen')
         if(this.isFalse){
           this.defaultOpeneds = [key]
         }
         this.isFalse = false
       },
       handleClose(key,path){
+        // console.log(key,path,'handleClose')
       },
       toUserHome(tea){
         this.$router.push({path:this.$xpage.getHomePath(tea.teacherId)})
@@ -588,6 +591,7 @@
         let $this=this;
         if(this.contentData.id==contentId){
            this.onPlayerPause()
+           //this.audioPause();
            this.contentData.lastStudyTime=time;
            setTimeout(() => {
              $this.$refs.myVideoPlayer.startPlay(time);
@@ -615,9 +619,18 @@
             }
         }
         this.playerBoxShow = false;
+        //this.changePlayRes(r);
+        // this.playerBoxShow = false;
+        // this.notePlay = null;
+        // let $this=this;
+        // setTimeout(() => {
+        //   $this.notePlay = time;
+        // }, 500)
       },
       //笔记组件触发,记录当前播放时间
       videoLocation() {
+        //this.$store.dispatch("SetIntTimeNote", this.intTimeNote);
+        //console.log(this.contentData.id+'='+this.intTimeNote,'设置视频播放时间')
         this.$refs.mynote.setVideoTime(this.contentData.id,this.intTimeNote);
       },
       coutab(n) {
@@ -627,7 +640,9 @@
         let nowDate = new Date();
         let ctime = parseInt(nowDate.getTime() / 1000);
         let beforeUrl = parseInt(nowDate.getTime() / 1000) + '/' + fid;
+        //console.log(beforeUrl,'beforeUrl');
         let urlSign = encodeURIComponent(encrypt(beforeUrl));
+        //console.log(urlSign,'urlSign');
         cookies.set('PLAYSIGN_TIME', ctime); //写客户端的cookie保存
         //以下判断是为了区分本地环境和服务器环境
         if (process.env.NODE_ENV == 'development') {
@@ -635,7 +650,9 @@
         } else {
           this.blobUrl = process.env.VUE_APP_BASE_API + '/xboe/m/course/cware/resource?sign=' + urlSign;
         }
+        // console.log('this.contentData.id:',this.contentData.id)
         this.blobId = this.contentData.id
+        //console.log(this.blobUrl,'this.blobUrl');
       },
       widthOpen(url) {
         window.open(url, '_blank');
@@ -668,6 +685,8 @@
             this.curriculumData.url = r.content;
           }
           this.$refs.mynote.showVideoTimeBtn(true);
+          //let url=process.env.VUE_APP_BASE_API+'/xboe/m/course/file/show?cf='+this.curriculumData.url;
+          //let url=this.fileBaseUrl+this.curriculumData.url;
           this.createPlayUrl(r.contentRefId, this.curriculumData.url);
         } else if (r.contentType == 40) {
           // if (r.content != '' && r.content.indexOf('.pdf') == -1) {
@@ -766,6 +785,7 @@
              });
             $this.appendStudyOtherTime();
           }, 15000); //非音视频课程学习,十五秒后记录
+          //this.appendStudyTime();
           this.isContentType = this.contentData.contentType
           if (this.contentData.contentType != 50) {
             this.handleTimeout = setTimeout(function(){
@@ -780,23 +800,28 @@
 
 
         this.$nextTick(function(){
-            if (r.contentType == 10) {
+            if(this.contentData.progressVideo){
-              console.log('视频处理lastStudyTime',this.contentData.lastStudyTime)
-              console.log('视频处理progressVideo',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;
+            ///console.log(h0,h,$this.controlHeight,'$this.controlHeight');
             //解决获取高度不正的问题
             if(h>400 && h<500){
               h=h+40;
             }else if(h>500){
               h=h+60;
             }
+            //$this.controlHeight=h-99;
             $this.controlHeight=h-95;
+            //console.log(h,$this.controlHeight,'$this.controlHeight');
         })
 
 
+        //console.log('this.contentData11:',this.contentData,this.curriculumData)
         // 视频设置禁用处理逻辑,如果用户已全部观看完该视频，则设置为能全部拖动的逻辑，把isDrag设置为true即可,同时删除本地存储的数据
         if(this.contentData.progressVideo ===1){
           var obj = JSON.parse(this.contentData.content)
@@ -1104,16 +1129,38 @@
 
             });
           } else {
+            //console.log('加载课程信息失败:'+res.error);
+            //this.$message.error(res.message);
           }
         });
       },
 
       onPlayerPlay() {
+        //console.log("开始播放");
+        // if(this.contentData.contentType == 10){
+        //   if(this.contentData.status<2){
+        //     this.contentData.status = 2;
+        //   }
+        // }
         this.playerBoxShow = false;
+        // this.onPlayerPlayFullscreen()
+        // this.$watermark.set(this.userInfo.name + this.userInfo.loginName);
         let $this = this;
         //这里有些不准备，如果文件未能加载，这个事件就是错误的
         this.isAppendTime=true;
         this.appendStudyTime();//启动追加学习时长
+        //console.log(this.contentData.status,'this.contentData.status');
+        // if(this.contentData.status<9){
+        //   let completeType=this.curriculumData.completeSetup;
+        //   //console.log(completeType,'completeType');
+        //   if(completeType==0){
+        //     //默认5秒后学习完成.
+        //     $this.handleTimeout= setTimeout(function() {$this.saveStudyInfo();}, 5000); //5秒后记录学习完成
+        //   }else{
+        //     //先记录进行中的学习内容
+        //     this.saveStudyItem();
+        //   }
+        // }
       },
 
       onFullscreen(full) {
@@ -1145,6 +1192,7 @@
         }
       },
       onPlayerPause() {
+        //console.log("暂停");
         this.stopStudyTime();
       },
       onPlayerEnded() {
@@ -1157,6 +1205,8 @@
       onPlayerPlaying(itme) {
         this.isAppendTime = true;//可以追加学习时长
         this.intTimeNote = parseInt(itme);
+        //console.log("当前播放"+itme);
+        //console.log("当前播放11"+itme);
         if (this.contentData.contentType && this.contentData.contentType == 10) {
           let intTime = parseInt(itme);
           //判断是否完成
@@ -1186,13 +1236,7 @@
             this.contentData.lastStudyTime = intTime;
             let postData = {
               itemId: this.contentData.studyItemId,
-              videoTime: intTime,
+              videoTime: intTime
-              id: this.appentId,
-              studyId: this.studyId,
-              courseId: this.contentData.courseId,
-              contentId: this.contentData.id,
-              studyInfo: this.courseInfo.name +"-" +this.contentData.contentName,
-              duration: 10
             };
             //console.log('this.courseInfo:',this.contentData)
             if(!this.curriculumData.isDrag && this.contentData.progressVideo !=1){
@@ -1200,24 +1244,22 @@
               var arr = time&&JSON.parse(time) || {}
               if(arr[this.blobId] && this.contentData.progressVideo<arr[this.blobId]) {
               postData.progressVideo = arr[this.blobId]
-              // postData.contentId = this.contentData.id
+              postData.contentId = this.contentData.id
-              // postData.courseId = this.contentData.courseId
+              postData.courseId = this.contentData.courseId
               }
             }
             //console.log('记录播放时间')
-            apiStudy.updateStudyVideoTime(postData).then(rs => {
+            apiStudy.studyVideoTime(postData).then(rs => {
               if (rs.status != 200) {
                 console.log('记录播放时间错误');
-              }else{
-                studyUtil.clearStudyDuration(); //清除本地存储
               }
             });
           }
         }
       },
       audioPlaying(item, currentTime) {
+        //console.log("当前播放"+item);
         let intTime = parseInt(currentTime);
-        console.log("======音频播放"+intTime);
         this.handleAudioTimeUpdate(intTime)
         //判断是否完成
         let completeType = this.curriculumData.completeSetup;
@@ -1246,13 +1288,7 @@
           this.contentData.lastStudyTime = intTime;
           let postData = {
             itemId: this.contentData.studyItemId,
-            videoTime: intTime,
+            videoTime: intTime
-            id: this.appentId,
-            studyId: this.studyId,
-            courseId: this.contentData.courseId,
-            contentId: this.contentData.id,
-            studyInfo: this.courseInfo.name +"-" +this.contentData.contentName,
-            duration: 10
           };
           //console.log('this.courseInfo:',this.contentData)
           if(!this.curriculumData.isDrag && this.contentData.progressVideo !=1){
@@ -1260,21 +1296,23 @@
             var arr = time&&JSON.parse(time) || {}
             if(arr[this.blobId] && this.contentData.progressVideo<arr[this.blobId]) {
             postData.progressVideo = arr[this.blobId]
-            // postData.contentId = this.contentData.id
+            postData.contentId = this.contentData.id
-            // postData.courseId = this.contentData.courseId
+            postData.courseId = this.contentData.courseId
             }
           }
           //console.log('记录播放时间')
-          apiStudy.updateStudyVideoTime(postData).then(rs => {
+          apiStudy.studyVideoTime(postData).then(rs => {
             if (rs.status != 200) {
               console.log('记录播放时间错误');
-            }else{
-              studyUtil.clearStudyDuration(); //清除本地存储
             }
           });
         }
       },
       audioPlay() {
+        //console.log("开始播放");
+        // if(this.contentData.contentType == 20 && this.contentData.status < 2){
+        //   this.contentData.status = 2;
+        // }
         let $this = this;
         this.isAppendTime=true;
         this.appendStudyTime();//启动追加学习时长
@@ -1386,7 +1424,6 @@
             this.totalContent = rs.result.contents.length;
             //加载学习的数据
             this.loadStudyData(rs.result);
-
           } else {
             this.$message.error(rs.message);
           }
@@ -1399,7 +1436,6 @@
         //对已学习的内容进行比对，重要的字段， 学习内容id，在后缀的
         let playIndex = -1;
         this.contentList.forEach((con, conIdx) => {
-          con.progressVideo = con.progressVideo || 0;
           result.contentStudys.forEach((scon, sconIdx) => {
             if (scon.contentId == con.id) {
               //定位显示的内容
@@ -1411,8 +1447,9 @@
                   playIndex = conIdx;
                 }
               }
+              //console.log(scon.contentId,con.id);
               con.lastStudyTime = scon.lastStudyTime;
-              con.progressVideo = scon.progressVideo || 0;
+              con.progressVideo = scon.progressVideo;
               //以下判断是为了兼容之前的问题，学习状态
               if (scon.status) {
                 con.status = scon.status;
@@ -1420,17 +1457,23 @@
                 con.status = 9;
               }
               con.studyItemId = scon.id; //这个就是学习内容（条目）的id
+              //console.log(scon.id,"scon.id");
+              //console.log(con,"scon.id");
             }
           });
         });
 
         if (this.courseInfo.type == 10) {
+          ///console.log(this.contentList[0],'ccccc11111')
           this.showRes(this.contentList[0]);
         } else {
           //如果没有，就定位第一项内容
           if (playIndex === -1) {
+            // this.showRes(this.contentList[0]);
+            //console.log(this.catalogTree,'ccccc22222')
             this.showRes(this.catalogTree[0].children[0])
           } else {
+             //console.log(this.contentList[0],'ccccc3333')
             this.showRes(this.contentList[playIndex]);
           }
         }
@@ -1545,23 +1588,22 @@
                   console.log(rs.message);
                 }
             });
-          // let postAppendData = {
+          let postAppendData = {
-          //   id: this.appentId,
+            id: this.appentId,
-          //   studyId: this.studyId,
+            studyId: this.studyId,
-          //   courseId: this.courseInfo.id,
+            courseId: this.courseInfo.id,
-          //   contentId: this.contentData.id,
+            contentId: this.contentData.id,
-          //   studyInfo: this.courseInfo.name +"-" +this.contentData.contentName,
+            studyInfo: this.courseInfo.name +"-" +this.contentData.contentName,
-          //   duration: duration,
+            duration: duration
-          //   type: 1
+          };
-          // };
+          apiStudy.appendStudyTime(postAppendData).then(rs => {
-          // apiStudy.updateStudyVideoTime(postAppendData).then(rs => {
+            if (rs.status == 200) {
-          //   if (rs.status == 200) {
+              this.appentId = rs.result;
-          //     this.appentId = rs.result;
+              studyUtil.clearStudyDuration(); //清除本地存储
-          //     studyUtil.clearStudyDuration(); //清除本地存储
+            } else {
-          //   } else {
+              console.log(rs.message);
-          //     console.log(rs.message);
+            }
-          //   }
+          });
-          // });
         }
       },
       //结束追加学习时长
@@ -1598,7 +1640,7 @@
             this.appentInterval = 60
             let totalTime = Math.round((endTime - this.appendStartTime) / 1000);
             this.appendStudyTime();
-            this.saveStudyDuration(totalTime)
+            this.saveStudyDuration(totalTime);
         }, this.appentInterval * 1000);
       },
 
@@ -1682,6 +1724,7 @@
             })
             this.trueFalse = false
           }
+        // }
       },
     },
   }

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;
+            if(this.experience.field == 'total') {
-            this.currentUserRankingTotalData.endValue = this.current.endValue;
-            if(data.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.endValue = this.current.endValue;
-              this.currentUserRankingTotalData.rankValue = res.result.currentUserRankingData.years;
             }
-
           }
           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)=>{
-                this.experience.list = listData.sort((a,b)=>{
+                return b.total-a.total
-                  return b.total-a.total
+              }).slice(0,5);
-                }).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.statType = 10
-        data.field = 'years';
+        data.field = 'total'
-        this.learningDuration.field = 'years';
+        this.learningDuration.field = 'total'
-        this.isStudyTime = true;
+        this.isStudyTime = true
-      }else{
-        data.statType = 10;
-        data.field = 'total';
-        this.learningDuration.field = 'total';
       }
       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)=>{
-                this.learningDuration.list = listData.sort((a,b)=>{
+                return b.total-a.total
-                  return b.total-a.total
+              }).slice(0,5);
-                }).slice(0,5)
-              } else if(data.field == 'years'){
-                this.learningDuration.list = listData.sort((a,b)=>{
-                  return b.years-a.years
-                }).slice(0,5)
-              }
-              ;
             } else {
               this.$message.error(res.message);
             }