标签管理未选择分类给个提示语

标签管理查询条件缺少重置按钮
2025-12-08 10:26:43 +08:00 · 2025-09-28 11:59:09 +08:00 · 2025-09-28 11:46:33 +08:00 · 2025-09-28 11:12:06 +08:00 · 2025-09-28 11:07:08 +08:00 · 2025-09-28 11:03:09 +08:00
31 changed files with 596 additions and 635 deletions
--- a/lexiang-sso-77deb595.txt
+++ b/lexiang-sso-77deb595.txt
@@ -1 +0,0 @@
-60ab8a4b97b446b2dcd32889
--- a/src/api/manage/manage.js
+++ b/src/api/manage/manage.js
@@ -34,48 +34,9 @@ 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,
-    getStudntProjectInfo,
-    signUpBpmProjectNow,
-    signUpBpmProjectAgain,
-    getNewSocialHireProject
+    userRsSginupCourse
 }
--- a/src/api/modules/course.js
+++ b/src/api/modules/course.js
@@ -4,7 +4,6 @@
 *
 **/
 import ajax from '@/utils/xajax.js'
-import request from "../unionAjax";

 /**
 * 保存课程基本信息，新增和更新都是此方式
@@ -174,7 +173,6 @@ const detail = function(id) {
 const getDictIds = function(pid,type) {
  return ajax.get(`/xboe/m/course/manage/getDictIds?pid=${pid}&type=${type}`);
 }
-
 /**
 * 更新内容的名称
 * @param {Object} data
--- a/src/assets/images/grateful/gratefulFooter20250611.png
+++ b/src/assets/images/grateful/gratefulFooter20250611.png
--- a/src/assets/images/project/title-bg.png
+++ b/src/assets/images/project/title-bg.png
--- a/src/components/Course/courseForm.vue
+++ b/src/components/Course/courseForm.vue
@@ -73,6 +73,9 @@
                :props="{ value: 'id', label: 'name' }"
                :options="sysTypeListMap"></el-cascader>
            </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="资源归属" required>
                <el-input placeholder="请选择" v-model="orgName" >
                    <el-button v-if="identity==3 || identity==5" @click="showChooseOrg()" slot="append" icon="el-icon-search">选择</el-button>
@@ -141,7 +144,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">
@@ -255,7 +257,7 @@
                  <choice :teacherValue="teacherValues" @getTeacherList="getTeacherList"></choice>
                </el-form-item>
                <el-form-item label="标签" required>
-                  <courseTag :courseId="curCourseId" :sysTypeList="sysTypeList"></courseTag>
+                  <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>
@@ -309,7 +311,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="课程来源">
@@ -424,6 +425,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';
@@ -472,6 +474,7 @@ export default {
      orgName:'',
      orgNamePath:'',
      orgKid:'',
+      courseTags:[],
      courseInfo: {
        id: '',
        name: '',
@@ -494,8 +497,6 @@ export default {
        refType:''
      },
      visibleShow:false,
-      isPermission:false,
-      dicts:[],
      extendRefId:'',
      extendRefType:'',
      courseTeachers: [], //课程的老师
@@ -535,11 +536,7 @@ export default {
        dlgShow: false
      },
      rightTypeId: {},
-      catalogSortDialogShow: false,
-      selectedOrg: {
-        orgId: null,
-        name: ''
-      }
+      catalogSortDialogShow: false
    };
  },
  created() {
@@ -564,18 +561,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;
@@ -597,19 +590,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("--- dicts  = ",this.dicts)
-      this.isPermission = this.dicts.includes(orgId);
-      console.log("--- 监听结束 this.isPermission  = ",this.isPermission)
-    },
    // 关键字的更改
    changeKeywords(option){
      if(option.target.value){
@@ -621,6 +601,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;
    },
@@ -751,6 +740,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();
@@ -798,6 +788,8 @@ export default {
      this.tips=[];

      if (!editData) {
+        this.tips=[];
+        this.courseTags=[],
        //console.log("新建课程？");
        //以下为了保证初始化处理
        this.weikeReset = Math.round(Math.random()) + '';
@@ -894,6 +886,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 {
@@ -914,29 +908,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;
@@ -950,10 +931,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=>{
@@ -1005,7 +983,6 @@ export default {
               }
            });
          }
-
          this.resOwnerArray=[];
          if (result.course.resOwner1 == '') {
            this.resOwnerArray.push(result.course.resOwner1);
@@ -1290,7 +1267,7 @@ export default {
        teachers: saveTeachers,
        crowds:crowds
      };
-      //console.log(postData);
+      console.log(postData);
      //this.btnLoading=false;
      apiCourse
        .saveBase(postData)
--- a/src/components/Course/courseImage.vue
+++ b/src/components/Course/courseImage.vue
@@ -48,17 +48,13 @@ 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
    },
--- a/src/components/Course/courseTag.vue
+++ b/src/components/Course/courseTag.vue
@@ -11,9 +11,12 @@
      :remote-method="debouncedSearch"
      :loading="loading"
      :disabled="sysTypeList.length===0"
-      placeholder="按回车键Enter创建标签"
+      :placeholder="sysTypeList.length === 0 ? '请先选择课程分类' : '请输入标签名称'"
      @remove-tag="handleTagRemove"
+      @change="handleSelectionChange"
      @keyup.enter.native="handleEnterKey"
+      @keyup.delete.native="handleDeleteKey"
+      ref="tagSelect"
    >
      <el-option
        v-for="item in searchResults"
@@ -22,18 +25,6 @@
        :value="item"
      />
    </el-select>
-    <!--   预览  ---
-        <div class="tag-preview">
-          <el-tag
-            v-for="tag in displayTags"
-            :key="tag.id"
-            closable
-            @close="removeTag(tag.id)"
-          >
-            {{ tag.tagName }}
-          </el-tag>
-        </div>
-     -->
  </div>
 </template>

@@ -56,6 +47,11 @@ export default {
    maxTags: {
      type: Number,
      default: 10
+    },
+    // 添加：接收初始标签数据的props
+    initialTags: {
+      type: Array,
+      default: () => []
    }
  },
  data() {
@@ -65,7 +61,8 @@ export default {
      loading: false,
      tagMap: new Map(),
      inputBuffer: '',
-      params: {}
+      params: {},
+      tag: {}
    }
  },
  computed: {
@@ -81,32 +78,66 @@ export default {
    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: {
-    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
-      }
+    // 新增：重置标签状态的方法
+    resetTagState() {
+      this.selectedTags = [];
+      this.searchResults = [];
+      this.tagMap.clear();
+      this.loading = false;
+      this.params = {};
    },
    handleTagRemove(tagId) {
      this.selectedTags = this.selectedTags.filter(id => id !== tagId)
      this.$emit('change', this.displayTags)
+      // 清空输入框内容
+      if (this.$refs.tagSelect) {
+        const input = this.$refs.tagSelect.$refs.input
+        if (input) {
+          input.value = ''
+        }
+      }
    },
    removeTag(tagId) {
      this.handleTagRemove(tagId)
    },

+    // 新增：处理删除键事件
+    handleDeleteKey(event) {
+      // 如果输入框内容为空，不执行任何搜索
+      if (!event.target.value.trim()) {
+        this.searchResults = []
+      }
+    },
+
    //按回车键，创建新标签
    handleEnterKey(event) {
      const inputVal = event.target.value?.trim()
@@ -116,8 +147,24 @@ export default {
      }
    },

+    // 新增：处理选择变化事件
+    handleSelectionChange() {
+      this.$emit('change', this.displayTags)
+      // 选择标签后清空输入框
+      if (this.$refs.tagSelect) {
+        const input = this.$refs.tagSelect.$refs.input
+        if (input) {
+          input.value = ''
+        }
+      }
+    },
    //创建新标签
    async createNewTag(tagName) {
+      // 标签不能超过八个字
+      if (tagName.length > 8) {
+        this.$message.error('标签不能超过8个字')
+        return;
+      }
      this.loading = true
      try {
        this.params.courseId = this.courseId;
@@ -133,13 +180,37 @@ export default {
          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.selectedTags.push(newTag.tagName)
-        this.$emit('change', this.selectedTags.map(tag => tag.id))
+        this.$emit('change', this.displayTags)
      } finally {
        this.loading = false
      }
    },
+    // 修改doSearch方法，添加搜索结果为空时的提示
+    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
+        // 当搜索结果为空时，提示用户可以按回车键创建标签
+        if (tags.length === 0) {
+          this.$message.info('无此标签，按回车键创建')
+        }
+      } finally {
+        this.loading = false
+      }
+    }
  }
 }
 </script>
--- a/src/components/Portal/comments.vue
+++ b/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,7 +633,6 @@
              this.$message.error(res.message);
           }
        });
-        this.loadData(false);
      },
      delCommnet(com,idx){
        if(com.replyList!='' && com.replyList.length>0){
--- a/src/components/PortalHeader.vue
+++ b/src/components/PortalHeader.vue
@@ -137,30 +137,6 @@
            </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>
@@ -168,7 +144,6 @@
 <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';
@@ -229,8 +204,6 @@ export default {
      keyword: '',
      isTiao: false,
      sex:'',
-      projectDialogVisible: false,
-      studentInfo: {},
    };
  },
  mounted() {
@@ -241,22 +214,7 @@ 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);
      },
@@ -297,29 +255,7 @@ export default {
      if (val === "four") {
        window.open("https://m.qingxuetang.com/x/?appId=qxtcorp306130")
          // this.$emit('showClass',true)
-      } 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 {
+      }  else {
        let urlPre = window.location.protocol + "//" + window.location.host;
        // process.env.VUE_APP_BOE_WEB_URL
        let obj = {
@@ -328,7 +264,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", //old社招新员工 zhengsongbo 注释掉 2025-07-14
+          five: urlPre + "/boe/new-employee/index.html",
          six: urlPre + "/web/contributor/index",
          seven: this.webBaseUrl + '/grateful/index'
        };
@@ -662,27 +598,4 @@ 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>
--- a/src/components/VideoPlayer/index.vue
+++ b/src/components/VideoPlayer/index.vue
@@ -317,7 +317,7 @@ export default {
    }

    setInterval(() => {
-          // console.log('当前状态:',this.currentProgress,this.isDrag,this.videoDom.currentTime , this.videoDom.duration)
+          console.log('当前状态:',this.currentProgress,this.isDrag,this.videoDom.currentTime , this.videoDom.duration)
          // 视频播放时本地记录视频实时播放时长,视频设置了禁止拖动时执行
          if(!this.isDrag){
            var time = localStorage.getItem('videoProgressData')
@@ -364,10 +364,10 @@ export default {
      }
      // 根据视频的readyState判断下一帧是否已加载，并控制loading的显示
      this.isShowLoading = this.videoDom.readyState < 3;
-      // console.log("当前缓存:"+this.videoDom.readyState)
+      console.log("当前缓存:"+this.videoDom.readyState)
      if (this.videoDom.readyState < 3){
-        // console.log("详细信息",this.videoDom)
-        // console.log("卡了",this.videoDom.readyState)
+        console.log("详细信息",this.videoDom)
+        console.log("卡了",this.videoDom.readyState)
      }
      //if()
      //console.log(this.videoDom.readyState,'this.videoDom.readyState');
--- a/src/components/VideoPlayer/progress-bar.vue
+++ b/src/components/VideoPlayer/progress-bar.vue
@@ -85,9 +85,10 @@ export default {
        if(current<0) current = 0;
        var time = localStorage.getItem('videoProgressData');
        var arr = time&&JSON.parse(time) || {}
-        console.log('down arr:',this.isDrag,this.blobId,arr,arr[this.blobId],current)
-        // 禁止拖动 true:禁止拖动，false:允许拖动
+        //console.log('down arr:',this.isDrag,this.blobId,arr,arr[this.blobId],current)
+        // 禁止拖动
        if(!this.isDrag && time && arr[this.blobId] < current) return;
+
        this.$emit("updateProgress", current);
      // }

@@ -101,7 +102,7 @@ export default {
        if(current<0) current = 0;
        var time = localStorage.getItem('videoProgressData');
        var arr = time&&JSON.parse(time) || {}
-        console.log('move arr:',this.isDrag,this.blobId,arr,arr[this.blobId],current)
+        //console.log('move arr:',this.isDrag,this.blobId,arr,arr[this.blobId],current)
        // 禁止拖动
        if(!this.isDrag && time && arr[this.blobId] < current) return;
        this.$emit("updateProgress", current);
@@ -117,12 +118,12 @@ export default {
        if(current<0) current = 0;
        var time = localStorage.getItem('videoProgressData');
        var arr = time&&JSON.parse(time) || {}
-        console.log('up arr:',this.isDrag,this.blobId,arr,arr[this.blobId],current)
+        //console.log('up arr:',this.isDrag,this.blobId,arr,arr[this.blobId],current)
        this.$emit("getMouseDownStatus", false);
        // 禁止拖动
        if(!this.isDrag && time && arr[this.blobId] < current) return;
        this.$emit("updateProgress", current);
-        this.$emit("getMouseDownStatus", false);
+
      }
    },
  },
--- a/src/views/article/ManageList.vue
+++ b/src/views/article/ManageList.vue
@@ -289,8 +289,8 @@ export default {
        })
    },
    viewTopic(data) {
-     window.open(this.webBaseUrl+'/article/detail?id='+data.id , '_blank')
-      // this.$router.push({path:'/article/detail',query:{id:data.id}})
+    //  window.open(this.webBaseUrl+'/article/detail?id='+data.id , '_blank')
+      this.$router.push({path:'/article/detail',query:{id:data.id}})
    },
  },
 }
--- a/src/views/case/ManageList.vue
+++ b/src/views/case/ManageList.vue
@@ -697,8 +697,7 @@ export default {
    },
    viewTopic(data) {
      if (data.confidentialityLevel == '内部') {
-        // this.$router.push({ path: '/case/detail', query: { id: data.id } })
-        window.open(this.webBaseUrl+'/case/detail?id='+data.id , '_blank')
+        this.$router.push({ path: '/case/detail', query: { id: data.id } })
      } else {
        this.$message.warning("非内部密级案例不能查看");
      }
--- a/src/views/course/Courseware.vue
+++ b/src/views/course/Courseware.vue
@@ -624,12 +624,8 @@ export default {
        // if(item.minute){
        //    item.duration=parseFloat(item.minute)*60;
        // }
-        // 视频文件才可以设置时长，其他类型直接赋值0
-        if (item.fileType === 'mp4' || item.fileType === 'mp3') {
-          item.duration = item.minute ? parseFloat(item.minute) * 60 : 0;
-        } else {
-          item.duration = 0;
-        }
+        // 如果没有给一个默认值30分钟
+        item.duration = item.minute ? parseFloat(item.minute) * 60 : 1800;
      });
      this.loading = true;
      coueseFile.batchUpdate(this.fileList).then(rs => {
--- a/src/views/grateful/GratefulHomePage.vue
+++ b/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">
-            <div class="bannbox" :style="{
+            class="swiper-slide games pointer"  >
+            <div class="bannbox" @click="handleCarouselClick(item)" :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">
-            <div class="bannbox" :style="{
+            class="swiper-slide games pointer"  >
+            <div class="bannbox" @click="handleCarouselClick(item)"  :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,6 +249,13 @@ 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}`)
--- a/src/views/grateful/TeacherOpinion.vue
+++ b/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">认证讲师库（2023）</span>
+              <span style="cursor: pointer;" class="nav">认证讲师库</span>
            </div>
            <div style="position: relative;">
              <el-input class="portal-input" placeholder="请输入课程名称" style="border-radius: 20px !important; "
--- a/src/views/hotforum/Index.vue
+++ b/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;">
--- a/src/views/lexiang-sso-77deb595.txt
+++ b/src/views/lexiang-sso-77deb595.txt
@@ -1 +0,0 @@
-60ab8a4b97b446b2dcd32889
--- a/src/views/portal/case/Detail.vue
+++ b/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"></author>
+                  :sex="authorInfo.sex" :name="authorInfo.name"></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 => {
--- a/src/views/portal/case/Index.vue
+++ b/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>{{ formatDateTime(item.eventTime) }}</span>
+                      <span>{{ item.eventTime }}</span>
                    </div>
                    <div class="case-info-title">
                      <div class="case-titdiv">
@@ -664,12 +664,6 @@ export default {
      return !this.speciData.some(item => item.fielclass);
    }
  },
-  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)}`;
-  },
  beforeRouteLeave (to, from, next) {
    const isScroll = 'caseDetail,caseCharts,caseExcellent'
    if(!isScroll.includes(to.name)){
@@ -1513,7 +1507,7 @@ export default {
                };
              });
              res.result.list.forEach(item=>{
-                item.viewRankTags = (item.viewRankTags||[]).slice(0,2)||[]
+                item.viewRankTags = item.viewRankTags?.slice(0,2)||[]
              })
              this.caseList.list = res.result.list
              this.getCaseUserData(res.result.list);
@@ -1568,7 +1562,7 @@ export default {
                };
              });
              res.result.list.forEach(item=>{
-                item.viewRankTags = (item.viewRankTags||[]).slice(0,2)||[]
+                item.viewRankTags = item.viewRankTags?.slice(0,2)||[]
              })
              this.caseList.list = res.result.list
              this.getCaseUserData(res.result.list);
@@ -1611,11 +1605,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;
--- a/src/views/portal/course/Index.vue
+++ b/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">
@@ -315,7 +315,7 @@
                <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.name}}</a>
+                  <a class="custom" :class="tag.checked ? 'custom2' : ''">{{tag.tagName}}</a>
                </div>
              </div>
            </div>
@@ -333,9 +333,11 @@
          <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>
-                <el-tag closable v-for="(tag, tagIdx) in stagList" :key="'t' + tagIdx" @close="stagClose(tag, tagIdx)">{{
-                  tag.name }}</el-tag>
+                <span class="item-title"> 搜索条件:</span>
+                <el-tag closable v-for="(tag, tagIdx) in stagList" :key="'t' + tagIdx" @close="stagClose(tag, tagIdx)"
+                  :style="{ color: tag.type === 0 ? '#ff0000' : '' }">
+                  {{ tag.tagName }}
+                </el-tag>
              </div>
              <div>
                <el-button type="primary" size="mini" @click="handleClearTags">清除</el-button>
@@ -369,6 +371,9 @@
                      <span v-if="cinfo.type == 40" class="course-type-left">学习项目</span>
                    </div>
                    <div class="course-title two-line-ellipsis" :title="cinfo.title" v-html="cinfo.name"></div>
+                    <el-tag v-for="tag in cinfo.tagList" v-if="cinfo.tagList && cinfo.tagList.length > 0" :style="{ color: '',margin: '5px'}">
+                      {{tag.tagName}}
+                    </el-tag>
                    <!-- 关键字 -->
                    <div class="keywordInfo-every">
                      <div class="keywordInfo" v-for="(keyword, index) in cinfo.keywordsActive" :key="index">
@@ -494,32 +499,6 @@
          </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>
@@ -570,26 +549,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);
+          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;
@@ -597,34 +593,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() {
@@ -654,18 +644,7 @@ export default {
  },
  data() {
    return {
-      hotTagsList: [  //热点标签
-        {id:1,name:"数据库", checked: false },
-        {id:2,name:"Python", checked: false },
-        {id:3,name:"Java", checked: false },
-        {id:4,name:"Vue3.0", checked: false },
-        {id:5,name:"大数据", checked: false },
-        {id:6,name:"Bootstrap", checked: false },
-        {id:7,name:"营销学", checked: false },
-        {id:8,name:"芯片", checked: false },
-        {id:9,name:"火箭", checked: false },
-        {id:10,name:"感悟", checked: false }
-      ],
+      hotTagsList: [],
      newData: false,//线上品牌系列隐藏
      navTitle: [],
      // 设置高亮
@@ -744,7 +723,10 @@ export default {
    //初始化:获取最新前10个热点标签
      apiCourseTag.getHotTagList(null).then(rs => {
      if (rs.status == 200) {
-        this.hotTagsList = rs.result;
+        this.hotTagsList = rs.result.map(tag => ({
+          ...tag,
+          checked: false
+        }));
      } else {
        console.log(rs.message);
      }
@@ -831,24 +813,6 @@ 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
@@ -932,10 +896,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();
    },

@@ -973,31 +981,33 @@ export default {
      this.searchData();
    },
    // 清除
-    handleClearTags() {
-      //清空所有的条件
-      this.keyword = '';
-      this.ctypeList.forEach(item => {
-        item.checked = false;
+handleClearTags() {
+  //清空所有的条件
+  this.keyword = '';
+  this.ctypeList.forEach(item => {
+    item.checked = false;
+  });
+  this.hotTagsList.forEach(item => {
+    item.checked = false;
+  });
+  this.course.tags = ''; // 清空标签ID
+
+  // 添加清除三级分类的逻辑
+  this.oneList.forEach(one => {
+    one.checked = false;
+    one.children.forEach(two => {
+      two.checked = false;
+      two.children.forEach(three => {
+        three.checked = false;
      });
-      this.hotTagsList.forEach(item => {
-        item.checked = false;
-      });
-      this.oneList.forEach(one => {
-        one.checked = false;
-        one.children.forEach(two => {
-          two.checked = false;
-          two.children.forEach(three => {
-            three.checked = false;
-          })
-        })
-      });
-      this.twoList = [];
-      this.threeList = [];
-      this.navTitle = [];
-      this.newData = false;
-      sessionStorage.removeItem(this.localSessionKey)
-      this.searchData();
-    },
+    });
+  });
+
+  // 清空导航标题
+  this.navTitle = [];
+
+  this.searchData();
+},
    // 导航切换(录播课，线下课，学习项目)
    handleTypeClick(item, list) {
      item.checked = !item.checked;
@@ -1012,13 +1022,21 @@ export default {
    //点击标签
    handleTagClick(item, list) {
      item.checked = !item.checked;
-      this.searchData();
+
+      // 更新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;
@@ -1304,33 +1322,9 @@ export default {
          let params = encodeURIComponent('courseId=' + courseId);
          this.$router.push('/forward?to=' + manageApi + '/stu/project/redirectDetail&params=' + params);
        } else if (item.type == 40) { //学习项目
-          if (item.bpmFlag == 1) { //是否是需要BPM审批的项目(新员工转正项目)
-            //检查当前用户是否已经报名该项目(“未报名”、“审批中”和“审核拒绝”--则弹窗！--“立即报名”和“重新报名"调BPM接口)
-            apiManage.getStudntProjectInfo(courseId).then(res=>{
-                this.studentInfo = res.data;
-                const bpmStatus = this.studentInfo.bpmStatus;
-                if (bpmStatus == 0){//未报名--则弹窗含“立即报名”
-                  this.projectDialogVisible=true;
-                  this.studentInfo.bpmStatusName="<span style='color: #ddc507;font-weight: bold;'>未报名</span>";
-
-                }else if (bpmStatus == 1){//已报名待审核(审批中)--仅弹窗展示
-                  this.projectDialogVisible=true;
-                  this.studentInfo.bpmStatusName="<span style='color: #ddc507;font-weight: bold;'>审批中</span>";
-
-                }else if (bpmStatus == 2){//bpm报名审核通过,则直接进入项目进行学习
-                  let params = encodeURIComponent('projectId=' + courseId);
-                  this.$router.push('/forward?to=' + studentPath + '/projectdetails&params=' + params);
-                }else if(bpmStatus == 3){//已拒绝--则弹窗含“重新报名”
-                  this.projectDialogVisible=true;
-                  this.studentInfo.bpmStatusName="<span style='color: red;font-weight: bold;'>已拒绝(含个人撤回)</span>";
-
-                }
-            })
-          }else {
-            let params = encodeURIComponent('projectId=' + courseId);
-            this.$router.push('/forward?to=' + studentPath + '/projectdetails&params=' + params);
-            //this.$router.push('/forward?to='+manageApi+'/stu/project/redirectDetail&params='+params);
-          }
+          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) {
@@ -1493,7 +1487,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) {
--- a/src/views/portal/course/Micro.vue
+++ b/src/views/portal/course/Micro.vue
@@ -95,10 +95,7 @@
                      <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">
-                                <el-button @click="widthOpen(conLink.url)" type="primary" style="margin-left: 15px">点击前往</el-button>
-                              </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;border:0px" border="0" frameborder="0"></iframe>
--- a/src/views/portal/qa/Index.vue
+++ b/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 && qa.images!==''" @click="jumpDetail(qa)">
-                            <img style="width: 156px;height: 105px;border-radius: 4px;margin-left: 18px;" :src="fileBaseUrl + qa.images" alt="图片貌似被外星人劫走了">
+                          <div style="cursor: pointer; text-align: right;cursor: pointer;" v-if="qa.images!==''" @click="jumpDetail(qa)">
+                            <img style="width: 156px;height: 105px;border-radius: 4px;margin-left: 18px;" :src="fileBaseUrl + qa.images" alt="">
                          </div>
                      </div>

--- a/src/views/portal/user/Message.vue
+++ b/src/views/portal/user/Message.vue
@@ -349,7 +349,6 @@ export default {
            this.$message.success('删除成功');
            this.queryData.pageIndex = 1;
            this.queryMessage(true);
-            this.$store.dispatch('refrashMsg');
          } else {
            this.$message.error('删除失败' + res.message);
          }
@@ -367,7 +366,6 @@ export default {
            this.$message.success('删除成功');
            this.queryData.pageIndex = 1;
            this.queryMessage(true);
-            this.$store.dispatch('refrashMsg');
          } else {
            this.$message.error('删除失败' + res.message);
          }
--- a/src/views/qa/ManageList.vue
+++ b/src/views/qa/ManageList.vue
@@ -306,8 +306,8 @@ export default {

    },
    viewTopic(data) {
-     window.open(this.webBaseUrl+'/qa/answer?id='+data.id, '_blank');
-       // this.$router.push({path:'/qa/answer',query:{id:data.id}})
+     // window.open(this.webBaseUrl+'/qa/answer?id='+data.id, '_blank');
+       this.$router.push({path:'/qa/answer',query:{id:data.id}})
    },
    aduit(row) {
      this.form={...row};
--- a/src/views/study/@/assets/images/over.png
+++ b/src/views/study/@/assets/images/over.png
--- a/src/views/study/TaskList.vue
+++ b/src/views/study/TaskList.vue
@@ -140,7 +140,6 @@ 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)
--- a/src/views/study/coursenew.vue
+++ b/src/views/study/coursenew.vue
@@ -22,7 +22,7 @@
      <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="Internet != 2">
+            <div v-if="renderCourse">
              <div v-if="resType == null || resType == 0">
                <!--先显示视频图片-->
                <course-image v-if="courseInfo.id != ''" :course="courseInfo"></course-image>
@@ -110,11 +110,11 @@
                </assess>
              </div>
            </div>
-            <div v-if="Internet == 2 || Internet == 3" style="margin:350px 250px" class="jianjie pdftext" id="pdfPreview">
+            <div v-if="!renderCourse && Internet ==2" style="margin:350px 250px" class="jianjie pdftext" id="pdfPreview">
              <div style="margin-top:40px;font-weight:700;font-size: 22px;color: #ccc">
-                <span>十分抱歉，您当前的网络环境不符合观看要求。为了保障案例信息的安全，您需要接入公司内网才能观看。</span>
+                <span>十分抱歉，您当前的网络环境不符合观看要求。为了保障课程信息的安全，您需要接入公司内网才能观看。</span>
              </div>
-              <div style="margin-top:20px;text-align:center" @click="()=>window.location.reload();">
+              <div style="margin-top:20px;text-align:center" @click="refreshPage">
                <el-button type="primary">重新检测</el-button>
              </div>
            </div>
@@ -177,7 +177,7 @@
            </div>
            <!-- 课程单元  -->
            <div class="course-units" v-if="tab == 1">
-              <div :style="`height: ${controlHeight}px;overflow-y: auto;`">
+              <div style="min-height: 350px;max-height: 650px ;overflow-y: auto;">
                <div class="catalog" v-if="courseInfo.type == 20">
                  <div  v-for="(item, index) in catalogTree" :key="index" :name="index">
                    <el-menu
@@ -454,6 +454,7 @@
        getType: getType,
        ctabName: 'catalog',
        resType: null,
+        renderCourse: true,
        activeNames: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9],
        scoreInfo: {
          dlgShow: false,
@@ -482,6 +483,7 @@
      }
    },
    mounted() {
+      this.getInternet();
      // 增加的用户受众id
      let localKey = "user_" + this.userInfo.sysId + "_gids";
      let hasIds = sessionStorage.getItem(localKey);
@@ -529,10 +531,6 @@
        return treeList;
      }
    },
-    destroyed(){
-      this.cleanAppendTime();
-      this.stopStudyTime();
-    },
    methods: {
      handleOpen(key,path){
        if(this.isFalse){
@@ -547,13 +545,13 @@
      },
      noteChange(){
        //视频点定位，直接到播放的视频位置
-         this.timer = new Date().getTime()
+        this.timer = new Date().getTime()
      },
      //清空追加学习时长事件
      cleanAppendTime(){
-         if(this.appendStudyOtherHandle){
-            window.clearTimeout(this.appendStudyOtherHandle);
-         }
+        if(this.appendStudyOtherHandle){
+          window.clearTimeout(this.appendStudyOtherHandle);
+        }
      },
      //非音视频课学习时长的增加,每一分钟保存一次
      appendStudyOtherTime() {
@@ -564,46 +562,46 @@
        if (!this.contentData.id) {
          return;
        }
-          //每一分钟保存一次
-          // 取消阅读的每分钟六十秒的计时，最多是设置的时间或默认时间
-          let $this=this;
-          let startTime = new Date().getTime();
-          this.appendStudyOtherHandle = setTimeout(function() {
-            let endTime = new Date().getTime();
-            let totalTime = Math.round((endTime - startTime) / 1000);
-            $this.cumulativeDuration += totalTime;
-            if($this.cumulativeDuration <= $this.maxDuration){
-              //发送时长
-              $this.sendStudyOtherTime(totalTime);
-              //递归调用
-              $this.appendStudyOtherTime();
-            }else{
-              clearTimeout(this.appendStudyOtherHandle);
-              $this.cumulativeDuration = 0;
-              $this.maxDuration = 0;
-            }
-          }, 1000*60);
+        //每一分钟保存一次
+        // 取消阅读的每分钟六十秒的计时，最多是设置的时间或默认时间
+        let $this=this;
+        let startTime = new Date().getTime();
+        this.appendStudyOtherHandle = setTimeout(function() {
+          let endTime = new Date().getTime();
+          let totalTime = Math.round((endTime - startTime) / 1000);
+          $this.cumulativeDuration += totalTime;
+          if($this.cumulativeDuration <= $this.maxDuration){
+            //发送时长
+            $this.sendStudyOtherTime(totalTime);
+            //递归调用
+            $this.appendStudyOtherTime();
+          }else{
+            clearTimeout(this.appendStudyOtherHandle);
+            $this.cumulativeDuration = 0;
+            $this.maxDuration = 0;
+          }
+        }, 1000*60);

      },
      sendStudyOtherTime(totalTime){
        //静默处理
        apiStat.sendEvent({
-            "key": "StudyCourseOther",//课程学习的key
-            "title": "非音视频课内容",//事件的标题
-            "parameters":"second:" + totalTime,//second:value 本次的学习时长
-            "content": "学习课程",//事件的内容
-            "objId": this.courseInfo.id,//课程的id
-            "objType": "1",//类型
-            "source":"page",
-            "objInfo": ""+this.courseInfo.name,
-            "aid":this.userInfo.aid, //当前登录人的id
-            "aname":this.userInfo.name,//当前人的姓名
-            "status": 1 //状态
-          }).then(rs=>{
-              if(rs.status != 200) {
-                console.log(rs.message);
-              }
-          });
+          "key": "StudyCourseOther",//课程学习的key
+          "title": "非音视频课内容",//事件的标题
+          "parameters":"second:" + totalTime,//second:value 本次的学习时长
+          "content": "学习课程",//事件的内容
+          "objId": this.courseInfo.id,//课程的id
+          "objType": "1",//类型
+          "source":"page",
+          "objInfo": ""+this.courseInfo.name,
+          "aid":this.userInfo.aid, //当前登录人的id
+          "aname":this.userInfo.name,//当前人的姓名
+          "status": 1 //状态
+        }).then(rs=>{
+          if(rs.status != 200) {
+            console.log(rs.message);
+          }
+        });
      },
      //笔记组件触发，播放指定时间
      onPlayVideo(contentId,time){
@@ -612,32 +610,32 @@
        console.log(contentId,this.contentData.id,'两个内容id');
        let $this=this;
        if(this.contentData.id==contentId){
-           this.onPlayerPause()
-           this.contentData.lastStudyTime=time;
-           setTimeout(() => {
-             $this.$refs.myVideoPlayer.startPlay(time);
-           }, 10)
-           console.log('开始播放1');
+          this.onPlayerPause()
+          this.contentData.lastStudyTime=time;
+          setTimeout(() => {
+            $this.$refs.myVideoPlayer.startPlay(time);
+          }, 10)
+          console.log('开始播放1');
        }else{
-           //通过contentId
-           let toResContent=null;
-            this.contentList.forEach(c => {
-              if(c.id==contentId){
-                 c.lastStudyTime=time;
-                 toResContent=c;
-              }
-            });
-            if(toResContent){
-
-              this.changePlayRes(toResContent);
-              setTimeout(() => {
-                $this.$refs.myVideoPlayer.startPlay(time);
-              }, 10)
-
-              console.log('开始播放2');
-            }else{
-              this.$message.error('资源已不存在或更换过，已无法定位');
+          //通过contentId
+          let toResContent=null;
+          this.contentList.forEach(c => {
+            if(c.id==contentId){
+              c.lastStudyTime=time;
+              toResContent=c;
            }
+          });
+          if(toResContent){
+
+            this.changePlayRes(toResContent);
+            setTimeout(() => {
+              $this.$refs.myVideoPlayer.startPlay(time);
+            }, 10)
+
+            console.log('开始播放2');
+          }else{
+            this.$message.error('资源已不存在或更换过，已无法定位');
+          }
        }
        this.playerBoxShow = false;
      },
@@ -715,23 +713,23 @@
        }else if(r.contentType==50){ //scorm
          this.scormUrl='';
          apiCourseFile.detail(r.contentRefId).then(cfrs => {
-             if(cfrs.status==200){
-                this.curCFile = cfrs.result;
-                //this.scormUrl=cfrs
-                let pars='?mode=normal&r='+Math.random();
-                pars+='&scormId='+this.curCFile.id;
-                pars+='&courseId='+this.courseId;
-                pars+='&contentId='+r.id;
-                pars+='&studentId='+this.userInfo.aid;
-                pars+='&studentName='+encodeURIComponent(this.userInfo.name);
-                pars+='&lmsId='+this.studyId;
-                pars+='&scoId=';//不指定，scorm模块自动根据学习记录定位
-                let urlPre=window.location.protocol;
-                let configUrl=process.env.VUE_APP_SCORM_URL;
-                configUrl=urlPre+configUrl.substring(configUrl.indexOf(':')+1);
+            if(cfrs.status==200){
+              this.curCFile = cfrs.result;
+              //this.scormUrl=cfrs
+              let pars='?mode=normal&r='+Math.random();
+              pars+='&scormId='+this.curCFile.id;
+              pars+='&courseId='+this.courseId;
+              pars+='&contentId='+r.id;
+              pars+='&studentId='+this.userInfo.aid;
+              pars+='&studentName='+encodeURIComponent(this.userInfo.name);
+              pars+='&lmsId='+this.studyId;
+              pars+='&scoId=';//不指定，scorm模块自动根据学习记录定位
+              let urlPre=window.location.protocol;
+              let configUrl=process.env.VUE_APP_SCORM_URL;
+              configUrl=urlPre+configUrl.substring(configUrl.indexOf(':')+1);

-                this.scormUrl=configUrl+pars;//播放的首页
-             }
+              this.scormUrl=configUrl+pars;//播放的首页
+            }
          });

        }else if (r.contentType == 52) {
@@ -762,12 +760,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() {
@@ -777,18 +775,18 @@
            // 没有设置默认时长三十分钟，
            $this.maxDuration =  r.duration !== 0 ? r.duration * 2 : $this.defaultMaxTime;
            $this.$store.dispatch("userTrigger", {
-                "key": "StudyCourseOther",//课程学习的key
-                "title": "非音视频课内容",//事件的标题
-                "parameters":"second:15",//second:value 本次的学习时长
-                "content": "学习课程",//事件的内容
-                "objId": $this.courseInfo.id,//课程的id
-                "objType": "1",//类型
-                "source":"page",
-                "objInfo": ""+$this.courseInfo.name,
-                "aid":$this.userInfo.aid, //当前登录人的id
-                "aname":$this.userInfo.name,//当前人的姓名
-                "status": 1 //状态
-             });
+              "key": "StudyCourseOther",//课程学习的key
+              "title": "非音视频课内容",//事件的标题
+              "parameters":"second:15",//second:value 本次的学习时长
+              "content": "学习课程",//事件的内容
+              "objId": $this.courseInfo.id,//课程的id
+              "objType": "1",//类型
+              "source":"page",
+              "objInfo": ""+$this.courseInfo.name,
+              "aid":$this.userInfo.aid, //当前登录人的id
+              "aname":$this.userInfo.name,//当前人的姓名
+              "status": 1 //状态
+            });
            $this.appendStudyOtherTime();
          }, 15000); //非音视频课程学习,十五秒后记录
          this.isContentType = this.contentData.contentType
@@ -805,20 +803,21 @@


        this.$nextTick(function(){
-            if (r.contentType == 10) {
-              console.log('视频处理lastStudyTime',this.contentData.lastStudyTime)
-              console.log('视频处理progressVideo',this.contentData.progressVideo)
-              this.$refs.myVideoPlayer.updateProgressByClickBar2(this.contentData.lastStudyTime,this.contentData.progressVideo);
-            }
+          if (r.contentType == 10) {
+            console.log('视频处理lastStudyTime',this.contentData.lastStudyTime)
+            console.log('视频处理progressVideo',this.contentData.progressVideo)
+            this.$refs.myVideoPlayer.updateProgressByClickBar2(this.contentData.lastStudyTime,this.contentData.progressVideo);
+          }

-            let h=$this.$refs.coursePlayer.offsetHeight;
-            //解决获取高度不正的问题
-            if(h>400 && h<500){
-              h=h+40;
-            }else if(h>500){
-              h=h+60;
-            }
-            $this.controlHeight=h-95;
+          let h=$this.$refs.coursePlayer.offsetHeight;
+          //解决获取高度不正的问题
+          if(h>400 && h<500){
+            h=h+40;
+          }else if(h>500){
+            h=h+60;
+          }
+          // 移除高度控制 防止内容塌陷
+            // $this.controlHeight=h-95;
        })


@@ -960,9 +959,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,
@@ -1103,7 +1102,7 @@
              class: 'catalog-cell-state1'
            };
          }
-          break;
+            break;
        }
        return data;
      },
@@ -1164,8 +1163,8 @@
          var markDiv = div.querySelector("#" + divId);
          console.log("去除水印 ---- gx markDiv ----",markDiv);
          if (markDiv) {
-              console.log("执行去除水印 ---- gx markDiv ----",markDiv);
-      	      div.removeChild(markDiv);
+            console.log("执行去除水印 ---- gx markDiv ----",markDiv);
+            div.removeChild(markDiv);
          }
        }
      },
@@ -1224,9 +1223,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.contentId = this.contentData.id
-              // postData.courseId = this.contentData.courseId
+                postData.progressVideo = arr[this.blobId]
+                // postData.contentId = this.contentData.id
+                // postData.courseId = this.contentData.courseId
              }
            }
            //console.log('记录播放时间')
@@ -1284,9 +1283,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.contentId = this.contentData.id
-            // postData.courseId = this.contentData.courseId
+              postData.progressVideo = arr[this.blobId]
+              // postData.contentId = this.contentData.id
+              // postData.courseId = this.contentData.courseId
            }
          }
          //console.log('记录播放时间')
@@ -1324,10 +1323,16 @@
          audiences:this.audiences
        }).then(rs => {
          if (rs.status == 200) {
-            if (rs.result.isPermission){
-              // if (true){
-              this.getInternet()
-              console.log('需要内网环境')
+            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('课程内容已删除或课程已不再使用');
@@ -1339,11 +1344,11 @@
            }
            //设置必须的字段
            if(rs.result.contents.length==1){
-               $this.tab=2;
-               //console.log('内容只有一个');
+              $this.tab=2;
+              //console.log('内容只有一个');
            }
            if(!rs.result.isCrowd){
-                $this.$message.error('您没有查看该课程的权限');
+              $this.$message.error('您没有查看该课程的权限');
            }
            // 是否播放
            this.isCrowd = rs.result.isCrowd
@@ -1420,8 +1425,14 @@
          } else {
            this.$message.error(rs.message);
          }
+
        });
      },
+      refreshPage() {
+        location.reload();
+        // this.getInternet();
+        // this.loadData();
+      },
      getXmlHttpRequest() {
        if (window.XMLHttpRequest) {
          return new XMLHttpRequest();
@@ -1439,7 +1450,7 @@
        let timer = setTimeout(function () {
          timedOut = true;
          xmlhttp.abort();
-        }, 1);
+        }, 1000);
        xmlhttp.open("HEAD", window.location.protocol + "//uapi.boe.com.cn/500.html", true);
        xmlhttp.send();
        xmlhttp.onreadystatechange = function () {
@@ -1449,7 +1460,7 @@
              $this.Internet = 1;
            } else {
              clearTimeout(timer);
-              $this.protocolDialogVisible=true
+              // $this.protocolDialogVisible=true
              $this.Internet = 2;
            }
          } else {
@@ -1580,37 +1591,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
-              "title": "学习课程",//事件的标题
-              "parameters":"second:"+duration,//second:value,total:value 本次的学习时长
-              "content": "学习课程【"+this.courseInfo.name+"】",//事件的内容
-              "objId": this.courseInfo.id,//课程的id
-              "objType": "1",//类型
-              "source":"page",
-              "objInfo": ""+this.courseInfo.name,
-              "aid":this.userInfo.aid, //当前登录人的id
-              "aname":this.userInfo.name,//当前人的姓名
-              "status": 1, //状态
-              "contentId": this.contentData.id,
+            "key": "StudyCourse",//课程学习的key
+            "title": "学习课程",//事件的标题
+            "parameters":"second:"+duration,//second:value,total:value 本次的学习时长
+            "content": "学习课程【"+this.courseInfo.name+"】",//事件的内容
+            "objId": this.courseInfo.id,//课程的id
+            "objType": "1",//类型
+            "source":"page",
+            "objInfo": ""+this.courseInfo.name,
+            "aid":this.userInfo.aid, //当前登录人的id
+            "aname":this.userInfo.name,//当前人的姓名
+            "status": 1, //状态
+            "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,
@@ -1632,13 +1643,13 @@
      },
      //结束追加学习时长
      stopStudyTime(){
-          //console.log('停止追加学习时长');
-          this.isAppendTime=false;
-          //暂停让他为空 从新计时
-          this.appendStartTime = null
-          if (this.appendHandle != null) {
-              window.clearTimeout(this.appendHandle);
-          }
+        //console.log('停止追加学习时长');
+        this.isAppendTime=false;
+        //暂停让他为空 从新计时
+        this.appendStartTime = null
+        if (this.appendHandle != null) {
+          window.clearTimeout(this.appendHandle);
+        }
      },
      appendStudyTime() {
        // 暂停的时候重新从十五秒开始计时
@@ -1660,11 +1671,11 @@
        this.appendHandle &&  window.clearTimeout(this.appendHandle);
        //启动下次追加学习时长
        this.appendHandle = setTimeout(() => {
-            let endTime = new Date().getTime();
-            this.appentInterval = 60
-            let totalTime = Math.round((endTime - this.appendStartTime) / 1000);
-            this.appendStudyTime();
-            this.saveStudyDuration(totalTime)
+          let endTime = new Date().getTime();
+          this.appentInterval = 60
+          let totalTime = Math.round((endTime - this.appendStartTime) / 1000);
+          this.appendStudyTime();
+          this.saveStudyDuration(totalTime)
        }, this.appentInterval * 1000);
      },

@@ -1730,26 +1741,30 @@
      },
      handleAudioTimeUpdate(currentTime) {
        // if(this.contentStudysLength.length == 0){
-          let params = {
-            studyId: this.studyId, //学习id,
-            courseId: this.courseId, //课程id,
-            contentId: this.contentData.id, //内容id,
-            contentType: this.contentData.contentType,
-            contentName: this.contentData.contentName, //内容名称
-            progress: 1,
-            status: 2,
-            contentTotal: this.totalContent
-          };
-          if(currentTime > 2 && this.trueFalse){
-            apiStudy.studyContent(params).then(()=>{
-              if(this.contentData.status<2){
-                this.contentData.status = 2;
-              }
-            })
-            this.trueFalse = false
-          }
+        let params = {
+          studyId: this.studyId, //学习id,
+          courseId: this.courseId, //课程id,
+          contentId: this.contentData.id, //内容id,
+          contentType: this.contentData.contentType,
+          contentName: this.contentData.contentName, //内容名称
+          progress: 1,
+          status: 2,
+          contentTotal: this.totalContent
+        };
+        if(currentTime > 2 && this.trueFalse){
+          apiStudy.studyContent(params).then(()=>{
+            if(this.contentData.status<2){
+              this.contentData.status = 2;
+            }
+          })
+          this.trueFalse = false
+        }
      },
    },
+    destroyed(){
+      this.cleanAppendTime();
+      this.stopStudyTime();
+    },
  }
 </script>

@@ -1786,22 +1801,44 @@
    margin: 20px auto;
    .course-playbox {
      background-color: #fff;
-      min-height: 400px;
+      //min-height: 400px;
      display: flex;
      justify-content: space-between;
+      .course-player-container {
+        display: flex;
+        flex-direction: column;
+        height: 100%;
+      }
      .course-player{ //内容播放区域
-        background-color: #f5f7fa;
-        flex:1;
+        flex: 4; // 80%高度
        min-width: 700px;
-        min-height: 400px;
-        max-height: 800px;
-        //height: 100%;
+        // min-height: 400px;
+        // max-height: 800px;
+        height: 80%;
        border: 1px solid #ffffff;
        padding-right: 20px;
+        background-color: rgb(238, 238, 238);
        // overflow: auto;
      }
      .course-control{ //内容控制区域
-         width: 420px;
+        width: 420px;
+      }
+    }
+
+    @media screen and (max-width: 1200px) {
+      .course-playbox,
+      .course-infobox {
+        flex-direction: column;
+      }
+      .course-player,
+      .course-info {
+        min-width: 100%;
+        padding-right: 0;
+      }
+      .course-control,
+      .course-teacher {
+        width: 100%;
+        margin-top: 20px;
      }
    }
    .course-infobox {
@@ -1923,13 +1960,10 @@
  }

  .player-box {
-    position: absolute;
-    // top: 62px;
-    // left: 184px;
-    width: 300px;
-    left: 50%;
-    top: 50%;
-    transform: translate(-50%, -50%);
+    position: relative;
+    width: 100%;
+    max-width: 300px;
+    margin: 20px auto;
    height: 187px;
    background: rgba(74, 74, 74, .5);
    border-radius: 33px;
@@ -2072,6 +2106,7 @@
  }

  .course-interact {
+    flex: 1; // 20%高度
    height: 54px;
    // padding-top: 10px;
    // padding-right: 10px;
--- a/src/views/tag/TagManageList.vue
+++ b/src/views/tag/TagManageList.vue
@@ -19,12 +19,14 @@

        <el-form-item>
          <el-button @click="getsearch" icon="el-icon-search" type="primary">查询</el-button>
+          <!-- 添加重置按钮 -->
+          <el-button @click="resetSearch" icon="el-icon-refresh">重置</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>
+<!--      <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">
@@ -168,6 +170,15 @@ export default {
  },
  methods: {

+    //重置搜索条件
+    resetSearch() {
+      this.pageData.id = '';
+      this.pageData.tagName = '';
+      this.pageData.isHot = '';
+      this.pageData.pageIndex = 1;
+      this.getCourseTagList(); // 重置后重新加载列表
+    },
+
    //初始化：课程标签列表
    getsearch(){
      this.pageData.pageIndex = 1;
@@ -236,8 +247,14 @@ export default {
      const originalStatus = row.isHot;
      try {
        // 调用 API 更新状态
-        await apiCourseTag.changeTagHot(row);
-        this.$message.success('更新成功');
+        await apiCourseTag.changeTagHot(row).then((res)=>{
+          if (res.status == 200){
+            this.$message.success(res.message);
+          }else {
+            row.isHot=false;
+            this.$message.warning(res.message);
+          }
+        });
      } catch (error) {
        // 发生错误时回滚状态
        row.isHot = originalStatus;
--- a/src/views/user/ranking.vue
+++ b/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
Author	SHA1	Message	Date
王卓煜	581be5567f	标签管理未选择分类给个提示语	2025-09-28 11:59:09 +08:00
王卓煜	c9465492f4	标签管理未选择分类给个提示语	2025-09-28 11:46:33 +08:00
王卓煜	b18500bad7	标签管理查询条件缺少重置按钮	2025-09-28 11:12:06 +08:00
王卓煜	5536fc06e1	标签管理修改无数据也可以回车创建	2025-09-28 11:07:08 +08:00
王卓煜	18f3804536	标签管理修改提示语	2025-09-28 11:03:09 +08:00
王卓煜	7230bd18e8	标签管理无目录课程添加标签	2025-09-26 19:03:56 +08:00
王卓煜	fd10d99454	标签管理去除无效功能	2025-09-22 10:17:37 +08:00
王卓煜	a51d87fbe8	标签关联课程下面展示标签	2025-09-19 17:12:24 +08:00
王卓煜	2aa36c82ab	标签管理搜索关键字和搜索条件区别显示	2025-09-19 11:12:58 +08:00
王卓煜	0bba87cb3d	标签管理前端友好提示	2025-09-18 09:45:33 +08:00
王卓煜	98ba239494	标签管理添加图片(社招新员工的样式影响了所以添加一下)	2025-09-12 16:14:43 +08:00
王卓煜	df3b1d7162	标签管理	2025-09-12 15:47:26 +08:00
huangzhe	0b0789feda	feat: 右侧菜单高度调整为 650	2025-09-09 17:51:26 +08:00
huangzhe	70bb87a17a	feat: 溢出控制高度的代码，防止内容塌陷	2025-09-09 17:51:25 +08:00
huangzhe	4e60811542	feat: 溢出控制高度的代码，防止内容塌陷	2025-09-09 17:51:24 +08:00
670788339	075fdb1913	认证讲师库删除年份后缀	2025-09-09 17:39:58 +08:00
670788339	8c7569ae4e	banner跳转	2025-09-04 16:46:09 +08:00
670788339	56f565cbf3	banner跳转暂时注释	2025-09-02 08:46:33 +08:00
670788339	c15f52e325	banner跳转	2025-09-01 15:37:12 +08:00
670788339	98c10e703e	教师专区banner点击跳转	2025-09-01 13:21:12 +08:00
670788339	2078c128c9	教师专区banner点击跳转	2025-09-01 13:12:22 +08:00
joshen	e8fe7b4fd3	fix: 修复火狐报错的弹窗提醒	2025-08-14 14:03:53 +08:00
joshen	029d5b0791	修复1181案例不显示案主信息	2025-08-05 15:26:27 +08:00
joshen	12a6ed8fea	Merge remote-tracking branch '104/master-0626' into master-0626	2025-08-05 14:30:02 +08:00
joshen	363492866f	修复1181案例不显示案主信息	2025-08-05 14:29:24 +08:00
joshen	d237dc99ee	修改弹框可见	2025-07-25 21:01:58 +08:00
joshen	995933ae56	Merge remote-tracking branch '104-git/master-0626' into master-0626	2025-07-25 20:53:15 +08:00
joshen	dff81df91d	修改弹框可见	2025-07-25 20:52:43 +08:00
670788339	0864704c4c	仅内网可见-管理员端调试	2025-07-23 17:53:43 +08:00
670788339	58fc6264fe	仅内网可见-管理员端调试	2025-07-23 17:45:30 +08:00
670788339	5276813eba	仅内网可见-管理员端调试	2025-07-23 17:28:36 +08:00
670788339	3485435c9e	仅内网可见-管理员端调试	2025-07-23 17:24:51 +08:00
670788339	2ee3daedf6	仅内网可见-管理员端调试	2025-07-23 17:10:19 +08:00
joshen	5d0d64abbf	修改背景颜色	2025-07-23 16:49:08 +08:00
joshen	ea97aee4af	修复评分会点错	2025-07-23 15:07:30 +08:00
joshen	a968062936	修复视频进度条拖动	2025-07-23 14:40:06 +08:00
joshen	6d11475456	修改边界颜色	2025-07-23 13:45:38 +08:00
joshen	a7396e0a6a	修改边界颜色	2025-07-23 13:37:42 +08:00
670788339	ac236e8d7c	仅内网可见-管理员端调试	2025-07-21 21:17:18 +08:00
670788339	f537608e4f	仅内网可见-管理员端调试	2025-07-21 21:10:41 +08:00
670788339	c7f4a224ff	仅内网可见-管理员端调试	2025-07-21 20:59:06 +08:00
670788339	a4d088a3ae	仅内网可见-管理员端调试	2025-07-21 20:44:20 +08:00
670788339	3cd2c5f433	仅内网可见-管理员端调试	2025-07-21 20:33:47 +08:00
670788339	8c69fac9be	仅内网可见-管理员端调试	2025-07-21 20:24:39 +08:00
670788339	4033eb2294	仅内网可见-管理员端调试	2025-07-21 20:18:33 +08:00
670788339	ec469db72a	仅内网可见-管理员端调试	2025-07-21 20:15:20 +08:00
670788339	5e1ea2469b	仅内网可见-管理员端调试	2025-07-21 20:11:41 +08:00
670788339	2baa5c61a4	仅内网可见-管理员端调试	2025-07-21 20:10:25 +08:00
670788339	b627398b7d	仅内网可见-管理员端调试	2025-07-21 19:57:51 +08:00
670788339	7be5c072d9	仅内网可见-管理员端调试	2025-07-21 19:37:32 +08:00
670788339	de14f9f561	仅内网可见-管理员端调试	2025-07-21 19:26:19 +08:00