pc贡献者大会入口免登

# Conflicts:
#	src/views/hotforum/Index.vue

lexiang-sso-77deb595.txt

@@ -0,0 +1 @@
+60ab8a4b97b446b2dcd32889

src/api/boe/courseRecord.js

@@ -62,15 +62,62 @@ const courseRecordList = function(data) {
     return ajax.postJson('/b1/system/teacher/teacher-course-list',data);
 }
 const getListByToken = function(data) {
-  return ajax2.get('/manageApi',`/admin/teacherRecord/getListByToken?courseName=${data.courseName}&page=${data.page}&pageSize=${data.pageSize}`);
+  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,
-    exportStudentOfTearcher
+    exportStudentOfCourse2,
+    exportStudentOfTearcher,
+    exportStudentOfTearcher2,
 
 }

src/api/manage/manage.js

@@ -34,9 +34,48 @@ const userRsSginupCourse = function(data){
   return ajax.postJson(baseURL,'/stu/project/stuCancelEnrollment',data);
 }
 
+/**
+ * 获取学员指定新员工转正项目的bpm审批状况
+ * {studentId,pid}
+ * add by zhengsongbo on 2025-07-12
+ */
+const getStudntProjectInfo = function(pid){
+  return ajax.get(baseURL,`/stu/project/queryStudentInfo?pid=${pid}`);
+}
+
+/**
+ * BPM项目：立即报名
+ * pid
+ * add by zhengsongbo on 2025-07-13
+ */
+const signUpBpmProjectNow = function(pid){
+  return ajax.get(baseURL,`/stu/project/signUpBpmProjectNow?pid=${pid}`);
+}
+
+/**
+ * BPM项目：重新报名
+ * pid
+ * add by zhengsongbo on 2025-07-13
+ */
+const signUpBpmProjectAgain = function(data){
+  return ajax.postJson(baseURL,'/stu/project/signUpBpmProjectAgain',data);
+}
+
+/**
+ * 社招新员工
+ * add by zhengsongbo on 2025-07-14
+ */
+const getNewSocialHireProject = function(){
+  return ajax.get(baseURL,'/stu/project/getNewSocialHireProject');
+}
+
 export default {
     getTaskNum,
     userTaskList,
     userDeleteStudy,
-    userRsSginupCourse
+    userRsSginupCourse,
+    getStudntProjectInfo,
+    signUpBpmProjectNow,
+    signUpBpmProjectAgain,
+    getNewSocialHireProject
 }

src/api/modules/courseStudy.js

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

src/api/modules/courseTag.js

@@ -0,0 +1,64 @@
+/**课程标签模块的相关处理*/
+import ajax from '@/utils/xajax.js'
+
+/**
+ * 分页查询：标签列表
+ * @param {Object} query
+ */
+const portalPageList = function(query) {
+  return ajax.post('/xboe/m/coursetag/page', query);
+}
+
+//改变标签的公共属性
+const changeTagPublic = function (row){
+  // 返回 Promise 的 API 调用
+  return ajax.post('/xboe/m/coursetag/changePublicStatus', {
+    id: row.id,
+    isPublic: row.isPublic
+  });
+}
+
+//改变标签的热点属性
+const changeTagHot = function (row){
+  // 返回 Promise 的 API 调用
+  return ajax.post('/xboe/m/coursetag/changeHotStatus', {
+    id: row.id,
+    isHot: row.isHot
+  });
+}
+
+//查询指定id的标签关联的所有课程
+const showCourseByTag = function (query){
+  return ajax.post('/xboe/m/coursetag/showCourseByTag', query);
+}
+
+//解除指定id的课程和某个标签之间的关联关系
+const unbindCourseTagRelation = function (params){
+  return ajax.post('/xboe/m/coursetag/unbind', params);
+}
+
+//编辑课程：标签模糊查询
+const searchTags = function (params){
+  return ajax.post('/xboe/m/coursetag/searchTags', params);
+}
+
+//编辑课程：创建标签(与当前课程关联)
+const createTag = function (params){
+  return ajax.post('/xboe/m/coursetag/createTag', params);
+}
+
+//获取最新前10个热点标签
+const getHotTagList = function (params){
+  return ajax.post('/xboe/m/coursetag/getHotTagList', params);
+}
+
+export default {
+  portalPageList,
+  changeTagPublic,
+  changeTagHot,
+  showCourseByTag,
+  unbindCourseTagRelation,
+  searchTags,
+  createTag,
+  getHotTagList
+}

src/api/modules/teacher.js

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

src/components/Course/courseForm.vue

@@ -253,6 +253,9 @@
                   </el-select> -->
                   <choice :teacherValue="teacherValues" @getTeacherList="getTeacherList"></choice>
                 </el-form-item>
+                <el-form-item label="标签" required>
+                  <courseTag ref="courseTag" :courseId="curCourseId" :sysTypeList="sysTypeList" :initialTags="courseTags" @change="handleTagsChange"></courseTag>
+                </el-form-item>
                 <el-form-item label="关键字">
                   <el-input v-model.trim="keywords" maxlength="100" @keyup.enter.native="changeKeywords"  placeholder="请输入关键字"></el-input>
                       <el-tag v-for="(tag,index) in tips" size="small" :key="index" closable type="info" @close="closeKeywordsTag(tag,index)">
@@ -402,6 +405,7 @@
   </div>
 </template>
 <script>
+import courseTag from "@/components/Course/courseTag.vue";
 import choice from '@/components/Course/choice.vue';
 import agreement from '@/components/Portal/agreement.vue';
 import weikeContent from '@/components/Course/weikeContent.vue';
@@ -418,6 +422,7 @@ import apiCourse from '../../api/modules/course.js';
 import apiCourseAudit from '../../api/modules/courseAudit.js';
 import apiOrg from '../../api/system/organiza.js';
 import apiUser from '../../api/system/user.js';
+import apiCourseTag from '../../api/modules/courseTag.js';
 import WxEditor from '@/components/Editor/index.vue';
 import catalogSort from '@/components/Course/catalogSort.vue';
 import { courseType, getType } from '../../utils/tools.js';
@@ -426,7 +431,7 @@ import filecloud from '@/components/FileCloud/index.vue';
 import chooseOrg from '@/components/System/chooseOrg.vue';
 export default {
   props: {},
-  components: { weikeContent, catalogCourseware, imageUpload, WxEditor, catalogSort,agreement,filecloud,choice,chooseOrg},
+  components: { courseTag, weikeContent, catalogCourseware, imageUpload, WxEditor, catalogSort,agreement,filecloud,choice,chooseOrg},
   data() {
     return {
       keywords:'',//关键字的定义
@@ -466,6 +471,7 @@ export default {
       orgName:'',
       orgNamePath:'',
       orgKid:'',
+      courseTags:[],
       courseInfo: {
         id: '',
         name: '',
@@ -592,6 +598,15 @@ export default {
     closeKeywordsTag(item,index){
       this.tips.splice(index, 1);
     },
+    // 处理标签变化事件
+    handleTagsChange(tags) {
+      console.log("父组件:",tags)
+      let ids = "";
+      tags.forEach(tag=>{
+        ids += tag.id + ',';
+      })
+      this.courseInfo.tags = ids;
+    },
     showChooseOrg(){
        this.$refs.refChooseOrg.dlgShow = true;
     },
@@ -722,6 +737,7 @@ export default {
       this.$emit('close');
     },
     initShow(editData) {
+      console.log('初始化显示内容============', editData)
       //console.log(this.$refs.weikePanel,'this.$refs.weikePanel');
       //this.$refs.weikePanel.init();
       //this.$refs.onlineCourse.resetData();
@@ -769,6 +785,8 @@ export default {
       this.tips=[];
 
       if (!editData) {
+        this.tips=[];
+        this.courseTags=[],
         //console.log("新建课程？");
         //以下为了保证初始化处理
         this.weikeReset = Math.round(Math.random()) + '';
@@ -865,6 +883,8 @@ export default {
         if (rs.status == 200) {
           this.courseChooseShow = false;
           this.courseInfo = rs.result;
+          this.curCourseId = this.courseInfo.id
+          console.log('保存课程成功',this.curCourseId)
           if (this.courseChooseId == 1) {
             this.weike.dlgShow = true;
           } else {
@@ -893,6 +913,8 @@ export default {
       try {
         const { result, status } = await apiCourse.detail(id);
         if (status === 200) {
+          this.courseTags = result.tagList;
+          console.log('获取课程信息成功', this.courseTags);
           //把数据附给三个对象
           if(result.course.visible==''){
             result.course.visible=false;
@@ -958,7 +980,6 @@ export default {
                }
             });
           }
-
           this.resOwnerArray=[];
           if (result.course.resOwner1 == '') {
             this.resOwnerArray.push(result.course.resOwner1);
@@ -1243,7 +1264,7 @@ export default {
         teachers: saveTeachers,
         crowds:crowds
       };
-      //console.log(postData);
+      console.log(postData);
       //this.btnLoading=false;
       apiCourse
         .saveBase(postData)

src/components/Course/courseImage.vue

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

src/components/Course/courseTag.vue

@@ -0,0 +1,200 @@
+
+<template>
+  <div class="tag-container">
+    <el-select style="width: 100%;"
+      v-model="selectedTags"
+      multiple
+      filterable
+      value-key="id"
+      remote
+      reserve-keyword
+      :remote-method="debouncedSearch"
+      :loading="loading"
+      :disabled="sysTypeList.length===0"
+      placeholder="按回车键Enter创建标签"
+      @remove-tag="handleTagRemove"
+      @change="handleSelectionChange"
+      @keyup.enter.native="handleEnterKey"
+    >
+      <el-option
+        v-for="item in searchResults"
+        :key="item.id"
+        :label="item.tagName"
+        :value="item"
+      />
+    </el-select>
+  </div>
+</template>
+
+<script>
+import { debounce } from 'lodash'
+import apiCourseTag from '@/api/modules/courseTag.js'
+import { mapGetters } from 'vuex';
+
+export default {
+  props: {
+    courseId:{
+      type:String,
+      require:true,
+    },
+    sysTypeList:{
+      type:Array,
+      require:true,
+      default: []
+    },
+    maxTags: {
+      type: Number,
+      default: 10
+    },
+    // 添加：接收初始标签数据的props
+    initialTags: {
+      type: Array,
+      default: () => []
+    }
+  },
+  data() {
+    return {
+      selectedTags: [],
+      searchResults: [],
+      loading: false,
+      tagMap: new Map(),
+      inputBuffer: '',
+      params: {},
+      tag: {}
+    }
+  },
+  computed: {
+    ...mapGetters(['userInfo']),
+    displayTags() {
+      return this.selectedTags.map(tag =>
+        typeof tag === 'object' ? tag : this.tagMap.get(tag)
+      ).filter(Boolean)
+    }
+  },
+  created() {
+    this.debouncedSearch = debounce(this.doSearch, 500)
+    console.log("----------sysTypeList.length---------->"+this.sysTypeList.length)
+    console.log("----------sysTypeList.length---------->"+(this.sysTypeList.length===0))
+  },
+  // 添加：挂载时初始化标签数据
+  mounted() {
+    if (this.initialTags && this.initialTags.length > 0) {
+      this.selectedTags = this.initialTags;
+      this.searchResults = this.initialTags;
+      // 将初始标签添加到tagMap中，确保删除功能正常
+      this.initialTags.forEach(tag => {
+        if (tag.id) {
+          this.tagMap.set(tag.id, tag);
+        }
+      });
+    }
+  },
+  watch: {
+    // 监听课程ID变化，重置所有状态
+    courseId(newVal) {
+      this.resetTagState();
+    },
+    // 监听初始标签变化，重新加载
+    initialTags(newVal) {
+      this.selectedTags = newVal || [];
+      this.searchResults = newVal || [];
+      this.tagMap.clear(); // 清空旧缓存
+      newVal.forEach(tag => {
+        if (tag.id) this.tagMap.set(tag.id, tag);
+      });
+    }
+  },
+  methods: {
+    // 新增：重置标签状态的方法
+    resetTagState() {
+      this.selectedTags = [];
+      this.searchResults = [];
+      this.tagMap.clear();
+      this.loading = false;
+      this.params = {};
+    },
+    async doSearch(query) {
+      if (!query.trim()) {
+        this.searchResults = []
+        return
+      }
+
+      this.loading = true
+      try {
+        const {result:tags} = await apiCourseTag.searchTags({tagName:query})
+        tags.forEach(item => {
+          this.tagMap.set(item.id, item)
+        })
+        this.searchResults = tags
+      } finally {
+        this.loading = false
+      }
+    },
+    handleTagRemove(tagId) {
+      this.selectedTags = this.selectedTags.filter(id => id !== tagId)
+      this.$emit('change', this.displayTags)
+    },
+    removeTag(tagId) {
+      this.handleTagRemove(tagId)
+    },
+
+    //按回车键，创建新标签
+    handleEnterKey(event) {
+      const inputVal = event.target.value?.trim()
+      if (!this.searchResults.length && inputVal && this.selectedTags.length < this.maxTags) {
+        this.createNewTag(event.target.value.trim())
+        event.target.value = ''
+      }
+    },
+
+    // 新增：处理选择变化事件
+    handleSelectionChange() {
+      this.$emit('change', this.displayTags)
+    },
+    //创建新标签
+    async createNewTag(tagName) {
+      // 标签不能超过八个字
+      if (tagName.length > 8) {
+        this.$message.error('标签不能超过8个字')
+        return;
+      }
+      this.loading = true
+      try {
+        this.params.courseId = this.courseId;
+        this.params.tagName = tagName;
+        // 分类
+        if (this.sysTypeList.length > 0) {
+          this.params.sysType1 = this.sysTypeList[0]; //一级的id
+        }
+        if (this.sysTypeList.length > 1) {
+          this.params.sysType2 = this.sysTypeList[1]; //二级的id
+        }
+        if (this.sysTypeList.length > 2) {
+          this.params.sysType3 = this.sysTypeList[2]; //三级的id
+        }
+        const {result:newTag} = await apiCourseTag.createTag(this.params)
+        this.$message.success('标签创建成功');
+        this.searchResults.push(newTag)
+        console.log("----------newTag---------->",this.searchResults)
+        this.tagMap.set(newTag.id, newTag)
+        this.$emit('change', this.displayTags)
+      } finally {
+        this.loading = false
+      }
+    },
+  }
+}
+</script>
+
+<style scoped>
+.tag-container {
+  position: relative;
+}
+.tag-preview {
+  margin-top: 8px;
+}
+.el-tag {
+  margin-right: 6px;
+  margin-bottom: 6px;
+}
+</style>

src/components/Course/homework.vue

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

src/components/Portal/comments.vue

@@ -97,7 +97,7 @@
                            <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> 
+                              <span>回复</span>
                            </a>
                            <!--必须当前登录人是一个人-->
                            <a style="display: flex;align-items: center;" v-if="userInfo.aid==com.sysCreateAid" @click="delCommnet(com,comIdx)">
@@ -558,7 +558,7 @@
                 this.$message.error(res.message);
             }
           });
-
+          this.loadData(false);
         }
 
       },
@@ -633,6 +633,7 @@
               this.$message.error(res.message);
            }
         });
+        this.loadData(false);
       },
       delCommnet(com,idx){
         if(com.replyList!='' && com.replyList.length>0){

src/components/PortalHeader.vue

@@ -137,6 +137,30 @@
             </div>
           </div>
         </div>
+      <!-- "社招新员工转正培训项目简介"弹框 -->
+      <el-dialog width="733px"
+                 :visible.sync="projectDialogVisible"
+                 :append-to-body="true"
+                 >
+        <div class="el-dialog__header">
+            <span style="font-size: 35px; font-weight: bold; color: white; margin: 60px;line-height: 100px;">项目简介</span>
+        </div>
+        <div style="height: 280px;margin: 0px 40px 0px 40px;">
+          <span v-html="studentInfo.introduction"></span>
+        </div>
+        <div>
+          <span style="font-size: 14px; margin: 40px;" v-if="studentInfo.bpmStatus!=0">审批编号：<span style="font-weight: bold;">{{studentInfo.bpmNumber}}</span></span>
+          <br/>
+          <span style="font-size: 14px; margin: 40px;">审批状态：<span style="font-weight: bold; color: #efbf82">{{studentInfo.bpmStatusName}}</span></span>
+        </div>
+        <template #footer>
+            <span class="dialog-footer">
+              <el-button type="primary" @click="signUpNow" v-if="studentInfo.bpmStatus==0">立即报名</el-button>
+              <el-button v-if="studentInfo.bpmStatus==1" disabled>审批中</el-button>
+              <el-button type="primary" @click="signUpAgain" v-if="studentInfo.bpmStatus==3">重新报名</el-button>
+            </span>
+        </template>
+      </el-dialog>
     </div>
     <popup></popup><yearMedal></yearMedal>
   </div>
@@ -144,7 +168,9 @@
 <script>
 import { mapGetters, mapActions } from 'vuex';
 import apiMessage from '@/api/system/message.js';
+import apiManage from '@/api/manage/manage.js';
 import popup from '@/components/AlertPopup.vue';
+import { getToken } from '@/utils/token.js';
 import yearMedal from '@/components/Popup/China2023.vue';
 import apiBoeCourse from '@/api/boe/course.js';
 import {userAvatarText} from "@/utils/tools.js";
@@ -204,6 +230,8 @@ export default {
       keyword: '',
       isTiao: false,
       sex:'',
+      projectDialogVisible: false,
+      studentInfo: {},
     };
   },
   mounted() {
@@ -214,7 +242,22 @@ export default {
     //this.loadPopupConfig();
   },
   methods: {
-
+    //BPM项目:立即报名
+    signUpNow(){
+      const pid = this.studentInfo.projectId;
+      apiManage.signUpBpmProjectNow(pid).then(res=>{
+        this.projectDialogVisible = false;
+      })
+    },
+    //BPM项目：重新报名
+    signUpAgain(){
+      const pid = this.studentInfo.projectId;
+      const studentId=this.studentInfo.studentId;
+      const data = {"pid":pid,"studentId":studentId};
+      apiManage.signUpBpmProjectAgain(data).then(res=>{
+        this.projectDialogVisible = false;
+      })
+    },
     setCurIdentity(iden){
         this.$store.dispatch('SetCurIdentity',iden);
       },
@@ -249,13 +292,37 @@ export default {
           two: urlPre + "/web/contributor/index",
           three: urlPre + "/web/contributor_2024/index"
         };
-        window.open(obj[val]);
+        // console.log(obj[val]  + "?token=" + encodeURIComponent(getToken()), 'getOrgToken()::',getToken(), encodeURIComponent(getToken()));
+        window.open(obj[val]  + "?token=" + encodeURIComponent(getToken()));
+        // window.location.href = obj[val]  + "?token=" + encodeURIComponent(getToken());
     },
     handleCommand(val) {
       if (val === "four") {
         window.open("https://m.qingxuetang.com/x/?appId=qxtcorp306130")
           // this.$emit('showClass',true)
-      }  else {
+      } else if(val === "five"){//new社招新员工项目(需BPM审批报名--唯一，如果不唯一，取发布时间最新的)
+        let studentPath = process.env.VUE_APP_STUDENT_PATH;
+        apiManage.getNewSocialHireProject().then(res=>{
+          this.studentInfo = res.data;
+          const bpmStatus = this.studentInfo.bpmStatus;
+          if (bpmStatus == 0){//未报名--则弹窗含“立即报名”
+            this.studentInfo.bpmStatusName="未报名";
+            this.projectDialogVisible=true;
+
+          }else if (bpmStatus == 1){//已报名待审核(审批中)--仅弹窗展示
+            this.studentInfo.bpmStatusName="审批中";
+            this.projectDialogVisible=true;
+
+          }else if (bpmStatus == 2){//bpm报名审核通过,则直接进入项目进行学习
+            let params = encodeURIComponent('projectId=' + this.studentInfo.projectId);
+            this.$router.push('/forward?to=' + studentPath + '/projectdetails&params=' + params);
+          }else if(bpmStatus == 3){//已拒绝--则弹窗含“重新报名”
+            this.studentInfo.bpmStatusName="已拒绝(含个人撤回)";
+            this.projectDialogVisible=true;
+
+          }
+        })
+      } else {
         let urlPre = window.location.protocol + "//" + window.location.host;
         // process.env.VUE_APP_BOE_WEB_URL
         let obj = {
@@ -264,7 +331,7 @@ export default {
           two: urlPre + "/grow180/login",
           three: this.webBaseUrl + "/study/index?study=1",
           // four: 'https://m.qingxuetang.com/x/?appId=qxtcorp306130',
-          five: urlPre + "/boe/new-employee/index.html",
+          // five: urlPre + "/boe/new-employee/index.html", //old社招新员工 zhengsongbo 注释掉 2025-07-14
           six: urlPre + "/web/contributor/index",
           seven: this.webBaseUrl + '/grateful/index'
         };
@@ -598,4 +665,27 @@ text-align: center;
      margin-right: 8px;
      border-radius: 50%;
    }
+  /* 项目简介 弹窗  ---start--- */
+  ::v-deep .el-dialog__header {
+    padding: 0 !important;
+  }
+  ::v-deep .el-dialog {
+    border-radius: 3% 3% 1% 1%;
+  }
+ .el-dialog__header {
+    height: 100px;
+    margin: 0 !important;
+    background-image: url('../assets/images/project/title-bg.png');
+    background-size: 100% 100%;  /* 完全填充 */
+    display: block;             /* 避免行内元素空隙 */
+ }
+  ::v-deep .el-dialog__title {
+    margin: 0 !important;
+    padding: 0 !important;
+  }
+  ::v-deep .el-dialog__body {
+    margin: 0 !important;
+    padding: 0 !important;
+  }
+/* 项目简介 弹窗  ---end--- */
 </style>

src/components/VideoPlayer/index.vue

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

src/components/VideoPlayer/progress-bar.vue

@@ -73,59 +73,51 @@ export default {
   },
   methods: {
     down(e) {
-      // if(this.isDrag) {
-        this.$emit("getMouseDownStatus", true);
-        this.is_mousedown_progress = true;
-        // 获取完整进度条的clientX（dom左上角）
-        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('down arr:',this.isDrag,this.blobId,arr,arr[this.blobId],current)
-        // 禁止拖动
-        if(!this.isDrag && time && arr[this.blobId] < current) return;
-
-        this.$emit("updateProgress", current);
-      // }
+      if (!this.isDrag) return;
+      this.$emit("getMouseDownStatus", true);
+      this.is_mousedown_progress = true;
+      // 获取完整进度条的clientX（dom左上角）
+      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) || {}
+      // 禁止拖动
+      if(time && arr[this.blobId] < current) return;
 
+      this.$emit("updateProgress", current);
     },
     move(e) {
-      if (this.is_mousedown_progress) {
-        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;
-        this.$emit("updateProgress", current);
-      }
+      if (!this.isDrag || !this.is_mousedown_progress) return;
+      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) || {}
+      // 禁止拖动
+      if(time && arr[this.blobId] < current) return;
+      this.$emit("updateProgress", current);
     },
     up() {
-      if (this.is_mousedown_progress) {
-        // 标记鼠标不处于按下的状态了
-        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;
-        this.$emit("updateProgress", current);
-
-      }
+      if (!this.isDrag || !this.is_mousedown_progress) return;
+      // 标记鼠标不处于按下的状态了
+      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) || {}
+      this.$emit("getMouseDownStatus", false);
+      // 禁止拖动
+      if(time && arr[this.blobId] < current) return;
+      this.$emit("updateProgress", current);
     },
   },
 };

src/data/pages.js

@@ -128,7 +128,8 @@ export const iframes=[
   {title:'查看受众', path:'/iframe/ugroup/view',hidden:false,component:'manage/AudienceView'},
   {title:'问答管理', path:'/iframe/qa/manages',hidden:false,component:'qa/ManageList'},
   {title:'待审核课程', path:'/iframe/course/noapproved',hidden:false,component:'examine/NotApproved'},
-  {title:'已审核课程', path:'/iframe/course/reviewed',hidden:false,component:'examine/Reviewed'}
+  {title:'已审核课程', path:'/iframe/course/reviewed',hidden:false,component:'examine/Reviewed'},
+  {title:'标签管理', path:'/iframe/tag/manages',hidden:false,component:'tag/TagManageList'},
 
 ]
 

src/views/article/ManageList.vue

@@ -289,8 +289,8 @@ export default {
         })
     },
     viewTopic(data) {
-    //  window.open(this.webBaseUrl+'/article/detail?id='+data.id , '_blank')
-      this.$router.push({path:'/article/detail',query:{id:data.id}})
+     window.open(this.webBaseUrl+'/article/detail?id='+data.id , '_blank')
+      // this.$router.push({path:'/article/detail',query:{id:data.id}})
     },
   },
 }

src/views/case/ManageList.vue

@@ -697,7 +697,8 @@ export default {
     },
     viewTopic(data) {
       if (data.confidentialityLevel == '内部') {
-        this.$router.push({ path: '/case/detail', query: { id: data.id } })
+        // this.$router.push({ path: '/case/detail', query: { id: data.id } })
+        window.open(this.webBaseUrl+'/case/detail?id='+data.id , '_blank')
       } else {
         this.$message.warning("非内部密级案例不能查看");
       }

src/views/course/Courseware.vue

@@ -624,8 +624,12 @@ export default {
         // if(item.minute){
         //    item.duration=parseFloat(item.minute)*60;
         // }
-        // 如果没有给一个默认值30分钟
-        item.duration = item.minute ? parseFloat(item.minute) * 60 : 1800;
+        // 视频文件才可以设置时长，其他类型直接赋值0
+        if (item.fileType === 'mp4' || item.fileType === 'mp3') {
+          item.duration = item.minute ? parseFloat(item.minute) * 60 : 0;
+        } else {
+          item.duration = 0;
+        }
       });
       this.loading = true;
       coueseFile.batchUpdate(this.fileList).then(rs => {

src/views/course/Mylecnotes.vue

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

src/views/exam/ExamList.vue

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

src/views/grateful/index.vue

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

src/views/hotforum/Index-bak.vue

@@ -0,0 +1,179 @@
+<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,7 +1,24 @@
 <template>
-  <div class="hot">
+  <div class="hot25">
     <div>
-      <div class="center">
+      <div class="title25" style="">
+          <img class="img" src="../../assets/images/hotforum/2025.png" alt="">
+      </div>
+      <div class="center" style="margin-top: 60px;">
+        <div class="item" style="margin-right: 49px;">
+          <img class="img" @click="goLearn('1351506180295131136')" src="../../assets/images/hotforum/2501.jpg" alt="">
+        </div>
+        <div class="item">
+          <img class="img"  @click="goLearn('1375146833375027200')" src="../../assets/images/hotforum/2503.png" alt="">
+        </div>
+      </div>
+      <div class="line" style="margin: 0 auto;margin-top: 60px;width: 100%;text-align: center;">
+        <img class="img" src="../../assets/images/hotforum/line.png" alt="">
+      </div>
+      <div class="title24" style="margin: 0 auto;margin-top: 60px;width: 100%;text-align: center;">
+        <img class="img" src="../../assets/images/hotforum/2024.png" alt="">
+      </div>
+      <div class="center" style="margin-top: 60px;">
         <div class="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>
@@ -11,11 +28,12 @@
       </div>
     </div>
   </div>
+
 </template>
 
 <script>
   export default {
-    name: "hotforum",
+    name: "hotforumNew",
     data() {
       return {
         imgData:[
@@ -24,6 +42,10 @@
           {img:'003',url:'1280185851054231552'},
           {img:'04',url:'1321778585966247936'},
         ],
+        imgData25:[
+          {img:'2501',url:'1351506180295131136'},
+          {img:'2503',url:'1375146833375027200'},
+        ],
       }
     },
     methods: {
@@ -38,20 +60,22 @@
 </script>
 
 <style lang="scss" scoped>
-.hot{
+.hot25{
   width: 100%;
   // max-width: 1920px;
   min-height: 100%;
   // min-height: 1373px;
-  background: url("../../assets/images/hotforum/back.jpg") no-repeat;
-  background-size: 100% 100%;
+  background: url("../../assets/images/hotforum/back25.png") no-repeat;
+  background-size: cover;
   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{
@@ -71,109 +95,109 @@
   }
   /* 当窗口宽度大于3068px时的样式 */
 }
-@media (min-width: 3000px) {
-.hot{
-  width: 100%;
-  // max-width: 1920px;
-  min-height: 100%;
-  // min-height: 1373px;
-  background: url("../../assets/images/hotforum/back.jpg") no-repeat;
-  background-size: 100% 100%;
-  display: flex;
-  justify-content: center;
-  .center {
-    max-width: 2560px;
-    max-height: 1300px;
-    margin-bottom: 5%;
-    margin-top: 30vh;
-    display: flex;
-    flex-wrap: wrap;
+// @media (min-width: 3000px) {
+// .hot{
+//   width: 100%;
+//   // max-width: 1920px;
+//   min-height: 100%;
+//   // min-height: 1373px;
+//   background: url("../../assets/images/hotforum/back.jpg") no-repeat;
+//   background-size: 100% 100%;
+//   display: flex;
+//   justify-content: center;
+//   .center {
+//     max-width: 2560px;
+//     max-height: 1300px;
+//     margin-bottom: 5%;
+//     margin-top: 30vh;
+//     display: flex;
+//     flex-wrap: wrap;
 
-    .item {
-      width: 1220px;
-      height: 660px;
-      background: url("../../assets/images/hotforum/border.png") no-repeat;
-      background-size: 100%;
-      padding: 28px;
-      padding-top: 62px;
-      margin-bottom: 59px;
+//     .item {
+//       width: 1220px;
+//       height: 660px;
+//       background: url("../../assets/images/hotforum/border.png") no-repeat;
+//       background-size: 100%;
+//       padding: 28px;
+//       padding-top: 62px;
+//       margin-bottom: 59px;
 
-      .img {
-        width: 100%; // 图片宽度占满item宽度
-        height: auto; // 自动调整高度
-      }
-    }
-  }
-}
-}
-@media (min-height: 1500px) {
-.hot{
-  width: 100%;
-  // max-width: 1920px;
-  min-height: 100%;
-  // min-height: 1373px;
-  background: url("../../assets/images/hotforum/back.jpg") no-repeat;
-  background-size: 100% 100%;
-  display: flex;
-  justify-content: center;
-  .center {
-    max-width: 1068px;
-    max-height: 580px;
-    margin-bottom: 5%;
-    margin-top: 30vh;
-    display: flex;
-    flex-wrap: wrap;
+//       .img {
+//         width: 100%; // 图片宽度占满item宽度
+//         height: auto; // 自动调整高度
+//       }
+//     }
+//   }
+// }
+// }
+// @media (min-height: 1500px) {
+// .hot{
+//   width: 100%;
+//   // max-width: 1920px;
+//   min-height: 100%;
+//   // min-height: 1373px;
+//   background: url("../../assets/images/hotforum/back.jpg") no-repeat;
+//   background-size: 100% 100%;
+//   display: flex;
+//   justify-content: center;
+//   .center {
+//     max-width: 1068px;
+//     max-height: 580px;
+//     margin-bottom: 5%;
+//     margin-top: 30vh;
+//     display: flex;
+//     flex-wrap: wrap;
 
-    .item {
-      width: 500px;
-      height: 271px;
-      background: url("../../assets/images/hotforum/border.png") no-repeat;
-      background-size: 100%;
-      padding: 14px;
-      padding-top: 26px;
-      margin-bottom: 30px;
+//     .item {
+//       width: 500px;
+//       height: 271px;
+//       background: url("../../assets/images/hotforum/border.png") no-repeat;
+//       background-size: 100%;
+//       padding: 14px;
+//       padding-top: 26px;
+//       margin-bottom: 30px;
 
-      .img {
-        width: 100%; // 图片宽度占满item宽度
-        height: auto; // 自动调整高度
-      }
-    }
-  }
-}
-}
-@media (min-width: 1928px) and (max-width: 3000px) {
-.hot{
-  width: 100%;
-  // max-width: 1920px;
-  min-height: 100%;
-  // min-height: 1373px;
-  background: url("../../assets/images/hotforum/back.jpg") no-repeat;
-  background-size: 100% 100%;
-  display: flex;
-  justify-content: center;
-  .center {
-    max-width: 1800px;
-    max-height: 1100px;
-    margin-bottom: 5%;
-    margin-top: 35vh;
-    display: flex;
-    flex-wrap: wrap;
+//       .img {
+//         width: 100%; // 图片宽度占满item宽度
+//         height: auto; // 自动调整高度
+//       }
+//     }
+//   }
+// }
+// }
+// @media (min-width: 1928px) and (max-width: 3000px) {
+// .hot{
+//   width: 100%;
+//   // max-width: 1920px;
+//   min-height: 100%;
+//   // min-height: 1373px;
+//   background: url("../../assets/images/hotforum/back.jpg") no-repeat;
+//   background-size: 100% 100%;
+//   display: flex;
+//   justify-content: center;
+//   .center {
+//     max-width: 1800px;
+//     max-height: 1100px;
+//     margin-bottom: 5%;
+//     margin-top: 35vh;
+//     display: flex;
+//     flex-wrap: wrap;
 
-    .item {
-      width: 860px;
-      height: 466px;
-      background: url("../../assets/images/hotforum/border.png") no-repeat;
-      background-size: 100%;
-      padding: 28px;
-      padding-top: 48px;
-      margin-bottom: 70px;
+//     .item {
+//       width: 860px;
+//       height: 466px;
+//       background: url("../../assets/images/hotforum/border.png") no-repeat;
+//       background-size: 100%;
+//       padding: 28px;
+//       padding-top: 48px;
+//       margin-bottom: 70px;
 
-      .img {
-        width: 100%; // 图片宽度占满item宽度
-        height: auto; // 自动调整高度
-      }
-    }
-  }
-}
-}
+//       .img {
+//         width: 100%; // 图片宽度占满item宽度
+//         height: auto; // 自动调整高度
+//       }
+//     }
+//   }
+// }
+// }
 </style>

src/views/lexiang-sso-77deb595.txt

@@ -0,0 +1 @@
+60ab8a4b97b446b2dcd32889

src/views/portal/case/Detail.vue

@@ -651,6 +651,9 @@ export default {
       });
     },
     getCaseData() {
+      // 清空pdf数据
+      // this.pdfPath = '';
+
       let $this = this;
       apiCase.details(this.resolveId, true).then(res => {
         if (res.status == 200) {

src/views/portal/case/Index.vue

@@ -196,7 +196,7 @@
                   <div @click="toCaseDetail(item.id, item.refId)" style="cursor: pointer;">
                     <div v-if="isTime" class="case_text">
                       <span style="margin-right:28px">阅读了案例</span>
-                      <span>{{ item.eventTime }}</span>
+                      <span>{{ formatDateTime(item.eventTime) }}</span>
                     </div>
                     <div class="case-info-title">
                       <div class="case-titdiv">
@@ -862,6 +862,12 @@ export default {
       this.popularityName = this.switch[e]
       this.getPopularity()
     },
+    formatDateTime(dateArray) {
+      if (!dateArray || dateArray.length !== 6) return '';
+      const [year, month, day, hour, minute, second] = dateArray;
+      const pad = (num) => num.toString().padStart(2, '0');
+      return `${year}-${pad(month)}-${pad(day)} ${pad(hour)}:${pad(minute)}:${pad(second)}`;
+    },
     handleType(msg){
       // this.queryCondition.type = msg
     },
@@ -1507,7 +1513,7 @@ export default {
                 };
               });
               res.result.list.forEach(item=>{
-                item.viewRankTags = item.viewRankTags?.slice(0,2)||[]
+                item.viewRankTags = (item.viewRankTags||[]).slice(0,2)||[]
               })
               this.caseList.list = res.result.list
               this.getCaseUserData(res.result.list);
@@ -1562,7 +1568,7 @@ export default {
                 };
               });
               res.result.list.forEach(item=>{
-                item.viewRankTags = item.viewRankTags?.slice(0,2)||[]
+                item.viewRankTags = (item.viewRankTags||[]).slice(0,2)||[]
               })
               this.caseList.list = res.result.list
               this.getCaseUserData(res.result.list);
@@ -1605,7 +1611,7 @@ export default {
           }
           console.log(res?.result?.list ,'有没有数据1');
           res.result.list.forEach(item=>{
-            item.viewRankTags = item.viewRankTags?.slice(0,2)||[]
+              item.viewRankTags = (item.viewRankTags||[]).slice(0,2)||[]
           })
           console.log(res?.result?.list ,'有没有数据2');
           this.caseList.list = res.result.list
@@ -2805,3 +2811,4 @@ export default {
   }
 }
 </style>
+

src/views/portal/course/Detail.vue

@@ -35,7 +35,7 @@
                 <!-- <div><span style="font-size:20px;color:#ff8e00">{{courseInfo.score ? courseInfo.score.toFixed(1) : 0}}</span><span style="font-size:12px;color:#ff8e00">分</span></div> -->
               </div>
               <div class="label-div">
-                <el-tag class="label-item" effect="plain" v-for="(item,tagIdx) in tagArray" :key="tagIdx">{{item}}</el-tag>
+<!--                <el-tag class="label-item" effect="plain" v-for="(item,tagIdx) in tagArray" :key="tagIdx">{{item}}</el-tag>-->
                </div>
               <!-- <div style="width:160px;height:50px"> -->
               <!-- </div> -->

src/views/portal/course/Index.vue

@@ -43,7 +43,7 @@
                   :disabled="!twoList.children.length" :open-delay="0" :close-delay="0" trigger="hover"
                   :visible-arrow="false" @hide="leaveIndex" @show="changeIndex(twoList.id)" transition="none">
                   <div class="course-two-content" slot="reference">{{
-                    twoList.name }}</div>
+                    twoList.name }}</div>-
                   <!-- 内容 -->
                   <div class="course-three-box">
                     <div class="course-three-box-title">
@@ -284,32 +284,40 @@
           <!-- 内容导航 -->
           <div class="topNav" v-if="!newData">
             <div class="search-div nav" style="height: 100px;flex: 1;">
-              <div @click="handleTypeAllClick(1)" class="option-item" :class="{ 'option-active': ctypeTagAll }">
+              <div @click="handleTypeAllClick(1)" class="option-item" style="font-weight: bold" :class="{ 'option-active': ctypeTagAll }">
                 <a>全部</a>
                 <span :class="ctypeTagAll ? 'nav-bottbor' : ''"></span>
               </div>
-              <div @click="handleTypeClick(ctypeList[0], ctypeList)" class="option-item"
+              <div @click="handleTypeClick(ctypeList[0], ctypeList)" class="option-item" style="font-weight: bold"
                 :class="{ 'option-active': ctypeList[0].checked }">
                 <a>录播课</a>
                 <span :class="ctypeList[0].checked ? 'nav-bottbor' : ''"></span>
               </div>
-              <div @click="handleTypeClick(ctypeList[1], ctypeList)" class="option-item"
+              <div @click="handleTypeClick(ctypeList[1], ctypeList)" class="option-item" style="font-weight: bold"
                 :class="{ 'option-active': ctypeList[1].checked }">
                 <a>线下课</a>
                 <span :class="ctypeList[1].checked ? 'nav-bottbor' : ''"></span>
               </div>
-              <div @click="handleTypeClick(ctypeList[2], ctypeList)" class="option-item"
+              <div @click="handleTypeClick(ctypeList[2], ctypeList)" class="option-item" style="font-weight: bold"
                 :class="{ 'option-active': ctypeList[2].checked }">
                 <a>学习项目</a>
                 <span :class="ctypeList[2].checked ? 'nav-bottbor' : ''"></span>
               </div>
               <a class="option-item">
-                <span @click="uClassClick" class="Uxtext" style=""> U选小课堂
+                <span @click="uClassClick" class="Uxtext" style="font-weight: bold"> U选小课堂
                   <span class="uxicon">
                     <svg-icon icon-class="hot" style="font-size:22px"></svg-icon>
                   </span>
                 </span>
               </a>
+              <!-- 热点标签 add by zhengsongbo on 2025-08-01 -->
+              <div style="margin-top:10px;flex: 1;">
+                <div  class="option-item" style="padding-top: 2px"
+                     v-for="tag in hotTagsList" :key="tag.id"
+                      @click="handleTagClick(tag, hotTagsList)">
+                  <a class="custom" :class="tag.checked ? 'custom2' : ''">{{tag.tagName}}</a>
+                </div>
+              </div>
             </div>
             <div id="fixd-box" class="upload" style="margin-left: 26px;">
               <div v-if="identity == 2 || identity == 3 || identity == 5">
@@ -325,9 +333,9 @@
           <div v-if="stagList.length > 0 && !newData" class="search-div" style="padding: 0;margin-bottom: 20px;">
             <div class="searchbar" style="background-color:#f6f7fb;display: flex;justify-content: space-between;">
               <div style="line-height: 30px;">
-                <span class="item-title"> 搜索条件</span>
+                <span class="item-title"> 搜索条件:</span>
                 <el-tag closable v-for="(tag, tagIdx) in stagList" :key="'t' + tagIdx" @close="stagClose(tag, tagIdx)">{{
-                  tag.name }}</el-tag>
+                  tag.tagName }}</el-tag>
               </div>
               <div>
                 <el-button type="primary" size="mini" @click="handleClearTags">清除</el-button>
@@ -486,6 +494,32 @@
           </div>
         </div>
       </el-dialog>
+      <!-- "新员工项目简介""弹框 -->
+      <el-dialog width="733px" title="项目简介" top="80px"
+                 :visible.sync="projectDialogVisible"
+                 class="custom-class">
+        <div slot="header" class="el-dialog__header">
+        </div>
+        <div style="height: 300px;margin: 20px 40px 0px 40px;">
+          <span v-html="studentInfo.introduction"></span>
+        </div>
+        <div>
+          <span style="margin: 40px; font-size: 14px" v-if="studentInfo.bpmStatus!=0">
+            审批编号：<span style="font-weight: bold;">{{studentInfo.bpmNumber}}</span>
+          </span>
+          <br/>
+          <span style="margin: 40px; font-size: 14px">
+            审批状态：<span v-html="studentInfo.bpmStatusName"></span>
+          </span>
+        </div>
+        <template #footer>
+            <span class="dialog-footer">
+              <el-button type="primary" @click="signUpNow" v-if="studentInfo.bpmStatus==0">立即报名</el-button>
+              <el-button v-if="studentInfo.bpmStatus==1" disabled>审批中</el-button>
+              <el-button type="primary" @click="signUpAgain" v-if="studentInfo.bpmStatus==3">重新报名</el-button>
+            </span>
+        </template>
+      </el-dialog>
     </div>
   </div>
 </template>
@@ -507,12 +541,14 @@ import apiTeacher from "@/api/modules/teacher.js";
 import apiUser from "@/api/system/user.js";
 import scene from "@/api/modules/scene.js";
 import apiUserbasic from "@/api/boe/userbasic.js";
+import apiManage from '@/api/manage/manage.js';
 import interactBar from "@/components/Portal/interactBar.vue";
 import courseImage from "@/components/Course/courseImage.vue";
 import { courseType, getType, toScore, formatDate, formatUserNumber, formatDateByFmt } from "@/utils/tools.js";
 import { deepClone, param } from "../../../utils";
 import apiSearchterm from "@/api/modules/searchterm.js";
 import apiPlace from "@/api/phase2/place.js"
+import apiCourseTag from '@/api/modules/courseTag.js'
 export default {
   name: "index",
   components: {
@@ -534,21 +570,43 @@ export default {
     },
     stagList() { //计算出选择的内容
       let list = [];
+
+      // 关键词
       if (this.keyword) {
         list.push({
           type: 0,
           id: 'keyword',
           name: this.keyword,
+          tagName: this.keyword,
           checked: true
-        })
+        });
       }
+
+      // 课程类型
       this.ctypeList.forEach(item => {
         if (item.checked) {
-          list.push(item);
+          list.push({
+            ...item,
+            tagName: item.name
+          });
         }
       });
+
+      // 热点标签 - 这是关键修复
+      this.hotTagsList.forEach(item => {
+        if (item.checked) {
+          list.push({
+            ...item,
+            name: item.tagName || item.name,
+            tagName: item.tagName || item.name,
+            type: 14
+          });
+        }
+      });
+
+      // 三级分类
       this.oneList.forEach(one => {
-        var twoChildChecked = false;//是否有下级
+        var twoChildChecked = false;
         one.children.forEach(two => {
           if (two.checked) {
             twoChildChecked = true;
@@ -556,34 +614,28 @@ export default {
           var threeChildChecked = false;
           two.children.forEach(three => {
             if (three.checked) {
-              list.push(three);
+              list.push({
+                ...three,
+                tagName: three.name
+              });
               threeChildChecked = true;
             }
           });
           if (two.checked && !threeChildChecked) {
-            list.push(two);
+            list.push({
+              ...two,
+              tagName: two.name
+            });
           }
         });
         if (one.checked && !twoChildChecked) {
-          list.push(one);
+          list.push({
+            ...one,
+            tagName: one.name
+          });
         }
-      })
-      // this.oneList.forEach(item=>{
-      //   if(item.checked){
-      //     list.push(item);
-      //   }
-      // });
-      // this.twoList.forEach(item=>{
-      //   if(item.checked){
-      //     list.push(item);
-      //   }
-      // });
-      // this.threeList.forEach(item=>{
-      //   if(item.checked){
-      //     list.push(item);
-      //   }
-      // });
-      //console.log(list,'list');
+      });
+
       return list;
     },
     ctypeTagAll() {
@@ -613,12 +665,14 @@ export default {
   },
   data() {
     return {
+      hotTagsList: [],
       newData: false,//线上品牌系列隐藏
       navTitle: [],
       // 设置高亮
       twoId: '',
       count: 0,//分页总条条数
       showUClass: false,
+      projectDialogVisible: false,
       ctypeList: [
         { type: 1, id: 20, name: '录播课', checked: false },
         { type: 1, id: 30, name: '线下课', checked: false },
@@ -629,7 +683,7 @@ export default {
       twoList: [], //二级分类{type:12}
       threeList: [],//三级分类{type:13}
       searching: false,//是否正在搜索中
-
+      studentInfo: {},
       resonimg: {},
       formatDate,
       formatNum: formatUserNumber,
@@ -687,6 +741,17 @@ export default {
         console.log(rs.message);
       }
     })
+    //初始化:获取最新前10个热点标签
+      apiCourseTag.getHotTagList(null).then(rs => {
+      if (rs.status == 200) {
+        this.hotTagsList = rs.result.map(tag => ({
+          ...tag,
+          checked: false
+        }));
+      } else {
+        console.log(rs.message);
+      }
+    })
   },
   mounted() {
     let screenWidth = window.screen.availWidth;
@@ -769,6 +834,24 @@ export default {
     // window.removeEventListener("scroll", this.handleScroll);
   },
   methods: {
+    //BPM项目:立即报名
+    signUpNow(){
+      const pid = this.studentInfo.projectId;
+      apiManage.signUpBpmProjectNow(pid).then(res=>{
+          this.projectDialogVisible = false;
+      })
+    },
+
+    //BPM项目：重新报名
+    signUpAgain(){
+      const pid = this.studentInfo.projectId;
+      const studentId=this.studentInfo.studentId;
+      const data = {"pid":pid,"studentId":studentId};
+      apiManage.signUpBpmProjectAgain(data).then(res=>{
+        this.projectDialogVisible = false;
+      })
+    },
+
     // 改变分页
     currentChange(val) {
       this.course.pageIndex = val
@@ -852,10 +935,54 @@ export default {
     //搜索条件
     stagClose(tag, tagIndex) {
       tag.checked = false;
+
+      // 根据标签类型处理不同的清除逻辑
       if (tag.type == 0) {
+        // 关键词类型
         this.keyword = '';
+      } else if (tag.type == 1) {
+        // 课程类型（录播课、线下课、学习项目）
+        this.ctypeList.forEach(item => {
+          if (item.id == tag.id) {
+            item.checked = false;
+          }
+        });
+      } else if (tag.type == 14) {
+        // 热点标签类型
+        this.hotTagsList.forEach(item => {
+          if (item.id == tag.id) {
+            item.checked = false;
+          }
+        });
+
+        // 更新course.tags，移除被删除的热点标签
+        const checkedHotTags = this.hotTagsList.filter(tag => tag.checked);
+        let tagIds = checkedHotTags.map(tag => tag.id).join(',');
+        this.course.tags = tagIds;
+
+      } else if (tag.type == 11 || tag.type == 12 || tag.type == 13) {
+        // 三级分类标签
+        this.oneList.forEach(one => {
+          if (one.id == tag.id) {
+            one.checked = false;
+          }
+          one.children.forEach(two => {
+            if (two.id == tag.id) {
+              two.checked = false;
+            }
+            two.children.forEach(three => {
+              if (three.id == tag.id) {
+                three.checked = false;
+              }
+            });
+          });
+        });
       }
-      this.navTitle = []
+
+      // 重置导航标题
+      this.navTitle = [];
+
+      // 触发搜索更新
       this.searchData();
     },
 
@@ -893,28 +1020,33 @@ export default {
       this.searchData();
     },
     // 清除
-    handleClearTags() {
-      //清空所有的条件
-      this.keyword = '';
-      this.ctypeList.forEach(item => {
-        item.checked = false;
+handleClearTags() {
+  //清空所有的条件
+  this.keyword = '';
+  this.ctypeList.forEach(item => {
+    item.checked = false;
+  });
+  this.hotTagsList.forEach(item => {
+    item.checked = false;
+  });
+  this.course.tags = ''; // 清空标签ID
+  
+  // 添加清除三级分类的逻辑
+  this.oneList.forEach(one => {
+    one.checked = false;
+    one.children.forEach(two => {
+      two.checked = false;
+      two.children.forEach(three => {
+        three.checked = false;
       });
-      this.oneList.forEach(one => {
-        one.checked = false;
-        one.children.forEach(two => {
-          two.checked = false;
-          two.children.forEach(three => {
-            three.checked = false;
-          })
-        })
-      });
-      this.twoList = [];
-      this.threeList = [];
-      this.navTitle = [];
-      this.newData = false;
-      sessionStorage.removeItem(this.localSessionKey)
-      this.searchData();
-    },
+    });
+  });
+  
+  // 清空导航标题
+  this.navTitle = [];
+  
+  this.searchData();
+},
     // 导航切换(录播课，线下课，学习项目)
     handleTypeClick(item, list) {
       item.checked = !item.checked;
@@ -926,11 +1058,24 @@ export default {
 
       this.searchData();
     },
+    //点击标签
+    handleTagClick(item, list) {
+      item.checked = !item.checked;
+
+      // 更新course.tags
+      const checkedTags = this.hotTagsList.filter(tag => tag.checked);
+      let tagIds = checkedTags.map(tag => tag.id).join(',');
+      this.course.tags = tagIds;
+
+      // 强制触发stagList重新计算
+      this.$nextTick(() => {
+        this.searchData();
+      });
+    },
     //三级分类
     handleOptionClick(item, level, list) {
       // 线上品牌展示效果
       this.newData = item.newData;
-      console.log(this.newData);
       // 单选，排除法
       this.oneList.forEach(one => {
         one.checked = false;
@@ -1216,9 +1361,33 @@ export default {
           let params = encodeURIComponent('courseId=' + courseId);
           this.$router.push('/forward?to=' + manageApi + '/stu/project/redirectDetail&params=' + params);
         } else if (item.type == 40) { //学习项目
-          let params = encodeURIComponent('projectId=' + courseId);
-          this.$router.push('/forward?to=' + studentPath + '/projectdetails&params=' + params);
-          //this.$router.push('/forward?to='+manageApi+'/stu/project/redirectDetail&params='+params);
+          if (item.bpmFlag == 1) { //是否是需要BPM审批的项目(新员工转正项目)
+            //检查当前用户是否已经报名该项目(“未报名”、“审批中”和“审核拒绝”--则弹窗！--“立即报名”和“重新报名"调BPM接口)
+            apiManage.getStudntProjectInfo(courseId).then(res=>{
+                this.studentInfo = res.data;
+                const bpmStatus = this.studentInfo.bpmStatus;
+                if (bpmStatus == 0){//未报名--则弹窗含“立即报名”
+                  this.projectDialogVisible=true;
+                  this.studentInfo.bpmStatusName="<span style='color: #ddc507;font-weight: bold;'>未报名</span>";
+
+                }else if (bpmStatus == 1){//已报名待审核(审批中)--仅弹窗展示
+                  this.projectDialogVisible=true;
+                  this.studentInfo.bpmStatusName="<span style='color: #ddc507;font-weight: bold;'>审批中</span>";
+
+                }else if (bpmStatus == 2){//bpm报名审核通过,则直接进入项目进行学习
+                  let params = encodeURIComponent('projectId=' + courseId);
+                  this.$router.push('/forward?to=' + studentPath + '/projectdetails&params=' + params);
+                }else if(bpmStatus == 3){//已拒绝--则弹窗含“重新报名”
+                  this.projectDialogVisible=true;
+                  this.studentInfo.bpmStatusName="<span style='color: red;font-weight: bold;'>已拒绝(含个人撤回)</span>";
+
+                }
+            })
+          }else {
+            let params = encodeURIComponent('projectId=' + courseId);
+            this.$router.push('/forward?to=' + studentPath + '/projectdetails&params=' + params);
+            //this.$router.push('/forward?to='+manageApi+'/stu/project/redirectDetail&params='+params);
+          }
         }
       } else {
         if (item.type == 10) {
@@ -1307,12 +1476,18 @@ export default {
     },
     getAllChecked() { //获取全部选中的标签
       let list = [];
-
+      //获取选中的课程类型
       this.ctypeList.forEach(item => {
         if (item.checked) {
           list.push(item);
         }
       });
+      //获取选中的热点标签
+      this.hotTagsList.forEach(item => {
+        if (item.checked) {
+          list.push(item);
+        }
+      });
       this.oneList.forEach(one => {
         one.children.forEach(two => {
           two.children.forEach(three => {
@@ -1375,7 +1550,18 @@ export default {
           that.course.sysType3 += item.id;
         }
       });
-
+      apiCourseTag.getHotTagList(that.course).then(rs => {
+        if (rs.status == 200) {
+          // 保留已选中标签的状态
+          const currentCheckedTags = this.hotTagsList.filter(tag => tag.checked);
+          this.hotTagsList = rs.result.map(tag => ({
+            ...tag,
+            checked: currentCheckedTags.some(checkedTag => checkedTag.id === tag.id)
+          }));
+        } else {
+          console.log(rs.message);
+        }
+      }),
       this.isFind = true;
       this.course.device = 1;
       if (this.course.pageIndex == 1) {
@@ -1417,7 +1603,7 @@ export default {
               item.name = item.name;
             }
           });
-console.log(res.result.list,'data')
+          console.log(res.result.list,'data')
           this.courseList = res?.result?.list ?? []
           console.log(this.courseList);
           if (this.newData) {
@@ -2421,4 +2607,73 @@ console.log(res.result.list,'data')
 
 .option-active {
   color: #387DF7;
-}</style>
+}
+  /* 项目简介 方法一：外部 CSS 类 */
+::v-deep.el-dialog {
+  border-radius: 3% 3% 1% 1%;
+  padding: 0;
+}
+::v-deep.custom-class .el-dialog__header {
+  height: 100px;
+  margin: 0 !important;
+  padding: 0 !important;
+  background-image: url('../../../assets/images/project/title-bg.png');
+  background-size: 100% 100%;  /* 完全填充 */
+  display: block;             /* 避免行内元素空隙 */
+}
+::v-deep.custom-class .el-dialog__header .el-dialog__title {
+  padding: 0 !important;
+  font-size: 35px;
+  font-weight: bold;
+  color: white;
+  margin: 60px;
+  line-height: 100px;
+}
+::v-deep.custom-class .el-dialog__body {
+  margin: 0 !important;
+  padding: 0 !important;
+}
+/* ---end--- */
+/* ---标签管理 added by zhengsongbo on 2025-08-01--- */
+.search-div.nav {
+  display: block;
+  width: 100%;
+  clear: both;
+}
+.option-item {
+  margin: 0px 5px;
+}
+/* 热点标签：自定义按钮样式 */
+a.custom {
+  /* 基础样式 */
+  display: inline-block; /* 使内边距生效 */
+  padding: 1px; /* 按钮内边距 */
+  margin: 1px 5px;
+  background-color: #F2F2F2; /* 淡灰色背景 */
+  color: #333; /* 文字颜色 */
+  text-decoration: none; /* 去除下划线 */
+  border-radius: 3px; /* 圆角设计 */
+  font-family: Arial, sans-serif; /* 字体 */
+  font-size: 14px; /* 文字大小 */
+  height: 24px;
+  line-height: 20px;
+  /* 过渡效果，使颜色变化更平滑 */
+  transition: background-color 0.2s ease;
+}
+
+/* 鼠标悬停效果 */
+a.custom:hover {
+  background-color: #DDEDFF; /* 浅蓝色背景 */
+}
+
+/* 可选：点击时效果 */
+a.custom:active {
+  background-color: #757575; /* 点击时更深的灰色 */
+}
+
+/* 鼠标悬停效果 */
+a.custom2 {
+  background-color: #DDEDFF; /* 浅蓝色背景 */
+}
+/* ---end--- */
+</style>

src/views/portal/course/Micro.vue

@@ -95,7 +95,10 @@
                       <div v-if="coursewareInfo.content.contentType == 52">
                           <div class="hyper-link" v-if="conLink.openType==2">
                               <div class="hyper-link-row">课程内容是外部连接</div>
-                              <div class="hyper-link-row">{{conLink.url}}</div>
+<!--                              <div class="hyper-link-row">{{conLink.url}}</div>-->
+                              <div class="hyper-link-row">
+                                <el-button @click="widthOpen(conLink.url)" type="primary" style="margin-left: 15px">点击前往</el-button>
+                              </div>
                           </div>
                           <div v-if="conLink.openType==1">
                               <iframe :src="conLink.url" style="width: 100%;border:0px;min-height: 473px;border:0px" border="0" frameborder="0"></iframe>
@@ -225,7 +228,7 @@
               </el-card>
             </el-col>
           </el-row>
-        
+
     </div>
     <portal-footer></portal-footer>
   </div>
@@ -653,7 +656,7 @@ export default {
           itemId:this.coursewareInfo.studyItemId,
           videoTime:intTime
         }
-        apicourseStudy.studyVideoTime(postData).then(rs=>{
+        apicourseStudy.updateStudyVideoTime(postData).then(rs=>{
            if(rs.status!=200){
              console.log('记录播放时间错误');
            }
@@ -693,7 +696,7 @@ export default {
           itemId:this.coursewareInfo.studyItemId,
           videoTime:intTime
         }
-        apicourseStudy.studyVideoTime(postData).then(rs=>{
+        apicourseStudy.updateStudyVideoTime(postData).then(rs=>{
            if(rs.status!=200){
              console.log('记录播放时间错误');
            }

src/views/portal/qa/Index.vue

@@ -48,8 +48,8 @@
                           <div class="qa-info-summary portal-summary-text" :class="qa.images==''? 'two-line-ellipsis':'four-line-ellipsis'" @click="jumpDetail(qa)" v-html="$keywordActiveShow(qa.content,queryKeyWord)">
 
                           </div>
-                          <div style="cursor: pointer; text-align: right;cursor: pointer;" v-if="qa.images!==''" @click="jumpDetail(qa)">
-                            <img style="width: 156px;height: 105px;border-radius: 4px;margin-left: 18px;" :src="fileBaseUrl + qa.images" alt="">
+                          <div style="cursor: pointer; text-align: right;cursor: pointer;" v-if="qa.images && qa.images!==''" @click="jumpDetail(qa)">
+                            <img style="width: 156px;height: 105px;border-radius: 4px;margin-left: 18px;" :src="fileBaseUrl + qa.images" alt="图片貌似被外星人劫走了">
                           </div>
                       </div>
 

src/views/portal/user/Message.vue

@@ -349,6 +349,7 @@ export default {
             this.$message.success('删除成功');
             this.queryData.pageIndex = 1;
             this.queryMessage(true);
+            this.$store.dispatch('refrashMsg');
           } else {
             this.$message.error('删除失败' + res.message);
           }
@@ -366,6 +367,7 @@ export default {
             this.$message.success('删除成功');
             this.queryData.pageIndex = 1;
             this.queryMessage(true);
+            this.$store.dispatch('refrashMsg');
           } else {
             this.$message.error('删除失败' + res.message);
           }

src/views/qa/ManageList.vue

@@ -306,8 +306,8 @@ export default {
 
     },
     viewTopic(data) {
-     // window.open(this.webBaseUrl+'/qa/answer?id='+data.id, '_blank');
-       this.$router.push({path:'/qa/answer',query:{id:data.id}})
+     window.open(this.webBaseUrl+'/qa/answer?id='+data.id, '_blank');
+       // this.$router.push({path:'/qa/answer',query:{id:data.id}})
     },
     aduit(row) {
       this.form={...row};

src/views/sso/lexiang.vue

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

src/views/study/TaskList.vue

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

src/views/study/coursenew.vue

@@ -91,8 +91,16 @@
             <div v-if="resType == 52">
               <div v-if="contentData.content != ''">
                 <div class="hyper-link" v-if="conLink.openType == 2">
-                  <div class="hyper-link-row">{{ contentData.contentName }}</div>
-                  <div class="hyper-link-row">{{ conLink.url }}</div>
+                  <div class="hyper-link-row">外链名称: {{ contentData.contentName }}</div>
+<!--                  <button class="copy-button" @click="copyUrl(conLink.url)">复制外链</button>-->
+<!--                  <div class="hyper-link-row">外链地址: {{ conLink.url }}</div>-->
+<!--                  <button class="copy-button" @click="copyUrl(conLink.url)">复制外链</button>-->
+                  <div class="hyper-link-url-container">
+<!--                    <span class="hyper-link-url" @click="copyUrl(conLink.url)" >外链地址: {{ conLink.url }}</span>-->
+                    <div class="hyper-link-url">
+                      <el-button @click="widthOpen(conLink.url)" type="primary" style="margin-left: 15px">点击前往</el-button>
+                    </div>
+                  </div>
                 </div>
                 <div v-if="conLink.openType == 1"><iframe :src="conLink.url"
                     style="width: 100%;border:0px;min-height: 473px;" frameborder="0"></iframe></div>
@@ -159,15 +167,15 @@
         <div class="course-control">
             <div class="control-tab" v-if="contentList.length>0" >
               <div v-if="contentList.length>1" @click="heartabone" :class="tab == 1 ? 'control-tab-active' : ' '">
-                <i class="el-icon-reading" style="margin-right:9px;margin-left:9px"></i>课程单元
+                <i class="el-icon-reading" style="margin-right:9px;margin-left:9px"></i>
               </div>
               <div @click="heartabtwo" :class="tab == 2 ? 'control-tab-active' : ' '">
                 <i class="el-icon-edit" style="margin-right:9px;margin-left:9px"></i>我的笔记
               </div>
             </div>
-            <!-- 课程单元  -->
+            <!--   -->
             <div class="course-units" v-if="tab == 1">
-              <div :style="`height: ${controlHeight}px;overflow-y: auto;`">
+              <div style="min-height: 350px;max-height: 650px ;overflow-y: auto;">
                 <div class="catalog" v-if="courseInfo.type == 20">
                   <div  v-for="(item, index) in catalogTree" :key="index" :name="index">
                     <el-menu
@@ -277,15 +285,18 @@
             <div class="teacher" v-for="(item, idx) in teachers" :key="idx">
               <div class="teacher-avator" @click="toUserHome(item)" title="点击进入他的主页">
                 <!-- <div class="teacher-text" v-if="item.authorInfo.avatar == ''">{{userAvatarText(item.teacherName)}}</div> -->
-                 <div v-if="item.authorInfo.avatar !== ''">
+                 <div v-if="item.authorInfo && item.authorInfo.avatar">
                     <el-avatar  :src="fileBaseUrl + item.authorInfo.avatar" shape="circle" :size="50"></el-avatar>
                 </div>
+                <div v-else-if="item.photo">
+                  <el-avatar :src="item.photo" shape="circle" :size="50"></el-avatar>
+                </div>
                 <div v-else class="teacher-text">
-                  <div v-if="item.authorInfo.sex === 1 "><img src="../../../public/images/Avatarman.png" alt=""></div>
+                  <div v-if="item.authorInfo && item.authorInfo.sex === 1"><img src="../../../public/images/Avatarman.png" alt=""></div>
                   <div v-else><img src="../../../public/images/Avatarwoman.png" alt=""></div>
                 </div>
               </div>
-              <div class="teacher-info">
+              <div class="teacher-info" @click="toUserHome(item)" title="点击进入他的主页">
                 <div class="teacher-name">
                     <span> {{ item.teacherName }}</span>
                     <!-- <span style="font-size: 12px; color:#666666 ;">( {{cutOrgNamePath(item.authorInfo.orgInfo)}} )</span> -->
@@ -467,7 +478,6 @@
       this.stopStudyTime();//先关闭
       this.cleanAppendTime();//
       this.loadData();
-      //console.log(this.$xpage.constants.fileBaseUrl,'this.$xpage.constants.fileBaseUrl');
     },
     computed: {
       ...mapGetters(['userInfo']),
@@ -511,14 +521,12 @@
     },
     methods: {
       handleOpen(key,path){
-        // console.log(key,path,'handleOpen')
         if(this.isFalse){
           this.defaultOpeneds = [key]
         }
         this.isFalse = false
       },
       handleClose(key,path){
-        // console.log(key,path,'handleClose')
       },
       toUserHome(tea){
         this.$router.push({path:this.$xpage.getHomePath(tea.teacherId)})
@@ -591,7 +599,6 @@
         let $this=this;
         if(this.contentData.id==contentId){
            this.onPlayerPause()
-           //this.audioPause();
            this.contentData.lastStudyTime=time;
            setTimeout(() => {
              $this.$refs.myVideoPlayer.startPlay(time);
@@ -619,18 +626,9 @@
             }
         }
         this.playerBoxShow = false;
-        //this.changePlayRes(r);
-        // this.playerBoxShow = false;
-        // this.notePlay = null;
-        // let $this=this;
-        // setTimeout(() => {
-        //   $this.notePlay = time;
-        // }, 500)
       },
       //笔记组件触发,记录当前播放时间
       videoLocation() {
-        //this.$store.dispatch("SetIntTimeNote", this.intTimeNote);
-        //console.log(this.contentData.id+'='+this.intTimeNote,'设置视频播放时间')
         this.$refs.mynote.setVideoTime(this.contentData.id,this.intTimeNote);
       },
       coutab(n) {
@@ -640,9 +638,7 @@
         let nowDate = new Date();
         let ctime = parseInt(nowDate.getTime() / 1000);
         let beforeUrl = parseInt(nowDate.getTime() / 1000) + '/' + fid;
-        //console.log(beforeUrl,'beforeUrl');
         let urlSign = encodeURIComponent(encrypt(beforeUrl));
-        //console.log(urlSign,'urlSign');
         cookies.set('PLAYSIGN_TIME', ctime); //写客户端的cookie保存
         //以下判断是为了区分本地环境和服务器环境
         if (process.env.NODE_ENV == 'development') {
@@ -650,9 +646,7 @@
         } else {
           this.blobUrl = process.env.VUE_APP_BASE_API + '/xboe/m/course/cware/resource?sign=' + urlSign;
         }
-        // console.log('this.contentData.id:',this.contentData.id)
         this.blobId = this.contentData.id
-        //console.log(this.blobUrl,'this.blobUrl');
       },
       widthOpen(url) {
         window.open(url, '_blank');
@@ -685,8 +679,6 @@
             this.curriculumData.url = r.content;
           }
           this.$refs.mynote.showVideoTimeBtn(true);
-          //let url=process.env.VUE_APP_BASE_API+'/xboe/m/course/file/show?cf='+this.curriculumData.url;
-          //let url=this.fileBaseUrl+this.curriculumData.url;
           this.createPlayUrl(r.contentRefId, this.curriculumData.url);
         } else if (r.contentType == 40) {
           // if (r.content != '' && r.content.indexOf('.pdf') == -1) {
@@ -725,6 +717,7 @@
                 configUrl=urlPre+configUrl.substring(configUrl.indexOf(':')+1);
 
                 this.scormUrl=configUrl+pars;//播放的首页
+                console.log('scormUrl',this.scormUrl);
              }
           });
 
@@ -785,7 +778,6 @@
              });
             $this.appendStudyOtherTime();
           }, 15000); //非音视频课程学习,十五秒后记录
-          //this.appendStudyTime();
           this.isContentType = this.contentData.contentType
           if (this.contentData.contentType != 50) {
             this.handleTimeout = setTimeout(function(){
@@ -800,28 +792,24 @@
 
 
         this.$nextTick(function(){
-            if(this.contentData.progressVideo){
+            if (r.contentType == 10) {
+              console.log('视频处理lastStudyTime',this.contentData.lastStudyTime)
+              console.log('视频处理progressVideo',this.contentData.progressVideo)
               this.$refs.myVideoPlayer.updateProgressByClickBar2(this.contentData.lastStudyTime,this.contentData.progressVideo);
-              // $this.notePlay = this.contentData.lastStudyTime;
             }
 
-            //let h0=document.getElementById('id_course_player').offsetHeight;
             let h=$this.$refs.coursePlayer.offsetHeight;
-            //let h1=$this.$refs.coursePlayer.clientHeight;
-            ///console.log(h0,h,$this.controlHeight,'$this.controlHeight');
             //解决获取高度不正的问题
             if(h>400 && h<500){
               h=h+40;
             }else if(h>500){
               h=h+60;
             }
-            //$this.controlHeight=h-99;
-            $this.controlHeight=h-95;
-            //console.log(h,$this.controlHeight,'$this.controlHeight');
+            // 移除高度控制 防止内容塌陷
+            // $this.controlHeight=h-95;
         })
 
 
-        //console.log('this.contentData11:',this.contentData,this.curriculumData)
         // 视频设置禁用处理逻辑,如果用户已全部观看完该视频，则设置为能全部拖动的逻辑，把isDrag设置为true即可,同时删除本地存储的数据
         if(this.contentData.progressVideo ===1){
           var obj = JSON.parse(this.contentData.content)
@@ -1129,38 +1117,16 @@
 
             });
           } else {
-            //console.log('加载课程信息失败:'+res.error);
-            //this.$message.error(res.message);
           }
         });
       },
 
       onPlayerPlay() {
-        //console.log("开始播放");
-        // if(this.contentData.contentType == 10){
-        //   if(this.contentData.status<2){
-        //     this.contentData.status = 2;
-        //   }
-        // }
         this.playerBoxShow = false;
-        // this.onPlayerPlayFullscreen()
-        // this.$watermark.set(this.userInfo.name + this.userInfo.loginName);
         let $this = this;
         //这里有些不准备，如果文件未能加载，这个事件就是错误的
         this.isAppendTime=true;
         this.appendStudyTime();//启动追加学习时长
-        //console.log(this.contentData.status,'this.contentData.status');
-        // if(this.contentData.status<9){
-        //   let completeType=this.curriculumData.completeSetup;
-        //   //console.log(completeType,'completeType');
-        //   if(completeType==0){
-        //     //默认5秒后学习完成.
-        //     $this.handleTimeout= setTimeout(function() {$this.saveStudyInfo();}, 5000); //5秒后记录学习完成
-        //   }else{
-        //     //先记录进行中的学习内容
-        //     this.saveStudyItem();
-        //   }
-        // }
       },
 
       onFullscreen(full) {
@@ -1192,7 +1158,6 @@
         }
       },
       onPlayerPause() {
-        //console.log("暂停");
         this.stopStudyTime();
       },
       onPlayerEnded() {
@@ -1205,8 +1170,6 @@
       onPlayerPlaying(itme) {
         this.isAppendTime = true;//可以追加学习时长
         this.intTimeNote = parseInt(itme);
-        //console.log("当前播放"+itme);
-        //console.log("当前播放11"+itme);
         if (this.contentData.contentType && this.contentData.contentType == 10) {
           let intTime = parseInt(itme);
           //判断是否完成
@@ -1236,7 +1199,13 @@
             this.contentData.lastStudyTime = intTime;
             let postData = {
               itemId: this.contentData.studyItemId,
-              videoTime: intTime
+              videoTime: intTime,
+              id: this.appentId,
+              studyId: this.studyId,
+              courseId: this.contentData.courseId,
+              contentId: this.contentData.id,
+              studyInfo: this.courseInfo.name +"-" +this.contentData.contentName,
+              duration: 10
             };
             //console.log('this.courseInfo:',this.contentData)
             if(!this.curriculumData.isDrag && this.contentData.progressVideo !=1){
@@ -1244,22 +1213,24 @@
               var arr = time&&JSON.parse(time) || {}
               if(arr[this.blobId] && this.contentData.progressVideo<arr[this.blobId]) {
               postData.progressVideo = arr[this.blobId]
-              postData.contentId = this.contentData.id
-              postData.courseId = this.contentData.courseId
+              // postData.contentId = this.contentData.id
+              // postData.courseId = this.contentData.courseId
               }
             }
             //console.log('记录播放时间')
-            apiStudy.studyVideoTime(postData).then(rs => {
+            apiStudy.updateStudyVideoTime(postData).then(rs => {
               if (rs.status != 200) {
                 console.log('记录播放时间错误');
+              }else{
+                studyUtil.clearStudyDuration(); //清除本地存储
               }
             });
           }
         }
       },
       audioPlaying(item, currentTime) {
-        //console.log("当前播放"+item);
         let intTime = parseInt(currentTime);
+        console.log("======音频播放"+intTime);
         this.handleAudioTimeUpdate(intTime)
         //判断是否完成
         let completeType = this.curriculumData.completeSetup;
@@ -1288,7 +1259,13 @@
           this.contentData.lastStudyTime = intTime;
           let postData = {
             itemId: this.contentData.studyItemId,
-            videoTime: intTime
+            videoTime: intTime,
+            id: this.appentId,
+            studyId: this.studyId,
+            courseId: this.contentData.courseId,
+            contentId: this.contentData.id,
+            studyInfo: this.courseInfo.name +"-" +this.contentData.contentName,
+            duration: 10
           };
           //console.log('this.courseInfo:',this.contentData)
           if(!this.curriculumData.isDrag && this.contentData.progressVideo !=1){
@@ -1296,23 +1273,21 @@
             var arr = time&&JSON.parse(time) || {}
             if(arr[this.blobId] && this.contentData.progressVideo<arr[this.blobId]) {
             postData.progressVideo = arr[this.blobId]
-            postData.contentId = this.contentData.id
-            postData.courseId = this.contentData.courseId
+            // postData.contentId = this.contentData.id
+            // postData.courseId = this.contentData.courseId
             }
           }
           //console.log('记录播放时间')
-          apiStudy.studyVideoTime(postData).then(rs => {
+          apiStudy.updateStudyVideoTime(postData).then(rs => {
             if (rs.status != 200) {
               console.log('记录播放时间错误');
+            }else{
+              studyUtil.clearStudyDuration(); //清除本地存储
             }
           });
         }
       },
       audioPlay() {
-        //console.log("开始播放");
-        // if(this.contentData.contentType == 20 && this.contentData.status < 2){
-        //   this.contentData.status = 2;
-        // }
         let $this = this;
         this.isAppendTime=true;
         this.appendStudyTime();//启动追加学习时长
@@ -1424,6 +1399,7 @@
             this.totalContent = rs.result.contents.length;
             //加载学习的数据
             this.loadStudyData(rs.result);
+
           } else {
             this.$message.error(rs.message);
           }
@@ -1436,6 +1412,7 @@
         //对已学习的内容进行比对，重要的字段， 学习内容id，在后缀的
         let playIndex = -1;
         this.contentList.forEach((con, conIdx) => {
+          con.progressVideo = con.progressVideo || 0;
           result.contentStudys.forEach((scon, sconIdx) => {
             if (scon.contentId == con.id) {
               //定位显示的内容
@@ -1447,9 +1424,8 @@
                   playIndex = conIdx;
                 }
               }
-              //console.log(scon.contentId,con.id);
               con.lastStudyTime = scon.lastStudyTime;
-              con.progressVideo = scon.progressVideo;
+              con.progressVideo = scon.progressVideo || 0;
               //以下判断是为了兼容之前的问题，学习状态
               if (scon.status) {
                 con.status = scon.status;
@@ -1457,23 +1433,17 @@
                 con.status = 9;
               }
               con.studyItemId = scon.id; //这个就是学习内容（条目）的id
-              //console.log(scon.id,"scon.id");
-              //console.log(con,"scon.id");
             }
           });
         });
 
         if (this.courseInfo.type == 10) {
-          ///console.log(this.contentList[0],'ccccc11111')
           this.showRes(this.contentList[0]);
         } else {
           //如果没有，就定位第一项内容
           if (playIndex === -1) {
-            // this.showRes(this.contentList[0]);
-            //console.log(this.catalogTree,'ccccc22222')
             this.showRes(this.catalogTree[0].children[0])
           } else {
-             //console.log(this.contentList[0],'ccccc3333')
             this.showRes(this.contentList[playIndex]);
           }
         }
@@ -1588,22 +1558,23 @@
                   console.log(rs.message);
                 }
             });
-          let postAppendData = {
-            id: this.appentId,
-            studyId: this.studyId,
-            courseId: this.courseInfo.id,
-            contentId: this.contentData.id,
-            studyInfo: this.courseInfo.name +"-" +this.contentData.contentName,
-            duration: duration
-          };
-          apiStudy.appendStudyTime(postAppendData).then(rs => {
-            if (rs.status == 200) {
-              this.appentId = rs.result;
-              studyUtil.clearStudyDuration(); //清除本地存储
-            } else {
-              console.log(rs.message);
-            }
-          });
+          // let postAppendData = {
+          //   id: this.appentId,
+          //   studyId: this.studyId,
+          //   courseId: this.courseInfo.id,
+          //   contentId: this.contentData.id,
+          //   studyInfo: this.courseInfo.name +"-" +this.contentData.contentName,
+          //   duration: duration,
+          //   type: 1
+          // };
+          // apiStudy.updateStudyVideoTime(postAppendData).then(rs => {
+          //   if (rs.status == 200) {
+          //     this.appentId = rs.result;
+          //     studyUtil.clearStudyDuration(); //清除本地存储
+          //   } else {
+          //     console.log(rs.message);
+          //   }
+          // });
         }
       },
       //结束追加学习时长
@@ -1640,7 +1611,7 @@
             this.appentInterval = 60
             let totalTime = Math.round((endTime - this.appendStartTime) / 1000);
             this.appendStudyTime();
-            this.saveStudyDuration(totalTime);
+            this.saveStudyDuration(totalTime)
         }, this.appentInterval * 1000);
       },
 
@@ -1724,9 +1695,22 @@
             })
             this.trueFalse = false
           }
-        // }
+      },
+      copyUrl(currentUrl) {
+        const urlToCopy = currentUrl;
+
+        navigator.clipboard.writeText(urlToCopy)
+          .then(() => {
+            this.$message.success('链接已成功复制到剪贴板');
+          })
+          .catch(err => {
+            this.$message.error('复制失败，请手动复制：' + urlToCopy);
+            console.error('复制错误:', err);
+          });
       },
     },
+
+
   }
 </script>
 
@@ -1763,15 +1747,20 @@
     margin: 20px auto;
     .course-playbox {
       background-color: #fff;
-      min-height: 400px;
+      //min-height: 400px;
       display: flex;
       justify-content: space-between;
+      .course-player-container {
+        display: flex;
+        flex-direction: column;
+        height: 100%;
+      }
       .course-player{ //内容播放区域
-        flex:1;
+        flex: 4; // 80%高度
         min-width: 700px;
-        min-height: 400px;
-        max-height: 800px;
-        //height: 100%;
+        // min-height: 400px;
+        // max-height: 800px;
+        height: 80%;
         border: 1px solid #ffffff;
         padding-right: 20px;
         // overflow: auto;
@@ -1780,6 +1769,23 @@
          width: 420px;
       }
     }
+
+    @media screen and (max-width: 1200px) {
+      .course-playbox,
+      .course-infobox {
+        flex-direction: column;
+      }
+      .course-player,
+      .course-info {
+        min-width: 100%;
+        padding-right: 0;
+      }
+      .course-control,
+      .course-teacher {
+        width: 100%;
+        margin-top: 20px;
+      }
+    }
     .course-infobox {
       margin-top: 20px;
       display: flex;
@@ -1899,13 +1905,10 @@
   }
 
   .player-box {
-    position: absolute;
-    // top: 62px;
-    // left: 184px;
-    width: 300px;
-    left: 50%;
-    top: 50%;
-    transform: translate(-50%, -50%);
+    position: relative;
+    width: 100%;
+    max-width: 300px;
+    margin: 20px auto;
     height: 187px;
     background: rgba(74, 74, 74, .5);
     border-radius: 33px;
@@ -2048,7 +2051,8 @@
   }
 
   .course-interact {
-    height: 54px;
+    flex: 1; // 20%高度
+    min-height: 54px;
     // padding-top: 10px;
     // padding-right: 10px;
     padding: 0 20px;
@@ -2411,4 +2415,29 @@
     height: 200px;
     background: url('../../../public/images/couresdetail.png');
   }
+  .copy-button {
+    background-color: #409EFF;
+    color: white;
+    border: none;
+    padding: 8px 12px;
+    border-radius: 4px;
+    cursor: pointer;
+  }
+
+  .copy-button:hover {
+    background-color: #66b1ff;
+  }
+  .hyper-link-url-container {
+    display: flex;
+    align-items: center;
+    gap: 10px;
+  }
+
+  .hyper-link-url {
+    max-width: calc(100% - 80px); /* 留出按钮空间 */
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+  }
+
 </style>

src/views/tag/TagManageList.vue

@@ -0,0 +1,372 @@
+<template>
+  <div class="u-page" style="padding-right:32px">
+    <div style="width: 100%; margin-left: 12px;padding: 2px 0px 10px 12px;background-color: white">
+      <el-form :inline="true" style="margin-left: 12px;" :model="pageData" class="demo-form-inline">
+        <el-form-item label="标签ID:" label-width="60px">
+          <el-input id="tag-id" placeholder="请输入标签ID" v-model="pageData.id" clearable />
+        </el-form-item>
+
+        <el-form-item label="标签名称:" label-width="80px">
+          <el-input id="tag-id" placeholder="请输入标签名称" v-model="pageData.tagName" clearable />
+        </el-form-item>
+
+        <el-form-item label="热点标签:" label-width="80px">
+          <el-select v-model="pageData.isHot" style="width: 120px;" clearable placeholder="请选择状态">
+            <el-option label="开启" value="true"></el-option>
+            <el-option label="关闭" value="false"></el-option>
+          </el-select>
+        </el-form-item>
+
+        <el-form-item>
+          <el-button @click="getsearch" icon="el-icon-search" type="primary">查询</el-button>
+        </el-form-item>
+      </el-form>
+    </div>
+    <div style="padding: 5px 0px 2px 12px;">
+      <el-checkbox label="前台公共显示"></el-checkbox>
+      <el-checkbox label="热点标签展示"></el-checkbox>
+    </div>
+
+    <div style="width: 100%; margin-left: 12px;padding: 2px 0px 10px 12px;background-color: white">
+      <el-table style="width: 96%; margin:2px 32px 10px 12px;" :data="pageData.list" border stripe
+                :header-cell-style="{ background: '#E9F0FF' }"
+                @selection-change="handleSelectionChange"
+                @sort-change="handleSortChange">
+        <el-table-column type="selection" width="80px"></el-table-column>
+        <el-table-column label="标签ID" width="200px" prop="id"></el-table-column>
+        <el-table-column label="标签名称" width="235px" prop="tagName"></el-table-column>
+        <el-table-column label="已关联课程" width="220px"
+                         prop="useCount"
+                         sortable="custom"
+                         :sort-orders="['descending', 'ascending']"
+                         >
+          <template #default="scope">
+            <a v-if="scope.row.useCount > 0"
+               @click="showCourseByTag(`${scope.row.id}`)"
+               style="font-weight:bold; color: #409EFF; text-decoration: underline;">
+              {{ scope.row.useCount }}
+            </a>
+            <span style="font-weight:bold; color: #409EFF; text-decoration: underline;" v-else>0</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="前台公共显示" width="220px" prop="isPublic">
+          <template #default="scope"><!-- 开关状态会直接修改 pageData.list 中的数据 -->
+            <el-switch
+              v-model="scope.row.isPublic"
+              :disabled="scope.row.isHot==1?true:false"
+              @change="handlePublicChange(scope.row)"
+            >
+            </el-switch>
+          </template>
+        </el-table-column>
+        <el-table-column label="热点标签展示" width="220px" prop="isHot">
+          <template #default="scope">
+            <el-switch
+              v-model="scope.row.isHot"
+              :disabled="scope.row.isPublic==0?true:false"
+              @change="handleHotChange(scope.row)"
+            >
+            </el-switch>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div v-if="pageData.list.length > 0" style="text-align: center;margin-top: 50px;">
+        <el-pagination
+          background
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
+          :current-page="pageData.pageIndex"
+          :page-sizes="[10, 20, 30, 40]"
+          :page-size="pageData.pageSize"
+          layout="total, sizes, prev, pager, next, jumper"
+          :total="total"
+        ></el-pagination>
+      </div>
+    </div>
+    <!-- 标签关联课程弹窗 -->
+    <el-dialog custom-class="g-dialog"  title="关联课程"
+                width="850px" top="20px"
+                :visible.sync="dialogVisible"
+               :modal-append-to-body="true"
+               :append-to-body="true">
+      <div class="dialog-content-container">
+        <el-table
+          :data="pageData.list2"
+          border stripe style="width: 100%"
+          :header-cell-style="{ background: '#E9F0FF' }"
+          @sort-change="handleSortChange2">
+          <el-table-column label="序号" width="60px" align="center">
+            <template #default="scope">
+              {{ scope.$index + 1 }}
+            </template>
+          </el-table-column>
+          <el-table-column label="关联课程名称" width="200px" prop="courseName"></el-table-column>
+          <el-table-column label="关联课程ID" width="100px" prop="courseId"></el-table-column>
+          <el-table-column label="关联人" width="80px" prop="sysCreateBy"></el-table-column>
+          <el-table-column label="关联时间" width="110px" prop="sysCreateTime"
+                           :formatter="dateFormat" sortable="custom"
+                           :sort-orders="['descending', 'ascending']"></el-table-column>
+          <el-table-column label="本课程绑定的其他标签" width="200px" prop="otherTags"></el-table-column>
+          <el-table-column label="操作" width="60px">
+            <template #default="scope">
+              <a @click="unbindCurrentTag(scope.row)"
+                 style="font-weight:bold; color: #409EFF;">
+                解绑
+              </a>
+            </template>
+          </el-table-column>
+        </el-table>
+        <!-- 分页 -->
+        <div v-if="pageData.list2.length > 0" class="pagination-container">
+          <el-pagination
+            background
+            @size-change="handleSizeChange2"
+            @current-change="handleCurrentChange2"
+            :current-page="pageData.pageIndex2"
+            :page-sizes="[10, 20, 30, 40]"
+            :page-size="pageData.pageSize2"
+            layout="total, sizes, prev, pager, next, jumper"
+            :total="total2">
+          </el-pagination>
+        </div>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import moment from 'moment';
+import apiCourseTag from '@/api/modules/courseTag.js'
+import { mapGetters } from 'vuex';
+export default {
+  name: 'courseTagItems',
+  computed: {
+    ...mapGetters(['userInfo'])
+  },
+  data() {
+    return {
+      pageData: {
+        pageIndex: 1,
+        pageIndex2: 1,
+        pageSize: 10,
+        pageSize2: 10,
+        list:[],
+        list2:[],
+        orderField: null,
+        orderAsc: null,
+        orderField2: null,
+        orderAsc2: null,
+      },
+      total: 0,
+      total2: 0,
+      dialogVisible: false,
+      tagId: null,
+    }
+  },
+  created() {
+    this.getCourseTagList()
+  },
+  methods: {
+
+    //初始化：课程标签列表
+    getsearch(){
+      this.pageData.pageIndex = 1;
+	    this.getCourseTagList()
+    },
+
+    //课程标签列表：排序
+    handleSortChange({ prop, order }) {
+      this.pageData.orderField = prop; // 当前排序字段
+      this.pageData.orderAsc = order === 'ascending'; // 排序方向
+      this.getCourseTagList(); // 重新获取数据
+    },
+
+    //TODO:课程标签列表：监听选中项变化(批量的设置标签公共显示|热点标签)
+    handleSelectionChange(selection) {
+      this.selectedRows = selection; // 更新选中的行数据
+    },
+
+    //课程标签列表：获取课程标签列表数据
+    getCourseTagList() {
+      const { pageIndex, pageSize, orderField, orderAsc } = this.pageData
+      let query = { pageIndex, pageSize, orderField, orderAsc}
+      //拼接查询条件
+      if (this.pageData.id) {
+        const { id } = this.pageData
+        query.id = id
+      }
+      if (this.pageData.tagName) {
+        const { tagName } = this.pageData
+        query.tagName = tagName
+      }
+      if (this.pageData.isHot) {
+        const { isHot } = this.pageData
+        query.isHot = isHot
+      }
+      apiCourseTag.portalPageList(query).then((res) => {
+          if (res.status == 200) {
+             this.total = res.result.count
+             this.pageData.list = res.result.list
+          }
+        })
+        .catch((err) => {
+          this.$message.error('获取数据失败')
+        })
+    },
+
+    //课程标签列表：改变标签的公共属性
+    async handlePublicChange(row) {
+      // 保存原始状态用于回滚
+      const originalStatus = row.isPublic;
+      try {
+        // 调用 API 更新状态
+        await apiCourseTag.changeTagPublic(row);
+        this.$message.success('更新成功');
+      } catch (error) {
+        // 发生错误时回滚状态
+        row.isPublic = originalStatus;
+        this.$message.error('更新失败：' + error.message);
+      }
+    },
+
+    //课程标签列表：改变标签的热点属性
+    async handleHotChange(row) {
+      const isPublic=row.isPublic;
+      // 保存原始状态用于回滚
+      const originalStatus = row.isHot;
+      try {
+        // 调用 API 更新状态
+        await apiCourseTag.changeTagHot(row);
+        this.$message.success('更新成功');
+      } catch (error) {
+        // 发生错误时回滚状态
+        row.isHot = originalStatus;
+        this.$message.error('更新失败：' + error.message);
+      }
+    },
+
+    //课程标签列表：改变条数的回调
+    handleSizeChange(value) {
+      this.pageData.pageIndex = 1;
+      this.pageData.pageSize = value;
+      this.getCourseTagList();
+    },
+    //课程标签列表：改变页数的回调
+    handleCurrentChange(value) {
+      this.pageData.pageIndex = value;
+      this.getCourseTagList();
+    },
+
+    //标签关联的所有课程弹出框：显示指定标签id关联的课程列表
+    showCourseByTag(tagId) {
+      this.tagId=tagId;
+      this.getCourseOfTagList(tagId);
+      this.dialogVisible=true;
+    },
+
+    //分页查询指定标签关联的所有课程
+    getCourseOfTagList(){
+      const { pageIndex2:pageIndex, pageSize2:pageSize, orderField2:orderField, orderAsc2:orderAsc } = this.pageData
+      let query = { pageIndex, pageSize, orderField, orderAsc }
+      //拼接查询条件
+      if (this.tagId) {
+        query.id = this.tagId
+        apiCourseTag.showCourseByTag(query).then((res) => {
+          if (res.status == 200) {
+            this.total2 = res.result.count
+            this.pageData.list2 = res.result.list
+            if (this.total2==0){
+              this.dialogVisible=false
+              this.getCourseTagList(); // 重新获取课程标签列表数据
+            }
+          }
+        })
+          .catch((err) => {
+            this.$message.error('获取数据失败')
+          });
+      }
+    },
+
+    //标签关联课程列表：排序
+    handleSortChange2({ prop, order }) {
+      this.pageData.orderField2 = prop; // 当前排序字段
+      this.pageData.orderAsc2 = order === 'ascending'; // 排序方向
+      this.getCourseOfTagList(); // 重新获取数据
+    },
+
+    //标签关联的所有课程列表：改变条数的回调
+    handleSizeChange2(value) {
+      this.pageData.pageIndex2= 1;
+      this.pageData.pageSize2 = value;
+      this.getCourseOfTagList();
+    },
+    //标签关联的所有课程列表：改变页数的回调
+    handleCurrentChange2(value) {
+      this.pageData.pageIndex2 = value;
+      this.getCourseOfTagList();
+    },
+    //关联时间格式化
+    dateFormat(row, column) {
+      return row[column.property] ?
+        moment(row[column.property]).format('YYYY-MM-DD') : '';
+    },
+
+    //解除指定课程和当前标签的关联关系
+    unbindCurrentTag (row) {
+      let id = row.id;
+      let tagId = this.tagId;
+      let courseId = row.courseId;
+      //拼接查询条件
+      if (tagId && courseId) {
+        let params = { id, tagId, courseId }
+        apiCourseTag.unbindCourseTagRelation(params).then((res) => {
+            if (res.status == 200) {
+              //刷新列表
+              this.getCourseOfTagList(this.tagId);
+            }
+          })
+          .catch((err) => {
+            this.$message.error('解绑失败！')
+          });
+      }
+    }
+  }
+}
+</script>
+
+<style>
+  .demo-form-inline {
+    display: flex;
+    align-items: center;
+    flex-wrap: wrap;
+    gap: 10px; /* 间距 */
+  }
+
+  .demo-form-inline .el-form-item {
+    margin-bottom: 0; /* 消除默认底部间距 */
+  }
+
+  .dialog-content-container {
+    padding: 10px;
+    border: 1px solid #d9d9d9;
+  }
+
+  .pagination-container {
+    margin-top: 20px;
+    text-align: center;
+  }
+
+  .g-dialog .el-dialog__header {
+    background-color: #409EFF;
+    padding: 15px 20px;
+  }
+
+  .g-dialog .el-dialog__title {
+    color: white;
+    font-weight: bold;
+  }
+
+  .g-dialog .el-dialog__headerbtn .el-dialog__close {
+    color: white;
+  }
+</style>

src/views/user/ranking.vue

@@ -23,7 +23,7 @@
                     </span>
             <el-dropdown-menu slot="dropdown">
               <el-dropdown-item command="total">累计</el-dropdown-item>
-              <el-dropdown-item command="now">当前</el-dropdown-item>
+              <el-dropdown-item command="now">当前年</el-dropdown-item>
               <!-- <el-dropdown-item command="weeks">本周</el-dropdown-item>
               <el-dropdown-item command="months">本月</el-dropdown-item>
               <el-dropdown-item command="years">本年</el-dropdown-item> -->
@@ -33,10 +33,10 @@
       </div>
       <div class="myselftext">
         <div class="myranking">
-          {{isNow ? '当前' : '累计'}}排名 :  <span> {{currentUserRankingTotalData.rankNo}}</span>
+          {{isNow ? '当前年' : '累计'}}排名 :  <span> {{currentUserRankingTotalData.rankNo}}</span>
         </div>
         <div class="myexperience">
-          {{isNow ? '当前' : '累计'}}经验值 :  <span>{{currentUserRankingTotalData.rankValue}}</span>
+          {{isNow ? '当前年' : '累计'}}经验值 :  <span>{{currentUserRankingTotalData.rankValue}}</span>
         </div>
       </div>
 
@@ -117,7 +117,7 @@
                     </span>
             <el-dropdown-menu slot="dropdown">
               <el-dropdown-item command="total">累计</el-dropdown-item>
-              <el-dropdown-item command="now">当前</el-dropdown-item>
+              <el-dropdown-item command="now">当前年</el-dropdown-item>
               <!-- <el-dropdown-item command="weeks">本周</el-dropdown-item>
               <el-dropdown-item command="months">本月</el-dropdown-item>
               <el-dropdown-item command="years">本年</el-dropdown-item> -->
@@ -127,10 +127,10 @@
       </div>
       <div class="myselftext">
         <div class="myranking">
-          {{isStudyTime ? '当前' : '累计'}}排名 :  <span> {{learningDurationTotalData.rankNo}}</span>
+          {{isStudyTime ? '当前年' : '累计'}}排名 :  <span> {{learningDurationTotalData.rankNo}}</span>
         </div>
         <div class="myexperience">
-          {{isStudyTime ? '当前' : '累计'}}学习时长:  <span> {{formatSecondToHour(learningDurationTotalData.rankValue)}}</span> h
+          {{isStudyTime ? '当前年' : '累计'}}学习时长:  <span> {{formatSecondToHour(learningDurationTotalData.rankValue)}}</span> h
         </div>
       </div>
       <div class="exp-table" style="margin-top:20px;">
@@ -206,7 +206,7 @@
                     </span>
             <el-dropdown-menu slot="dropdown">
               <el-dropdown-item command="total">累计</el-dropdown-item>
-              <!-- <el-dropdown-item command="now">当前</el-dropdown-item> -->
+               <el-dropdown-item command="now">当前年</el-dropdown-item>
               <!-- <el-dropdown-item command="weeks">本周</el-dropdown-item>
               <el-dropdown-item command="months">本月</el-dropdown-item>
               <el-dropdown-item command="years">本年</el-dropdown-item> -->
@@ -216,10 +216,10 @@
       </div>
       <div class="myselftext">
         <div class="myranking">
-          {{isStudyDay ? '当前' : '累计'}}排名 :  <span> {{learningDaysTotalData.rankNo}}</span>
+          {{isStudyDay ? '当前年' : '累计'}}排名 :  <span> {{learningDaysTotalData.rankNo}}</span>
         </div>
         <div class="myexperience">
-          {{isStudyDay ? '当前' : '累计'}}学习天数 :  <span>{{learningDaysTotalData.rankValue}}</span>
+          {{isStudyDay ? '当前年' : '累计'}}学习天数 :  <span>{{learningDaysTotalData.rankValue}}</span>
         </div>
       </div>
       <div class="exp-table" style="margin-top:20px;">
@@ -311,7 +311,7 @@ export default {
       formatSecondToHour:formatSecondToHour,
       experience:{
         field:'now',
-        name:'当前',
+        name:'当前年',
         data:{
           rankingNo:0,
           total:0
@@ -320,7 +320,7 @@ export default {
       },
       learningDuration:{
         field:'now',
-        name:'当前',
+        name:'当前年',
         data:{
           rankingNo:0,
           total:0
@@ -380,15 +380,19 @@ export default {
     getExperience() {//经验值
       let data = {
         aid:this.userInfo.aid,// #用户id
-        statType:21, // #统计类型  10学习时长 11 学习天数 20表经验值 30表u币 40表获取天数
+        statType:20, // #统计类型  10学习时长 11 学习天数 20表经验值 30表u币 40表获取天数
         field:this.experience.field,// #统计周期 todays-当天,weeks-周,months-月,years-年 total-总计
         num:10,//  #显示的条数
       }
       if(data.field == 'now'){
+        data.statType = 20
+        data.field = 'years'
+        this.experience.field = 'years'
+        this.isNow = true
+      }else{
         data.statType = 20
         data.field = 'total'
         this.experience.field = 'total'
-        this.isNow = true
       }
       apiStat.getRanking(data).then(res=>{
         if(res.status==200){
@@ -402,12 +406,15 @@ export default {
             }
             this.getUserData([res.result.currentUserRankingData.aid],[res.result.currentUserRankingData])
             this.experience.data = res.result.currentUserRankingData;
-            if(this.experience.field == 'total') {
+            this.currentUserRankingTotalData.rankNo = res.result.currentUserRankingData.rankingNo;
+            this.currentUserRankingTotalData.endValue = this.current.endValue;
+            if(data.field == 'total') {
               this.current = this.experienceValue(res.result.currentUserRankingData.total);
-              this.currentUserRankingTotalData.rankNo = res.result.currentUserRankingData.rankingNo;
               this.currentUserRankingTotalData.rankValue = res.result.currentUserRankingData.total;
-              this.currentUserRankingTotalData.endValue = this.current.endValue;
+            }else if(data.field == 'years'){
+              this.currentUserRankingTotalData.rankValue = res.result.currentUserRankingData.years;
             }
+
           }
           this.current.total=res.result.currentUserRankingData.total;//当前用户的经验值是固定的
           const ids= [];
@@ -434,9 +441,15 @@ export default {
                   }
                 });
               });
-              this.experience.list = listData.sort((a,b)=>{
-                return b.total-a.total
-              }).slice(0,5);
+              if(data.field == 'total') {
+                this.experience.list = listData.sort((a,b)=>{
+                  return b.total-a.total
+                }).slice(0,5);
+              }else if(data.field == 'years'){
+                this.experience.list = listData.sort((a,b)=>{
+                  return b.years-a.years
+                }).slice(0,5);
+              }
             } else {
               this.$message.error(res.message);
             }
@@ -447,15 +460,19 @@ export default {
     getDuration() {//学习时长
       let data = {
         aid:this.userInfo.aid,// #用户id
-        statType:12, // #统计类型  10学习时长 11 学习天数 20表经验值 30表u币 40表获取天数
+        statType:10, // #统计类型  10学习时长 11 学习天数 20表经验值 30表u币 40表获取天数
         field:this.learningDuration.field,// #统计周期 todays-当天,weeks-周,months-月,years-年 total-总计
         num:10,//  #显示的条数
       }
       if(data.field == 'now'){
-        data.statType = 10
-        data.field = 'total'
-        this.learningDuration.field = 'total'
-        this.isStudyTime = true
+        data.statType = 10;
+        data.field = 'years';
+        this.learningDuration.field = 'years';
+        this.isStudyTime = true;
+      }else{
+        data.statType = 10;
+        data.field = 'total';
+        this.learningDuration.field = 'total';
       }
       apiStat.getRanking(data).then(res=>{
         if(res.status==200){
@@ -469,9 +486,11 @@ export default {
             }
             this.getUserData([res.result.currentUserRankingData.aid],[res.result.currentUserRankingData])
             this.learningDuration.data = res.result.currentUserRankingData;
+            this.learningDurationTotalData.rankNo = res.result.currentUserRankingData.rankingNo;
             if(data.field == 'total'){
-              this.learningDurationTotalData.rankNo = res.result.currentUserRankingData.rankingNo;
               this.learningDurationTotalData.rankValue = res.result.currentUserRankingData.total;
+            } else if(data.field == 'years'){
+              this.learningDurationTotalData.rankValue = res.result.currentUserRankingData.years;
             }
           }
 
@@ -500,9 +519,16 @@ export default {
                   }
                 });
               });
-              this.learningDuration.list = listData.sort((a,b)=>{
-                return b.total-a.total
-              }).slice(0,5);
+              if(data.field == 'total'){
+                this.learningDuration.list = listData.sort((a,b)=>{
+                  return b.total-a.total
+                }).slice(0,5)
+              } else if(data.field == 'years'){
+                this.learningDuration.list = listData.sort((a,b)=>{
+                  return b.years-a.years
+                }).slice(0,5)
+              }
+              ;
             } else {
               this.$message.error(res.message);
             }