热点

.env.development

@@ -41,7 +41,6 @@ VUE_APP_PUBLIC_PATH='/pc'
 VUE_APP_MANAGER_PATH='/manage'
 VUE_APP_STUDENT_PATH='/fe-student'
 VUE_APP_MANAGER_API_PATH='/manageApi'
-VUE_APP_GROWTH_API_PATH=''
 
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true

.env.preview

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

.env.production

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

.env.testing

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

src/api/boe/courseRecord.js

@@ -1,6 +1,5 @@
 /**我的授课记录*/
 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;
@@ -61,63 +60,13 @@ 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}&pageNo=${data.pageNo}&pageSize=${data.pageSize}`);
-}
 
-/**
- * 导出授课记录
- *
- * @param {Object} data
- */
-const courseRecordExport2 = function(data) {
-  return axios.request({
-    baseURL: "/manageApi",
-    url: '/admin/export/exportInTeacherRecord',
-    method: 'get',
-    data:data,
-    headers:{'Content-Type':'application/json;charset=utf-8'},
-    responseType: 'blob'
-  })
-}
-
-/**
- * 导出课程下的学员信息
- *
- */
-const exportStudentOfCourse2 = function(courseId,courseType) {
-  return axios.request({
-    baseURL: "/manageApi",
-    url: '/admin/export/exportTeacherRecordStudentInfo?courseId='+courseId+'&courseType='+courseType,
-    method: 'get'
-    // headers:{'Content-Type':'application/json;charset=utf-8'},
-    // responseType: 'blob'
-  })
-}
-
-/**
- * 导出教师下的所有授课记录下的学员信息
- *
- */
-const exportStudentOfTearcher2 = function(userId) {
-  return axios.request({
-    baseURL: "/manageApi",
-    url: '/b1/system/teacher/teacher-course-student-export?userId='+userId,
-    method: 'post',
-    headers:{'Content-Type':'application/json;charset=utf-8'},
-    responseType: 'blob'
-  })
-}
 
 
 export default {
     courseRecordExport,
-    courseRecordExport2,
     courseRecordList,
-    getListByToken,
     exportStudentOfCourse,
-    exportStudentOfCourse2,
-    exportStudentOfTearcher,
-    exportStudentOfTearcher2,
+    exportStudentOfTearcher
 
 }

src/api/growth/growthpath.js

@@ -1,8 +0,0 @@
-// import ajax from '@/utils/xajax.js'
-import ajax from '../ajax';
-// const baseURL = process.env.VUE_APP_GROWTH_API_PATH;
-const baseURL = '/growth';
-// 查询专业力必修列表
-export const listData = (obj) => ajax.get(baseURL, '/professional/student/studentGrowthList', { params: obj })
-// 查询专业力统计
-export const getTotalGrowthTaskDetail = (obj) => ajax.get(baseURL, '/professional/student/getTotalGrowthTaskDetail', { params: obj })

src/api/modules/cases.js

@@ -1,6 +1,6 @@
 /* 案例模块的相关处理*/
 import ajax from '@/utils/xajax.js'
-import ajaxs from '@/api/ajax.js'
+
 /**首页查询
  * pageSize
  * orderField
@@ -88,12 +88,6 @@ const usernameList = function (pageSize) {
 const queryPraises = function (pageSize) {
   return ajax.get(`/xboe/m/boe/cases/query-praises?pageSize=${pageSize}`);
 }
-const queryPraisesNew = function (pageSize,rankType) {
-  return ajax.get(`/xboe/m/boe/cases/queryPopularity?pageSize=${pageSize}&rankType=${rankType}`);
-}
-const queryRecommendRank = function (pageSize) {
-  return ajax.get(`/xboe/m/boe/cases/queryRecommendRank?pageSize=${pageSize}`);
-}
 /*
 好评榜
 @param pageSize 长度
@@ -101,9 +95,6 @@ const queryRecommendRank = function (pageSize) {
 const queryComments = function (pageSize) {
   return ajax.get(`/xboe/m/boe/cases/query-comments?pageSize=${pageSize}`);
 }
-const queryCommentsNew = function (pageSize,rankType) {
-  return ajax.get(`/xboe/m/boe/cases/queryHighOpinion?pageSize=${pageSize}&rankType=${rankType}`);
-}
 
 /**
  * 专业分类
@@ -195,36 +186,11 @@ const endReadTimer =  (data)=> ajax.postJson('/xboe/m/boe/cases/recommend/record
 const caseYears = function (query = {}) {
   return ajax.post('/xboe/m/boe/cases/caseYears', query);
 }
-//案例推荐榜单
-const getQueryRecommendRank = function (params) {
-  return ajax.get(`/xboe/m/boe/cases/queryRecommendRank?pageSize=${params.pageSize}`)
-}
-//案例上榜
-const riseIntoRank = (data) => ajax.post(`/xboe/m/boe/cases/riseIntoRank?caseId=${data.caseId}`)
-//取消上榜
-const cancelRiseIntoRank = (data) => ajax.post(`/xboe/m/boe/cases/cancelRiseIntoRank?caseId=${data.caseId}`)
-//调整榜单
-const adjustRank = (data) => ajax.post(`/xboe/m/boe/cases/adjustRank?caseIds=${data.caseIds}`)
-//收藏案例
-const queryFavoriteCaseOfIndex = (params) => ajax.get(`/xboe/m/boe/cases/queryFavoriteCaseOfIndex?pageIndex=${params.pageIndex}&pageSize=${params.pageSize}&orderField=${params.orderField}&orderAsc=${params.orderAsc}`)
-//浏览记录
-const queryViewRecord = (data) => ajaxs.post(`/statApi/xboe/m/stat/userdynamic/list?pageIndex=${data.pageIndex}&pageSize=${data.pageSize}&contentType=${data.contentType}&aid=${data.aid}&hidden=${data.hidden}&eventKey=${data.eventKey}`)
-//浏览量TOP榜单
-const queryPopularityOfMajor = (params) => ajax.get(`/xboe/m/boe/cases/queryPopularityOfMajor?pageSize=${params.pageSize}&rankMonth=${params.rankMonth}&majorId=${params.majorId}`)
-//浏览记录新
-const browsingHistory = (params) => ajax.get(`/xboe/m/boe/cases/browsingHistory?pageIndex=${params.pageIndex}&pageSize=5`)
-//获取所有的专业月份
-const queryAllTimePopularityOfMajor = () => ajax.get('/xboe/m/boe/cases/queryAllTimePopularityOfMajor')
+
+
+
+
 export default {
-  queryAllTimePopularityOfMajor,
-  getQueryRecommendRank,
-  queryPopularityOfMajor,
-  browsingHistory,
-  queryViewRecord,
-  queryFavoriteCaseOfIndex,
-  riseIntoRank,
-  cancelRiseIntoRank,
-  adjustRank,
   indexList,
   queryList,
   queryListV2,
@@ -236,10 +202,7 @@ export default {
   query,
   usernameList,
   queryPraises,
-  queryPraisesNew,
-  queryRecommendRank,
   queryComments,
-  queryCommentsNew,
   majorTypes,
   details,
   ids,

src/api/modules/courseStudy.js

@@ -389,10 +389,7 @@ 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);
@@ -428,7 +425,6 @@ export default {
     myExamList2,
 	myCourseStudy,
   myStudysFromES,
-  homeworkExport,
   findByIds,
 	deleteSignUp,
   ids,

src/api/modules/paper.js

@@ -72,9 +72,6 @@ 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,
@@ -83,7 +80,6 @@ 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,9 +9,7 @@ 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);
 }
@@ -219,7 +217,7 @@ export default {
     update,
     del,
     detail,
-    findByNameNew,
+    findByName,
     updateSysId,
 	has,
 	start,

src/components/AlertPopup.vue

@@ -1,7 +1,7 @@
 <template>
   <!--弹出窗口设置-->
   <div>
-    <div v-for="pop in popupList" :key="pop.id">
+    <div v-for="pop in popupList" :key="pop.id">wwww
       <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/Case/collectList.vue

@@ -8,10 +8,7 @@
 
           </div>
           <div class="article-info-date">
-            <div class="box">
-              <div class="image"></div>
-              <el-button @click="delItem(item)" type="text" style="color: #8590A6;font-size:14px">取消收藏</el-button>
-            </div>
+            <el-button @click="delItem(item)" type="text" style="color: #8590A6;font-size:14px" icon="el-icon-star-on">取消收藏</el-button>
           </div>
         </div>
         <div class="article-info-tools">
@@ -164,26 +161,6 @@
         line-height: 40px;
         font-weight: 200;
         color: #999999;
-        display: flex;
-        justify-content: end;
-        .box{
-          display: flex;
-          justify-content: end;
-          align-items: center;
-          .image{
-            width: 14px;
-            height: 14px;
-            background: url('../../assets/images/case/Frame(5).png') no-repeat;
-            background-size: 100%;
-            margin-right: 10px;
-          }
-          &:hover{
-            .image{
-              background: url('../../assets/images/case/Frame(12).png') no-repeat;
-              background-size: 100%;
-            }
-          }
-        }
         i {
           margin-right: 5px;
         }

src/components/Course/auditCourse1.vue

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

src/components/Course/auditCourse2.vue

@@ -681,9 +681,7 @@ export default {
           }
           this.teacherList = rs.result.teachers;
           this.teacherName = rs.result.teachers;
-          this.teacher = rs.result.teachers.map(item => {
-            return `${item.teacherName}(${item.userNo})`
-          });
+          this.teacher = rs.result.teachers.map(item => item.teacherName);
           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 { data, message, code } = await apiTeacher.findByNameNew(this.teacherValues);
+            const { result, message, status } = await apiTeacher.findByName(this.teacherValues);
             this.loading = false;
-            if (code === 200) {
+            if (status === 200) {
                 let list = [];
-                data.forEach(item => {
+                result.forEach(item => {
                 list.push({
                     teacherId: item.id,
                     teacherName: item.name,
-                    teacherCode: item.mobile
+                    teacherCode: item.code
                 });
                 });
                 this.teacherDownList = list;

src/components/Course/courseExam.vue

@@ -85,28 +85,6 @@
             <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">
@@ -307,9 +285,7 @@
              return;
            }
         }
-        if(!this.examInfo.randomMode){
-          this.examInfo.qnum = 0
-        }
+
         this.$emit("save",this.examInfo);
       },
       deleteExam(){ //删除
@@ -318,8 +294,6 @@
           cancelButtonText: '取消',
           type: 'warning'
         }).then(() => {
-          this.examInfo.randomMode = false;
-          this.examInfo.qnum = 0;
           this.$emit("remove",this.examInfo);
         }).catch(() => {
 

src/components/Course/exam.vue

@@ -326,25 +326,27 @@ export default {
         return qitems;
     },
     startTest(){
-      apiExamPaper.newPaperContent(this.info.id).then(res=>{
-        if(!res.error&&res.result != ''){
       if(this.info.paperType==2){
-            //TODO1
-            console.log("调用开始考试 if paperType == 2")
-            this.examPaper.json=res.result;
+        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.content.status=1;
             this.timer=setInterval(this.changeTimer,60000);
             this.testStart=true;
           }else{
-            console.log("调用开始考试 else paperType != 2")
-            let paper= {items:res.result};
+            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){
@@ -358,6 +360,7 @@ export default {
         });
         this.total=paper.items.length;
         this.paper =paper;
+        //console.log(this.paper);
 
         this.curItem=paper.items[this.curIndex];
         this.startTime=new Date();//记录开始时间
@@ -365,52 +368,6 @@ 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){
@@ -575,7 +532,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),
       }
       //计划考试的时长
@@ -586,15 +543,8 @@ export default {
       apiStudy.saveExam(postData).then(res=>{
         this.thisTrue = true
          if(res.status == 200) {
-            console.log("获取数据结果 考试 res ==>",res)
             this.records.push(res.result);
-            //TODO 评分更改 最终完成
-            if(res.result.score > res.result.passLine){
             this.content.status=9;//表已学习完，判断上级的章是否已完成
-            }else{
-              this.content.status=1;
-            }
-
             this.studyItemId=res.result.studyItemId;//第一次保存时是没有的，所以这里要赋值
             this.$alert('您本次考试得分：'+this.lastScore, '考试成绩', {
                   confirmButtonText: '确定',

src/components/Course/weikeContent.vue

@@ -401,28 +401,6 @@
               <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">
@@ -1081,14 +1059,12 @@
           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;
@@ -1111,9 +1087,6 @@
             }
             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);
@@ -1179,8 +1152,6 @@
             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,16 +217,13 @@ export default {
         if(delIdx>-1){
           fileList.splice(delIdx,1);
         }
-        this.$emit("success", res);
       } else {
         this.isLoading = false;
-        if(this.limit == 1){
-          this.fileList = [];
-        }
+        //this.fileList = [];
         this.$message({message:"上传失败",type:'error',offset:100});
       }
 
-      // this.$emit("success", res);
+      this.$emit("success", res);
     },
     // 删除文件
     handleDelete(index) {

src/components/HomePage/caseList.vue

@@ -8,10 +8,7 @@
                     <span style="margin-left:28px">{{item.eventTime}}</span>
                     <span v-if="item.aid == userInfo.aid" class="follow-hide pointer" style="float:right">
                       <span v-if="item.hidden">已隐藏</span>
-                      <span class="span_hidden" v-else  @click="emitHide(item.id)">  
-                        <!-- <svg-icon style="margin-right: 10px;font-size:22px;padding-top: 4px;" icon-class="eyes"></svg-icon> -->
-                         <div class="is_hidden"></div>
-                        隐藏 </span>
+                      <span v-else  @click="emitHide(item.id)">  <svg-icon style="margin-right: 10px;font-size:22px;padding-top: 4px;" icon-class="eyes"></svg-icon>隐藏 </span>
                     </span>
                   </p>
                   <div class="case-info-cont">
@@ -139,22 +136,6 @@
   </script>
 
   <style lang="scss" scoped>
-  .span_hidden{
-    display: flex;
-    &:hover{
-      .is_hidden{
-        background: url('../../assets/images/case/Frame(12).png');
-        background-size: 100%;
-      }
-    }
-    .is_hidden{
-      width: 18px;
-      height: 18px;
-      background: url('../../assets/images/case/Frame(5).png');
-      background-size: 100%;
-      margin-right: 10px;
-    }
-  }
     .sign-text{
       color: #666666;
       font-size: 14px;

src/components/Portal/authorInfo.vue

@@ -1,6 +1,6 @@
 <template>
 	<div class="item-author">
-		<div  v-if="userName" @click="toHome()">
+		<div  @click="toHome()">
       <!-- <el-avatar shape="square" size="small" :src="userAvatar" v-if="userAvatar"></el-avatar> -->
       <!-- <div v-else class="uavatar"><span class="uavatar-text">{{avatarText}}</span></div> -->
       <el-avatar shape="circle" size="small" :src="userAvatar" v-if="userAvatar"></el-avatar>
@@ -12,10 +12,9 @@
         </div>
         </div>
     </div>
-		<div v-if="!onlyAvatar&&userName" style="padding-left: 14px;padding-top: 6px;font-size: 14px;">
+		<div v-if="!onlyAvatar" style="padding-left: 14px;padding-top: 6px;font-size: 14px;">
       <span style="color: #333333;font-weight: 600;font-size: 16px;">{{userName}}</span>
       <span class="author-text" v-if="userInfo && userInfo!=''"> {{userInfo}} </span>
-      <span style="margin-left: 15px;" class="comWords" v-if="authorTags.length != 0" v-for="tag in authorTags">{{tag}}</span>
     </div>
     <slot />
 	</div>
@@ -50,12 +49,6 @@
       onlyAvatar:{
         type:Boolean,
         default:false
-      },
-      authorTags: {
-        type:Array,
-        default(){
-          return []
-        }
       }
 		},
     data(){
@@ -126,14 +119,6 @@
       font-weight: 300;
       margin-left: 4px;
     }
-    .comWords {
-      background: #409EFF;
-      border-radius: 2px;
-      font-weight: 400;
-      font-size: 12px;
-      color: #FFFFFF;
-      padding: 4px 10px;
-    }
     .uavatar{
       // border: 1px solid #73adfe;
       width: 28px;

src/components/Portal/comments.vue

@@ -92,19 +92,11 @@
                       <div class="comment-btns">
 
                          <!-- <a><svg-icon icon-class="like"></svg-icon><span>66</span></a> -->
-                         <div style="display: flex" v-show="btnsShowRowId==com.id">
+                         <div v-show="btnsShowRowId==com.id">
 
-                           <a style="display: flex;align-items: center;" @click="showReply(com)">
-                            <!-- <svg-icon icon-class="comment" style="margin-right: 0px;font-size: 16px;"></svg-icon> -->
-                              <div class="is_comment"></div>
-                              <span>回复</span> 
-                           </a>
+                           <a @click="showReply(com)"><svg-icon icon-class="comment" style="margin-right: 0px;font-size: 16px;"></svg-icon><span>回复</span></a>
                            <!--必须当前登录人是一个人-->
-                           <a style="display: flex;align-items: center;" v-if="userInfo.aid==com.sysCreateAid" @click="delCommnet(com,comIdx)">
-                            <!-- <svg-icon icon-class="remove" style="margin-right: 0px;font-size: 16px;"></svg-icon> -->
-                             <div class="is_remove"></div>
-                            <span>删除</span>
-                           </a>
+                           <a v-if="userInfo.aid==com.sysCreateAid" @click="delCommnet(com,comIdx)"><svg-icon icon-class="remove" style="margin-right: 0px;font-size: 16px;"></svg-icon><span>删除</span></a>
                            <a v-if="com.replyList && com.replyList.length==5" @click="showMoreReply(com)" ><svg-icon icon-class="all" style="margin-right: 0px;font-size: 16px;"></svg-icon><span>全部</span></a>
                          </div>
                       </div>
@@ -968,28 +960,6 @@
         line-height: 35px;
         a{
           margin-right:15px;
-          &:hover{
-            .is_comment{
-              background: url('../../assets/images/case/Frame(9).png');
-              background-size: 100%;
-            }
-            .is_remove{
-              background: url('../../assets/images/case/Frame(15).png');
-              background-size: 100%;
-            }
-          }
-          .is_comment{
-            width: 16px;
-            height: 16px;
-            background: url('../../assets/images/case/Frame.png');
-            background-size: 100%;
-          }
-          .is_remove{
-            width: 16px;
-            height: 16px;
-            background: url('../../assets/images/case/Frame(8).png');
-            background-size: 100%;
-          }
           span{
             margin-left: 6px;
             color: #8590A6;

src/components/Portal/interactBar.vue

@@ -10,8 +10,7 @@
         <el-tooltip  effect="light" :content="type == 4 || type == 5 ?'回答':'回复'" placement="left" :visible-arrow="false" popper-class="text-tooltip">
           <!-- <svg-icon style="margin-right: 0;"  icon-class="comment"></svg-icon> -->
          <!-- <img style="width:16px;height:14px;vertical-align: middle;" :src="require('@/assets/images/icon/answers.png')"> -->
-         <!-- <svg-icon style="margin-right: 0;font-size: 14px;" icon-class="comment"></svg-icon> -->
-         <div class="is_comment"></div>
+         <svg-icon style="margin-right: 0;font-size: 14px;" icon-class="comment"></svg-icon>
         </el-tooltip>
         <span class="interact-bar-value"> {{ data.answers? data.answers:0}}</span>
       </div>
@@ -24,16 +23,14 @@
       </div>
       <div v-if="comments" class="interact-bar-btn" :style="`min-width: ${nodeWidth};`" :class="{cursor:!readonly}">
         <el-tooltip  effect="light" content="评论" placement="left" :visible-arrow="false" popper-class="text-tooltip">
-          <!-- <svg-icon style="margin-right: 0;font-size: 14px;" icon-class="comment"></svg-icon> -->
-           <div class="is_comment"></div>
+          <svg-icon style="margin-right: 0;font-size: 14px;" icon-class="comment"></svg-icon>
         </el-tooltip>
         <span class="interact-bar-value"> {{data.comments? data.comments:0}}</span>
       </div>
 
       <div v-if="praises" @click="addPraise()" :style="`min-width: ${nodeWidth};`" class="interact-bar-btn" :class="{cursor:!readonly}">
         <el-tooltip effect="light" content="点赞" placement="top" :visible-arrow="false" popper-class="text-tooltip">
-          <!-- <svg-icon style="margin-right: 0;font-size: 14px;" :icon-class="isPraise?'praised':'like'"></svg-icon> -->
-           <div class="is_praise" :class="isPraise?'is_praise_a':'is_praise'"></div>
+          <svg-icon style="margin-right: 0;font-size: 14px;" :icon-class="isPraise?'praised':'like'"></svg-icon>
         </el-tooltip>
         <span class="interact-bar-value"> {{ data.praises? data.praises:0}}</span>
       </div>
@@ -41,22 +38,19 @@
       <div v-if="favorites"  @click.stop="addFavorite()" :style="`min-width: ${nodeWidth};`" class="interact-bar-btn" :class="{cursor:!readonly}">
         <el-tooltip effect="light" content="收藏" placement="top" :visible-arrow="false" popper-class="text-tooltip">
           <svg-icon v-if="courseExclusive" style="font-size: 32px;margin-right: 0;" :icon-class="isFavorite?'collectedCourse':'collectionCourse'"></svg-icon>
-          <!-- <svg-icon v-else style="margin-right: 0;" :style="{'font-size':(size+2)+'px'}" :icon-class="isFavorite?'scactive2':'xihuan'"></svg-icon> -->
-           <div v-else class="is_favorite" :class="isFavorite?'is_favorite_a':'is_favorite'"></div>
+          <svg-icon v-else style="margin-right: 0;" :style="{'font-size':(size+2)+'px'}" :icon-class="isFavorite?'scactive2':'xihuan'"></svg-icon>
         </el-tooltip>
         <span v-if="!courseExclusive" class="interact-bar-value"> {{ data.favorites? data.favorites:0}}</span>
       </div>
       <div v-if="shares" @click="addShare()" :style="`min-width: ${nodeWidth};`" class="interact-bar-btn" :class="{cursor:!readonly}">
         <el-tooltip effect="light" content="分享" placement="top" :visible-arrow="false" popper-class="text-tooltip">
-          <!-- <svg-icon icon-class="share" style="margin-right: 0;" :style="{'font-size':(size+2)+'px'}"></svg-icon> -->
-           <div class="is_share"></div>
+          <svg-icon icon-class="share" style="margin-right: 0;" :style="{'font-size':(size+2)+'px'}"></svg-icon>
         </el-tooltip>
         <span class="interact-bar-value"> {{data.shares}}</span>
       </div>
       <div v-if="views" style="cursor: default;" :style="`min-width: ${nodeWidth};margin-left:${data.views>1000? '20px':'20px'}`" class="interact-bar-btn ese-view" :class="{cursor:!readonly}">
         <el-tooltip effect="light" content="浏览量" placement="top" :visible-arrow="false" popper-class="text-tooltip">
-          <!-- <svg-icon style="margin-right: 0; font-size:22px;" icon-class="eyes"></svg-icon> -->
-           <div class="is_view"></div>
+          <svg-icon style="margin-right: 0; font-size:22px;" icon-class="eyes"></svg-icon>
         </el-tooltip>
         <!-- <div style="float:right;margin-left:8px"> -->
         <span  class="interact-bar-value eyes-view" > {{ formatNum(data.views)}}</span>
@@ -536,7 +530,6 @@ export default {
             this.$store.dispatch("unicomFavorites",false)
           }
           this.$message({message:'已取消收藏',type:'success'});
-          this.$emit('deleteFavorite',true)
           //this.$emit('addFavorite',res.result);//添加收藏,如果是true代表添加成功，false代表已存在
         }else{
           console.log('取消收藏失败：'+res.message);
@@ -720,77 +713,6 @@ export default {
     justify-content: flex-end;
     .interact-bar-btn {
       margin: 0 0 0 15px;
-      display: flex;
-      justify-content: end;
-      align-items: center;
-      &:hover{
-        .is_praise{
-          background: url('../../assets/images/case/Frame\(10\).png');
-        }
-        .is_favorite{
-          background: url('../../assets/images/case/Frame\(11\).png');
-          background-size: 100%;
-        }
-        .is_share{
-          background: url('../../assets/images/case/Frame\(14\).png');
-          background-size: 100%;
-        }
-        .is_view{
-          background: url('../../assets/images/case/Frame\(12\).png');
-        background-size: 100%;
-        }
-        .is_comment{
-          background: url('../../assets/images/case/Frame\(9\).png');
-          background-size: 100%;
-        }
-      }
-      .is_comment{
-        width: 16px;
-        height: 16px;
-        background: url('../../assets/images/case/Frame.png');
-        background-size: 100%;
-        margin-right: 4px;
-      }
-      .is_view{
-        width: 17px;
-        height: 17px;
-        background: url('../../assets/images/case/Frame\(5\).png');
-        background-size: 100%;
-        margin-right: 4px;
-      }
-      .is_share{
-        width: 16px;
-        height: 16px;
-        background: url('../../assets/images/case/Frame\(7\).png');
-        background-size: 100%;
-        margin-right: 4px;
-      }
-      .is_praise{
-        width: 14px;
-        height: 14px;
-        background: url('../../assets/images/case/Frame\(1\).png');
-        margin-right: 4px;
-      }
-      .is_praise_a{
-        width: 14px;
-        height: 14px;
-        background: url('../../assets/images/case/Frame\(10\).png');
-        margin-right: 4px;
-      }
-      .is_favorite{
-        width: 16px;
-        height: 16px;
-        background: url('../../assets/images/case/Frame\(2\).png');
-        background-size: 100%;
-        margin-right: 4px;
-      }
-      .is_favorite_a{
-        width: 16px;
-        height: 16px;
-        background: url('../../assets/images/case/Frame\(11\).png');
-        background-size: 100%;
-        margin-right: 4px;
-      }
     }
     .interact-bar-value{
       //  color:#6E7B84; ui图给的颜色，但是效果于ui图效果不一样，也没有透明度，所以找一个相近的和谐的颜色

src/components/PortalHeader.vue

@@ -51,8 +51,7 @@
               <el-dropdown placement="bottom" @command="handleContributor">
                 <span class="el-dropdown-link" style="font-size:16px;cursor: pointer;" :style="{color:textColor}">贡献者大会</span>
                 <el-dropdown-menu slot="dropdown">
-                  <el-dropdown-item command="three">2024</el-dropdown-item>
-                  <el-dropdown-item command="one" divided>2023</el-dropdown-item>
+                  <el-dropdown-item command="one">2023</el-dropdown-item>
                   <el-dropdown-item command="two" divided>2022</el-dropdown-item>
                 </el-dropdown-menu>
               </el-dropdown>
@@ -210,7 +209,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: {
@@ -247,7 +246,6 @@ export default {
       let obj = {
           one: urlPre + "/web/contributornew/index",
           two: urlPre + "/web/contributor/index",
-          three: urlPre + "/web/contributor_2024/index"
         };
         window.open(obj[val]);
     },

src/components/Study/manager.vue

@@ -13,7 +13,7 @@
     </div>
     <!-- <div style="color: red;">下面的表格标题及内容需要调整完善</div> -->
     <div>
-      <el-tabs style="width: 100%;" v-model="tabName" @tab-click="handleTabClick">
+      <el-tabs v-model="tabName" @tab-click="handleTabClick">
         <el-tab-pane label="报名管理" name="second">
           <!-- <div>已报名{{study.list.length}}人，共有0人报名未成功，共有{{study.list.length}}人通过审核</div> -->
           <el-row style="margin: 20px 0;" :gutter="20">
@@ -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.contentType)" >学习人员</el-button>
+                  <el-button size="mini" type="info" @click="getCatalogue(scope.row,scope.row.contentName)" >学习人员</el-button>
                 </template>
               </el-table-column>
             </el-table>
@@ -292,7 +292,6 @@
         <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>
@@ -336,8 +335,6 @@ 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: {
@@ -355,10 +352,7 @@ export default {
   },
   data() {
     return {
-      downParams: {},
       typePress: false,
-      isHomeWork: false,
-      isTrue: false,
       catalogRecordTree:[],
       catalogRecordList:[],
       resOwnerListMap:[],
@@ -383,8 +377,8 @@ export default {
         count: 0,
         type: "",
         list: [],
-        status: '',
         name: '',
+        status: '',
       },
       learningRecords: {
         pageIndex: 1, //第几页
@@ -521,7 +515,6 @@ 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;
@@ -531,77 +524,6 @@ 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;
@@ -800,16 +722,11 @@ export default {
       this.getSignupList();
     },
     getCatalogue(row,type) {
-      if(type==61){
+      if(type=='考试'){
         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;//重置为第一页
@@ -863,19 +780,4 @@ export default {
   height: 400px;
   overflow: auto;
 }
-
-.el-tabs__nav-wrap::after {
-  display: none; /* 隐藏滚动条轨道 */
-}
-
-.el-tabs__nav-scroll {
-  overflow: hidden; /* 隐藏滚动条滑块 */
-}
-
-/* 隐藏垂直滚动条 */
-.el-table .el-table__body-wrapper::-webkit-scrollbar {
-  display: none; /* Chrome, Safari, Opera*/
-}
-
-
 </style>

src/components/UserCenter/menu.vue

@@ -14,7 +14,7 @@
         :default-active="activeMenu"
         router
         active-text-color="#3379FB"
-        :default-openeds="['manageTodo','manageFinish','teacherTodo','teacherFinish','lecturer','myqa','notice','mystudy','myGrowth', 'course', 'exam', 'u001', 'u002', 'u003', 'u004','mylecnotes','mycaseRecord']"
+        :default-openeds="['manageTodo','manageFinish','teacherTodo','teacherFinish','lecturer','myqa','notice','mystudy', 'course', 'exam', 'u001', 'u002', 'u003', 'u004','mylecnotes','mycaseRecord']"
         class="el-menu-vertical"
         @open="handleOpen"
         @close="handleClose"
@@ -242,20 +242,6 @@
           <svg-icon :icon-class="activeMenu == '/user/medal'?'myxunzhang-active':'myxunzhang'"></svg-icon>
           <span slot="title">我的勋章</span>
       </el-menu-item>
-        <template v-if="showGrowthNav">
-          <el-submenu index="myGrowth" v-show="curIdentity == 1">
-            <template slot="title">
-              <!-- <i class="el-icon-s-grid"></i> -->
-              <img src="../../assets/images/myGrowth.jpg" style="width: 1em;height: 1em;margin-right: 8px;"></img>
-              <span>我的必修</span>
-            </template>
-            <el-menu-item index="/growth/growthPage">
-              <!-- <i class="el-icon-menu"></i> -->
-              <span slot="title" class="study textl">专业力必修</span>
-            </el-menu-item>
-          </el-submenu>
-        </template>
-
         <el-submenu index="mystudy" v-show="curIdentity == 1">
           <template slot="title">
             <!-- <i class="el-icon-s-grid"></i> -->
@@ -399,7 +385,6 @@ import { mapGetters } from 'vuex';
 import apicourseStudy from "../../api/modules/courseStudy.js"
 import {pageList} from "@/api/modules/lecturer"
 import courseImage from "@/components/Course/courseImage.vue"
-import { listData } from "@/api/growth/growthpath"
 import testUser from '@/utils/testUsers.js'
 export default {
   name: 'UcMenu',
@@ -428,8 +413,7 @@ export default {
       isCollapse: false,
       lastStudy:{},
       overlayShow: false,
-      instructor:0,
-      showGrowthNav: false
+      instructor:0
     };
   },
   created() {
@@ -438,11 +422,6 @@ export default {
     this.getLastStudy();
     //获取讲师认证中条数
     this.instructorCertification()
-    console.log(this.userInfo,'userInfouserInfo')
-    //如果专业力必修没有学习任务则隐藏“我的必修按钮”
-    listData().then(res => {
-      this.showGrowthNav = !!res.data.length
-    })
   },
   mounted() {
     //console.log(this.userInfo.loginName,'this.userInfo.loginName');

src/components/VideoPlayer/index.vue

@@ -18,6 +18,7 @@
       @keydown.right.prevent="forwardCurrentTime"
       @keydown.up.prevent="increaseVolume"
       @keydown.down.prevent="lowerVolume"
+      @keydown.esc.prevent="toggleFullScreen"
       tabindex="0"
       width="100%"
       height="100%"
@@ -39,12 +40,12 @@
             :isPlaying="isPlaying"
             :biBarrageXml="biBarrageXml"
     />
-    <!-- 加载动画(应该当前视频没有缓存时显示加载动画)   && isCrowd && isShowPlayer -->
-    <div v-show="isShowLoading" class="player-loading" @click="videoDom.focus({preventScroll: true})">
+    <!-- 加载动画 -->
+    <div v-show="isShowLoading  && isCrowd && isShowPlayer" class="player-loading" @click="videoDom.focus({preventScroll: true})">
       <img src="@/components/VideoPlayer/images/loading.svg"  alt="loading"/>
     </div>
     <!-- 控制栏 -->
-    <div v-show="isCrowd" class="player-controls-container" @click="videoDom.focus({preventScroll: true})">
+    <div v-show="!isShowLoading && 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>
@@ -70,7 +71,6 @@
       <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,11 +241,6 @@ export default {
       type: String,
       default: null,
     },
-    // 视频链接对应的content Id
-    blobId: {
-      type: String,
-      default: null,
-    },
     // 主题色
     primaryColor: {
       type: String,
@@ -271,7 +266,7 @@ export default {
     },
     isDrag:{
       type: Boolean,
-      default: true,
+      default: null,
     },
     isCrowd:{
       type: Boolean,
@@ -317,17 +312,6 @@ 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 =
@@ -372,50 +356,20 @@ 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("F", () => {
+    window.addEventListener("fullscreenchange", () => {
       this.isFullscreen = this.isFullScreen();
     });
-    document.addEventListener('fullscreenchange',this.handleFullscreenChange);
-    document.addEventListener('webkitfullscreenchange',this.handleFullscreenChange );
-    // this.videoDom.addEventListener('keydown', function(e){
-    //   //console.log('\x1b[31m%s\x1b[0m','*****************加载失败**********')
-    //   console.log("video is exit");
-    //   if(e.key === "Escape"){
-    //     console.log("按键 退出全屏 执行")
-    //   }
-    // })
-
-    // this.videoDom.addEventListener("keydown", (e) => {
-    //   console.log("是否监听到");
-    //   if(e.keyCode == 27){
-    //     console.log("是否监听到 esc");
-    //     this.toggleFullScreen();
-    //   }
-    // });
   },
   methods: {
     //当视频由于需要缓冲下一帧而停止，解决一直计时的问题
     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{
@@ -506,13 +460,6 @@ export default {
     updateProgressBySetTime(newCurrentTime) {
       this.currentProgress = newCurrentTime / this.videoDom.duration;
     },
-    /* 点击进度条更新视频播放进度2
-    */
-    updateProgressByClickBar2(newCurrentTime,progressVideo) {
-      this.currentProgress = progressVideo;
-      this.barrageTimelineStart = newCurrentTime;
-      this.videoDom.currentTime = newCurrentTime;
-    },
     /* 提高视频音量
      */
     increaseVolume() {
@@ -563,7 +510,6 @@ export default {
     /* 切换“全屏”和“非全屏”模式
      */
     toggleFullScreen() {
-      console.log("toggleFullScreen 执行 ",this.isFullScreen())
       let element = this.$refs.area;
       if (!this.isFullScreen()) {
         if (element.requestFullscreen) {
@@ -620,24 +566,6 @@ export default {
       const currentTime = this.$refs.video.currentTime;
       this.$emit('onTimeUpdate', currentTime);
     },
-    /**
-     * 监听全屏变化
-     */
-    handleFullscreenChange() {
-      console.log("handleFullscreenChange gx this.isFullScreen()",this.isFullScreen())
-      console.log("handleFullscreenChange gx this.isFullscreen",this.isFullscreen)
-
-      if(this.isFullscreen){
-        this.isFullscreen = !!document.fullscreenElement;
-        if (!this.isFullscreen) {
-          // 退出全屏后的逻辑（如暂停视频、更新 UI 等）
-          console.log('ESC 已退出全屏 handleFullscreenChange',this.isFullscreen);
-          this.$emit('onFullscreen',false);//全屏
-        }
-      }
-
-
-    }
   },
   watch: {
     currentVolume: function () {

src/components/VideoPlayer/progress-bar.vue

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

src/data/pages.js

@@ -82,9 +82,6 @@ export const pages=[
     {title:'学习路径图',path:'path',component:'study/StudyPath',hidden:false},
     {title:'学习项目',path:'project',component:'study/StudyProject',hidden:false}
   ]},
-  {title:'我的必修',path:'/growth',hidden:false,children:[
-    {title:'专业力必修',path:'growthPage',component:'growth/index',hidden:false},
-  ]},
   {title:'个人中心',path:'/uc',hidden:false,children:[
     {title:'首页',path:'index',component:'StudyIndex',hidden:false}
   ]},

src/layout/components/AppMain.vue

@@ -6,10 +6,7 @@
         <!-- <div style="height: 20px;"></div> -->
       </div>
       <!-- width: 990px; -->
-      <div class="main-body" :style="{
-             backgroundColor: bgColor,
-             padding
-            }" style="flex:1; margin-left: 20px;">
+      <div class="main-body" style="padding: 30px 20px;flex:1; background-color: #fff;margin-left: 20px;">
         <!-- <div style="margin-bottom: 10px;padding:10px; border-bottom: 1px solid #dbdbdb;"> -->
           <!-- <el-breadcrumb separator-class="el-icon-arrow-right">
             <el-breadcrumb-item :to="{ path: '/uc/index' }"><i class="el-icon-arrow-right"></i>个人中心</el-breadcrumb-item>
@@ -18,9 +15,7 @@
         <!-- </div> -->
         <transition name="fade-transform" mode="out-in">
           <keep-alive :include="cachedViews">
-            <div :style="{
-             backgroundColor: bgColor
-            }" style="min-height: 600px;padding-bottom: 50px;">
+            <div style="background-color: #FFFFFF;min-height: 600px;padding-bottom: 50px;">
             <router-view :key="key" />
             </div>
           </keep-alive>
@@ -44,14 +39,7 @@ export default {
       return this.$route.meta.title;
     },
     key() {
-      console.log(this.$route)
       return this.$route.path
-    },
-    bgColor() {
-     return this.$route.path === "/growth/growthPage" ? "rgba(0,0,0,0)" : "#fff";
-    },
-    padding(){
-      return this.$route.path === "/growth/growthPage" ? "0" : "30px 20px";
     }
   }
 }

src/router/index.js

@@ -193,20 +193,6 @@ export const constantRoutes = [{
     name: 'caseDetail',
     meta: {title: '案例详情', keepAlive: true, icon: 'dashboard', noCache: false, affix: true},
   },
-  {
-    path: '/case/charts',
-    hidden: true,
-    component: (resolve) => require(['@/views/portal/case/Charts'], resolve),
-    name: 'caseCharts',
-    meta: {title: '排行榜', keepAlive: true, icon: 'dashboard', noCache: false, affix: true},
-  },
-  {
-    path: '/case/excellent',
-    hidden: true,
-    component: (resolve) => require(['@/views/portal/case/Excellent'], resolve),
-    name: 'caseExcellent',
-    meta: {title: '浏览量榜单', keepAlive: true, icon: 'dashboard', noCache: false, affix: true},
-  },
   {
     path: '/article',
     hidden: true,
@@ -341,13 +327,6 @@ export const constantRoutes = [{
     name: 'hotforum',
     meta: {title: '热点论坛', icon: 'dashboard', noCache: true, affix: true},
   },
-  {
-    path: '/lexiang',
-    hidden: true,
-    component: (resolve) => require(['@/views/sso/lexiang'], resolve),
-    name: 'lexiang',
-    meta: {title: '单点登录', icon: 'dashboard', noCache: true, affix: true},
-  },
   {
     path: '/404',
     component: (resolve) => require(['@/views/error/404'], resolve),

src/utils/tools.js

@@ -423,7 +423,6 @@ 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/Forward.vue

@@ -2,7 +2,7 @@
   <div class="box" :class="{ incl: url.includes('projectdetails') }">
     <portal-header style="background: #387DF7;" :hideSearch="true" textColor="#ffffff"></portal-header>
         <iframe :src="url" style="width: 100%;height: 100%;" frameborder="0" ref="iframe"></iframe>
-    <portal-footer v-if="isShowFooter"></portal-footer>
+    <portal-footer></portal-footer>
   </div>
 </template>
 <script>
@@ -16,8 +16,7 @@ import portalFooter from "@/components/PortalFooter.vue";
     data(){
       return {
        url: "",
-       boeUrl:process.env.VUE_APP_BOE_WEB_URL,
-       isShowFooter:true
+       boeUrl:process.env.VUE_APP_BOE_WEB_URL
       }
     },
     mounted() {
@@ -25,10 +24,6 @@ import portalFooter from "@/components/PortalFooter.vue";
       let to = this.$route.query.to;//跳转的地址，以 /开头的地址
       let urlPre=window.location.protocol+'//'+window.location.host;
       this.url=urlPre+to
-
-      if(to.includes('growthList')){
-        this.isShowFooter = false
-      }
       if(params){
          this.url=this.url+'?'+params;
       }

src/views/Login.vue

@@ -1,4 +1,3 @@
-<!--
 <template>
   <div class="login" :style="`background: url(${webBaseUrl}/temp/background.jpg) no-repeat`">
     <el-form :model="form" ref="form" :rules="rules">
@@ -25,7 +24,7 @@
       <el-form-item>
         <section>
           <el-checkbox v-model="rememberMe">记住密码</el-checkbox>
-          &lt;!&ndash; <span>忘记密码</span> &ndash;&gt;
+          <!-- <span>忘记密码</span> -->
         </section>
       </el-form-item>
       <el-form-item><el-button type="primary" @click="loginSubmit">点击登录</el-button></el-form-item>
@@ -195,4 +194,3 @@
   }
 }
 </style>
--->

src/views/case/ManageList.vue

@@ -32,9 +32,6 @@
           </div>
         </div>
       </div>
-      <div style="margin: 5px 0 0 5px;">
-        <el-button type="primary" @click="recoRanking">推荐榜单</el-button>
-      </div>
     </div>
     <el-table style="100%" :data="caseList" border stripe>
       <el-table-column label="标题" prop="title" show-overflow-tooltip>
@@ -52,7 +49,6 @@
       <el-table-column label="操作">
         <template slot-scope="scope">
           <el-button-group>
-            <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>
@@ -60,12 +56,8 @@
               @click="setTop(scope.row)" icon="el-icon-bottom">取消置顶</el-button>
             <el-button type="text" icon="el-icon-medal"
               v-if="scope.row.filePath && scope.row.confidentialityLevel == '内部'"><span @click="cancal(scope.row)"
-                v-if="scope.row.excellent">取消最佳</span>
-                <!-- <span @click="open(scope.row)" v-else>最佳案例</span> -->
-                <span @click="theBest(scope.row)" v-else>最佳</span>
-              </el-button>
+                v-if="scope.row.excellent">取消最佳</span><span @click="open(scope.row)" v-else>最佳案例</span></el-button>
             <el-button style="margin:0 5px" type="text" @click="delItem(scope.row)" icon="el-icon-delete">删除</el-button>
-            <!-- <el-button style="margin:0 5px" type="text" @click="theBest(scope.row)" icon="el-icon-delete">最佳</el-button> -->
           </el-button-group>
         </template>
       </el-table-column>
@@ -129,91 +121,16 @@
       </div>
       <span slot="footer" class="dialog-footer"><el-button @click="recommend.dlgShow = false">关闭</el-button></span>
     </el-dialog>
-    <el-dialog
-      title="最佳案例"
-      :visible.sync="bestValue"
-      width="36%">
-      <div class="best_card">
-        <div class="card_item">
-          <div class="card_title">
-            <i class="icon"></i>
-            <span class="text">年度</span>
-          </div>
-          <el-input style="width:190px" disabled v-model="bestYear" placeholder="请输入年度"></el-input>
-        </div>
-        <div class="card_item">
-          <div class="card_title">
-            <i class="icon"></i>
-            <span class="text">组织领域</span>
-          </div>
-          <el-input disabled v-model="bestOrg" placeholder="请输入组织领域"></el-input>
-        </div>
-        <div class="card_item">
-          <div class="card_title">
-            <span class="text">最佳理由</span>
-          </div>
-          <el-input type="textarea"
-            placeholder="请输入内容"
-            v-model="bestTextarea"
-            maxlength="200"
-            show-word-limit></el-input>
-        </div>
-      </div>
-      <span slot="footer" class="dialog-footer">
-        <el-button @click="notBest">取 消</el-button>
-        <el-button type="primary" @click="parameBest">确 定</el-button>
-      </span>
-    </el-dialog>
-    <el-drawer
-      title="推荐榜单"
-      :visible.sync="RankingShow"
-      size="80%">
-      <div style="padding: 10px 20px 80px">
-        <el-table :data="tableData" border stripe>
-          <el-table-column
-            type="index"
-            width="50"
-            label="排序">
-          </el-table-column>
-          <el-table-column show-overflow-tooltip label="案例标题" prop="caseTitle"></el-table-column>
-          <el-table-column width="150px" label="作者名称" prop="caseAuthor"></el-table-column>
-          <el-table-column width="150px" label="上榜人" prop="caseAuthor"></el-table-column>
-          <el-table-column width="250px" label="上榜时间" prop="recommendRankPusTime"></el-table-column>
-          <el-table-column label="操作">
-            <template slot-scope="scope">
-              <el-button-group>
-                <el-button style="margin:0 5px" type="text" @click="handleNotRank(scope.row)" icon="el-icon-delete">取消推荐</el-button>
-                <el-button style="margin:0 5px" type="text" @click="moveUp(scope.row,scope.$index)" icon="el-icon-top">上移排序</el-button>
-                <el-button style="margin:0 5px" type="text" @click="moveDown(scope.row,scope.$index)" icon="el-icon-bottom">下移排序</el-button>
-              </el-button-group>
-            </template>
-          </el-table-column>
-        </el-table>
-      </div>
-      <div class="rank_footer">
-        <el-button @click="closeDrawer" style="width: 130px;height:40px;margin-right: 30px;" type="default">取消</el-button>
-        <el-button @click="queryList" style="width: 130px;height:40px;margin-right: 15px;" type="primary">确定</el-button>
-      </div>
-    </el-drawer>
   </div>
 </template>
 
 <script>
 import apiCase from '@/api/modules/cases.js';
 import apiUser from '@/api/system/user.js'
-import apiType from "@/api/modules/type.js";
 export default {
   name: 'articleItems',
   data() {
     return {
-      adminList: [],
-      caseType: process.env.VUE_APP_CASE_TYPE,
-      RankingShow: false,
-      bestYear: '',
-      bestOrg: '',
-      bestId: '',
-      bestTextarea: '',
-      bestValue: false,
       excellent: false,
       queryObj: {
         pageIndex: 1,
@@ -222,8 +139,6 @@ export default {
         excellent: '',
       }, //查询对象
       caseList: [], //案例列表
-      tableData: [],
-      caseIds: '',
       count: 0,
       recommend: {
         dlgShow: false,
@@ -256,153 +171,8 @@ export default {
   },
   mounted() {
     this.getData();
-    this.getList();
-    apiType.treeList(1,Number(this.caseType ?? 155),1).then(res=>{
-      if(res.code == 200){
-        this.adminList = res.data.records;
-      }
-    })
-  },
-  watch:{
-    RankingShow(val){
-      if(val){
-        this.getList()
-      }
-    }
   },
   methods: {
-    orgDomainTranslate(code) { // 组织领域翻译
-      if (code == '') {
-        return
-      }
-      let name = '';
-      let data = this.adminList.find(item => {
-        return item.code == code;
-      });
-      if (data) {
-        name = data.name;
-      }
-      return name;
-    },
-    suggest(record){
-      if(this.tableData.length == 10){
-        this.$message.error('最多推荐10个')
-        return
-      }
-      this.$confirm('你确认要推荐此案例吗?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        apiCase.riseIntoRank({caseId:record.id}).then(res=>{
-          if(res.status == 200 ){
-            this.$message.success('推荐成功')
-            this.getData()
-            this.getList()
-          }
-        })
-      })
-    },
-    handleNotRank(record){
-      this.$confirm('你确认要取消推荐吗?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        apiCase.cancelRiseIntoRank({caseId:record?.caseId}).then(res=>{
-          if(res.status == 200){
-            this.$message.success('取消推荐成功')
-            this.getList()
-            this.getData()
-          }
-        }).catch(()=>{
-          this.$message.error('取消推荐失败')
-        })
-      })
-    },
-    moveUp(row,index){
-      console.log(row,index,'index')
-      if(index == 0){
-        this.$message.error('已经排到第一位了')
-        return
-      }
-      this.swapArray(this.tableData,index,index-1)
-    },
-    moveDown(row,index){
-      if(index == this.tableData.length - 1){
-        this.$message.error('已经排到最后一位了')
-        return
-      }
-      this.swapArray(this.tableData,index,index+1)
-    },
-    swapArray(arr, index1, index2){
-      const temp = arr[index1];
-      arr.splice(index1, 1);
-      arr.splice(index2, 0, temp);
-    },
-    getList(){
-      apiCase.getQueryRecommendRank({pageSize:10}).then(res=>{
-        console.log(res,'res')
-        if(res.status == 200){
-          this.tableData = res.result
-          this.caseIds = res.result.map(item=>item.caseId).join(',')
-        }
-      })
-    },
-    notBest(){
-      this.bestValue = false
-      this.bestYear = ''
-      this.bestOrg = ''
-      this.bestId = ''
-      this.bestTextarea = ''
-    },
-    parameBest(){
-      this.excellent = true;
-      let data = {
-        id: this.bestId,
-        excellent: this.excellent,
-        excellentReason: this.bestTextarea
-      }
-      apiCase.excellent(data).then(res=>{
-        if (res.status == 200) {
-            this.$message({
-              type: 'success',
-              message: '设置最佳案例成功!'
-            });
-            this.getData()
-          }else{
-            this.$message({
-              type: 'error',
-              message: res.message
-            });
-          }
-          this.notBest()
-      })
-    },
-    recoRanking(){
-      this.RankingShow = true
-    },
-    closeDrawer(){
-      this.RankingShow = false
-    },
-    queryList(){
-      if(this.caseIds != this.tableData.map(item=>item.caseId).join(',')){
-        apiCase.adjustRank({caseIds:this.tableData.map(item=>item.caseId).join(',')}).then(res=>{
-          if(res.status == 200){
-            this.$message({
-              message: '调整成功',
-              type: 'success'
-            })
-          }
-        }).catch(()=>{
-          this.$message({
-            message: '调整失败',
-            type: 'error'
-          })
-        })
-      }
-      this.RankingShow = false
-    },
     // 导出
     importList() {
       apiCase.exports(this.queryObj).then(res => {
@@ -441,11 +211,6 @@ export default {
               message: '取消成功!'
             });
             this.getData()
-          }else{
-            this.$message({
-              type: 'error',
-              message: res.message
-            });
           }
         })
       }).catch(() => {
@@ -589,12 +354,6 @@ export default {
           this.$message({ type: 'info', message: '已取消删除', offset: 50 });
         });
     },
-    theBest(item){
-      this.bestValue = true
-      this.bestId = item.id
-      this.bestOrg = this.orgDomainTranslate(item.orgDomainParent)
-      this.bestYear = item.sysCreateTime.split('-')[0]
-    },
     //添加推荐
     shareItem(item) {
       this.shareItemData = { ...item }
@@ -708,48 +467,6 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.rank_footer{
-  position: absolute;
-  bottom: 0;
-  right: 0;
-  width: 100%;
-  height: 80px;
-  display: flex;
-  justify-content: flex-end;
-  align-items: center;
-  background: #fff;
-  padding-right: 20px;
-}
-::v-deep .el-dialog__header{
-  border-bottom: 1px solid #f0f0f1;
-}
-::v-deep .el-textarea__inner{
-  height: 100px !important;
-}
-.best_card{
-  .card_item{
-    display: flex;
-    justify-content: start;
-    margin-bottom: 20px;
-    .card_title{
-      width: 94px;
-      min-width: 94px;
-      display: flex;
-      align-items: center;
-      justify-content: end;
-      margin-right: 14px;
-      .icon{
-        width:8px;
-        height: 8px;
-        background: url('../../assets/images/asterisk.png') no-repeat;
-        background-size: 100%;
-      }
-      .text{
-
-      }
-    }
-  }
-}
 .article-status1 {
   padding: 3px;
   border: 1px dotted #1ea0fa;

src/views/course/ManageList.vue

@@ -195,15 +195,7 @@
       </template>
     </el-dialog>
     <!--课程管理-->
-    <el-dialog
-        custom-class="g-dialog"
-        title="课程学习管理"
-        width="900px"
-        height="900px"
-        :visible.sync="manageStudy.dlgShow"
-        :close-on-click-modal="false"
-
-        >
+    <el-dialog custom-class="g-dialog" title="课程学习管理" width="900px" :visible.sync="manageStudy.dlgShow" :close-on-click-modal="false">
       <manager :manageStudyData="manageStudyData" :isShowDialog="manageStudy.dlgShow"></manager>
       <template #footer>
         <el-button @click="manageStudy.dlgShow = false">关闭</el-button>
@@ -676,10 +668,8 @@ export default {
       }
       apiCourse.pageList(this.params).then(rs=>{
           if(rs.status==200){
-            this.pageData = rs.result.list ? rs.result.list : [];
-            // this.pageData = rs.result.list;
+            this.pageData = rs.result.list;
             this.page.count = rs.result.count;
-            this.page.pageSize = rs.result.pageSize;
           }else{
             return this.$message.error(rs.message);
           }
@@ -949,8 +939,4 @@ export default {
     }
   }
 }
-
-.el-dialog__body {
-  overflow: hidden;
-}
 </style>

src/views/course/Mylecnotes.vue

@@ -2,23 +2,11 @@
      <div style="padding: 12px 32px 10px 12px;">
       <div style="display: flex;justify-content: flex-start;">
 
-      <div>
-        <el-input v-model="keyword" placeholder="输入课程名称搜索" clearable></el-input>
-      </div>
-      <div style="padding-left: 10px;">
-        <el-button @click="recordList()" type="primary" icon="el-icon-search">搜索</el-button>
-      </div>
-      <div style="padding: 0px 5px;">
-        <el-button icon="el-icon-refresh-right" @click="keyword = ''" type="primary">重置</el-button>
-      </div>
-      <div style="padding: 0px 5px;">
-        <el-button type="primary" @click="exportFile()" icon="el-icon-search" size="small" round>导出</el-button>
-      </div>
-<!--      <div style="padding: 0px 5px;">-->
-<!--        <el-button type="primary" @click="exportStudentOfTearcher()" icon="el-icon-search" size="small" round>-->
-<!--          导出学员信息-->
-<!--        </el-button>-->
-<!--      </div>-->
+        <div><el-input v-model="keyword" placeholder="输入课程名称搜索" clearable></el-input></div>
+        <div style="padding-left: 10px;"><el-button @click="recordList()" type="primary" icon="el-icon-search">搜索</el-button></div>
+        <div style="padding: 0px 5px;"><el-button icon="el-icon-refresh-right" @click="keyword = ''" type="primary" >重置</el-button></div>
+        <div style="padding: 0px 5px;"><el-button type="primary" @click="exportFile()" icon="el-icon-search" size="small" round>导出</el-button></div>
+        <div style="padding: 0px 5px;"><el-button type="primary" @click="exportStudentOfTearcher()" icon="el-icon-search" size="small" round>导出学员信息</el-button></div>
       </div>
       <div class="Export">
         <!-- <div style="padding-left: 10px;"><el-button type="primary" @click="exportFile()" icon="el-icon-search" size="small" round>导出</el-button></div> -->
@@ -27,21 +15,8 @@
       <div style="margin-top:20px;">
         <el-table :data="pageData" border stripe>
             <el-table-column
-          label="序号"
-          prop="index"
-          width="100px">
-          <template v-slot="scope">
-            <span>{{ scope.$index + 1 }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column
-          label="讲师工号"
-          prop="userNo"
-          width="100px">
-        </el-table-column>
-        <el-table-column
-          label="讲师姓名"
-          prop="teacherName"
+            label="课程时间"
+            prop="courseTime"
             width="200px">
             </el-table-column>
             <el-table-column
@@ -50,77 +25,38 @@
             width="200px">
             </el-table-column>
             <el-table-column
-          label="培训发生组织"
-          prop="trainOrgName"
-          width="200px">
-        </el-table-column>
-        <el-table-column label="课程类型" prop="type" width="120px">
-          <template v-slot="scope">
-                <span>{{
-                    {
-                      "0": "在线课",
-                      "1": "面授课",
-                      "2": "课程开发",
-                      "3": "作业员入模培训",
-                      "4": "其他",
-                    }[scope.row.type + '']
-                  }}</span>
-          </template>
+            label="开课场地"
+            prop="address"
+            width="240px">
             </el-table-column>
             <el-table-column
-          label="授课/课程日期"
-          prop="teachingDate"
-          width="200px">
-        </el-table-column>
-
-        <el-table-column
-          label="内容分类"
-          prop="courseTypeName"
-          width="200px">
-        </el-table-column>
-        <el-table-column label="开课状态" width="100px" prop="courseStatus">
-          <template v-slot="scope">
-                <span>{{
-                    {
-                      "0": "未开课",
-                      "1": "已开课",
-                    }[scope.row.courseStatus + '']
-                  }}</span>
-          </template>
+            label="所属课程"
+            prop="parentCourse"
+            width="120px">
             </el-table-column>
             <el-table-column
-          label="授课时长(分钟)"
-          prop="teaching"
-          width="120px"
+            label="所属项目"
+            prop="parentProject"
             ></el-table-column>
             <el-table-column
-          label="参训人数"
-          prop="studys"
-          width="120px"
+            label="所属路径"
+            prop="parentRoute"
+            width="200px"
+            ></el-table-column>
+            <el-table-column
+            label="学习总人数"
+            prop="studentNumber"
+            width="100px"
+            ></el-table-column>
+            <el-table-column
+            label="时长(分钟)"
+            width="100px"
+            prop="period"
             ></el-table-column>
             <el-table-column
             label="评分"
+            width="100px"
             prop="score"
-          width="100px"
-        ></el-table-column>
-        <el-table-column
-          label="是否生成讲师费"
-          prop="createdFee"
-          width="100px"
-        >
-          <template v-slot="scope">
-                <span>{{
-                    {
-                      "0": "否",
-                      "1": "是",
-                    }[scope.row.createdFee + '']
-                  }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column
-          label="备注"
-          width="200px"
-          prop="remark"
              ></el-table-column>
             <el-table-column
             label="操作"
@@ -130,9 +66,7 @@
             fixed="right"
              >
              <template v-slot="scope">
-            <el-button type="text" @click="exportStudentOfCourse(scope.row.courseId, scope.row.type)"
-                       size="small">导出学员信息
-            </el-button>
+              <el-button type="text" @click="exportStudentOfCourse(scope.row.courseId)" size="small">导出学员信息</el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -157,70 +91,32 @@
 <script>
 import apiCourse from '../../api/boe/courseRecord.js';
 import { mapGetters } from 'vuex';
-
 export default {
   data(){
     return {
         pageData:[],
         keyword:'',
-      pageInfo: {
-        pageIndex:1,
-        pageSize:10,
-      },
+        pageInfo:{},
     }
   },
+
   mounted() {
-    this.recordList();
+    this.recordList(1);
+
   },
   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}`
-        );
+        let req = {
+          userId: this.userInfo.sysId
+          // userId:"70F80F4E-34BA-10AB-894A-8FA812B19637"
         }
-    },
-
-    // 导出课程下的学员信息
-    exportStudentOfCourse(courseId, courseType) {
-      // apiCourse.exportStudentOfCourse2(courseId, courseType).then(res => {
-      //   const link = document.createElement('a');// 创建a标签
-      //   let blob = new Blob([res.data], {type: 'application/vnd.ms-excel'}); // 设置文件类型
-      //   link.style.display = "none";
-      //   link.href = URL.createObjectURL(blob); // 创建URL
-      //   link.setAttribute("download", "授课记录.xls");
-      //   document.body.appendChild(link);
-      //   link.click();
-      //   document.body.removeChild(link);
-      // })
-
-      window.open(
-        `/manageApi/admin/export/exportTeacherRecordStudentInfo?courseId=${courseId}&courseType=${courseType}`
-      );
-    },
-
-    // 导出教师下的所有授课记录下的学员信息
-    exportStudentOfTearcher() {
-      let userId = this.userInfo.sysId;
-      apiCourse.exportStudentOfTearcher2(userId).then(res => {
+        apiCourse.courseRecordExport(req).then(res=>{
             const link = document.createElement('a');// 创建a标签
             let blob = new Blob([res.data],{type: 'application/vnd.ms-excel'}); // 设置文件类型
             link.style.display = "none";
@@ -232,18 +128,51 @@ export default {
         })
       },
 
-    recordList() {
+
+      // 导出课程下的学员信息
+      exportStudentOfCourse(courseId){
+        let userId = this.userInfo.sysId;
+        apiCourse.exportStudentOfCourse(userId,courseId).then(res=>{
+            const link = document.createElement('a');// 创建a标签
+            let blob = new Blob([res.data],{type: 'application/vnd.ms-excel'}); // 设置文件类型
+            link.style.display = "none";
+            link.href = URL.createObjectURL(blob); // 创建URL
+            link.setAttribute("download", "授课记录.xls");
+            document.body.appendChild(link);
+            link.click();
+            document.body.removeChild(link);
+        })
+      },
+
+      // 导出教师下的所有授课记录下的学员信息
+      exportStudentOfTearcher(){
+        let userId = this.userInfo.sysId;
+        // let userId = '5D36C207-64F4-C512-312D-C9598257695C';
+        apiCourse.exportStudentOfTearcher(userId).then(res=>{
+            const link = document.createElement('a');// 创建a标签
+            let blob = new Blob([res.data],{type: 'application/vnd.ms-excel'}); // 设置文件类型
+            link.style.display = "none";
+            link.href = URL.createObjectURL(blob); // 创建URL
+            link.setAttribute("download", "授课记录.xls");
+            document.body.appendChild(link);
+            link.click();
+            document.body.removeChild(link);
+        })
+      },
+
+
+      recordList(pageIndex){
         let req = {
-        courseName: this.keyword,
-        pageNo: this.pageInfo.pageIndex,
-        pageSize: this.pageInfo.pageSize
+        //     userId:"6B049FAF-C314-7CCF-0D28-0D23F4C42531",
+            userId: this.userInfo.sysId,
+            keyword:this.keyword,
+            page:pageIndex,
+            pageSize:10
         }
-      apiCourse.getListByToken(req).then(res => {
+        apiCourse.courseRecordList(req).then(res=>{
           if(res.status == 200) {
-          this.pageData = res.data.records;
-          this.pageInfo.pageSize = Number(res.data.size);
-          this.pageInfo.total = Number(res.data.total);
-          this.pageInfo.page = Number(res.data.current);
+            this.pageData = res.result.list;
+            this.pageInfo = res.result.pageInfo;
           } else {
              this.$message({
               type: 'error',
@@ -255,16 +184,17 @@ export default {
 
       // 每页显示的条数事件
       handleSizeChange(val){
-      this.pageInfo.pageIndex = 1;
         this.pageInfo.pageSize = val;
-      this.recordList();
+        this.recordList(1);
       },
       // 显示制定页的数据
       handleCurrentChange(val){
         this.pageInfo.pageIndex = val;
         this.recordList(this.pageInfo.pageIndex);
       },
+
   },
+
 }
 </script>
 

src/views/exam/Test.vue

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

src/views/grateful/TeacherOpinion.vue

@@ -118,7 +118,7 @@ export default {
   }
 
   &::after {
-    content: '认证讲师库';
+    content: '认证讲师库(2023)';
     position: absolute;
     bottom: 25px;
     left: 180px;

src/views/growth/index.vue

@@ -1,390 +0,0 @@
-<template>
-  <div class="growth" v-loading="loading" id="scrollContainer">
-    <div class="growth-left">
-      <div class="navbar">
-        <div style="display: flex; flex: 1">
-          <div class="nav-title">我的专业力必修</div>
-        </div>
-      </div>
-
-      <div class="growth-item" v-for="item of list" :id="item.id">
-        <div class="growth-nav">
-          <div class="growth-name">{{ item.growthName }}</div>
-          <div class="f-a-c">
-            <div
-              class="growth-state"
-              :style="{
-                color:
-                  item.learningState === 0
-                    ? '#999999'
-                    : item.learningState === 1
-                    ? '#6ba158'
-                    : '#F2903D',
-              }"
-            >
-              {{
-                item.learningState === 0
-                  ? "未开始"
-                  : item.learningState === 1
-                  ? "已完成"
-                  : "进行中"
-              }}
-            </div>
-            <div class="growth-btn" @click="jumpRouter(item)">去学习</div>
-          </div>
-        </div>
-        <template v-if="item.description">
-          <div class="tip-title">说明</div>
-          <div class="tip-content">
-            {{ item.description || "暂无说明" }}
-          </div>
-        </template>
-
-        <div class="progress-title">学习进度</div>
-
-        <div class="progress-content">
-          <div class="f-j-b" style="margin-bottom: 10px">
-            <div class="f-a-c">
-              <div style="font-size: 16px; color: #333333">必修进度</div>
-              <div style="font-size: 18px; color: #999999; margin-left: 12px">
-                {{ item.requiredTaskCompletedNum }}/{{ item.requiredTaskNum }}
-              </div>
-            </div>
-            <div style="font-size: 18px; color: #0077ec">
-              {{ requiredTaskCompletionRate(item) }}%
-            </div>
-          </div>
-          <el-progress
-            :stroke-width="6"
-            :show-text="false"
-            :percentage="requiredTaskCompletionRate(item)"
-            color="#0077EC"
-          ></el-progress>
-        </div>
-        <template v-if="item.electiveTaskNum !== 0">
-          <div class="progress-content">
-            <div class="f-j-b" style="margin-bottom: 10px">
-              <div class="f-a-c">
-                <div style="font-size: 16px; color: #333333">选修进度</div>
-                <div style="font-size: 18px; color: #999999; margin-left: 12px">
-                  {{ item.electiveTaskCompletedNum }}/{{ item.electiveTaskNum }}
-                </div>
-                <el-tooltip
-                  class="item"
-                  effect="light"
-                  :content="`还需完成${item.electivePoorNum}个选修任务`"
-                  placement="top-start"
-                >
-                  <i class="el-icon-question"></i>
-                </el-tooltip>
-              </div>
-              <div style="font-size: 18px; color: #0077ec">
-                {{ electiveTaskCompletionRate(item) }}%
-              </div>
-            </div>
-            <el-progress
-              :stroke-width="6"
-              :show-text="false"
-              color="#0077EC"
-              :percentage="electiveTaskCompletionRate(item)"
-            ></el-progress>
-          </div>
-        </template>
-        <div class="progress-content">
-          <div class="f-j-b" style="margin-bottom: 10px">
-            <div class="f-a-c">
-              <div style="font-size: 16px; color: #333333">总进度</div>
-              <div style="font-size: 18px; color: #999999; margin-left: 12px">
-                {{ item.totalTaskCompletedNum }}/{{ item.totalTaskNum }}
-              </div>
-            </div>
-            <div style="font-size: 18px; color: #0077ec">
-              {{ totalTaskCompletionRate(item) }}%
-            </div>
-          </div>
-          <el-progress
-            :stroke-width="6"
-            :show-text="false"
-            color="#0077EC"
-            :percentage="totalTaskCompletionRate(item)"
-          ></el-progress>
-        </div>
-        <div class="growth-bg-icon">
-          <img src="@/assets/images/growth/growth-bg-icon.png" />
-        </div>
-      </div>
-      <template v-if="!list.length">
-        <div class="empty">
-          <el-empty :image-size="200"></el-empty>
-        </div>
-      </template>
-    </div>
-    <!-- <template v-if="!list || list.length < 2">
-      <div class="growth-right">
-        <div class="title">专业力必修</div>
-        <div
-          :key="item.id"
-          class="item-growth"
-          :class="activeItem.id == item.id ? 'active' : ''"
-          v-for="item of list"
-        >
-          <div class="icon"></div>
-          <div @click="handlerAnchor(item)">
-            {{ item.growthName }}
-          </div>
-        </div>
-      </div>
-    </template> -->
-  </div>
-</template>
-<script>
-import { listData, getTotalGrowthTaskDetail } from "@/api/growth/growthpath";
-export default {
-  data() {
-    return {
-      list: [],
-      loading: false,
-      totalData: {},
-      activeItem: {},
-    };
-  },
-  computed: {
-    // 完成进度
-    totalTaskCompletionRate() {
-      return (item) => {
-        if (item.totalTaskCompletedNum && item.totalTaskNum) {
-          let num = item.totalTaskCompletedNum / item.totalTaskNum;
-          num = num * 100;
-          num = num.toFixed(0);
-          return Number(num);
-        } else {
-          return 0;
-        }
-      };
-    },
-    // 选修进度
-    electiveTaskCompletionRate() {
-      return (item) => {
-        if (item.electiveTaskCompletedNum && item.electiveTaskNum) {
-          let num = item.electiveTaskCompletedNum / item.electiveTaskNum;
-          num = num * 100;
-          num = num.toFixed(0);
-          return Number(num);
-        } else if (item.electiveTaskNum == 0) {
-          return 100;
-        } else {
-          return 0;
-        }
-      };
-    },
-    // 必修进度
-    requiredTaskCompletionRate() {
-      return (item) => {
-        if (item.requiredTaskCompletedNum && item.requiredTaskNum) {
-          let num = item.requiredTaskCompletedNum / item.requiredTaskNum;
-          num = num * 100;
-          num = num.toFixed(0);
-          return Number(num);
-        } else {
-          return 0;
-        }
-      };
-    },
-  },
-  methods: {
-    select(item) {},
-    jumpRouter(item) {
-      let studentPath = process.env.VUE_APP_STUDENT_PATH;
-      let params = encodeURIComponent("routerId=" + item.id);
-      this.$router.push(
-        "/forward?to=" + studentPath + "/growthList&params=" + params
-      );
-    },
-
-    handlerAnchor(item, index) {
-      this.activeItem = item;
-      let dom = document.getElementById(`${item.id}`);
-      dom.classList.add("handler-add-padding");
-      dom.scrollIntoView({ behavior: "smooth" });
-    },
-  },
-  created() {
-    this.loading = true;
-    listData().then((res) => {
-      this.activeItem = res.data[0];
-      this.list = res.data;
-      this.loading = false;
-    });
-    getTotalGrowthTaskDetail().then((res) => {
-      this.totalData = res.data;
-    });
-    // 处理滚动事件的代码
-    let that = this;
-    window.addEventListener("scroll", function () {
-      let dom = document.getElementById(`${that.activeItem.id}`);
-      if (dom) {
-        dom.classList.remove("handler-add-padding");
-      }
-    });
-  },
-};
-</script>
-<style lang="less" scoped>
-.f-a-c {
-  display: flex;
-  align-items: center;
-}
-.f-j-b {
-  display: flex;
-  justify-content: space-between;
-}
-.f-j-c {
-  display: flex;
-  justify-content: center;
-}
-.growth {
-  .empty {
-    height: 600px;
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    background-color: #ffffff;
-  }
-  .el-icon-question {
-    color: #387df7;
-    font-size: 16px;
-    margin-left: 5px;
-  }
-  .handler-add-padding {
-    padding: 100px 38px 66px 40px !important;
-    margin-top: -80px;
-  }
-  display: flex;
-  .growth-left {
-    margin-right: 10px;
-
-    flex: 1;
-    .growth-item {
-      background: #ffffff;
-      padding: 30px 38px 66px 40px;
-      margin-bottom: 35px;
-      position: relative;
-      .growth-bg-icon {
-        position: absolute;
-        right: 92px;
-        bottom: 0;
-      }
-      .progress-title {
-        // font-weight: 700;
-        font-size: 18px;
-        color: #000000;
-        margin: 28px 0 20px 0;
-      }
-      .progress-content {
-        margin-bottom: 28px;
-      }
-      .tip-title {
-        // font-weight: 700;
-        font-size: 18px;
-        color: #000000;
-        margin: 30px 0 10px 0;
-      }
-      .tip-content {
-        font-size: 16px;
-        color: #333333;
-        line-height: 30px;
-      }
-      .growth-nav {
-        display: flex;
-        justify-content: space-between;
-        align-items: center;
-        padding-bottom: 28px;
-        border-bottom: 2px solid #f5f5f5;
-      }
-      .growth-name {
-        font-weight: bold;
-        font-size: 18px;
-        color: #0071ed;
-      }
-      .growth-state {
-        font-size: 15px;
-        margin-right: 18px;
-      }
-      .growth-btn {
-        display: flex;
-        justify-content: center;
-        align-items: center;
-        width: 120px;
-        height: 36px;
-        background: #f2903d;
-        border-radius: 4px;
-        font-size: 16px;
-        color: #ffffff;
-        cursor: pointer;
-      }
-    }
-    .navbar {
-      display: flex;
-      align-items: center;
-      height: 90px;
-      padding-left: 40px;
-      margin-bottom: 10px;
-      color: #ffffff;
-      background-image: url(../../assets/images/growth/growth-bg.png);
-      background-size: 100% 100%;
-      .nav-title {
-        font-weight: 700;
-        font-size: 18px;
-        margin-right: 10%;
-      }
-      .nav-total {
-        // margin-left: 15%;
-        width: 20%;
-      }
-      .total-num {
-        font-weight: bold;
-        font-size: 22px;
-      }
-    }
-  }
-  .growth-right {
-    width: 30%;
-    max-width: 464px;
-    margin-bottom: 35px;
-    background-color: #ffffff;
-    padding: 35px 20px 20px 30px;
-    .title {
-      font-size: 18px;
-      color: #000000;
-      font-weight: 700;
-      margin-bottom: 30px;
-      overflow: hidden;
-      white-space: nowrap;
-      text-overflow: ellipsis;
-    }
-    .item-growth {
-      display: flex;
-      align-items: center;
-      border-radius: 5px;
-      font-size: 14px;
-      color: #666666;
-      padding: 10px 20px 10px 8px;
-      cursor: pointer;
-    }
-    .icon {
-      width: 4px;
-      height: 4px;
-      background: #4c5564;
-      border-radius: 50%;
-      margin-right: 10px;
-    }
-    .active {
-      background: #e3edfe;
-      color: #000;
-      .icon {
-        background: #0077ec;
-      }
-    }
-  }
-}
-</style>

src/views/hotforum/Index-bak.vue

@@ -1,179 +0,0 @@
-<template>
-  <div class="hot">
-    <div>
-      <div class="center">
-        <div class="item" :style="{marginRight:(i%2==0||i==0)?'49px':'0'}" v-for="item,i in imgData" :key="i">
-          <img class="img" @click="goLearn(item.url)" :src="require(`../../assets/images/hotforum/${item.img}.png`)" alt="">
-        </div>
-      </div>
-      <div style="display: flex;justify-content: center;margin-bottom: 52px;">
-        <img src="../../assets/images/hotforum/foot.png" alt="">
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-  export default {
-    name: "hotforum",
-    data() {
-      return {
-        imgData:[
-          {img:'01',url:'1265897142383042560'},
-          {img:'02',url:'1265697724606210048'},
-          {img:'003',url:'1280185851054231552'},
-          {img:'04',url:'1321778585966247936'},
-        ],
-      }
-    },
-    methods: {
-      goLearn(item){
-        if(item){
-          // this.$router.push({path:'/course/detail',query:{id:item}})
-          window.open(`https://u.boe.com/pc/course/detail?id=${item}`)
-        }
-      },
-    },
-  }
-</script>
-
-<style lang="scss" scoped>
-.hot{
-  width: 100%;
-  // max-width: 1920px;
-  min-height: 100%;
-  // min-height: 1373px;
-  background: url("../../assets/images/hotforum/back.jpg") no-repeat;
-  background-size: 100% 100%;
-  display: flex;
-  justify-content: center;
-  .center{
-    max-width: 1270px;
-    max-height: 700px;
-    margin-bottom: 5%;
-    margin-top: 22%;
-    display: flex;
-    flex-wrap: wrap;
-    .item{
-      width: 610px;
-      height: 330px;
-      background: url("../../assets/images/hotforum/border.png") no-repeat;
-      background-size: 100%;
-      padding: 14px;
-      padding-top: 31px;
-      margin-bottom: 59px;
-      cursor: pointer;
-      .img{
-        width: 581px;
-        height: 283px;
-      }
-    }
-  }
-  /* 当窗口宽度大于3068px时的样式 */
-}
-@media (min-width: 3000px) {
-.hot{
-  width: 100%;
-  // max-width: 1920px;
-  min-height: 100%;
-  // min-height: 1373px;
-  background: url("../../assets/images/hotforum/back.jpg") no-repeat;
-  background-size: 100% 100%;
-  display: flex;
-  justify-content: center;
-  .center {
-    max-width: 2560px;
-    max-height: 1300px;
-    margin-bottom: 5%;
-    margin-top: 30vh;
-    display: flex;
-    flex-wrap: wrap;
-
-    .item {
-      width: 1220px;
-      height: 660px;
-      background: url("../../assets/images/hotforum/border.png") no-repeat;
-      background-size: 100%;
-      padding: 28px;
-      padding-top: 62px;
-      margin-bottom: 59px;
-
-      .img {
-        width: 100%; // 图片宽度占满item宽度
-        height: auto; // 自动调整高度
-      }
-    }
-  }
-}
-}
-@media (min-height: 1500px) {
-.hot{
-  width: 100%;
-  // max-width: 1920px;
-  min-height: 100%;
-  // min-height: 1373px;
-  background: url("../../assets/images/hotforum/back.jpg") no-repeat;
-  background-size: 100% 100%;
-  display: flex;
-  justify-content: center;
-  .center {
-    max-width: 1068px;
-    max-height: 580px;
-    margin-bottom: 5%;
-    margin-top: 30vh;
-    display: flex;
-    flex-wrap: wrap;
-
-    .item {
-      width: 500px;
-      height: 271px;
-      background: url("../../assets/images/hotforum/border.png") no-repeat;
-      background-size: 100%;
-      padding: 14px;
-      padding-top: 26px;
-      margin-bottom: 30px;
-
-      .img {
-        width: 100%; // 图片宽度占满item宽度
-        height: auto; // 自动调整高度
-      }
-    }
-  }
-}
-}
-@media (min-width: 1928px) and (max-width: 3000px) {
-.hot{
-  width: 100%;
-  // max-width: 1920px;
-  min-height: 100%;
-  // min-height: 1373px;
-  background: url("../../assets/images/hotforum/back.jpg") no-repeat;
-  background-size: 100% 100%;
-  display: flex;
-  justify-content: center;
-  .center {
-    max-width: 1800px;
-    max-height: 1100px;
-    margin-bottom: 5%;
-    margin-top: 35vh;
-    display: flex;
-    flex-wrap: wrap;
-
-    .item {
-      width: 860px;
-      height: 466px;
-      background: url("../../assets/images/hotforum/border.png") no-repeat;
-      background-size: 100%;
-      padding: 28px;
-      padding-top: 48px;
-      margin-bottom: 70px;
-
-      .img {
-        width: 100%; // 图片宽度占满item宽度
-        height: auto; // 自动调整高度
-      }
-    }
-  }
-}
-}
-</style>

src/views/hotforum/Index.vue

@@ -1,50 +1,40 @@
 <template>
-  <div class="hot25">
   <div>
-      <div class="title25" style="">
-          <img class="img" src="../../assets/images/hotforum/2025.png" alt="">
-      </div>
-      <div class="center" style="margin-top: 60px;">
-        <div class="item" style="margin-right: 49px;">
-          <img class="img" @click="goLearn('1351506180295131136')" src="../../assets/images/hotforum/2501.jpg" alt="">
-        </div>
-        <div class="item">
-          <img class="img"  src="../../assets/images/hotforum/2502.png" alt="">
+    <div class="hot_2025">
+      <div class="center">
+        <div class="item" :style="{marginRight:(i%2==0||i==0)?'49px':'0'}" v-for="(item,i) in imgData_2025" :key="i">
+          <img class="img" @click="goLearn(item.url)" :src="require(`../../assets/images/hotforum/${item.img}.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="hot">
+      <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 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: "hotforumNew",
+  name: "hotforum",
   data() {
     return {
+      imgData_2025:[
+        {img:'005',url:'1351506180295131136'},
+        {img:'006',url:''},
+      ],
       imgData:[
         {img:'01',url:'1265897142383042560'},
         {img:'02',url:'1265697724606210048'},
         {img:'003',url:'1280185851054231552'},
-          {img:'04',url:'1321778585966247936'},
-        ],
-        imgData25:[
-          {img:'01',url:'1265897142383042560'},
-          {img:'02',url:'1265697724606210048'},
+        // {img:'4',url:''},
       ],
     }
   },
@@ -60,22 +50,20 @@
 </script>
 
 <style lang="scss" scoped>
-.hot25{
+.hot{
   width: 100%;
   // max-width: 1920px;
   min-height: 100%;
   // min-height: 1373px;
-  background: url("../../assets/images/hotforum/back25.png") no-repeat;
-  background-size: cover;
+  background: url("../../assets/images/hotforum/back.jpg") no-repeat;
+  background-size: 100% 100%;
   display: flex;
   justify-content: center;
-  .title25{
-    margin: 0 auto;margin-top: 100px;width: 100%;text-align: center;
-  }
   .center{
     max-width: 1270px;
     max-height: 700px;
     margin-bottom: 5%;
+    margin-top: 22%;
     display: flex;
     flex-wrap: wrap;
     .item{
@@ -95,109 +83,249 @@
   }
   /* 当窗口宽度大于3068px时的样式 */
 }
-// @media (min-width: 3000px) {
-// .hot{
-//   width: 100%;
-//   // max-width: 1920px;
-//   min-height: 100%;
-//   // min-height: 1373px;
-//   background: url("../../assets/images/hotforum/back.jpg") no-repeat;
-//   background-size: 100% 100%;
-//   display: flex;
-//   justify-content: center;
-//   .center {
-//     max-width: 2560px;
-//     max-height: 1300px;
-//     margin-bottom: 5%;
-//     margin-top: 30vh;
-//     display: flex;
-//     flex-wrap: wrap;
+@media (min-width: 3000px) {
+  .hot{
+    width: 100%;
+    // max-width: 1920px;
+    min-height: 100%;
+    // min-height: 1373px;
+    background: url("../../assets/images/hotforum/back.jpg") no-repeat;
+    background-size: 100% 100%;
+    display: flex;
+    justify-content: center;
+    .center {
+      max-width: 2560px;
+      max-height: 1300px;
+      margin-bottom: 5%;
+      margin-top: 30vh;
+      display: flex;
+      flex-wrap: wrap;
 
-//     .item {
-//       width: 1220px;
-//       height: 660px;
-//       background: url("../../assets/images/hotforum/border.png") no-repeat;
-//       background-size: 100%;
-//       padding: 28px;
-//       padding-top: 62px;
-//       margin-bottom: 59px;
+      .item {
+        width: 1220px;
+        height: 660px;
+        background: url("../../assets/images/hotforum/border.png") no-repeat;
+        background-size: 100%;
+        padding: 28px;
+        padding-top: 62px;
+        margin-bottom: 59px;
 
-//       .img {
-//         width: 100%; // 图片宽度占满item宽度
-//         height: auto; // 自动调整高度
-//       }
-//     }
-//   }
-// }
-// }
-// @media (min-height: 1500px) {
-// .hot{
-//   width: 100%;
-//   // max-width: 1920px;
-//   min-height: 100%;
-//   // min-height: 1373px;
-//   background: url("../../assets/images/hotforum/back.jpg") no-repeat;
-//   background-size: 100% 100%;
-//   display: flex;
-//   justify-content: center;
-//   .center {
-//     max-width: 1068px;
-//     max-height: 580px;
-//     margin-bottom: 5%;
-//     margin-top: 30vh;
-//     display: flex;
-//     flex-wrap: wrap;
+        .img {
+          width: 100%; // 图片宽度占满item宽度
+          height: auto; // 自动调整高度
+        }
+      }
+    }
+  }
+}
+@media (min-height: 1500px) {
+  .hot{
+    width: 100%;
+    // max-width: 1920px;
+    min-height: 100%;
+    // min-height: 1373px;
+    background: url("../../assets/images/hotforum/back.jpg") no-repeat;
+    background-size: 100% 100%;
+    display: flex;
+    justify-content: center;
+    .center {
+      max-width: 1068px;
+      max-height: 580px;
+      margin-bottom: 5%;
+      margin-top: 30vh;
+      display: flex;
+      flex-wrap: wrap;
 
-//     .item {
-//       width: 500px;
-//       height: 271px;
-//       background: url("../../assets/images/hotforum/border.png") no-repeat;
-//       background-size: 100%;
-//       padding: 14px;
-//       padding-top: 26px;
-//       margin-bottom: 30px;
+      .item {
+        width: 500px;
+        height: 271px;
+        background: url("../../assets/images/hotforum/border.png") no-repeat;
+        background-size: 100%;
+        padding: 14px;
+        padding-top: 26px;
+        margin-bottom: 30px;
 
-//       .img {
-//         width: 100%; // 图片宽度占满item宽度
-//         height: auto; // 自动调整高度
-//       }
-//     }
-//   }
-// }
-// }
-// @media (min-width: 1928px) and (max-width: 3000px) {
-// .hot{
-//   width: 100%;
-//   // max-width: 1920px;
-//   min-height: 100%;
-//   // min-height: 1373px;
-//   background: url("../../assets/images/hotforum/back.jpg") no-repeat;
-//   background-size: 100% 100%;
-//   display: flex;
-//   justify-content: center;
-//   .center {
-//     max-width: 1800px;
-//     max-height: 1100px;
-//     margin-bottom: 5%;
-//     margin-top: 35vh;
-//     display: flex;
-//     flex-wrap: wrap;
+        .img {
+          width: 100%; // 图片宽度占满item宽度
+          height: auto; // 自动调整高度
+        }
+      }
+    }
+  }
+}
+@media (min-width: 1928px) and (max-width: 3000px) {
+  .hot{
+    width: 100%;
+    // max-width: 1920px;
+    min-height: 100%;
+    // min-height: 1373px;
+    background: url("../../assets/images/hotforum/back.jpg") no-repeat;
+    background-size: 100% 100%;
+    display: flex;
+    justify-content: center;
+    .center {
+      max-width: 1800px;
+      max-height: 1100px;
+      margin-bottom: 5%;
+      margin-top: 35vh;
+      display: flex;
+      flex-wrap: wrap;
 
-//     .item {
-//       width: 860px;
-//       height: 466px;
-//       background: url("../../assets/images/hotforum/border.png") no-repeat;
-//       background-size: 100%;
-//       padding: 28px;
-//       padding-top: 48px;
-//       margin-bottom: 70px;
+      .item {
+        width: 860px;
+        height: 466px;
+        background: url("../../assets/images/hotforum/border.png") no-repeat;
+        background-size: 100%;
+        padding: 28px;
+        padding-top: 48px;
+        margin-bottom: 70px;
+
+        .img {
+          width: 100%; // 图片宽度占满item宽度
+          height: auto; // 自动调整高度
+        }
+      }
+    }
+  }
+}
+
+.hot_2025{
+  width: 100%;
+  // max-width: 1920px;
+  min-height: 100%;
+  // min-height: 1373px;
+  background: url("../../assets/images/hotforum/back_2025.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_2025{
+    width: 100%;
+    // max-width: 1920px;
+    min-height: 100%;
+    // min-height: 1373px;
+    background: url("../../assets/images/hotforum/back_2025.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_2025{
+    width: 100%;
+    // max-width: 1920px;
+    min-height: 100%;
+    // min-height: 1373px;
+    background: url("../../assets/images/hotforum/back_2025.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_2025{
+    width: 100%;
+    // max-width: 1920px;
+    min-height: 100%;
+    // min-height: 1373px;
+    background: url("../../assets/images/hotforum/back_2025.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; // 自动调整高度
+        }
+      }
+    }
+  }
+}
 
-//       .img {
-//         width: 100%; // 图片宽度占满item宽度
-//         height: auto; // 自动调整高度
-//       }
-//     }
-//   }
-// }
-// }
 </style>

src/views/lecturer/CoachingPage.vue

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

src/views/lecturer/CoachingSuccess.vue

@@ -64,7 +64,7 @@ export default {
       })
     },
     addTeacher() {
-      addTeacher({pageNo: 1, pageSize: 10, userNo: this.form.teacherNo}).then(res => {
+      addTeacher({pageNo: 1, pageSize: 10, keyword: this.form.teacherNo}).then(res => {
         this.getProgress(res.data[0].id)
       })
     },

src/views/lecturer/FinalSuccess.vue

@@ -100,7 +100,7 @@ export default {
       })
     },
     addTeacher() {
-      addTeacher({pageNo: 1, pageSize: 10, userNo: this.form.teacherNo}).then(res => {
+      addTeacher({pageNo: 1, pageSize: 10, keyword: this.form.teacherNo}).then(res => {
         this.getProgress(res.data[0].id)
       })
     },

src/views/lecturer/OnlineLearning.vue

@@ -56,7 +56,7 @@ export default {
       })
     },
     addTeacher(){
-      addTeacher({pageNo:1,pageSize:10,userNo:this.form.teacherNo}).then(res=>{
+      addTeacher({pageNo:1,pageSize:10,keyword:this.form.teacherNo}).then(res=>{
         this.getProgress(res.data[0].id)
       })
     },
@@ -64,17 +64,16 @@ export default {
       getProgress({teacherId:id}).then(res=>{
         this.progressData=res.data
         if ( res.data.length>=1 ){
-          const isAll = true;
-          res.data.some(item => {
-            if (item.progress != 100) {
-              this.disabled = true;
-              isAll = false;
-              return true;
-            }
-          });
-          if (isAll) {
-            this.disabled = false;
+          res.data.forEach((item,index)=>{
+            if (item.progress==100 && index==res.data.length-1){
+              this.disabled=false
+            }else if (item.progress==100) {
+            }else {
+              this.disabled=true
+              return
             }
+          })
+
         }
       })
     },

src/views/lecturer/TwoAthentication.vue

@@ -87,7 +87,7 @@ export default {
       })
     },
     addTeacher(){
-      addTeacher({pageNo:1,pageSize:10,userNo:this.form.teacherNo}).then(res=>{
+      addTeacher({pageNo:1,pageSize:10,keyword:this.form.teacherNo}).then(res=>{
         this.getProgress(res.data[0].id)
       })
     },

src/views/lecturer/TwoCoaching.vue

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

src/views/lecturer/TwoCos.vue

@@ -90,7 +90,7 @@ export default {
       })
     },
     addTeacher(){
-      addTeacher({pageNo:1,pageSize:10,userNo:this.form.teacherNo}).then(res=>{
+      addTeacher({pageNo:1,pageSize:10,keyword:this.form.teacherNo}).then(res=>{
         this.getProgress(res.data[0].id)
       })
     },

src/views/lecturer/TwoFinals.vue

@@ -95,7 +95,7 @@ export default {
       })
     },
     addTeacher(){
-      addTeacher({pageNo:1,pageSize:10,userNo:this.form.teacherNo}).then(res=>{
+      addTeacher({pageNo:1,pageSize:10,keyword:this.form.teacherNo}).then(res=>{
         this.getProgress(res.data[0].id)
       })
     },

src/views/portal/case/Charts.vue

@@ -1,242 +0,0 @@
-<template>
-  <div class="charts">
-    <div class="charts_header">
-      <portal-header textColor="#fff"></portal-header>
-      <div class="text">
-        排行榜
-      </div>
-    </div>
-    <div class="charts_content">
-      <div class="charts_item" :style="{justifyContent:recommendRank.length>0?'':'center'}">
-          <div :style="{width:recommendRank.length>0?'':'600px',marginRight:recommendRank.length>0?'':'45px'}" class="charts_item_box charts_bg1">
-            <div class="charts_text">
-              <div class="text">好评榜</div>
-              <el-dropdown trigger="click"  @command="positiveReview">
-                <span class="el-dropdown-link">
-                  {{favorableName}}<i class="el-icon-arrow-down el-icon--right"></i>
-                </span>
-                <el-dropdown-menu slot="dropdown">
-                  <el-dropdown-item command="total">总</el-dropdown-item>
-                  <el-dropdown-item command="quarter">季度</el-dropdown-item>
-                </el-dropdown-menu>
-              </el-dropdown>
-            </div>
-            <ul class="charts_list">
-              <li v-for="(item, index) in Positive" :key="index" class="list">
-                <router-link style="display: flex;align-items: center;" :to="'/case/detail?id=' + item.caseId">
-                  <img class="num" :src="require(
-                    `../../../../public/images/${imgNumBlue(index)}.png`
-                  )" alt="">
-                  <span class="text">{{ item.caseTitle }}</span>
-                </router-link>
-              </li>
-            </ul>
-          </div>
-          <div :style="{width:recommendRank.length>0?'':'600px'}" class="charts_item_box charts_bg2">
-            <div class="charts_text">
-              <div class="text">人气榜</div>
-              <el-dropdown trigger="click"  @command="popularityReview">
-                <span class="el-dropdown-link">
-                  {{popularityName}}<i class="el-icon-arrow-down el-icon--right"></i>
-                </span>
-                <el-dropdown-menu slot="dropdown">
-                  <el-dropdown-item command="total">总</el-dropdown-item>
-                  <el-dropdown-item command="quarter">季度</el-dropdown-item>
-                </el-dropdown-menu>
-              </el-dropdown>
-            </div>
-            <ul class="charts_list">
-              <li v-for="(item, index) in Popularity" :key="index" class="list">
-                <router-link style="display: flex;align-items: center;" :to="'/case/detail?id=' + item.caseId">
-                  <img class="num" :src="require(
-                    `../../../../public/images/${imgNumOrg(index)}.png`
-                  )" alt="">
-                  <span class="text">{{ item.caseTitle }}</span>
-                </router-link>
-              </li>
-            </ul>
-          </div>
-          <div v-if="recommendRank.length > 0" class="charts_item_box charts_bg3">
-            <div class="charts_text">
-              <div class="text">推荐榜</div>
-            </div>
-            <ul class="charts_list">
-              <li v-for="(item, index) in recommendRank" :key="index" class="list">
-                <router-link style="display: flex;align-items: center;" :to="'/case/detail?id=' + item.caseId">
-                  <img class="num" :src="require(
-                    `../../../../public/images/${imgNumPink(index)}.png`
-                  )" alt="">
-                  <span class="text">{{ item.caseTitle }}</span>
-                </router-link>
-              </li>
-            </ul>
-          </div>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-import apiCase from "@/api/modules/cases.js";
-import portalHeader from '@/components/PortalHeader.vue'
-  export default {
-    name: 'charts',
-    components:{portalHeader},
-    data() {
-      return {
-        ankingList: [],//排行数据1
-        Popularity: [],//排行数据2
-        Positive: [],//排行数据3
-        recommendRank: [],
-        switch: {
-          'total': '总',
-          'quarter': '季度',
-        },
-        favorableName: '季度',
-        popularityName: '季度',
-      }
-    },
-    mounted() {
-      this.getPopularity();
-      this.getPositive();
-      this.getQueryRecommendRank()
-    },
-    methods: {
-      getPopularity() {
-        apiCase.queryPraisesNew(10,this.popularityName == '季度' ? 1 : 2).then(res => {
-          if(res.status == 200) {
-            this.Popularity = res.result
-          }
-        })
-      },
-      getPositive() {
-        apiCase.queryCommentsNew(10,this.favorableName == '季度' ? 3 : 4).then(res => {
-          if(res.status == 200) {
-            this.Positive = res.result
-          }
-        })
-      },
-      getQueryRecommendRank(){
-        apiCase.queryRecommendRank(10).then(res => {
-          if(res.status == 200) {
-            this.recommendRank = res.result
-          }
-        })
-      },
-      imgNumBlue(index){
-        return 'listblue0' + (index+1)
-      },
-      imgNumOrg(index){
-        return (
-          index>2?'listblue0' + (index+1):'list0'+(index+1)
-        )
-      },
-      imgNumPink(index){
-        return (
-          index>2?'listblue0' + (index+1):'listred0'+(index+1)
-        )
-      },
-      positiveReview(e){
-        this.favorableName = this.switch[e]
-        this.getPositive()
-      },
-      popularityReview(e){
-        this.popularityName = this.switch[e]
-        this.getPopularity()
-      },
-    },
-  }
-</script>
-
-<style lang="scss" scoped>
-.el-dropdown-link {
-  cursor: pointer;
-  font-weight: 400;
-  font-size: 14px;
-  color: rgba(51,51,51,0.9);
-}
-.el-icon--right{
-  margin-left: 13px !important;
-}
-.charts{
-  min-height: 100vh;
-  background-color: #F2F5F7;
-  .charts_header{
-    width: 100%;
-    // height: 240px;
-    background: url('../../../../public/images/headerBack.png') no-repeat;
-    background-size: 100% 100%;
-    padding-bottom: 37px;
-    .text{
-      margin-top: 41px;
-      font-weight: 400;
-      font-size: 340%;
-      color: #FFFFFF;
-      padding-left: 98px;
-    }
-  }
-  .charts_content{
-    padding: 52px 91px 58px;
-    .charts_item{
-      display: flex;
-      justify-content: space-between;
-      .charts_item_box{
-        width: 30%;
-        padding: 30px;
-        background-color: #fff;
-        width: 30%;
-        min-height: 716px;
-        margin-right: 30px;
-        .charts_text{
-          display: flex;
-          justify-content: space-between;
-          height: 40px;
-          align-items: center;
-          .text{
-            font-size: 24px;
-            color: #000000;
-          }
-        }
-        .charts_list{
-          .list{
-            cursor: pointer;
-            margin-top:30px;
-            line-height: 22px;
-            .num{
-              width: 25px;
-              height: 30px;
-              margin-right: 10px;
-            }
-            .text{
-              font-weight: 500;
-              font-size: 14px;
-              color: #677D86;
-              overflow: hidden;
-              text-overflow: ellipsis;
-              white-space: nowrap;
-            }
-          }
-        }
-      }
-      .charts_bg1{
-        // width: 100%;
-        height: 100%;
-        background: url('../../../../public/images/qa-box.png') no-repeat;
-        background-size: 100% 100%;
-      }
-      .charts_bg2{
-        // width: 100%;
-        height: 100%;
-        background: url('../../../../public/images/list-or.png') no-repeat;
-        background-size: 100% 100%;
-      }
-      .charts_bg3{
-        // width: 100%;
-        height: 100%;
-        background: url('../../../../public/images/list-pink.png') no-repeat;
-        background-size: 100% 100%;
-      }
-    }
-  }
-}
-</style>