考试整理1

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

src/api/boe/courseRecord.js

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

src/api/modules/courseStudy.js

@@ -338,7 +338,7 @@ const myExamList = function(itemId) {
    contentId:''
  }
  */
- const myExamList2 = function(data) {
+const myExamList2 = function(data) {
   return ajax.post('/xboe/school/study/exam/list-study',data);
 }
 
@@ -389,7 +389,10 @@ const followIds=function (data){
 const myStudysFromES=function (data){
   return ajax.post('/xboe/school/study/es/search',data);
 }
-
+//导出作业
+const homeworkExport=function (data){
+  return ajax.get(`/xboe/m/course/portal/export?contentId=${data.contentId}&courseName=${data.courseName}`);
+}
 /**根据id集合查询，传入的是id数组*/
 const findByIds=function (ids){
   return ajax.postJson('/xboe/school/study/es/list-by-ids',ids);
@@ -425,6 +428,7 @@ export default {
   myExamList2,
   myCourseStudy,
   myStudysFromES,
+  homeworkExport,
   findByIds,
   deleteSignUp,
   ids,

src/api/modules/paper.js

@@ -72,6 +72,9 @@ const querypaper = function(data) {
 const getPaperContent = function(id) {
     return ajax.get('/xboe/m/exam/paper/paper-content?id=' + id);
 }
+const newPaperContent = function(id){
+    return ajax.get('/xboe/m/course/content/exam/paper-content?courseExamId='+id);
+}
 export default {
     detail,
     update,
@@ -80,6 +83,7 @@ export default {
     querylist,
     querypaper,
     getPaperContent,
+    newPaperContent,
     batchImportCount,
     batchImportData
 }

src/api/modules/teacher.js

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

src/assets/styles/portal.scss

@@ -110,7 +110,7 @@ body {margin: 0px;padding: 0px;}
       padding-bottom:12px
     }
     .ranking-data{
-      min-height: 196px;
+      min-height: 246px;
       margin: 0px;
       overflow-y: auto;
     }
@@ -130,7 +130,7 @@ body {margin: 0px;padding: 0px;}
     padding-bottom:12px
   }
   .ranking-data{
-    min-height: 196px;
+    min-height: 246px;
     margin: 0px;
     // overflow-y: auto;
   }

src/components/AlertPopup.vue

@@ -1,7 +1,7 @@
 <template>
   <!--弹出窗口设置-->
   <div>
-    <div v-for="pop in popupList" :key="pop.id">wwww
+    <div v-for="pop in popupList" :key="pop.id">
       <el-dialog :close-on-press-escape="false" :close-on-click-modal="false"  class="medalbox"  :visible.sync="pop.show"  :append-to-body="true" >
         <div style="text-align: center;position: relative;">
           <!-- <span style="float: right;" @click="pop.show = false"><i style="font-size: 28px;color: #000000;" class="el-icon-close"></i></span> -->

src/components/Course/auditCourse1.vue

@@ -637,7 +637,9 @@ export default {
           }
           this.teacherList = rs.result.teachers;
           this.teacherName = rs.result.teachers;
-          this.teacher = rs.result.teachers.map(res => res.teacherName);
+          this.teacher = rs.result.teachers.map(item => {
+            return `${item.teacherName}(${item.userNo})`
+          });
           this.totalContent = rs.result.contents.length; //计算总内容数
           if (this.courseInfo.tags != "") {
             this.showTags = this.courseInfo.tags.split(",");

src/components/Course/auditCourse2.vue

@@ -681,7 +681,9 @@ export default {
           }
           this.teacherList = rs.result.teachers;
           this.teacherName = rs.result.teachers;
-          this.teacher = rs.result.teachers.map(item => item.teacherName);
+          this.teacher = rs.result.teachers.map(item => {
+            return `${item.teacherName}(${item.userNo})`
+          });
           this.showTags = this.courseInfo.tags.split(",");
           if (rs.result.course.resOwner3 == "") {
             this.resOwnerArray = [

src/components/Course/choice.vue

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

src/components/Course/courseExam.vue

@@ -85,6 +85,28 @@
             <el-form-item label="考试说明">
                <el-input type="textarea" show-word-limit v-model="examInfo.info" placeholder="关于考试的说明(限255字以内)" maxlength="255"></el-input>
             </el-form-item>
+            <el-form-item  label="随机模式">
+              <el-col :span="4">
+                <el-radio-group v-model="examInfo.randomMode">
+                  <el-radio :label="true">是</el-radio>
+                  <el-radio :label="false">否</el-radio>
+                </el-radio-group>
+              </el-col>
+              <el-col :span="20" v-if="examInfo.randomMode&&examInfo.paperType==1">
+                <el-form-item label="数量">
+                    <el-input-number v-model="examInfo.qnum" :min="1" :max="examPaper.items.length" label="数量"></el-input-number>
+                    <span style="margin-left:10px;" v-if="examPaper.items.length==0">先添加试题</span>
+                    <span style="margin-left:10px;" v-if="examPaper.items.length>0">试卷有 {{examPaper.items.length}} 道试题</span>
+                </el-form-item>
+              </el-col>
+              <el-col :span="20" v-if="examInfo.randomMode&&examInfo.paperType==2">
+                <el-form-item label="数量">
+                    <el-input-number v-model="examInfo.qnum" :min="1" :max="usePaper.counts" label="数量"></el-input-number>
+                    <span style="margin-left:10px;" v-if="usePaper.counts==0">先选择试卷</span>
+                    <span style="margin-left:10px;" v-if="usePaper.counts>0">试卷有 {{usePaper.counts}} 道试题</span>
+                </el-form-item>
+              </el-col>
+            </el-form-item>
           </el-form>
           </div>
           <div v-if="examInfo.paperType==1">
@@ -285,7 +307,9 @@
              return;
            }
         }
-
+        if(!this.examInfo.randomMode){
+          this.examInfo.qnum = 0
+        }
         this.$emit("save",this.examInfo);
       },
       deleteExam(){ //删除
@@ -294,6 +318,8 @@
           cancelButtonText: '取消',
           type: 'warning'
         }).then(() => {
+          this.examInfo.randomMode = false;
+          this.examInfo.qnum = 0;
           this.$emit("remove",this.examInfo);
         }).catch(() => {
 

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/exam.vue

@@ -326,27 +326,25 @@ export default {
         return qitems;
     },
     startTest(){
+      apiExamPaper.newPaperContent(this.info.id).then(res=>{
+        if(!res.error&&res.result != ''){
           if(this.info.paperType==2){
-        apiExamPaper.getPaperContent(this.info.paperId).then(rs=>{
+            //TODO1
-          if(rs.status=200){
+            console.log("调用开始考试 if paperType == 2")
-             this.examPaper.json=JSON.parse(rs.result);
+            this.examPaper.json=res.result;
-             //console.log(this.examPaper.json,'this.examPaper.json');
             let qitems=this.convertToItems(this.examPaper.json);
             this.paper ={items:qitems};
             this.total=qitems.length;
             this.curItem=qitems[this.curIndex];
             this.startTime=new Date();//记录开始时间
             this.timerValue=this.info.testDuration;
+            this.content.status=1;
             this.timer=setInterval(this.changeTimer,60000);
             this.testStart=true;
           }else{
-            this.$message.error('加载试卷内容失败，请与管理员联系，试卷是否已删除');
+            console.log("调用开始考试 else paperType != 2")
-          }
+            let paper= {items:res.result};
-        })
-      }else{
-        let paper= JSON.parse(this.info.paperContent);
             paper.items.forEach(item=>{
-          //console.log(item);
               if(item.type==101){
                 item.userAnswer='';
               }else if(item.type==102){
@@ -360,7 +358,6 @@ export default {
             });
             this.total=paper.items.length;
             this.paper =paper;
-        //console.log(this.paper);
 
             this.curItem=paper.items[this.curIndex];
             this.startTime=new Date();//记录开始时间
@@ -368,6 +365,52 @@ export default {
             this.timer=setInterval(this.changeTimer,60000);
             this.testStart=true;
           }
+        }else{
+          this.$message.error('加载试卷内容失败，请与管理员联系，试卷是否已删除');
+        }
+      })
+      // if(this.info.paperType==2){
+      //   apiExamPaper.getPaperContent(this.info.paperId).then(rs=>{
+      //     if(rs.status=200){
+      //        this.examPaper.json=JSON.parse(rs.result);
+      //        //console.log(this.examPaper.json,'this.examPaper.json');
+      //        let qitems=this.convertToItems(this.examPaper.json);
+      //       this.paper ={items:qitems};
+      //       this.total=qitems.length;
+      //       this.curItem=qitems[this.curIndex];
+      //       this.startTime=new Date();//记录开始时间
+      //       this.timerValue=this.info.testDuration;
+      //       this.timer=setInterval(this.changeTimer,60000);
+      //       this.testStart=true;
+      //     }else{
+      //       this.$message.error('加载试卷内容失败，请与管理员联系，试卷是否已删除');
+      //     }
+      //   })
+      // }else{
+      //   let paper= JSON.parse(this.info.paperContent);
+      //   paper.items.forEach(item=>{
+      //     //console.log(item);
+      //     if(item.type==101){
+      //       item.userAnswer='';
+      //     }else if(item.type==102){
+      //       item.userAnswer=[];
+      //     }else{
+      //       item.userAnswer=''
+      //     }
+      //     item.options.forEach(opt=>{
+      //       opt.checked=false;
+      //     })
+      //   });
+      //   this.total=paper.items.length;
+      //   this.paper =paper;
+      //   //console.log(this.paper);
+
+      //   this.curItem=paper.items[this.curIndex];
+      //   this.startTime=new Date();//记录开始时间
+      //   this.timerValue=this.info.testDuration;
+      //   this.timer=setInterval(this.changeTimer,60000);
+      //   this.testStart=true;
+      // }
     },
     chooseOption(opt){
     	if(this.curItem.type==101 || this.curItem.type==103){
@@ -532,7 +575,7 @@ export default {
         randomMode:this.info.randomMode,
         score:testScore,
         paperJson:JSON.stringify(this.paper),//原来是对象，这里要也要对象
-        //startTime:formatDate(this.startTime),//此时间需要格式化,格式化时间可以放在util中
+        startTime:formatDate(this.startTime),//此时间需要格式化,格式化时间可以放在util中
         //endTime:formatDate(now),
       }
       //计划考试的时长
@@ -543,8 +586,15 @@ export default {
       apiStudy.saveExam(postData).then(res=>{
         this.thisTrue = true
          if(res.status == 200) {
+            console.log("获取数据结果 考试 res ==>",res)
             this.records.push(res.result);
+            //TODO 评分更改 最终完成
+            if(res.result.score > res.result.passLine){
               this.content.status=9;//表已学习完，判断上级的章是否已完成
+            }else{
+              this.content.status=1;
+            }
+
             this.studyItemId=res.result.studyItemId;//第一次保存时是没有的，所以这里要赋值
             this.$alert('您本次考试得分：'+this.lastScore, '考试成绩', {
                   confirmButtonText: '确定',

src/components/Course/homework.vue

@@ -210,7 +210,7 @@ export default {
 </script>
 
 <style scoped lang="scss">
-.homework-div {
+  .homework-div {
     border: 1px solid #dadada;
     min-height: 500px;
     padding: 20px;
@@ -232,5 +232,5 @@ export default {
       }
     }
 
-}
+  }
 </style>

src/components/Course/weikeContent.vue

@@ -401,6 +401,28 @@
               <el-form-item label="考试说明">
                  <el-input type="textarea" show-word-limit v-model="exam.info.info" placeholder="关于考试的说明(限255字以内)" maxlength="255"></el-input>
               </el-form-item>
+              <el-form-item  label="随机模式">
+                <el-col :span="4">
+                  <el-radio-group v-model="exam.info.randomMode">
+                    <el-radio :label="true">是</el-radio>
+                    <el-radio :label="false">否</el-radio>
+                  </el-radio-group>
+                </el-col>
+                <el-col :span="20" v-if="exam.info.randomMode&&exam.info.paperType==1">
+                  <el-form-item label="数量">
+                     <el-input-number v-model="exam.info.qnum" :min="1" :max="exam.paperJson.items.length" label="数量"></el-input-number>
+                     <span style="margin-left:10px;" v-if="exam.paperJson.items.length==0">先添加试题</span>
+                     <span style="margin-left:10px;" v-if="exam.paperJson.items.length>0">试卷有 {{exam.paperJson.items.length}} 道试题</span>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="20" v-if="exam.info.randomMode&&exam.info.paperType==2">
+                  <el-form-item label="数量">
+                     <el-input-number v-model="exam.info.qnum" :min="1" :max="usePaper.counts" label="数量"></el-input-number>
+                     <span style="margin-left:10px;" v-if="usePaper.counts==0">先选择试卷</span>
+                     <span style="margin-left:10px;" v-if="usePaper.counts>0">试卷有 {{usePaper.counts}} 道试题</span>
+                  </el-form-item>
+                </el-col>
+              </el-form-item>
             </el-form>
             </div>
             <div v-if="exam.info.paperType==1">
@@ -1059,12 +1081,14 @@
           if(this.exam.info.paperType==2){
             if(!this.exam.info.paperId){
                this.$message.error("您还未选择任何试卷");
+               this.loading=false;
                return;
             }
           }else{
             //检查是不是所有的试题都有了答案
             if(this.exam.paperJson.items.length==0){
               this.$message.error("您还没有添加考试的试题");
+              this.loading=false;
               return;
             }
             let pass=true;
@@ -1087,6 +1111,9 @@
             }
             this.exam.info.paperContent=JSON.stringify(this.exam.paperJson);
           }
+          if(!this.exam.info.randomMode){
+            this.exam.info.qnum = 0
+          }
           postData.exam=this.exam.info;
           postData.content.contentName='考试';
           this.examChange = deepClone(this.exam);
@@ -1152,6 +1179,8 @@
             postData.id=this.exam.content.id;
             postData.ctype=this.exam.content.contentType;
             curContent=this.exam.content;
+            this.exam.info.randomMode = false;
+            this.exam.info.qnum = 0
           }else if(index==4){
             postData.id=this.assess.content.id;
             postData.ctype=this.assess.content.contentType;

src/components/FileUpload/index.vue

@@ -217,13 +217,16 @@ export default {
         if(delIdx>-1){
           fileList.splice(delIdx,1);
         }
+        this.$emit("success", res);
       } else {
         this.isLoading = false;
-        //this.fileList = [];
+        if(this.limit == 1){
+          this.fileList = [];
+        }
         this.$message({message:"上传失败",type:'error',offset:100});
       }
 
-      this.$emit("success", res);
+      // this.$emit("success", res);
     },
     // 删除文件
     handleDelete(index) {

src/components/PortalHeader.vue

@@ -210,7 +210,7 @@ export default {
     this.sex = this.userInfo.sex;
     this.$store.dispatch('refrashMsg');
     this.loadBoeData();
-    console.log('this.userInfo::',this.userInfo)
+    // console.log('this.userInfo::',this.userInfo)
     //this.loadPopupConfig();
   },
   methods: {

src/components/Study/manager.vue

@@ -13,7 +13,7 @@
     </div>
     <!-- <div style="color: red;">下面的表格标题及内容需要调整完善</div> -->
     <div>
-      <el-tabs v-model="tabName" @tab-click="handleTabClick">
+      <el-tabs style="width: 100%;" v-model="tabName" @tab-click="handleTabClick">
         <el-tab-pane label="报名管理" name="second">
           <!-- <div>已报名{{study.list.length}}人，共有0人报名未成功，共有{{study.list.length}}人通过审核</div> -->
           <el-row style="margin: 20px 0;" :gutter="20">
@@ -192,7 +192,7 @@
               </el-table-column>-->
               <el-table-column label="学习人员" width="110">
                 <template slot-scope="scope">
-                  <el-button size="mini" type="info" @click="getCatalogue(scope.row,scope.row.contentName)" >学习人员</el-button>
+                  <el-button size="mini" type="info" @click="getCatalogue(scope.row,scope.row.contentType)" >学习人员</el-button>
                 </template>
               </el-table-column>
             </el-table>
@@ -292,6 +292,7 @@
         <el-form-item>
           <el-button type="primary" @click="studyContentRecordsSearch">搜索</el-button>
         </el-form-item>
+        <el-button v-if="isHomeWork" :disabled="isTrue" style="padding:10px 15px;margin-bottom: 10px;" type="primary" @click="downLoad">导出全部作业</el-button>
       </el-form>
       <el-table max-height="500" border :data="learningSituation.list" style="width: 100%">
         <el-table-column prop="aname" label="姓名" width="180"></el-table-column>
@@ -335,6 +336,8 @@ import apiCoursePortal from "@/api/modules/coursePortal.js";
 import { mapGetters,mapActions } from 'vuex';
 import apiUser from '@/api/system/user.js';
 import apiStudy from '@/api/modules/courseStudy.js';
+import { getToken } from '@/utils/token'
+import axios from 'axios'
 export default {
   components: {auditCourse1,auditCourse2},
   computed: {
@@ -352,7 +355,10 @@ export default {
   },
   data() {
     return {
+      downParams: {},
       typePress: false,
+      isHomeWork: false,
+      isTrue: false,
       catalogRecordTree:[],
       catalogRecordList:[],
       resOwnerListMap:[],
@@ -377,8 +383,8 @@ export default {
         count: 0,
         type: "",
         list: [],
-        name: '',
         status: '',
+        name: '',
       },
       learningRecords: {
         pageIndex: 1, //第几页
@@ -515,6 +521,7 @@ export default {
         pageIndex: this.learningSituation.pageIndex,
         pageSize: this.learningSituation.pageSize
       };
+      this.downParams = params;
       apicourseStudy.studyContentRecords(params).then(res => {
         if (res.status === 200) {
           this.learningSituation.list = res.result.list;
@@ -524,6 +531,77 @@ export default {
         }
       });
     },
+    downLoad(){
+      if(this.learningSituation.list.length == 0){
+        this.$message.warning('暂无数据');
+        return
+      }
+      this.isTrue = true;
+      let params = {
+        courseName:this.manageStudyData.name,
+        courseId: this.manageStudyData.id,
+        status: this.downParams.status || '',
+        name: this.downParams.name || '',
+        contentId: this.contentId,
+      }
+      // window.open(`/systemapi/xboe/m/course/portal/export?contentId=${params.contentId}&courseName=${params.courseName}&courseId=${params.courseId}&status=${params.status}&name=${params.name}`)
+      const url = `/systemapi/xboe/m/course/portal/export?contentId=${params.contentId}&courseName=${params.courseName}&courseId=${params.courseId}&status=${params.status}&name=${params.name}`
+      axios({
+          method: 'get',
+          url: url,
+          // responseType: 'blob',
+          headers: { 'X-Access-Token': getToken() }
+        }).then((res) => {
+          this.isTrue = false;
+          if(res.data.status == 200){
+            if(res.data.result.includes('upload')){
+              window.open('/upload'+res.data.result.split('upload')[1])
+            }else{
+              this.$message.warning(res.data.result)
+            }
+          }
+        }).catch(err=>{
+          this.isTrue = false;
+          this.$message.error(err.response.data.message)
+        })
+      // axios({
+      //     method: 'get',
+      //     url: url,
+      //     responseType: 'blob',
+      //     headers: { 'X-Access-Token': getToken() }
+      //   }).then((response) => {
+      //       if (response.status === 200) {
+      //         this.isTrue = false;
+      //         if (!(response.headers['content-type']).startsWith('application/json')) {
+      //           this.resolveBlob(response, 'application/zip', `${params.courseName}【作业】`);
+      //         } else {
+      //           console.log(response,'response')
+      //           const reader = new FileReader();
+      //           reader.onload = (e) => {
+      //             const errorData = JSON.parse(e.target.result)
+      //             this.$message.error(errorData.result)
+      //           };
+      //           reader.readAsText(response.data);
+      //         }
+      //       }
+      //     }).catch((error) => {
+      //       this.isTrue = false;
+      //       // 错误处理
+      //       console.log(error);
+      //       this.$message.error(error.data ? error.data.message : error.toString());
+      //     });
+    },
+    resolveBlob(res, mimeType,filename) {
+      const link = document.createElement('a');// 创建a标签
+      let blob = new Blob([res.data], { type: mimeType }); // 设置文件类型
+      link.style.display = "none";
+      link.href = URL.createObjectURL(blob); // 创建URL
+      link.setAttribute("download", `${filename}`);
+      document.body.appendChild(link);
+      link.click();
+      URL.revokeObjectURL(link.href);
+      document.body.removeChild(link);
+    },
     handleSizeChangeSituation(val) {
       this.learningSituation.pageSize = val;
       this.learningSituation.pageIndex = 1;
@@ -722,11 +800,16 @@ export default {
       this.getSignupList();
     },
     getCatalogue(row,type) {
-      if(type=='考试'){
+      if(type==61){
         this.typePress = true
       }else{
         this.typePress = true
       }
+      if(type == 60){
+        this.isHomeWork = true
+      }else{
+        this.isHomeWork = false
+      }
       this.contentId = row.id;
       this.study.catalogueShow = true;
       this.learningSituation.pageIndex = 1;//重置为第一页
@@ -780,4 +863,19 @@ export default {
   height: 400px;
   overflow: auto;
 }
+
+.el-tabs__nav-wrap::after {
+  display: none; /* 隐藏滚动条轨道 */
+}
+
+.el-tabs__nav-scroll {
+  overflow: hidden; /* 隐藏滚动条滑块 */
+}
+
+/* 隐藏垂直滚动条 */
+.el-table .el-table__body-wrapper::-webkit-scrollbar {
+  display: none; /* Chrome, Safari, Opera*/
+}
+
+
 </style>

src/components/VideoPlayer/index.vue

@@ -18,7 +18,6 @@
       @keydown.right.prevent="forwardCurrentTime"
       @keydown.up.prevent="increaseVolume"
       @keydown.down.prevent="lowerVolume"
-      @keydown.esc.prevent="toggleFullScreen"
       tabindex="0"
       width="100%"
       height="100%"
@@ -40,12 +39,12 @@
             :isPlaying="isPlaying"
             :biBarrageXml="biBarrageXml"
     />
-    <!-- 加载动画 -->
+    <!-- 加载动画(应该当前视频没有缓存时显示加载动画)   && isCrowd && isShowPlayer -->
-    <div v-show="isShowLoading  && isCrowd && isShowPlayer" class="player-loading" @click="videoDom.focus({preventScroll: true})">
+    <div v-show="isShowLoading" class="player-loading" @click="videoDom.focus({preventScroll: true})">
       <img src="@/components/VideoPlayer/images/loading.svg"  alt="loading"/>
     </div>
     <!-- 控制栏 -->
-    <div v-show="!isShowLoading && isCrowd" class="player-controls-container" @click="videoDom.focus({preventScroll: true})">
+    <div v-show="isCrowd" class="player-controls-container" @click="videoDom.focus({preventScroll: true})">
       <div v-show="isShowVolumeHint" class="player-volumeHint">
         <span class="player-volumeHint-text">当前音量:{{volumePercent}}%</span>
       </div>
@@ -71,6 +70,7 @@
       <div :class="{'player-controls': true, 'cursor-lasting-static': isCursorStatic}">
         <div class="player-progress-bar">
           <progressBar
+            :blobId="blobId"
             :currentProgress="currentProgress"
             v-on:updateProgress="updateProgressByClickBar"
             v-on:getMouseDownStatus="getMouseDownStatusOfProgressBar"
@@ -241,6 +241,11 @@ export default {
       type: String,
       default: null,
     },
+    // 视频链接对应的content Id
+    blobId: {
+      type: String,
+      default: null,
+    },
     // 主题色
     primaryColor: {
       type: String,
@@ -312,6 +317,17 @@ export default {
     }
 
     setInterval(() => {
+          //console.log('this.currentProgress::',this.currentProgress,this.isDrag,this.videoDom.currentTime , this.videoDom.duration)
+          // 视频播放时本地记录视频实时播放时长,视频设置了禁止拖动时执行
+          if(!this.isDrag){
+            var time = localStorage.getItem('videoProgressData')
+            var arr = time&&JSON.parse(time) || {}
+            if(arr[this.blobId] < this.currentProgress || !arr[this.blobId]){
+              arr[this.blobId] = parseFloat((this.currentProgress).toFixed(8))
+              if(arr[this.blobId]) localStorage.setItem('videoProgressData',JSON.stringify(arr))
+            }
+          }
+
       // 定时更新进度条
       if (this.isPlaying && !this.isMousedownProgress) {
         this.currentProgress =
@@ -356,20 +372,50 @@ export default {
       this.isCursorStatic = false;
       this.timeoutControlsHint = 2000;
     });
+    this.videoDom.addEventListener('loadstart', function(){
+      console.log('\x1b[34m%s\x1b[0m','*****************视频加载中**************')
+    })
+
+    this.videoDom.addEventListener('loadeddata', function(){
+      console.log('\x1b[32m%s\x1b[0m','*****************加载完毕*************')
+    })
+
+    this.videoDom.addEventListener('error', function(){
+      console.log('\x1b[31m%s\x1b[0m','*****************加载失败**********')
+    })
     // 监听全屏事件的变化，保存数据
-    window.addEventListener("fullscreenchange", () => {
+    window.addEventListener("F", () => {
       this.isFullscreen = this.isFullScreen();
     });
+    document.addEventListener('fullscreenchange',this.handleFullscreenChange);
+    document.addEventListener('webkitfullscreenchange',this.handleFullscreenChange );
+    // this.videoDom.addEventListener('keydown', function(e){
+    //   //console.log('\x1b[31m%s\x1b[0m','*****************加载失败**********')
+    //   console.log("video is exit");
+    //   if(e.key === "Escape"){
+    //     console.log("按键 退出全屏 执行")
+    //   }
+    // })
+
+    // this.videoDom.addEventListener("keydown", (e) => {
+    //   console.log("是否监听到");
+    //   if(e.keyCode == 27){
+    //     console.log("是否监听到 esc");
+    //     this.toggleFullScreen();
+    //   }
+    // });
   },
   methods: {
     //当视频由于需要缓冲下一帧而停止，解决一直计时的问题
     onWaiting(){
       console.log('触发了onWairing');
+      this.isShowLoading = true
       this.$emit('onPlayerPause', {})
     },
     //当音频/视频在已因缓冲而暂停或停止后已就绪时
     onPlaying(){
       console.log('触发缓存结束onPlaying');
+      this.isShowLoading = false
       if(this.videoDom.paused){
         this.$emit('onPlayerPause', {})
       }else{
@@ -510,6 +556,7 @@ export default {
     /* 切换“全屏”和“非全屏”模式
      */
     toggleFullScreen() {
+      console.log("toggleFullScreen 执行 ",this.isFullScreen())
       let element = this.$refs.area;
       if (!this.isFullScreen()) {
         if (element.requestFullscreen) {
@@ -566,6 +613,24 @@ export default {
       const currentTime = this.$refs.video.currentTime;
       this.$emit('onTimeUpdate', currentTime);
     },
+    /**
+     * 监听全屏变化
+     */
+    handleFullscreenChange() {
+      console.log("handleFullscreenChange gx this.isFullScreen()",this.isFullScreen())
+      console.log("handleFullscreenChange gx this.isFullscreen",this.isFullscreen)
+    
+      if(this.isFullscreen){
+        this.isFullscreen = !!document.fullscreenElement;
+        if (!this.isFullscreen) {
+          // 退出全屏后的逻辑（如暂停视频、更新 UI 等）
+          console.log('ESC 已退出全屏 handleFullscreenChange',this.isFullscreen);
+          this.$emit('onFullscreen',false);//全屏
+        }
+      }
+
+     
+    }
   },
   watch: {
     currentVolume: function () {

src/components/VideoPlayer/progress-bar.vue

@@ -38,6 +38,9 @@ export default {
     isDrag:{
       type: Boolean,
       default: true,
+    },
+    blobId:{
+      type: String,
     }
   },
   data() {
@@ -57,10 +60,12 @@ export default {
     window.addEventListener("mousemove", (e) => {
       if (this.is_mousedown_progress) {
         this.move(e);
+        e.preventDefault();
       }
     });
     window.addEventListener("mouseup", (e) => {
       this.up(e);
+      e.preventDefault();
     });
   },
   beforeDestroy() {
@@ -68,7 +73,7 @@ export default {
   },
   methods: {
     down(e) {
-      if(this.isDrag) {
+      // if(this.isDrag) {
         this.$emit("getMouseDownStatus", true);
         this.is_mousedown_progress = true;
         // 获取完整进度条的clientX（dom左上角）
@@ -76,30 +81,50 @@ export default {
         // 计算调整后的当前进度条的长度
         this.current_width_px = e.clientX - init_clientX;
         // 设置当前的播放进度（同时作用于当前进度条的样式）
-        let current =
+        let current = (e.clientX - init_clientX) / this.dom_full.clientWidth;
-            (e.clientX - init_clientX) / this.dom_full.clientWidth;
+        if(current>1) current = 1;
+        if(current<0) current = 0;
+        var time = localStorage.getItem('videoProgressData');
+        var arr = time&&JSON.parse(time) || {}
+        //console.log('down arr:',this.isDrag,this.blobId,arr,arr[this.blobId],current)
+        // 禁止拖动
+        if(!this.isDrag && time && arr[this.blobId] < current) return;
+
         this.$emit("updateProgress", current);
-      }
+      // }
 
     },
     move(e) {
-      if (this.is_mousedown_progress && this.isDrag) {
+      if (this.is_mousedown_progress) {
         let init_clientX = this.dom_full.getBoundingClientRect().left;
         this.current_width_px = e.clientX - init_clientX;
-        let current =
+        let current = (e.clientX - init_clientX) / this.dom_full.clientWidth;
-          (e.clientX - init_clientX) / this.dom_full.clientWidth;
+        if(current>1) current = 1;
+        if(current<0) current = 0;
+        var time = localStorage.getItem('videoProgressData');
+        var arr = time&&JSON.parse(time) || {}
+        //console.log('move arr:',this.isDrag,this.blobId,arr,arr[this.blobId],current)
+        // 禁止拖动
+        if(!this.isDrag && time && arr[this.blobId] < current) return;
         this.$emit("updateProgress", current);
       }
     },
     up() {
-      if (this.is_mousedown_progress && this.isDrag) {
+      if (this.is_mousedown_progress) {
         // 标记鼠标不处于按下的状态了
         this.is_mousedown_progress = false;
         // 松开鼠标后，即调整进度条后，此时的进度（0-1）
-        let current =
+        let current = this.current_width_px / this.dom_full.clientWidth;
-          this.current_width_px / this.dom_full.clientWidth;
+        if(current>1) current = 1;
-        this.$emit("updateProgress", current);
+        if(current<0) current = 0;
+        var time = localStorage.getItem('videoProgressData');
+        var arr = time&&JSON.parse(time) || {}
+        //console.log('up arr:',this.isDrag,this.blobId,arr,arr[this.blobId],current)
         this.$emit("getMouseDownStatus", false);
+        // 禁止拖动
+        if(!this.isDrag && time && arr[this.blobId] < current) return;
+        this.$emit("updateProgress", current);
+
       }
     },
   },

src/utils/tools.js

@@ -423,6 +423,7 @@ export function translate(field) {
   let name = '';
   switch (field) {
       case 'total':name = '累计'; break;
+      case 'now':name = '当前'; break;
       case 'weeks':name = '本周'; break;
       case 'months':name = '本月'; break;
       case 'years':name = '本年'; break;

src/views/case/ManageList.vue

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

src/views/course/ManageList.vue

@@ -195,7 +195,15 @@
       </template>
     </el-dialog>
     <!--课程管理-->
-    <el-dialog custom-class="g-dialog" title="课程学习管理" width="900px" :visible.sync="manageStudy.dlgShow" :close-on-click-modal="false">
+    <el-dialog 
+        custom-class="g-dialog" 
+        title="课程学习管理" 
+        width="900px"
+        height="900px" 
+        :visible.sync="manageStudy.dlgShow" 
+        :close-on-click-modal="false"
+        
+        >
       <manager :manageStudyData="manageStudyData" :isShowDialog="manageStudy.dlgShow"></manager>
       <template #footer>
         <el-button @click="manageStudy.dlgShow = false">关闭</el-button>
@@ -939,4 +947,8 @@ export default {
     }
   }
 }
+
+.el-dialog__body {
+  overflow: hidden;
+}
 </style>

src/views/course/Mylecnotes.vue

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

src/views/exam/Test.vue

@@ -16,7 +16,7 @@
                 <li v-if="testPaper.deadlineTime">结束时间:  {{ testPaper.deadlineTime }}</li>
               </ul>
             </div>
-            <div v-if="testPaper.testFront" style="padding: 20px;text-align: center;" v-html="testPaper.testFront">
+            <div v-if="testPaper.testFront && testPaper.testFront != 'null'" style="padding: 20px;text-align: center;" v-html="testPaper.testFront">
               <!--考前说明-->
             </div>
             <div v-if="canExam" class="test-time" style="margin-top:20px" >

src/views/hotforum/Index.vue

@@ -21,7 +21,7 @@
         imgData:[
           {img:'01',url:'1265897142383042560'},
           {img:'02',url:'1265697724606210048'},
-          {img:'03',url:''},
+          {img:'003',url:'1280185851054231552'},
           {img:'04',url:'1321778585966247936'},
         ],
       }

src/views/portal/case/Detail.vue

@@ -391,7 +391,7 @@ export default {
         timedOut = true;
         xmlhttp.abort();
       }, 5000);
-      xmlhttp.open("HEAD", window.location.protocol + "//uapi.boe.com.cn", true);
+      xmlhttp.open("HEAD", window.location.protocol + "//uapi.boe.com.cn/500.html", true);
       xmlhttp.send();
       xmlhttp.onreadystatechange = function () {
         if (xmlhttp.readyState == 4) {

src/views/portal/case/Index.vue

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

src/views/portal/course/rePreview.vue

@@ -370,7 +370,15 @@ export default {
             }
           });
         }
-
+        if(r.content==''){
+          apiCourseFile.detail(r.contentRefId).then(cfrs=>{
+            if(cfrs.status==200){
+              r.content=cfrs.result.previewFilePath;
+            }else{
+              $this.$message.error('加载pdf课件文件失败');
+            }
+          });
+        }
       }
       this.contentData = r;
     },

src/views/study/Courses.vue

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

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/study/coursenew.vue

@@ -27,7 +27,7 @@
               <course-image v-if="courseInfo.id != ''" :course="courseInfo"></course-image>
             </div>
             <div v-if="resType == 10" style="position: relative;">
-              <videoPlayer ref="myVideoPlayer" id="myVideoPlayer" @progress="progress" :src="blobUrl" @onPlayerPlaying="onPlayerPlaying"
+              <videoPlayer ref="myVideoPlayer" id="myVideoPlayer" @progress="progress" :src="blobUrl" :blobId="blobId" @onPlayerPlaying="onPlayerPlaying"
                 :initTime="contentData.lastStudyTime" :notePlay="notePlay" @onPlayerPlay="onPlayerPlay"
                 :isDrag="curriculumData.isDrag" @onFullscreen="onFullscreen" @onPlayerPause="onPlayerPause"
                 @onPlayerEnded="onPlayerEnded" :isCrowd="isCrowd" @onTimeUpdate="handleAudioTimeUpdate"></videoPlayer>
@@ -167,7 +167,6 @@
             </div>
             <!-- 课程单元  -->
             <div class="course-units" v-if="tab == 1">
-
               <div :style="`height: ${controlHeight}px;overflow-y: auto;`">
                 <div class="catalog" v-if="courseInfo.type == 20">
                   <div  v-for="(item, index) in catalogTree" :key="index" :name="index">
@@ -501,7 +500,7 @@
           }
           treeList.push(treeNode);
         });
-        console.log(treeList,'treeList')
+        // console.log(treeList,'treeList')
         return treeList;
       }
     },
@@ -652,6 +651,8 @@
         } 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) {
@@ -814,6 +815,28 @@
             $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)
+          obj.isDrag = true
+          this.contentData.content = JSON.stringify(obj)
+          this.curriculumData.isDrag = true
+          var time = localStorage.getItem('videoProgressData')
+          var arr = time&&JSON.parse(time) || {}
+          //alert(con.progressVideo+'--'+con.id + '--'+JSON.stringify(arr))
+          delete arr[this.contentData.id];
+          localStorage.setItem('videoProgressData',JSON.stringify(arr))
+        }
+        if(this.contentData.progressVideo>0 && this.contentData.progressVideo !==1){
+          var time = localStorage.getItem('videoProgressData')
+          var arr = time&&JSON.parse(time) || {}
+          arr[this.contentData.id] = this.contentData.progressVideo
+          localStorage.setItem('videoProgressData',JSON.stringify(arr))
+        }
+
       },
       isShowTime(){
         if(this.isContentTypeTwo != this.contentData.contentType){
@@ -1116,6 +1139,8 @@
         //   }
         // }
         this.playerBoxShow = false;
+        // this.onPlayerPlayFullscreen()
+        // this.$watermark.set(this.userInfo.name + this.userInfo.loginName);
         let $this = this;
         //这里有些不准备，如果文件未能加载，这个事件就是错误的
         this.isAppendTime=true;
@@ -1133,6 +1158,7 @@
         //   }
         // }
       },
+      
       onFullscreen(full) {
         let divId = 'videowatermark';
         var div = document.getElementById('myVideoPlayer')
@@ -1152,8 +1178,11 @@
             "position:absolute;pointer-events: none; width: 100%;height: 100%;top:0;left:0;bottom: 0;right: 0; display: flex;justify-content: center;flex-wrap: wrap;overflow: hidden; opacity:0.3;padding-top:10px";
           div.appendChild(div3);
         } else {
+          console.log("去除水印 ---- gx ----");
           var markDiv = div.querySelector("#" + divId);
+          console.log("去除水印 ---- gx markDiv ----",markDiv);
           if (markDiv) {
+              console.log("执行去除水印 ---- gx markDiv ----",markDiv);
       	      div.removeChild(markDiv);
           }
         }
@@ -1205,6 +1234,16 @@
               itemId: this.contentData.studyItemId,
               videoTime: intTime
             };
+            //console.log('this.courseInfo:',this.contentData)
+            if(!this.curriculumData.isDrag && this.contentData.progressVideo !=1){
+              var time = localStorage.getItem('videoProgressData')
+              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.courseId = this.contentData.courseId
+              }
+            }
             //console.log('记录播放时间')
             apiStudy.studyVideoTime(postData).then(rs => {
               if (rs.status != 200) {
@@ -1247,6 +1286,16 @@
             itemId: this.contentData.studyItemId,
             videoTime: intTime
           };
+          //console.log('this.courseInfo:',this.contentData)
+          if(!this.curriculumData.isDrag && this.contentData.progressVideo !=1){
+            var time = localStorage.getItem('videoProgressData')
+            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.courseId = this.contentData.courseId
+            }
+          }
           //console.log('记录播放时间')
           apiStudy.studyVideoTime(postData).then(rs => {
             if (rs.status != 200) {

src/views/user/ranking.vue

@@ -23,6 +23,7 @@
                     </span>
             <el-dropdown-menu slot="dropdown">
               <el-dropdown-item command="total">累计</el-dropdown-item>
+              <el-dropdown-item command="now">当前</el-dropdown-item>
               <!-- <el-dropdown-item command="weeks">本周</el-dropdown-item>
               <el-dropdown-item command="months">本月</el-dropdown-item>
               <el-dropdown-item command="years">本年</el-dropdown-item> -->
@@ -32,10 +33,10 @@
       </div>
       <div class="myselftext">
         <div class="myranking">
-                 当前排名 :  <span> {{currentUserRankingTotalData.rankNo}}</span>
+          {{isNow ? '当前' : '累计'}}排名 :  <span> {{currentUserRankingTotalData.rankNo}}</span>
         </div>
         <div class="myexperience">
-                 累计经验值 :  <span>{{currentUserRankingTotalData.rankValue}}</span>
+          {{isNow ? '当前' : '累计'}}经验值 :  <span>{{currentUserRankingTotalData.rankValue}}</span>
         </div>
       </div>
 
@@ -116,6 +117,7 @@
                     </span>
             <el-dropdown-menu slot="dropdown">
               <el-dropdown-item command="total">累计</el-dropdown-item>
+              <el-dropdown-item command="now">当前</el-dropdown-item>
               <!-- <el-dropdown-item command="weeks">本周</el-dropdown-item>
               <el-dropdown-item command="months">本月</el-dropdown-item>
               <el-dropdown-item command="years">本年</el-dropdown-item> -->
@@ -125,10 +127,10 @@
       </div>
       <div class="myselftext">
         <div class="myranking">
-                 当前排名 :  <span> {{learningDurationTotalData.rankNo}}</span>
+          {{isStudyTime ? '当前' : '累计'}}排名 :  <span> {{learningDurationTotalData.rankNo}}</span>
         </div>
         <div class="myexperience">
-                 累计学习时长:  <span> {{formatSecondToHour(learningDurationTotalData.rankValue)}}</span> h
+          {{isStudyTime ? '当前' : '累计'}}学习时长:  <span> {{formatSecondToHour(learningDurationTotalData.rankValue)}}</span> h
         </div>
       </div>
       <div class="exp-table" style="margin-top:20px;">
@@ -204,6 +206,7 @@
                     </span>
             <el-dropdown-menu slot="dropdown">
               <el-dropdown-item command="total">累计</el-dropdown-item>
+              <!-- <el-dropdown-item command="now">当前</el-dropdown-item> -->
               <!-- <el-dropdown-item command="weeks">本周</el-dropdown-item>
               <el-dropdown-item command="months">本月</el-dropdown-item>
               <el-dropdown-item command="years">本年</el-dropdown-item> -->
@@ -213,10 +216,10 @@
       </div>
       <div class="myselftext">
         <div class="myranking">
-                 当前排名 :  <span> {{learningDaysTotalData.rankNo}}</span>
+          {{isStudyDay ? '当前' : '累计'}}排名 :  <span> {{learningDaysTotalData.rankNo}}</span>
         </div>
         <div class="myexperience">
-                 累计学习天数 :  <span>{{learningDaysTotalData.rankValue}}</span>
+          {{isStudyDay ? '当前' : '累计'}}学习天数 :  <span>{{learningDaysTotalData.rankValue}}</span>
         </div>
       </div>
       <div class="exp-table" style="margin-top:20px;">
@@ -283,11 +286,11 @@
 </template>
 
 <script>
-    import apiUser from "@/api/system/user.js";
+import apiUser from "@/api/system/user.js";
-    import apiStat from '@/api/phase2/stat.js';
+import apiStat from '@/api/phase2/stat.js';
-    import { mapGetters } from 'vuex';
+import { mapGetters } from 'vuex';
-    import authorImg from '@/components/Portal/authorImg.vue';
+import authorImg from '@/components/Portal/authorImg.vue';
-    import {translate,experienceValue,formatSecondToHour,cutOrgNamePath} from "@/utils/tools.js";
+import {translate,experienceValue,formatSecondToHour,cutOrgNamePath} from "@/utils/tools.js";
 export default {
   computed: {
     ...mapGetters(['userInfo']),
@@ -307,8 +310,8 @@ export default {
       translate,
       formatSecondToHour:formatSecondToHour,
       experience:{
-            field:'total',
+        field:'now',
-            name:'累计',
+        name:'当前',
         data:{
           rankingNo:0,
           total:0
@@ -316,8 +319,8 @@ export default {
         list:[],
       },
       learningDuration:{
-            field:'total',
+        field:'now',
-            name:'累计',
+        name:'当前',
         data:{
           rankingNo:0,
           total:0
@@ -340,7 +343,10 @@ export default {
           total:0
         },
         list:[],
-        }
+      },
+      isNow: false,
+      isStudyTime: false,
+      isStudyDay: false,
     }
   },
   mounted() {
@@ -352,18 +358,21 @@ export default {
 
     // 经验值排行榜（下拉框事件）
     experienceCommand(e) {
+      this.isNow = false
       this.experience.field = e;
       this.experience.name = this.translate(e)
       this.getExperience();
     },
     // 学习时长（下拉框事件）
     durationCommand(e) {
+      this.isStudyTime = false
       this.learningDuration.field = e;
       this.learningDuration.name = this.translate(e)
       this.getDuration();
     },
     // 学习天数（下拉框事件）
     daysCommand(e) {
+      this.isStudyDay = false
       this.learningDays.field = e;
       this.learningDays.name = this.translate(e)
       this.getDays();
@@ -371,9 +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:5,//  #显示的条数
+        num:10,//  #显示的条数
+      }
+      if(data.field == 'now'){
+        data.statType = 20
+        data.field = 'total'
+        this.experience.field = 'total'
+        this.isNow = true
       }
       apiStat.getRanking(data).then(res=>{
         if(res.status==200){
@@ -406,17 +421,41 @@ export default {
               sex: null
             }
           })
-         this.getUserData(ids,res.result.rankingData)
+          // this.getUserData(ids,res.result.rankingData)
-         this.experience.list = res.result.rankingData;
+          const noReapetIds = [...new Set(ids)];
+          apiUser.getByIds(noReapetIds).then(rs => {
+            if (rs.status == 200) {
+              const listData = []
+              rs.result.forEach((item, index) => {
+                res.result.rankingData.forEach(author => {
+                  if (author.aid == item.aid) {
+                    author.authorInfo = item;
+                    listData.push(author)
+                  }
+                });
+              });
+              this.experience.list = listData.sort((a,b)=>{
+                return b.total-a.total
+              }).slice(0,5);
+            } else {
+              this.$message.error(res.message);
+            }
+          });
         }
       })
     },
     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:5,//  #显示的条数
+        num:10,//  #显示的条数
+      }
+      if(data.field == 'now'){
+        data.statType = 10
+        data.field = 'total'
+        this.learningDuration.field = 'total'
+        this.isStudyTime = true
       }
       apiStat.getRanking(data).then(res=>{
         if(res.status==200){
@@ -448,8 +487,26 @@ export default {
               sex: null
             }
           })
-             this.getUserData(ids,res.result.rankingData)
+          // this.getUserData(ids,res.result.rankingData)
-             this.learningDuration.list = res.result.rankingData;
+          const noReapetIds = [...new Set(ids)];
+          apiUser.getByIds(noReapetIds).then(rs => {
+            if (rs.status == 200) {
+              const listData = []
+              rs.result.forEach((item, index) => {
+                res.result.rankingData.forEach(author => {
+                  if (author.aid == item.aid) {
+                    author.authorInfo = item;
+                    listData.push(author)
+                  }
+                });
+              });
+              this.learningDuration.list = listData.sort((a,b)=>{
+                return b.total-a.total
+              }).slice(0,5);
+            } else {
+              this.$message.error(res.message);
+            }
+          });
         }
       })
     },
@@ -459,7 +516,13 @@ export default {
         aid:this.userInfo.aid,// #用户id
         statType:11, // #统计类型  10学习时长 11 学习天数 20表经验值 30表u币 40表获取天数
         field:this.learningDays.field,// #统计周期 todays-当天,weeks-周,months-月,years-年 total-总计
-          num:5,//  #显示的条数
+        num:10,//  #显示的条数
+      }
+      if(data.field == 'now'){
+        data.statType = 13
+        data.field = 'total'
+        this.learningDays.field = 'total'
+        this.isStudyDay = true
       }
       apiStat.getRanking(data).then(res=>{
         if(res.status==200){
@@ -490,8 +553,26 @@ export default {
               sex: null
             }
           })
-             this.getUserData(ids,res.result.rankingData)
+          // this.getUserData(ids,res.result.rankingData)
-             this.learningDays.list = res.result.rankingData;
+          const noReapetIds = [...new Set(ids)];
+          apiUser.getByIds(noReapetIds).then(rs => {
+            if (rs.status == 200) {
+              const listData = []
+              rs.result.forEach((item, index) => {
+                res.result.rankingData.forEach(author => {
+                  if (author.aid == item.aid) {
+                    author.authorInfo = item;
+                    listData.push(author)
+                  }
+                });
+              });
+              this.learningDays.list = listData.sort((a,b)=>{
+                return b.total-a.total
+              }).slice(0,5);
+            } else {
+              this.$message.error(res.message);
+            }
+          });
         }
       })
     },
@@ -514,29 +595,29 @@ export default {
         }
       });
     },
-}
+  }
 }
 </script>
 
 <style lang="scss" scoped>
-  //只是控制布局
+//只是控制布局
-  .page-ranking{
+.page-ranking{
   padding:15px 18px;
   display:flex;
   overflow-x: auto;
-  }
+}
-  ::v-deep .el-dropdown-menu__item:not(.is-disabled):hover{
+::v-deep .el-dropdown-menu__item:not(.is-disabled):hover{
   background-color: #fff !important;
   color: #0059FF !important;
-    }
+}
-  ::v-deep.el-dropdown-menu {
+::v-deep.el-dropdown-menu {
   border: none !important;
-  }
+}
-  .page-ranking-col{
+.page-ranking-col{
   min-width: 430px;
   //padding-right:30px;
   padding-right: 5%;
-  }
+}
 
 .omit{
   padding-left: 13px;
@@ -573,8 +654,8 @@ export default {
   }
 
 
-  }
+}
- .myselftext{
+.myselftext{
   height: 75px;
   padding: 0 25px;
   width: 100%;
@@ -605,7 +686,7 @@ export default {
       font-size: 18px;
     }
   }
-  }
+}
 .tab-jy{
   padding-top: 10px;
   padding-right: 10px;