Merge remote-tracking branch 'origin/20250708_add_wzy' into 20250708_add_wzy

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

lexiang-sso-77deb595.txt

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

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/course.js

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

src/api/modules/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/components/Course/courseForm.vue

@@ -141,7 +141,6 @@
               <el-radio style="margin-right: 10px;" v-model="courseInfo.device" :label="1">PC端可见</el-radio>
               <el-radio style="margin-right: 10px;" v-model="courseInfo.device" :label="2">移动端可见</el-radio>
               <el-radio style="margin-right: 10px;" v-model="courseInfo.device" :label="3">多端可见</el-radio>
-              <el-radio style="margin-right: 10px;" v-model="courseInfo.device" v-if="isPermission" :label="4">仅内网访问</el-radio>
             </el-form-item>
             <el-form-item v-if="!weike.onlyRequired" label="课程来源">
               <el-radio-group v-model="courseInfo.source">
@@ -254,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)">
@@ -306,7 +308,6 @@
                 <el-radio v-model="courseInfo.device" :label="1">PC端可见</el-radio>
                 <el-radio v-model="courseInfo.device" :label="2">移动端可见</el-radio>
                 <el-radio v-model="courseInfo.device" :label="3">多端可见</el-radio>
-                <el-radio style="margin-right: 10px;" v-model="courseInfo.device" v-if="isPermission" :label="4">仅内网访问</el-radio>
               </el-col>
               <el-col :span="10">
                 <el-form-item label="课程来源">
@@ -404,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';
@@ -420,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';
@@ -428,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:'',//关键字的定义
@@ -468,6 +471,7 @@ export default {
       orgName:'',
       orgNamePath:'',
       orgKid:'',
+      courseTags:[],
       courseInfo: {
         id: '',
         name: '',
@@ -490,8 +494,6 @@ export default {
         refType:''
       },
       visibleShow:false,
-      isPermission:false,
-      dicts:[],
       extendRefId:'',
       extendRefType:'',
       courseTeachers: [], //课程的老师
@@ -531,11 +533,7 @@ export default {
         dlgShow: false
       },
       rightTypeId: {},
-      catalogSortDialogShow: false,
+      catalogSortDialogShow: false
-      selectedOrg: {
-        orgId: null,
-        name: ''
-      }
     };
   },
   created() {
@@ -560,18 +558,14 @@ export default {
   },
   watch: {
     courseInfo: {
-      handler(newVal, oldVal) {
+      handler(newVal) {
-        // 需要保存
+        //需要保存
         this.requireSaveCourse = true;
-
-        console.log("--- watch比较 = ", oldVal.orgId, newVal.orgId);
-        this.checkOrgPermission(newVal.orgId);
       },
       deep: true
     }
   },
   mounted() {
-    this.getDictIds();
     let extendFlag=this.$route.query.f; //是否是管理端过来的
     this.extendRefId=this.$route.query.refId;
     this.extendRefType=this.$route.query.refType;
@@ -593,19 +587,6 @@ export default {
     this.loadUserGroup();
   },
   methods: {
-    // 检查机构权限
-    checkOrgPermission(orgId) {
-      console.log("--- 监测组织id orgId  = ",orgId)
-      console.log("--- this.isPermission  = ",this.isPermission)
-      console.log("--- device  = ",this.courseInfo.device)
-      if (!orgId) {
-        this.isPermission = false;
-        return;
-      }
-      console.log("--- this.dicts  = ",this.dicts)
-      this.isPermission = this.dicts.includes(orgId);
-      console.log("--- 监听结束 this.isPermission  = ",this.isPermission)
-    },
     // 关键字的更改
     changeKeywords(option){
       if(option.target.value){
@@ -617,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;
     },
@@ -747,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();
@@ -794,6 +785,8 @@ export default {
       this.tips=[];
 
       if (!editData) {
+        this.tips=[];
+        this.courseTags=[],
         //console.log("新建课程？");
         //以下为了保证初始化处理
         this.weikeReset = Math.round(Math.random()) + '';
@@ -890,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 {
@@ -910,30 +905,16 @@ export default {
       this.courseCoverurl = '';
       this.courseInfo.coverImg = '';
     },
-    //获取字典信息
-    async getDictIds() {
-      console.log("--- 获取字典信息 1  = ", this.dicts);
-      try {
-        const response = await apiCourse.getDictIds(637, 1); // 确保返回 Promise
-        console.log("--- 获取字典信息 2 result= ", response);
-
-        if (response.status === 200) {
-          this.dicts = response.result.dicts; // 正确提取 dicts
-          console.log("--- 获取字典信息 3 = ", this.dicts);
-        }
-      } catch (error) {
-        console.error("获取字典信息失败：", error);
-      }
-    },
     //获取课程信息
     async getDetail(id) {
       this.curCourseId = id;
       this.orgName='';
-      this.isPermission = false;
+      let $this = this;
-        let $this = this;
       try {
         const { result, status } = await apiCourse.detail(id);
         if (status === 200) {
+          this.courseTags = result.tagList;
+          console.log('获取课程信息成功', this.courseTags);
           //把数据附给三个对象
           if(result.course.visible==''){
             result.course.visible=false;
@@ -947,10 +928,7 @@ export default {
           this.contentInfo.list = result.contents;
           this.sectionInfo.list = result.sections;
           this.courseTeachers = result.teachers; //课程的老师信息
-          this.isPermission = result.isPermission; //课程的老师信息
+
-          this.dicts = result.dicts; //课程的老师信息
-          console.log("--- 编辑查看 this.isPermission  = ",this.isPermission)
-          console.log("--- 编辑查看 this.dicts  = ",this.dicts)
           if(!this.courseInfo.orgId){
             //根据课程创建者获取机构id
             apiUser.getOrgSimpleByUserId(result.course.sysCreateAid).then(ors=>{
@@ -1002,7 +980,6 @@ export default {
                }
             });
           }
-
           this.resOwnerArray=[];
           if (result.course.resOwner1 == '') {
             this.resOwnerArray.push(result.course.resOwner1);
@@ -1287,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/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,6 +168,7 @@
 <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 yearMedal from '@/components/Popup/China2023.vue';
 import apiBoeCourse from '@/api/boe/course.js';
@@ -204,6 +229,8 @@ export default {
       keyword: '',
       isTiao: false,
       sex:'',
+      projectDialogVisible: false,
+      studentInfo: {},
     };
   },
   mounted() {
@@ -214,7 +241,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);
       },
@@ -255,7 +297,29 @@ export default {
       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 +328,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 +662,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/progress-bar.vue

@@ -37,6 +37,7 @@ export default {
     },
     isDrag:{
       type: Boolean,
+      default: true,
     },
     blobId:{
       type: String,
@@ -72,59 +73,51 @@ export default {
   },
   methods: {
     down(e) {
-      // if(this.isDrag) {
+      if (!this.isDrag) return;
-        this.$emit("getMouseDownStatus", true);
+      this.$emit("getMouseDownStatus", true);
-        this.is_mousedown_progress = true;
+      this.is_mousedown_progress = true;
-        // 获取完整进度条的clientX（dom左上角）
+      // 获取完整进度条的clientX（dom左上角）
-        let init_clientX = this.dom_full.getBoundingClientRect().left;
+      let init_clientX = this.dom_full.getBoundingClientRect().left;
-        // 计算调整后的当前进度条的长度
+      // 计算调整后的当前进度条的长度
-        this.current_width_px = e.clientX - init_clientX;
+      this.current_width_px = e.clientX - init_clientX;
-        // 设置当前的播放进度（同时作用于当前进度条的样式）
+      // 设置当前的播放进度（同时作用于当前进度条的样式）
-        let current = (e.clientX - init_clientX) / this.dom_full.clientWidth;
+      let current = (e.clientX - init_clientX) / this.dom_full.clientWidth;
-        if(current>1) current = 1;
+      if(current>1) current = 1;
-        if(current<0) current = 0;
+      if(current<0) current = 0;
-        var time = localStorage.getItem('videoProgressData');
+      var time = localStorage.getItem('videoProgressData');
-        var arr = time&&JSON.parse(time) || {}
+      var arr = time&&JSON.parse(time) || {}
-        //console.log('down arr:',this.isDrag,this.blobId,arr,arr[this.blobId],current)
+      // 禁止拖动
-        // 禁止拖动
+      if(time && arr[this.blobId] < current) return;
-        if(!this.isDrag && time && arr[this.blobId] < current) return;
-
-        this.$emit("updateProgress", current);
-      // }
 
+      this.$emit("updateProgress", current);
     },
     move(e) {
-      if (this.is_mousedown_progress) {
+      if (!this.isDrag || !this.is_mousedown_progress) return;
-        let init_clientX = this.dom_full.getBoundingClientRect().left;
+      let init_clientX = this.dom_full.getBoundingClientRect().left;
-        this.current_width_px = e.clientX - init_clientX;
+      this.current_width_px = e.clientX - init_clientX;
-        let current = (e.clientX - init_clientX) / this.dom_full.clientWidth;
+      let current = (e.clientX - init_clientX) / this.dom_full.clientWidth;
-        if(current>1) current = 1;
+      if(current>1) current = 1;
-        if(current<0) current = 0;
+      if(current<0) current = 0;
-        var time = localStorage.getItem('videoProgressData');
+      var time = localStorage.getItem('videoProgressData');
-        var arr = time&&JSON.parse(time) || {}
+      var arr = time&&JSON.parse(time) || {}
-        //console.log('move arr:',this.isDrag,this.blobId,arr,arr[this.blobId],current)
+      // 禁止拖动
-        // 禁止拖动
+      if(time && arr[this.blobId] < current) return;
-        if(!this.isDrag && time && arr[this.blobId] < current) return;
+      this.$emit("updateProgress", current);
-        this.$emit("updateProgress", current);
-      }
     },
     up() {
-      if (this.is_mousedown_progress) {
+      if (!this.isDrag || !this.is_mousedown_progress) return;
-        // 标记鼠标不处于按下的状态了
+      // 标记鼠标不处于按下的状态了
-        this.is_mousedown_progress = false;
+      this.is_mousedown_progress = false;
-        // 松开鼠标后，即调整进度条后，此时的进度（0-1）
+      // 松开鼠标后，即调整进度条后，此时的进度（0-1）
-        let current = this.current_width_px / this.dom_full.clientWidth;
+      let current = this.current_width_px / this.dom_full.clientWidth;
-        if(current>1) current = 1;
+      if(current>1) current = 1;
-        if(current<0) current = 0;
+      if(current<0) current = 0;
-        var time = localStorage.getItem('videoProgressData');
+      var time = localStorage.getItem('videoProgressData');
-        var arr = time&&JSON.parse(time) || {}
+      var arr = time&&JSON.parse(time) || {}
-        //console.log('up arr:',this.isDrag,this.blobId,arr,arr[this.blobId],current)
+      this.$emit("getMouseDownStatus", false);
-        this.$emit("getMouseDownStatus", false);
+      // 禁止拖动
-        // 禁止拖动
+      if(time && arr[this.blobId] < current) return;
-        if(!this.isDrag && time && arr[this.blobId] < current) return;
+      this.$emit("updateProgress", current);
-        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')
+     window.open(this.webBaseUrl+'/article/detail?id='+data.id , '_blank')
-      this.$router.push({path:'/article/detail',query:{id:data.id}})
+      // 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分钟
+        // 视频文件才可以设置时长，其他类型直接赋值0
-        item.duration = item.minute ? parseFloat(item.minute) * 60 : 1800;
+        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/grateful/GratefulHomePage.vue

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

src/views/grateful/TeacherOpinion.vue

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

src/views/hotforum/Index.vue

@@ -9,7 +9,7 @@
           <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="">
+          <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;">

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

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

src/views/portal/case/Detail.vue

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

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,11 +1611,11 @@ 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
-          this.getCaseUserData(res.result.list);
+          // this.getCaseUserData(res.result.list);
           // 给所有的赋值
           this.caseList.count = res.result.count;
           this.caseList.showPagCount = res.result.count;
@@ -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() {
+handleClearTags() {
-      //清空所有的条件
+  //清空所有的条件
-      this.keyword = '';
+  this.keyword = '';
-      this.ctypeList.forEach(item => {
+  this.ctypeList.forEach(item => {
-        item.checked = false;
+    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 => {
+  this.navTitle = [];
-            three.checked = false;
+  
-          })
+  this.searchData();
-        })
+},
-      });
-      this.twoList = [];
-      this.threeList = [];
-      this.navTitle = [];
-      this.newData = false;
-      sessionStorage.removeItem(this.localSessionKey)
-      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);
+          if (item.bpmFlag == 1) { //是否是需要BPM审批的项目(新员工转正项目)
-          this.$router.push('/forward?to=' + studentPath + '/projectdetails&params=' + params);
+            //检查当前用户是否已经报名该项目(“未报名”、“审批中”和“审核拒绝”--则弹窗！--“立即报名”和“重新报名"调BPM接口)
-          //this.$router.push('/forward?to='+manageApi+'/stu/project/redirectDetail&params='+params);
+            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>

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)">
+                          <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="">
+                            <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');
+     window.open(this.webBaseUrl+'/qa/answer?id='+data.id, '_blank');
-       this.$router.push({path:'/qa/answer',query:{id:data.id}})
+       // this.$router.push({path:'/qa/answer',query:{id:data.id}})
     },
     aduit(row) {
       this.form={...row};

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

@@ -22,101 +22,99 @@
       <div class="course-playbox" ref="coursePlayerBox" id="id_course_player_box">
         <div class="course-player" ref="coursePlayer" id="id_course_player">
           <div>
-            <div v-if="renderCourse">
+            <div v-if="resType == null || resType == 0">
-              <div v-if="resType == null || resType == 0">
+              <!--先显示视频图片-->
-                <!--先显示视频图片-->
+              <course-image v-if="courseInfo.id != ''" :course="courseInfo"></course-image>
-                <course-image v-if="courseInfo.id != ''" :course="courseInfo"></course-image>
+            </div>
-              </div>
+            <div v-if="resType == 10" style="position: relative;">
-              <div v-if="resType == 10" style="position: relative;">
+              <videoPlayer ref="myVideoPlayer" id="myVideoPlayer" @progress="progress" :src="blobUrl" :blobId="blobId" @onPlayerPlaying="onPlayerPlaying"
-                <videoPlayer ref="myVideoPlayer" id="myVideoPlayer" @progress="progress" :src="blobUrl" :blobId="blobId" @onPlayerPlaying="onPlayerPlaying"
+                :initTime="contentData.lastStudyTime" :notePlay="notePlay" @onPlayerPlay="onPlayerPlay"
-                             :initTime="contentData.lastStudyTime" :notePlay="notePlay" @onPlayerPlay="onPlayerPlay"
+                :isDrag="curriculumData.isDrag" @onFullscreen="onFullscreen" @onPlayerPause="onPlayerPause"
-                             :isDrag="curriculumData.isDrag" @onFullscreen="onFullscreen" @onPlayerPause="onPlayerPause"
+                @onPlayerEnded="onPlayerEnded" :isCrowd="isCrowd" @onTimeUpdate="handleAudioTimeUpdate"></videoPlayer>
-                             @onPlayerEnded="onPlayerEnded" :isCrowd="isCrowd" @onTimeUpdate="handleAudioTimeUpdate"></videoPlayer>
+              <div class="player-box" v-if="playerBoxShow">
-                <div class="player-box" v-if="playerBoxShow">
+                <div class="player-praise" style="cursor: pointer;">
-                  <div class="player-praise" style="cursor: pointer;">
+                  <div @click="praiseContent">
-                    <div @click="praiseContent">
+                    <img class="icon-small" v-if="isPraise" :src="require('@/assets/images/icon/praise-active.png')" />
-                      <img class="icon-small" v-if="isPraise" :src="require('@/assets/images/icon/praise-active.png')" />
+                    <img class="icon-small" v-else :src="require('@/assets/images/icon/zhan.png')" />
-                      <img class="icon-small" v-else :src="require('@/assets/images/icon/zhan.png')" />
+                    <!-- {{ courseInfo.praises }} -->
-                      <!-- {{ courseInfo.praises }} -->
+                    <div style="color:#fff;cursor: pointer;">赞</div>
-                      <div style="color:#fff;cursor: pointer;">赞</div>
-                    </div>
-                    <div style="margin-left: 15px;cursor: pointer;" @click="treadContent">
-                      <img class="icon-small" v-if="isTrample"
-                           :src="require('@/assets/images/icon/trample-active.png')" />
-                      <img class="icon-small" v-else :src="require('@/assets/images/icon/cai.png')" />
-                      <!-- {{ courseInfo.trampleCount }} -->
-                      <div style="color:#fff;cursor: pointer;">踩</div>
-                    </div>
                   </div>
-                  <div v-if="!scoreInfo.has" class="player-rate">
+                  <div style="margin-left: 15px;cursor: pointer;" @click="treadContent">
+                    <img class="icon-small" v-if="isTrample"
+                      :src="require('@/assets/images/icon/trample-active.png')" />
+                    <img class="icon-small" v-else :src="require('@/assets/images/icon/cai.png')" />
+                    <!-- {{ courseInfo.trampleCount }} -->
+                    <div style="color:#fff;cursor: pointer;">踩</div>
+                  </div>
+                </div>
+                <div v-if="!scoreInfo.has" class="player-rate">
 
-                    <el-rate v-model="scoreInfo.score" text-color="#ff9900" score-template="{value}" void-color="#fff"  @change="addScore"></el-rate>
+                  <el-rate v-model="scoreInfo.score" text-color="#ff9900" score-template="{value}" void-color="#fff"  @change="addScore"></el-rate>
+                </div>
+                <div v-if="scoreInfo.has" style="padding-top: 5px;display: flex;">
+                  <div class="player-rate" style="padding-left: 35px;">
+                    <el-rate disabled v-model="courseInfo.score" :allow-half="true"></el-rate>
                   </div>
-                  <div v-if="scoreInfo.has" style="padding-top: 5px;display: flex;">
+                  <span class="score-text" style="margin-top:35px">
-                    <div class="player-rate" style="padding-left: 35px;">
-                      <el-rate disabled v-model="courseInfo.score" :allow-half="true"></el-rate>
-                    </div>
-                    <span class="score-text" style="margin-top:35px">
                     <span style="color:#ffb30f;">{{ toScore(courseInfo.score) }}</span>
                     <span style="font-size: 12px;color: #fff">分</span>
                   </span>
 
-                  </div>
                 </div>
               </div>
-              <div v-if="resType == 20">
-                <div class="con-audio">
-                  <div class="con-audio-title">{{ contentData.contentName }}</div>
-                  <div class="con-audio-player">
-                    <audioPlayer v-if="resType == 20" :url="blobUrl" :name="contentData.contentName" @onPlaying="audioPlaying" :isDrag="curriculumData.isDrag"
-                                 @onPlay="audioPlay" @onPause="audioPause" @onPlayEnd="audioEnd"></audioPlayer>
-                  </div>
-                </div>
-              </div>
-              <div v-if="resType == 40">
-                <div style="padding: 10px;color: #ed0000; " v-if="curCFile.converStatus < 2 && !contentData.content">
-                  <div>此课程内容无法预览，请联系管理员</div>
-                </div>
-                <div style="padding: 10px;color: #ed0000;" v-if="curCFile.converStatus == 3 && !contentData.content">
-                  此课程内容无法预览，请联系管理员
-                </div>
-                <pdfPreview :autoScroll="true" v-if="resType == 40" :filePath="fileBaseUrl + contentData.content">
-                </pdfPreview>
-              </div>
-              <div v-if="resType == 41">
-                <div style="padding: 20px;" v-html="contentData.content"></div>
-              </div>
-              <div v-if="resType == 50" style="min-height: 500px;">
-                <iframe v-if="scormUrl" :src="scormUrl" frameborder="0"  border="0px" style="width:100%;height:500px;border:0px;"></iframe>
-              </div>
-              <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>
-                  <div v-if="conLink.openType == 1"><iframe :src="conLink.url"
-                                                            style="width: 100%;border:0px;min-height: 473px;" frameborder="0"></iframe></div>
-                </div>
-              </div>
-              <div v-if="resType == 60">
-                <homework @submit="homeWorkSubmit" v-if="resType == 60 && studyId != ''" :studyId="studyId" :content="contentData"></homework>
-              </div>
-              <div v-if="resType == 61">
-                <exam @startTest="startTest" v-if="resType == 61 && studyId != '' " :studyId="studyId" :content="contentData"></exam>
-              </div>
-              <div v-if="resType == 62" style="padding:5px">
-                <assess v-if="resType == 62 && studyId != '' && contentData.id" :studyId="studyId" :content="contentData">
-                </assess>
-              </div>
             </div>
-            <div v-if="!renderCourse && Internet ==2" style="margin:350px 250px" class="jianjie pdftext" id="pdfPreview">
+            <div v-if="resType == 20">
-              <div style="margin-top:40px;font-weight:700;font-size: 22px;color: #ccc">
+              <div class="con-audio">
-                <span>十分抱歉，您当前的网络环境不符合观看要求。为了保障课程信息的安全，您需要接入公司内网才能观看。</span>
+                <div class="con-audio-title">{{ contentData.contentName }}</div>
+                <div class="con-audio-player">
+                  <audioPlayer v-if="resType == 20" :url="blobUrl" :name="contentData.contentName" @onPlaying="audioPlaying" :isDrag="curriculumData.isDrag"
+                    @onPlay="audioPlay" @onPause="audioPause" @onPlayEnd="audioEnd"></audioPlayer>
+                </div>
               </div>
-              <div style="margin-top:20px;text-align:center" @click="refreshPage">
+            </div>
-                <el-button type="primary">重新检测</el-button>
+            <div v-if="resType == 40">
+              <div style="padding: 10px;color: #ed0000; " v-if="curCFile.converStatus < 2 && !contentData.content">
+                <div>此课程内容无法预览，请联系管理员</div>
               </div>
+              <div style="padding: 10px;color: #ed0000;" v-if="curCFile.converStatus == 3 && !contentData.content">
+                此课程内容无法预览，请联系管理员
+              </div>
+              <pdfPreview :autoScroll="true" v-if="resType == 40" :filePath="fileBaseUrl + contentData.content">
+              </pdfPreview>
+            </div>
+            <div v-if="resType == 41">
+              <div style="padding: 20px;" v-html="contentData.content"></div>
+            </div>
+            <div v-if="resType == 50" style="min-height: 500px;">
+              <iframe v-if="scormUrl" :src="scormUrl" frameborder="0"  border="0px" style="width:100%;height:500px;border:0px;"></iframe>
+            </div>
+            <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>
+<!--                  <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>
+              </div>
+            </div>
+            <div v-if="resType == 60">
+              <homework @submit="homeWorkSubmit" v-if="resType == 60 && studyId != ''" :studyId="studyId" :content="contentData"></homework>
+            </div>
+            <div v-if="resType == 61">
+              <exam @startTest="startTest" v-if="resType == 61 && studyId != '' " :studyId="studyId" :content="contentData"></exam>
+            </div>
+            <div v-if="resType == 62" style="padding:5px">
+              <assess v-if="resType == 62 && studyId != '' && contentData.id" :studyId="studyId" :content="contentData">
+              </assess>
             </div>
           </div>
           <!--交互部分-->
@@ -169,13 +167,13 @@
         <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="min-height: 350px;max-height: 650px ;overflow-y: auto;">
                 <div class="catalog" v-if="courseInfo.type == 20">
@@ -287,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> -->
@@ -313,17 +314,6 @@
         </div>
       </div>
     </div>
-    <el-dialog class="protocol" :close-on-click-modal="false" :visible="protocolDialogVisible" width="30%"
-               :show-close="false">
-      <div class="protocol-title">{{warnTitle}}</div>
-      <div class="protocol-content">
-        &emsp;&emsp;{{warn}}
-      </div>
-      <span slot="footer" class="dialog-footer">
-          <el-button type="primary" @click="protocolDialogVisible = false">确
-                定</el-button>
-      </span>
-    </el-dialog>
     <!-- <div><portal-footer></portal-footer></div> -->
   </div>
 </template>
@@ -390,7 +380,6 @@
     },
     data() {
       return {
-        protocolDialogVisible: false,
         tentative: false,
         isContentTypeTwo: null,
         isContentType: null,
@@ -412,7 +401,6 @@
         curCFile: {
           converStatus: 4,
         },
-        Internet: 3,//1是成功 2是是失败 3是检测中
         radio: '',
         interactRuning: false,
         playerBoxShow: false,
@@ -454,7 +442,6 @@
         getType: getType,
         ctabName: 'catalog',
         resType: null,
-        renderCourse: true,
         activeNames: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9],
         scoreInfo: {
           dlgShow: false,
@@ -478,12 +465,9 @@
         cumulativeDuration:0, //非音频累计时长
         maxDuration:0, //非音频最大时长
         defaultMaxTime:1800, //非音频默认最大时间
-        warn:"测试内容",
-        warnTitle:"测试标题",
       }
     },
     mounted() {
-      this.getInternet();
       // 增加的用户受众id
       let localKey = "user_" + this.userInfo.sysId + "_gids";
       let hasIds = sessionStorage.getItem(localKey);
@@ -531,6 +515,10 @@
         return treeList;
       }
     },
+    destroyed(){
+      this.cleanAppendTime();
+      this.stopStudyTime();
+    },
     methods: {
       handleOpen(key,path){
         if(this.isFalse){
@@ -545,13 +533,13 @@
       },
       noteChange(){
         //视频点定位，直接到播放的视频位置
-        this.timer = new Date().getTime()
+         this.timer = new Date().getTime()
       },
       //清空追加学习时长事件
       cleanAppendTime(){
-        if(this.appendStudyOtherHandle){
+         if(this.appendStudyOtherHandle){
-          window.clearTimeout(this.appendStudyOtherHandle);
+            window.clearTimeout(this.appendStudyOtherHandle);
-        }
+         }
       },
       //非音视频课学习时长的增加,每一分钟保存一次
       appendStudyOtherTime() {
@@ -562,46 +550,46 @@
         if (!this.contentData.id) {
           return;
         }
-        //每一分钟保存一次
+          //每一分钟保存一次
-        // 取消阅读的每分钟六十秒的计时，最多是设置的时间或默认时间
+          // 取消阅读的每分钟六十秒的计时，最多是设置的时间或默认时间
-        let $this=this;
+          let $this=this;
-        let startTime = new Date().getTime();
+          let startTime = new Date().getTime();
-        this.appendStudyOtherHandle = setTimeout(function() {
+          this.appendStudyOtherHandle = setTimeout(function() {
-          let endTime = new Date().getTime();
+            let endTime = new Date().getTime();
-          let totalTime = Math.round((endTime - startTime) / 1000);
+            let totalTime = Math.round((endTime - startTime) / 1000);
-          $this.cumulativeDuration += totalTime;
+            $this.cumulativeDuration += totalTime;
-          if($this.cumulativeDuration <= $this.maxDuration){
+            if($this.cumulativeDuration <= $this.maxDuration){
-            //发送时长
+              //发送时长
-            $this.sendStudyOtherTime(totalTime);
+              $this.sendStudyOtherTime(totalTime);
-            //递归调用
+              //递归调用
-            $this.appendStudyOtherTime();
+              $this.appendStudyOtherTime();
-          }else{
+            }else{
-            clearTimeout(this.appendStudyOtherHandle);
+              clearTimeout(this.appendStudyOtherHandle);
-            $this.cumulativeDuration = 0;
+              $this.cumulativeDuration = 0;
-            $this.maxDuration = 0;
+              $this.maxDuration = 0;
-          }
+            }
-        }, 1000*60);
+          }, 1000*60);
 
       },
       sendStudyOtherTime(totalTime){
         //静默处理
         apiStat.sendEvent({
-          "key": "StudyCourseOther",//课程学习的key
+            "key": "StudyCourseOther",//课程学习的key
-          "title": "非音视频课内容",//事件的标题
+            "title": "非音视频课内容",//事件的标题
-          "parameters":"second:" + totalTime,//second:value 本次的学习时长
+            "parameters":"second:" + totalTime,//second:value 本次的学习时长
-          "content": "学习课程",//事件的内容
+            "content": "学习课程",//事件的内容
-          "objId": this.courseInfo.id,//课程的id
+            "objId": this.courseInfo.id,//课程的id
-          "objType": "1",//类型
+            "objType": "1",//类型
-          "source":"page",
+            "source":"page",
-          "objInfo": ""+this.courseInfo.name,
+            "objInfo": ""+this.courseInfo.name,
-          "aid":this.userInfo.aid, //当前登录人的id
+            "aid":this.userInfo.aid, //当前登录人的id
-          "aname":this.userInfo.name,//当前人的姓名
+            "aname":this.userInfo.name,//当前人的姓名
-          "status": 1 //状态
+            "status": 1 //状态
-        }).then(rs=>{
+          }).then(rs=>{
-          if(rs.status != 200) {
+              if(rs.status != 200) {
-            console.log(rs.message);
+                console.log(rs.message);
-          }
+              }
-        });
+          });
       },
       //笔记组件触发，播放指定时间
       onPlayVideo(contentId,time){
@@ -610,32 +598,32 @@
         console.log(contentId,this.contentData.id,'两个内容id');
         let $this=this;
         if(this.contentData.id==contentId){
-          this.onPlayerPause()
+           this.onPlayerPause()
-          this.contentData.lastStudyTime=time;
+           this.contentData.lastStudyTime=time;
-          setTimeout(() => {
+           setTimeout(() => {
-            $this.$refs.myVideoPlayer.startPlay(time);
+             $this.$refs.myVideoPlayer.startPlay(time);
-          }, 10)
+           }, 10)
-          console.log('开始播放1');
+           console.log('开始播放1');
         }else{
-          //通过contentId
+           //通过contentId
-          let toResContent=null;
+           let toResContent=null;
-          this.contentList.forEach(c => {
+            this.contentList.forEach(c => {
-            if(c.id==contentId){
+              if(c.id==contentId){
-              c.lastStudyTime=time;
+                 c.lastStudyTime=time;
-              toResContent=c;
+                 toResContent=c;
+              }
+            });
+            if(toResContent){
+
+              this.changePlayRes(toResContent);
+              setTimeout(() => {
+                $this.$refs.myVideoPlayer.startPlay(time);
+              }, 10)
+
+              console.log('开始播放2');
+            }else{
+              this.$message.error('资源已不存在或更换过，已无法定位');
             }
-          });
-          if(toResContent){
-
-            this.changePlayRes(toResContent);
-            setTimeout(() => {
-              $this.$refs.myVideoPlayer.startPlay(time);
-            }, 10)
-
-            console.log('开始播放2');
-          }else{
-            this.$message.error('资源已不存在或更换过，已无法定位');
-          }
         }
         this.playerBoxShow = false;
       },
@@ -713,23 +701,24 @@
         }else if(r.contentType==50){ //scorm
           this.scormUrl='';
           apiCourseFile.detail(r.contentRefId).then(cfrs => {
-            if(cfrs.status==200){
+             if(cfrs.status==200){
-              this.curCFile = cfrs.result;
+                this.curCFile = cfrs.result;
-              //this.scormUrl=cfrs
+                //this.scormUrl=cfrs
-              let pars='?mode=normal&r='+Math.random();
+                let pars='?mode=normal&r='+Math.random();
-              pars+='&scormId='+this.curCFile.id;
+                pars+='&scormId='+this.curCFile.id;
-              pars+='&courseId='+this.courseId;
+                pars+='&courseId='+this.courseId;
-              pars+='&contentId='+r.id;
+                pars+='&contentId='+r.id;
-              pars+='&studentId='+this.userInfo.aid;
+                pars+='&studentId='+this.userInfo.aid;
-              pars+='&studentName='+encodeURIComponent(this.userInfo.name);
+                pars+='&studentName='+encodeURIComponent(this.userInfo.name);
-              pars+='&lmsId='+this.studyId;
+                pars+='&lmsId='+this.studyId;
-              pars+='&scoId=';//不指定，scorm模块自动根据学习记录定位
+                pars+='&scoId=';//不指定，scorm模块自动根据学习记录定位
-              let urlPre=window.location.protocol;
+                let urlPre=window.location.protocol;
-              let configUrl=process.env.VUE_APP_SCORM_URL;
+                let configUrl=process.env.VUE_APP_SCORM_URL;
-              configUrl=urlPre+configUrl.substring(configUrl.indexOf(':')+1);
+                configUrl=urlPre+configUrl.substring(configUrl.indexOf(':')+1);
 
-              this.scormUrl=configUrl+pars;//播放的首页
+                this.scormUrl=configUrl+pars;//播放的首页
-            }
+                console.log('scormUrl',this.scormUrl);
+             }
           });
 
         }else if (r.contentType == 52) {
@@ -760,12 +749,12 @@
             setTimeout(() => {
               this.isContentTypeTwo = r.contentType
               $this.isShowTime()
-            }, 2000);
+              }, 2000);
-          }
+            }
         }
         //以下是学习记录,50是scorm项目
         if (this.contentData.contentType > 20 && this.contentData.contentType !== 50) { //非视频类的
-          //用户的学习时长，非音视频课程学习,单独的处理
+         //用户的学习时长，非音视频课程学习,单独的处理
           this.isAppendTime = false;
 
           this.appendStudyOtherHandle = setTimeout(function() {
@@ -775,18 +764,18 @@
             // 没有设置默认时长三十分钟，
             $this.maxDuration =  r.duration !== 0 ? r.duration * 2 : $this.defaultMaxTime;
             $this.$store.dispatch("userTrigger", {
-              "key": "StudyCourseOther",//课程学习的key
+                "key": "StudyCourseOther",//课程学习的key
-              "title": "非音视频课内容",//事件的标题
+                "title": "非音视频课内容",//事件的标题
-              "parameters":"second:15",//second:value 本次的学习时长
+                "parameters":"second:15",//second:value 本次的学习时长
-              "content": "学习课程",//事件的内容
+                "content": "学习课程",//事件的内容
-              "objId": $this.courseInfo.id,//课程的id
+                "objId": $this.courseInfo.id,//课程的id
-              "objType": "1",//类型
+                "objType": "1",//类型
-              "source":"page",
+                "source":"page",
-              "objInfo": ""+$this.courseInfo.name,
+                "objInfo": ""+$this.courseInfo.name,
-              "aid":$this.userInfo.aid, //当前登录人的id
+                "aid":$this.userInfo.aid, //当前登录人的id
-              "aname":$this.userInfo.name,//当前人的姓名
+                "aname":$this.userInfo.name,//当前人的姓名
-              "status": 1 //状态
+                "status": 1 //状态
-            });
+             });
             $this.appendStudyOtherTime();
           }, 15000); //非音视频课程学习,十五秒后记录
           this.isContentType = this.contentData.contentType
@@ -803,20 +792,20 @@
 
 
         this.$nextTick(function(){
-          if (r.contentType == 10) {
+            if (r.contentType == 10) {
-            console.log('视频处理lastStudyTime',this.contentData.lastStudyTime)
+              console.log('视频处理lastStudyTime',this.contentData.lastStudyTime)
-            console.log('视频处理progressVideo',this.contentData.progressVideo)
+              console.log('视频处理progressVideo',this.contentData.progressVideo)
-            this.$refs.myVideoPlayer.updateProgressByClickBar2(this.contentData.lastStudyTime,this.contentData.progressVideo);
+              this.$refs.myVideoPlayer.updateProgressByClickBar2(this.contentData.lastStudyTime,this.contentData.progressVideo);
-          }
+            }
 
-          let h=$this.$refs.coursePlayer.offsetHeight;
+            let h=$this.$refs.coursePlayer.offsetHeight;
-          //解决获取高度不正的问题
+            //解决获取高度不正的问题
-          if(h>400 && h<500){
+            if(h>400 && h<500){
-            h=h+40;
+              h=h+40;
-          }else if(h>500){
+            }else if(h>500){
-            h=h+60;
+              h=h+60;
-          }
+            }
-          // 移除高度控制 防止内容塌陷
+            // 移除高度控制 防止内容塌陷
             // $this.controlHeight=h-95;
         })
 
@@ -959,9 +948,9 @@
         this.interactRuning = true;
         let teacherId='';
         if(this.teachers.length>0){
-          teacherId=this.teachers[0].teacherId;
+        	teacherId=this.teachers[0].teacherId;
         }else{
-          teacherId=this.courseInfo.sysCreateAid
+        	teacherId=this.courseInfo.sysCreateAid
         }
         let postData = {
           objType: 1,
@@ -1102,7 +1091,7 @@
               class: 'catalog-cell-state1'
             };
           }
-            break;
+          break;
         }
         return data;
       },
@@ -1163,8 +1152,8 @@
           var markDiv = div.querySelector("#" + divId);
           console.log("去除水印 ---- gx markDiv ----",markDiv);
           if (markDiv) {
-            console.log("执行去除水印 ---- gx markDiv ----",markDiv);
+              console.log("执行去除水印 ---- gx markDiv ----",markDiv);
-            div.removeChild(markDiv);
+      	      div.removeChild(markDiv);
           }
         }
       },
@@ -1223,9 +1212,9 @@
               var time = localStorage.getItem('videoProgressData')
               var arr = time&&JSON.parse(time) || {}
               if(arr[this.blobId] && this.contentData.progressVideo<arr[this.blobId]) {
-                postData.progressVideo = arr[this.blobId]
+              postData.progressVideo = arr[this.blobId]
-                // postData.contentId = this.contentData.id
+              // postData.contentId = this.contentData.id
-                // postData.courseId = this.contentData.courseId
+              // postData.courseId = this.contentData.courseId
               }
             }
             //console.log('记录播放时间')
@@ -1283,9 +1272,9 @@
             var time = localStorage.getItem('videoProgressData')
             var arr = time&&JSON.parse(time) || {}
             if(arr[this.blobId] && this.contentData.progressVideo<arr[this.blobId]) {
-              postData.progressVideo = arr[this.blobId]
+            postData.progressVideo = arr[this.blobId]
-              // postData.contentId = this.contentData.id
+            // postData.contentId = this.contentData.id
-              // postData.courseId = this.contentData.courseId
+            // postData.courseId = this.contentData.courseId
             }
           }
           //console.log('记录播放时间')
@@ -1323,17 +1312,6 @@
           audiences:this.audiences
         }).then(rs => {
           if (rs.status == 200) {
-            if(rs.result.isPermission){
-              this.protocolDialogVisible=true
-            }
-            if (!rs.result.isPermission || (rs.result.isPermission && this.Internet==1)){
-              // this.getInternet()
-              this.renderCourse = true
-            }else{
-              // this.Internet=1;
-              this.renderCourse = false
-              this.protocolDialogVisible=true
-            }
             if(rs.result.contents.length==0){
               $this.$message.error('课程内容已删除或课程已不再使用');
               return;
@@ -1344,11 +1322,11 @@
             }
             //设置必须的字段
             if(rs.result.contents.length==1){
-              $this.tab=2;
+               $this.tab=2;
-              //console.log('内容只有一个');
+               //console.log('内容只有一个');
             }
             if(!rs.result.isCrowd){
-              $this.$message.error('您没有查看该课程的权限');
+                $this.$message.error('您没有查看该课程的权限');
             }
             // 是否播放
             this.isCrowd = rs.result.isCrowd
@@ -1392,8 +1370,7 @@
               }
             }
             this.courseInfo = rs.result.course;
-            this.warn = rs.result.warn;
+
-            this.warnTitle = rs.result.warnTitle;
             if (rs.result.teachers && rs.result.teachers.length > 0) {
               let userIds = [];
               let ctoUsers = [];
@@ -1422,53 +1399,12 @@
             this.totalContent = rs.result.contents.length;
             //加载学习的数据
             this.loadStudyData(rs.result);
+
           } else {
             this.$message.error(rs.message);
           }
-
         });
       },
-      refreshPage() {
-        location.reload();
-        // this.getInternet();
-        // this.loadData();
-      },
-      getXmlHttpRequest() {
-        if (window.XMLHttpRequest) {
-          return new XMLHttpRequest();
-        }
-        else if (window.ActiveXObject) {
-          return new ActiveXObject("Microsoft.XMLHTTP");
-        }
-      },
-      // 检测是否为内网
-      getInternet() {
-        this.Internet = 3;
-        let $this = this;
-        let xmlhttp = this.getXmlHttpRequest();
-        let timedOut = false;
-        let timer = setTimeout(function () {
-          timedOut = true;
-          xmlhttp.abort();
-        }, 1000);
-        xmlhttp.open("HEAD", window.location.protocol + "//uapi.boe.com.cn/500.html", true);
-        xmlhttp.send();
-        xmlhttp.onreadystatechange = function () {
-          if (xmlhttp.readyState == 4) {
-            if (xmlhttp.status == 200) {
-              clearTimeout(timer);
-              $this.Internet = 1;
-            } else {
-              clearTimeout(timer);
-              // $this.protocolDialogVisible=true
-              $this.Internet = 2;
-            }
-          } else {
-            if (timedOut) return;//忽略中止请求
-            clearTimeout(timer);//取消等待的超时
-          }
-        }
-      },
       loadStudyData(result) {
         let $this=this;
         this.loadScorePraiseAndTrample();
@@ -1591,37 +1527,37 @@
       progress(val) {
         const progressValue = parseFloat(val) * 100;
         this.sendEventProgress = Number(progressValue.toFixed(2));
-      },
+       },
       saveStudyDuration(duration) { //保存本地存储的学习时长
         if (duration > 0) {
           //发送用户学习事件
           //console.log('保存到后台学习时长='+duration);
           let postData={
-            "key": "StudyCourse",//课程学习的key
+              "key": "StudyCourse",//课程学习的key
-            "title": "学习课程",//事件的标题
+              "title": "学习课程",//事件的标题
-            "parameters":"second:"+duration,//second:value,total:value 本次的学习时长
+              "parameters":"second:"+duration,//second:value,total:value 本次的学习时长
-            "content": "学习课程【"+this.courseInfo.name+"】",//事件的内容
+              "content": "学习课程【"+this.courseInfo.name+"】",//事件的内容
-            "objId": this.courseInfo.id,//课程的id
+              "objId": this.courseInfo.id,//课程的id
-            "objType": "1",//类型
+              "objType": "1",//类型
-            "source":"page",
+              "source":"page",
-            "objInfo": ""+this.courseInfo.name,
+              "objInfo": ""+this.courseInfo.name,
-            "aid":this.userInfo.aid, //当前登录人的id
+              "aid":this.userInfo.aid, //当前登录人的id
-            "aname":this.userInfo.name,//当前人的姓名
+              "aname":this.userInfo.name,//当前人的姓名
-            "status": 1, //状态
+              "status": 1, //状态
-            "contentId": this.contentData.id,
+              "contentId": this.contentData.id,
-          }
-          if(this.resType == 10){
-            postData.progress = this.sendEventProgress;
-          }
-          //静默处理
-          apiStat.sendEvent(postData).then(rs=>{
-            if(rs.status == 200) {
-              // this.appendStartTime = new Date();//重新计时
-              // studyUtil.clearStudyDuration(); //清除本地存储
-            } else {
-              console.log(rs.message);
             }
-          });
+            if(this.resType == 10){
+              postData.progress = this.sendEventProgress;
+            }
+            //静默处理
+            apiStat.sendEvent(postData).then(rs=>{
+                if(rs.status == 200) {
+                  // this.appendStartTime = new Date();//重新计时
+                  // studyUtil.clearStudyDuration(); //清除本地存储
+                } else {
+                  console.log(rs.message);
+                }
+            });
           // let postAppendData = {
           //   id: this.appentId,
           //   studyId: this.studyId,
@@ -1643,13 +1579,13 @@
       },
       //结束追加学习时长
       stopStudyTime(){
-        //console.log('停止追加学习时长');
+          //console.log('停止追加学习时长');
-        this.isAppendTime=false;
+          this.isAppendTime=false;
-        //暂停让他为空 从新计时
+          //暂停让他为空 从新计时
-        this.appendStartTime = null
+          this.appendStartTime = null
-        if (this.appendHandle != null) {
+          if (this.appendHandle != null) {
-          window.clearTimeout(this.appendHandle);
+              window.clearTimeout(this.appendHandle);
-        }
+          }
       },
       appendStudyTime() {
         // 暂停的时候重新从十五秒开始计时
@@ -1671,11 +1607,11 @@
         this.appendHandle &&  window.clearTimeout(this.appendHandle);
         //启动下次追加学习时长
         this.appendHandle = setTimeout(() => {
-          let endTime = new Date().getTime();
+            let endTime = new Date().getTime();
-          this.appentInterval = 60
+            this.appentInterval = 60
-          let totalTime = Math.round((endTime - this.appendStartTime) / 1000);
+            let totalTime = Math.round((endTime - this.appendStartTime) / 1000);
-          this.appendStudyTime();
+            this.appendStudyTime();
-          this.saveStudyDuration(totalTime)
+            this.saveStudyDuration(totalTime)
         }, this.appentInterval * 1000);
       },
 
@@ -1741,30 +1677,40 @@
       },
       handleAudioTimeUpdate(currentTime) {
         // if(this.contentStudysLength.length == 0){
-        let params = {
+          let params = {
-          studyId: this.studyId, //学习id,
+            studyId: this.studyId, //学习id,
-          courseId: this.courseId, //课程id,
+            courseId: this.courseId, //课程id,
-          contentId: this.contentData.id, //内容id,
+            contentId: this.contentData.id, //内容id,
-          contentType: this.contentData.contentType,
+            contentType: this.contentData.contentType,
-          contentName: this.contentData.contentName, //内容名称
+            contentName: this.contentData.contentName, //内容名称
-          progress: 1,
+            progress: 1,
-          status: 2,
+            status: 2,
-          contentTotal: this.totalContent
+            contentTotal: this.totalContent
-        };
+          };
-        if(currentTime > 2 && this.trueFalse){
+          if(currentTime > 2 && this.trueFalse){
-          apiStudy.studyContent(params).then(()=>{
+            apiStudy.studyContent(params).then(()=>{
-            if(this.contentData.status<2){
+              if(this.contentData.status<2){
-              this.contentData.status = 2;
+                this.contentData.status = 2;
-            }
+              }
+            })
+            this.trueFalse = false
+          }
+      },
+      copyUrl(currentUrl) {
+        const urlToCopy = currentUrl;
+
+        navigator.clipboard.writeText(urlToCopy)
+          .then(() => {
+            this.$message.success('链接已成功复制到剪贴板');
           })
-          this.trueFalse = false
+          .catch(err => {
-        }
+            this.$message.error('复制失败，请手动复制：' + urlToCopy);
+            console.error('复制错误:', err);
+          });
       },
     },
-    destroyed(){
+
-      this.cleanAppendTime();
+
-      this.stopStudyTime();
-    },
   }
 </script>
 
@@ -1817,11 +1763,10 @@
         height: 80%;
         border: 1px solid #ffffff;
         padding-right: 20px;
-        background-color: rgb(238, 238, 238);
         // overflow: auto;
       }
       .course-control{ //内容控制区域
-        width: 420px;
+         width: 420px;
       }
     }
 
@@ -2107,7 +2052,7 @@
 
   .course-interact {
     flex: 1; // 20%高度
-    height: 54px;
+    min-height: 54px;
     // padding-top: 10px;
     // padding-right: 10px;
     padding: 0 20px;
@@ -2470,18 +2415,29 @@
     height: 200px;
     background: url('../../../public/images/couresdetail.png');
   }
-
+  .copy-button {
-.protocol {
+    background-color: #409EFF;
-  .protocol-title {
+    color: white;
-    font-size: 20px;
+    border: none;
-    font-weight: 600;
+    padding: 8px 12px;
-    text-align: center;
+    border-radius: 4px;
-    margin-bottom: 25px;
+    cursor: pointer;
   }
 
-  .protocol-content {
+  .copy-button:hover {
-    font-size: 14px;
+    background-color: #66b1ff;
-    line-height: 25px;
   }
-}
+  .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