取消日志

Merge remote-tracking branch 'yx/master-0720-lyc' into master-110
2025-12-09 02:46:44 +08:00 · 2025-07-23 11:14:08 +08:00 · 2025-07-23 11:02:35 +08:00 · 2025-07-23 10:23:24 +08:00 · 2025-07-11 17:46:17 +08:00
31 changed files with 75 additions and 1024 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
@@ -1,10 +1,9 @@
 /**
 * 课程的操作，课程的添加，修改，列表查询，课程的审核发布等操作。
 * 针对于管理员，教师的功能
- *
+ * 
 **/
 import ajax from '@/utils/xajax.js'
-import request from "../unionAjax";

 /**
 * 保存课程基本信息，新增和更新都是此方式
@@ -171,9 +170,6 @@ 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}`);
-}

 /**
 * 更新内容的名称
@@ -278,7 +274,7 @@ const countWaitAudit = function() {
 }

 /**
- * [已用courseAudit中的hrbpAuditList替换]
+ * [已用courseAudit中的hrbpAuditList替换]
 * 当前用户需要审核的课程列表
 * @param {Object} query 同pageList
 */
@@ -287,9 +283,9 @@ const auditList = function(query) {
 }


-/**
- * 【已移到courseAudit中】
- * 教师需要审核的课程列表
+/**
+ * 【已移到courseAudit中】
+ * 教师需要审核的课程列表
 */
 const teacherAuditList = function(query) {
    return ajax.post('/xboe/m/course/audit/teacher-course', query);
@@ -450,7 +446,6 @@ export default {
    findUpdateLogs,
    getUpdateLog,
    detail,
-    getDictIds,
    saveContent,
    pageList,
    setEnabled,
--- a/src/api/modules/courseTag.js
+++ b/src/api/modules/courseTag.js
@@ -1,64 +0,0 @@
-/**课程标签模块的相关处理*/
-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
-}
--- 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
@@ -254,9 +254,6 @@
                  </el-select> -->
                  <choice :teacherValue="teacherValues" @getTeacherList="getTeacherList"></choice>
                </el-form-item>
-                <el-form-item label="标签" required>
-                  <courseTag :courseId="curCourseId" :sysTypeList="sysTypeList"></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)">
@@ -407,7 +404,6 @@
  </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';
@@ -432,7 +428,7 @@ import filecloud from '@/components/FileCloud/index.vue';
 import chooseOrg from '@/components/System/chooseOrg.vue';
 export default {
  props: {},
-  components: { courseTag, weikeContent, catalogCourseware, imageUpload, WxEditor, catalogSort,agreement,filecloud,choice,chooseOrg},
+  components: { weikeContent, catalogCourseware, imageUpload, WxEditor, catalogSort,agreement,filecloud,choice,chooseOrg},
  data() {
    return {
      keywords:'',//关键字的定义
@@ -569,13 +565,15 @@ export default {
        this.requireSaveCourse = true;

        console.log("--- watch比较 = ", oldVal.orgId, newVal.orgId);
-        this.checkOrgPermission(newVal.orgId);
+        if (newVal.orgId !== oldVal.orgId) {
+          console.log("--- watch newVal.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;
@@ -606,8 +604,11 @@ export default {
        this.isPermission = false;
        return;
      }
-      console.log("--- dicts  = ",this.dicts)
      this.isPermission = this.dicts.includes(orgId);
+      this.courseInfo.device = 3;
+      if(this.isPermission){
+        this.courseInfo.device = 4;
+      }
      console.log("--- 监听结束 this.isPermission  = ",this.isPermission)
    },
    // 关键字的更改
@@ -914,20 +915,6 @@ 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;
--- 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
@@ -1,158 +0,0 @@
-
-<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"
-      @keyup.enter.native="handleEnterKey"
-    >
-      <el-option
-        v-for="item in searchResults"
-        :key="item.id"
-        :label="item.tagName"
-        :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>
-
-<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
-    }
-  },
-  data() {
-    return {
-      selectedTags: [],
-      searchResults: [],
-      loading: false,
-      tagMap: new Map(),
-      inputBuffer: '',
-      params: {}
-    }
-  },
-  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))
-  },
-  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
-      }
-    },
-    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 = ''
-      }
-    },
-
-    //创建新标签
-    async createNewTag(tagName) {
-      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.tagMap.set(newTag.id, newTag)
-        this.selectedTags.push(newTag.tagName)
-        this.$emit('change', this.selectedTags.map(tag => tag.id))
-      } 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>
--- 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,8 +317,8 @@ export default {
    }

    setInterval(() => {
-          // console.log('当前状态:',this.currentProgress,this.isDrag,this.videoDom.currentTime , this.videoDom.duration)
-          // 视频播放时本地记录视频实时播放时长,视频设置了禁止拖动时执行
+        // console.log('this.currentProgress::',this.currentProgress,this.isDrag,this.videoDom.currentTime , this.videoDom.readyState)
+        // 视频播放时本地记录视频实时播放时长,视频设置了禁止拖动时执行
          if(!this.isDrag){
            var time = localStorage.getItem('videoProgressData')
            var arr = time&&JSON.parse(time) || {}
@@ -365,7 +365,7 @@ export default {
      // 根据视频的readyState判断下一帧是否已加载，并控制loading的显示
      this.isShowLoading = this.videoDom.readyState < 3;
      // console.log("当前缓存:"+this.videoDom.readyState)
-      if (this.videoDom.readyState < 3){
+      if (this.videoDom.readyState < 1){
        // console.log("详细信息",this.videoDom)
        // console.log("卡了",this.videoDom.readyState)
      }
--- a/src/components/VideoPlayer/progress-bar.vue
+++ b/src/components/VideoPlayer/progress-bar.vue
@@ -37,6 +37,7 @@ export default {
    },
    isDrag:{
      type: Boolean,
+      default: true,
    },
    blobId:{
      type: String,
--- a/src/data/pages.js
+++ b/src/data/pages.js
@@ -128,8 +128,7 @@ 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/tag/manages',hidden:false,component:'tag/TagManageList'},
+  {title:'已审核课程', path:'/iframe/course/reviewed',hidden:false,component:'examine/Reviewed'}

 ]

--- 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/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
@@ -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,7 +1605,7 @@ export default {
          }
          console.log(res?.result?.list ,'有没有数据1');
          res.result.list.forEach(item=>{
-              item.viewRankTags = (item.viewRankTags||[]).slice(0,2)||[]
+            item.viewRankTags = item.viewRankTags?.slice(0,2)||[]
          })
          console.log(res?.result?.list ,'有没有数据2');
          this.caseList.list = res.result.list
--- a/src/views/portal/course/Index.vue
+++ b/src/views/portal/course/Index.vue
@@ -284,40 +284,32 @@
          <!-- 内容导航 -->
          <div class="topNav" v-if="!newData">
            <div class="search-div nav" style="height: 100px;flex: 1;">
-              <div @click="handleTypeAllClick(1)" class="option-item" style="font-weight: bold" :class="{ 'option-active': ctypeTagAll }">
+              <div @click="handleTypeAllClick(1)" class="option-item" :class="{ 'option-active': ctypeTagAll }">
                <a>全部</a>
                <span :class="ctypeTagAll ? 'nav-bottbor' : ''"></span>
              </div>
-              <div @click="handleTypeClick(ctypeList[0], ctypeList)" class="option-item" style="font-weight: bold"
+              <div @click="handleTypeClick(ctypeList[0], ctypeList)" class="option-item"
                :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" style="font-weight: bold"
+              <div @click="handleTypeClick(ctypeList[1], ctypeList)" class="option-item"
                :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" style="font-weight: bold"
+              <div @click="handleTypeClick(ctypeList[2], ctypeList)" class="option-item"
                :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="font-weight: bold"> U选小课堂
+                <span @click="uClassClick" class="Uxtext" style=""> 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.name}}</a>
-                </div>
-              </div>
            </div>
            <div id="fixd-box" class="upload" style="margin-left: 26px;">
              <div v-if="identity == 2 || identity == 3 || identity == 5">
@@ -494,32 +486,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>
@@ -541,14 +507,12 @@ 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: {
@@ -583,11 +547,6 @@ export default {
          list.push(item);
        }
      });
-      this.hotTagsList.forEach(item => {
-        if (item.checked) {
-          list.push(item);
-        }
-      });
      this.oneList.forEach(one => {
        var twoChildChecked = false;//是否有下级
        one.children.forEach(two => {
@@ -654,25 +613,12 @@ 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 }
-      ],
      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 },
@@ -683,7 +629,7 @@ export default {
      twoList: [], //二级分类{type:12}
      threeList: [],//三级分类{type:13}
      searching: false,//是否正在搜索中
-      studentInfo: {},
+
      resonimg: {},
      formatDate,
      formatNum: formatUserNumber,
@@ -741,14 +687,6 @@ export default {
        console.log(rs.message);
      }
    })
-    //初始化:获取最新前10个热点标签
-      apiCourseTag.getHotTagList(null).then(rs => {
-      if (rs.status == 200) {
-        this.hotTagsList = rs.result;
-      } else {
-        console.log(rs.message);
-      }
-    })
  },
  mounted() {
    let screenWidth = window.screen.availWidth;
@@ -831,24 +769,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
@@ -979,9 +899,6 @@ export default {
      this.ctypeList.forEach(item => {
        item.checked = false;
      });
-      this.hotTagsList.forEach(item => {
-        item.checked = false;
-      });
      this.oneList.forEach(one => {
        one.checked = false;
        one.children.forEach(two => {
@@ -1009,11 +926,6 @@ export default {

      this.searchData();
    },
-    //点击标签
-    handleTagClick(item, list) {
-      item.checked = !item.checked;
-      this.searchData();
-    },
    //三级分类
    handleOptionClick(item, level, list) {
      // 线上品牌展示效果
@@ -1304,33 +1216,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) {
@@ -1419,18 +1307,12 @@ 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 => {
@@ -1535,7 +1417,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) {
@@ -2539,73 +2421,4 @@ export default {

 .option-active {
  color: #387DF7;
-}
-  /* 项目简介 方法一：外部 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>
+}</style>
--- 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="false">
              <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="true" style="margin:350px 250px" class="jianjie pdftext" id="pdfPreview">
              <div style="margin-top:40px;font-weight:700;font-size: 22px;color: #ccc">
                <span>十分抱歉，您当前的网络环境不符合观看要求。为了保障案例信息的安全，您需要接入公司内网才能观看。</span>
              </div>
-              <div style="margin-top:20px;text-align:center" @click="()=>window.location.reload();">
+              <div style="margin-top:20px;text-align:center" @click="getInternet" >
                <el-button type="primary">重新检测</el-button>
              </div>
            </div>
@@ -1324,11 +1324,6 @@
          audiences:this.audiences
        }).then(rs => {
          if (rs.status == 200) {
-            if (rs.result.isPermission){
-              // if (true){
-              this.getInternet()
-              console.log('需要内网环境')
-            }
            if(rs.result.contents.length==0){
              $this.$message.error('课程内容已删除或课程已不再使用');
              return;
@@ -1417,6 +1412,11 @@
            this.totalContent = rs.result.contents.length;
            //加载学习的数据
            this.loadStudyData(rs.result);
+            if (rs.result.isPermission){
+            // if (true){
+              this.getInternet()
+              console.log('需要内网环境')
+            }
          } else {
            this.$message.error(rs.message);
          }
@@ -1439,7 +1439,7 @@
        let timer = setTimeout(function () {
          timedOut = true;
          xmlhttp.abort();
-        }, 1);
+        }, 5000);
        xmlhttp.open("HEAD", window.location.protocol + "//uapi.boe.com.cn/500.html", true);
        xmlhttp.send();
        xmlhttp.onreadystatechange = function () {
@@ -1447,9 +1447,9 @@
            if (xmlhttp.status == 200) {
              clearTimeout(timer);
              $this.Internet = 1;
+              $this.protocolDialogVisible=true
            } else {
              clearTimeout(timer);
-              $this.protocolDialogVisible=true
              $this.Internet = 2;
            }
          } else {
@@ -1790,7 +1790,7 @@
      display: flex;
      justify-content: space-between;
      .course-player{ //内容播放区域
-        background-color: #f5f7fa;
+        background-color: rgb(238, 238, 238);
        flex:1;
        min-width: 700px;
        min-height: 400px;
--- a/src/views/tag/TagManageList.vue
+++ b/src/views/tag/TagManageList.vue
@@ -1,372 +0,0 @@
-<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>
--- 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
joshen	77a3c2759e	取消日志	2025-07-23 11:14:08 +08:00
joshen	0830c53840	Merge remote-tracking branch 'yx/master-0720-lyc' into master-110	2025-07-23 11:02:35 +08:00
joshen	7bcff6bc85	Merge remote-tracking branch 'yx/master-0720-lyc' into master-110 # Conflicts: # src/components/VideoPlayer/index.vue	2025-07-23 10:23:24 +08:00
joshen	ce23930a04	test	2025-07-11 17:46:17 +08:00