Merge branch 'master-20251023-tag' into merge-20251113-tag

src/api/modules/course.js

@@ -440,6 +440,12 @@ const queryCrowd=function(query){
 const ids=function (data){
   return ajax.postJson('/xboe/m/course/manage/ids',data);
 }
+
+const saveTip = function() {
+  return ajax.postJson('/xboe/m/course/manage/saveTip');
+}
+
+
 export default {
     saveBase,
     submitCourse,
@@ -482,6 +488,7 @@ export default {
 	exportCourseAudit,
 	exportCourse,
 	queryCrowd,
-  ids
+  ids,
+  saveTip
 
 }

src/api/modules/courseTag.js

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

src/components/Course/courseForm.vue

@@ -41,6 +41,43 @@
         <el-button @click="toInputCourse()" type="primary">确定</el-button>
       </span> -->
     </el-dialog>
+
+    <!-- 蒙层引导组件 -->
+    <div v-if="showGuidance" class="guidance-overlay" @click="closeGuidance">
+      <div class="guidance-content">
+        <div class="guidance-title">新功能引导</div>
+        <div class="guidance-steps">
+          <div class="guidance-step" :class="{ active: currentStep === 1 }">
+            <div class="step-number">1</div>
+            <div class="step-content">
+              <div class="step-title">用标签为课程精准定位，吸引更多学员！可从以下维度构思：</div>
+              <div class="step-desc">✨ 讲领域（如：品质管理）</div>
+              <div class="step-desc">✨ 教技能（如：沟通技巧）</div>
+              <div class="step-desc">✨ 涉内容（如：5W1H分析法）</div>
+            </div>
+          </div>
+<!--          <div class="guidance-step" :class="{ active: currentStep === 2 }">
+            <div class="step-number">2</div>
+            <div class="step-content">
+              <div class="step-title">添加课程标签</div>
+              <div class="step-desc">为课程添加相关标签,最多5个，便于搜索和分类,可回车创建新标签</div>
+            </div>
+          </div>-->
+        </div>
+        <!--        <div class="guidance-actions">
+                  <el-button @click="previousStep1" v-if="currentStep > 1">上一步</el-button>
+                  <el-button type="primary" @click="nextStep">
+                    {{ currentStep === 2 ? '完成' : '下一步' }}
+                  </el-button>
+                  <el-button @click="closeGuidance">跳过引导</el-button>
+                </div>-->
+      </div>
+    </div>
+
+    <!-- 高亮指引元素 -->
+<!--    <div v-if="showGuidance" class="highlight-element" :style="highlightStyle"></div>-->
+
+
     <!--微课-->
     <el-dialog v-if="weike.dlgShow" width="980px" :title="curCourseId == '' ? '新建课程' : '编辑课程'" :visible.sync="weike.dlgShow" :close-on-click-modal="false" custom-class="g-dialog" top="8vh">
       <el-form label-width="100px" size="small" class="wei-from" style="min-height: 600px;">
@@ -64,15 +101,26 @@
                 </span>
               </div>
             </el-form-item>
-            <el-form-item label="内容分类" required>
+            <el-form-item label="内容分类" required >
               <el-cascader
                 placeholder="选择内容分类"
                 style="width: 100%;"
                 clearable
                 v-model="sysTypeList"
                 :props="{ value: 'id', label: 'name' }"
-                :options="sysTypeListMap"></el-cascader>
+                :options="sysTypeListMap"
+                @focus="onContentTypeFocus"
+                @change="onContentTypeChange">
+              </el-cascader>
             </el-form-item>
+
+            <el-form-item label="标签" required class="guidance-highlight" data-step="1">
+              <courseTag ref="courseTag" :courseId="curCourseId" :sysTypeList="sysTypeList"
+                         :initialTags="courseTags" @change="handleTagsChange"
+                         @focus="onTagFocus">
+              </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 +189,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">
@@ -219,14 +266,16 @@
                 </div>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="内容分类" required>
+                <el-form-item label="内容分类" required >
                   <el-cascader
                     placeholder="选择内容分类"
                     style="width: 100%;"
                     clearable
                     v-model="sysTypeList"
                     :props="{ value: 'id', label: 'name' }"
-                    :options="sysTypeListMap">
+                    :options="sysTypeListMap"
+                    @focus="onContentTypeFocus"
+                    @change="onContentTypeChange">
                   </el-cascader>
                 </el-form-item>
 
@@ -254,6 +303,13 @@
                   </el-select> -->
                   <choice :teacherValue="teacherValues" @getTeacherList="getTeacherList"></choice>
                 </el-form-item>
+                <el-form-item label="标签" required class="guidance-highlight" data-step="1">
+                  <courseTag ref="courseTag" :courseId="curCourseId" :sysTypeList="sysTypeList"
+                             :initialTags="courseTags" @change="handleTagsChange"
+                             @focus="onTagFocus">
+                  </courseTag>
+                </el-form-item>
+
                 <el-form-item label="关键字">
                   <el-input v-model.trim="keywords" maxlength="100" @keyup.enter.native="changeKeywords"  placeholder="请输入关键字"></el-input>
                   <el-tag v-for="(tag,index) in tips" size="small" :key="index" closable type="info" @close="closeKeywordsTag(tag,index)">
@@ -306,7 +362,6 @@
                 <el-radio v-model="courseInfo.device" :label="1">PC端可见</el-radio>
                 <el-radio v-model="courseInfo.device" :label="2">移动端可见</el-radio>
                 <el-radio v-model="courseInfo.device" :label="3">多端可见</el-radio>
-                <el-radio style="margin-right: 10px;" v-model="courseInfo.device" v-if="isPermission" :label="4">仅内网访问</el-radio>
               </el-col>
               <el-col :span="10">
                 <el-form-item label="课程来源">
@@ -404,6 +459,7 @@
   </div>
 </template>
 <script>
+import courseTag from "@/components/Course/courseTag.vue";
 import choice from '@/components/Course/choice.vue';
 import agreement from '@/components/Portal/agreement.vue';
 import weikeContent from '@/components/Course/weikeContent.vue';
@@ -420,6 +476,7 @@ import apiCourse from '../../api/modules/course.js';
 import apiCourseAudit from '../../api/modules/courseAudit.js';
 import apiOrg from '../../api/system/organiza.js';
 import apiUser from '../../api/system/user.js';
+import apiCourseTag from '../../api/modules/courseTag.js';
 import WxEditor from '@/components/Editor/index.vue';
 import catalogSort from '@/components/Course/catalogSort.vue';
 import { courseType, getType } from '../../utils/tools.js';
@@ -428,7 +485,7 @@ import filecloud from '@/components/FileCloud/index.vue';
 import chooseOrg from '@/components/System/chooseOrg.vue';
 export default {
   props: {},
-  components: { weikeContent, catalogCourseware, imageUpload, WxEditor, catalogSort,agreement,filecloud,choice,chooseOrg},
+  components: { courseTag, weikeContent, catalogCourseware, imageUpload, WxEditor, catalogSort,agreement,filecloud,choice,chooseOrg},
   data() {
     return {
       keywords:'',//关键字的定义
@@ -468,6 +525,7 @@ export default {
       orgName:'',
       orgNamePath:'',
       orgKid:'',
+      courseTags:[],
       courseInfo: {
         id: '',
         name: '',
@@ -490,8 +548,6 @@ export default {
         refType:''
       },
       visibleShow:false,
-      isPermission:false,
-      dicts:[],
       extendRefId:'',
       extendRefType:'',
       courseTeachers: [], //课程的老师
@@ -532,10 +588,12 @@ export default {
       },
       rightTypeId: {},
       catalogSortDialogShow: false,
-      selectedOrg: {
+      // 蒙层引导相关数据
-        orgId: null,
+      showGuidance: false,
-        name: ''
+      currentStep: 1,
-      }
+      highlightStyle: {},
+      guidanceElements: [],
+      isFirstCreate: false, // 标记是否为首次创建
     };
   },
   created() {
@@ -560,18 +618,14 @@ export default {
   },
   watch: {
     courseInfo: {
-      handler(newVal, oldVal) {
+      handler(newVal) {
-        // 需要保存
+        //需要保存
         this.requireSaveCourse = true;
-
-        console.log("--- watch比较 = ", oldVal.orgId, newVal.orgId);
-        this.checkOrgPermission(newVal.orgId);
       },
       deep: true
     }
   },
   mounted() {
-    this.getDictIds();
     let extendFlag=this.$route.query.f; //是否是管理端过来的
     this.extendRefId=this.$route.query.refId;
     this.extendRefType=this.$route.query.refType;
@@ -593,19 +647,6 @@ export default {
     this.loadUserGroup();
   },
   methods: {
-    // 检查机构权限
-    checkOrgPermission(orgId) {
-      console.log("--- 监测组织id orgId  = ",orgId)
-      console.log("--- this.isPermission  = ",this.isPermission)
-      console.log("--- device  = ",this.courseInfo.device)
-      if (!orgId) {
-        this.isPermission = false;
-        return;
-      }
-      console.log("--- this.dicts  = ",this.dicts)
-      this.isPermission = this.dicts.includes(orgId);
-      console.log("--- 监听结束 this.isPermission  = ",this.isPermission)
-    },
     // 关键字的更改
     changeKeywords(option){
       if(option.target.value){
@@ -617,6 +658,24 @@ export default {
     closeKeywordsTag(item,index){
       this.tips.splice(index, 1);
     },
+    // 处理标签变化事件
+    handleTagsChange(tags) {
+      console.log("父组件:",tags)
+      // 限制最多5个标签
+      if (tags.length > 5) {
+        this.$message.warning('最多只能选择5个标签')
+        // 强制限制为5个
+        tags = tags.slice(0, 5);
+        return
+      }
+      let ids = "";
+      tags.forEach(tag=>{
+        console.log("父组件name : ",tag.tagName)
+        ids += tag.id + ',';
+      })
+      this.courseInfo.tags = ids;
+      this.$emit('change', tags.slice(0, 5)); // 确保传出数据也不超过5个
+    },
     showChooseOrg(){
       this.$refs.refChooseOrg.dlgShow = true;
     },
@@ -747,6 +806,7 @@ export default {
       this.$emit('close');
     },
     initShow(editData) {
+      console.log('初始化显示内容============', editData)
       //console.log(this.$refs.weikePanel,'this.$refs.weikePanel');
       //this.$refs.weikePanel.init();
       //this.$refs.onlineCourse.resetData();
@@ -794,6 +854,8 @@ export default {
       this.tips=[];
 
       if (!editData) {
+        this.tips=[];
+        this.courseTags=[],
           //console.log("新建课程？");
           //以下为了保证初始化处理
           this.weikeReset = Math.round(Math.random()) + '';
@@ -844,7 +906,7 @@ export default {
 
     },
     resetCurCourseContent() {
-      this.curContent = { id: '', contentType: 0, contentName: '', content: '', csectionId: '', contentName: '', contentRefId: '', courseId: this.courseInfo.id };
+      this.curContent = { id: '', contentType: 0, contentName: '', content: '', csectionId: '', contentRefId: '', courseId: this.courseInfo.id };
     },
     // chooseCourseType(item, idx, open) {
     //   this.courseChooseId = item.id;
@@ -890,16 +952,117 @@ export default {
         if (rs.status == 200) {
           this.courseChooseShow = false;
           this.courseInfo = rs.result;
+          this.curCourseId = this.courseInfo.id
+          console.log('保存课程成功',this.curCourseId)
+          console.log('isTip ',this.courseInfo.isTip)
+          if(this.courseInfo.isTip){
+            // 检查是否为首次创建，显示引导
+            this.checkAndShowGuidance();
+          }
+
           if (this.courseChooseId == 1) {
             this.weike.dlgShow = true;
           } else {
             this.biaoke.dlgShow = true;
           }
+          this.$nextTick(() => {
+            this.initTagComponent();
+            // 如果显示引导，初始化高亮元素
+            if (this.showGuidance) {
+              this.$nextTick(() => {
+                this.initGuidanceElements();
+                this.highlightCurrentStep();
+              });
+            }
+          });
         } else {
           this.$message.error(rs.message);
         }
       });
     },
+    // 检查并显示引导
+    checkAndShowGuidance() {
+      // 检查本地存储，判断是否为首次创建
+      const hasShownGuidance = localStorage.getItem('course_creation_guidance_shown');
+      if (!hasShownGuidance) {
+        this.showGuidance = true;
+        this.currentStep = 1;
+        this.isFirstCreate = true;
+        // 标记引导已显示
+        localStorage.setItem('course_creation_guidance_shown', 'true');
+        apiCourse.saveTip();
+      }
+    },
+    // 初始化引导元素
+    initGuidanceElements() {
+      this.guidanceElements = Array.from(document.querySelectorAll('.guidance-highlight'));
+    },
+
+    // 高亮当前步骤对应的元素
+    highlightCurrentStep() {
+      if (this.guidanceElements.length === 0) return;
+
+      const currentElement = this.guidanceElements[this.currentStep - 1];
+      if (currentElement) {
+        currentElement.scrollIntoView({ behavior: 'smooth', block: 'center' });
+      }
+    },
+// 下一步
+    nextStep() {
+      if (this.currentStep < 2) {
+        this.currentStep++;
+        this.highlightCurrentStep();
+      } else {
+        this.closeGuidance();
+      }
+    },
+
+    // 上一步
+    previousStep1() {
+      if (this.currentStep > 1) {
+        this.currentStep--;
+        this.highlightCurrentStep();
+      }
+    },
+
+    // 关闭引导
+    closeGuidance() {
+      this.showGuidance = false;
+      this.currentStep = 1;
+      this.highlightStyle = {};
+    },
+    // 内容分类获得焦点时的处理
+    onContentTypeFocus() {
+      if (this.showGuidance && this.currentStep === 1) {
+        this.currentStep = 2;
+        this.highlightCurrentStep();
+      }
+    },
+
+    // 内容分类改变时的处理
+    onContentTypeChange() {
+      if (this.showGuidance && this.currentStep === 1) {
+        this.currentStep = 2;
+        this.highlightCurrentStep();
+      }
+    },
+
+    // 标签获得焦点时的处理
+    onTagFocus() {
+      if (this.showGuidance && this.currentStep === 2) {
+        this.closeGuidance();
+      }
+    },
+
+    // 新增初始化标签方法
+    initTagComponent() {
+      if (this.$refs.courseTag) {
+        // 确保组件已渲染后再调用搜索
+        setTimeout(() => {
+          this.$refs.courseTag.debouncedSearch('');
+        }, 100);
+      }
+    },
     //上传课程图片处理
     uploadCoverImgSuccess(res) {
       //console.log(res,'res');
@@ -910,30 +1073,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;
       try {
         const { result, status } = await apiCourse.detail(id);
         if (status === 200) {
+          this.courseTags = result.tagList;
+          console.log('获取课程信息成功', this.courseTags);
           //把数据附给三个对象
           if(result.course.visible==''){
             result.course.visible=false;
@@ -947,10 +1096,7 @@ export default {
           this.contentInfo.list = result.contents;
           this.sectionInfo.list = result.sections;
           this.courseTeachers = result.teachers; //课程的老师信息
-          this.isPermission = result.isPermission; //课程的老师信息
+
-          this.dicts = result.dicts; //课程的老师信息
-          console.log("--- 编辑查看 this.isPermission  = ",this.isPermission)
-          console.log("--- 编辑查看 this.dicts  = ",this.dicts)
           if(!this.courseInfo.orgId){
             //根据课程创建者获取机构id
             apiUser.getOrgSimpleByUserId(result.course.sysCreateAid).then(ors=>{
@@ -1002,7 +1148,6 @@ export default {
               }
             });
           }
-
           this.resOwnerArray=[];
           if (result.course.resOwner1 == '') {
             this.resOwnerArray.push(result.course.resOwner1);
@@ -1222,12 +1367,17 @@ export default {
     },
     //保存课程信息并进入下一步
     saveAndNext(btnType) {
+      console.log("courseForm 保存课程信息 btnType = " + btnType);
       //if(this.courseInfo.type)
       //console.log(this.courseCrowds,'courseCrowds');
       //标签,多个，转化为逗号分隔的
-      if (this.showTags.length > 0) {
+
-        this.courseInfo.tags = this.showTags.join();
+      console.log("courseForm 保存课程信息 this.showTags = " + this.showTags);
-      }
+      console.log("courseForm 保存课程信息 this.courseInfo.tags = " + this.courseInfo.tags);
+      // if (this.showTags.length > 0) {
+      //   this.courseInfo.tags = this.courseInfo.tags.join();
+      // }
+      // console.log("courseForm 保存课程信息 this.courseInfo.tags = " + this.courseInfo.tags);
       this.courseInfo.keywords = this.tips.join(',') || ''
       //检查输入是否合法
       //if(!this.requireSaveCourse){
@@ -1287,7 +1437,7 @@ export default {
         teachers: saveTeachers,
         crowds:crowds
       };
-      //console.log(postData);
+      console.log(postData);
       //this.btnLoading=false;
       apiCourse
         .saveBase(postData)
@@ -1410,6 +1560,9 @@ export default {
       return true;
     },
     submitCourse() {
+      console.log("courseForm 课程提交审核 this.showTags = " + this.showTags);
+      console.log("courseForm 课程提交审核 this.courseInfo.tags = " + this.courseInfo.tags);
+
       if(this.biaoke.dlgShow && !this.unsavedContent()){
         this.$message.error('您有未保存的内容，请先保存');
         return;
@@ -1447,7 +1600,7 @@ export default {
         return;
       }
       if (this.showTags.length > 0) {
-        this.courseInfo.tags = this.showTags.join();
+        // this.courseInfo.tags = this.showTags.join();
       }
       if (this.sysTypeList.length < 1) {
         this.$message.error('请选择内容分类');
@@ -1695,13 +1848,13 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-  .red-tip{
+.red-tip{
   margin-top: 8px;
   color: red;
   font-size: 14px;
   float: left;
   font-weight: 600;
-  }
+}
 ::v-deep .wei-from{
   .el-form-item{
     margin-bottom: 10px;
@@ -1798,7 +1951,7 @@ export default {
 
 </style>
 <style lang="scss">
-  .cusprompt{
+.cusprompt{
   padding: 20px 30px;
   .el-message-box__content{
     margin-top: 30px;
@@ -1806,5 +1959,105 @@ export default {
 
     }
   }
-  }
+}
+
+/* 蒙层样式 */
+.guidance-overlay {
+  position: fixed;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  background: rgba(0, 0, 0, 0.6);
+  z-index: 9999;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+
+.guidance-content {
+  position: fixed;
+  background: white;
+  border-radius: 8px;
+  padding: 24px;
+  max-width: 500px;
+  box-shadow: 0 4px 20px rgba(0, 0, 0, 0.15);
+  z-index: 10000;
+  top: 50%;
+  left: 50%;
+  transform: translate(-50%, -50%);
+}
+
+.guidance-title {
+  font-size: 18px;
+  font-weight: bold;
+  margin-bottom: 20px;
+  text-align: center;
+}
+
+.guidance-steps {
+  margin-bottom: 20px;
+}
+
+.guidance-step {
+  display: flex;
+  align-items: flex-start;
+  margin-bottom: 16px;
+  opacity: 0.5;
+  transition: opacity 0.3s;
+}
+
+.guidance-step.active {
+  opacity: 1;
+}
+
+.step-number {
+  width: 24px;
+  height: 24px;
+  background: #409EFF;
+  color: white;
+  border-radius: 50%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin-right: 12px;
+  font-size: 14px;
+}
+
+.step-content {
+  flex: 1;
+}
+
+.step-title {
+  font-weight: bold;
+  margin-bottom: 4px;
+}
+
+.step-desc {
+  color: #666;
+  font-size: 14px;
+}
+
+.guidance-actions {
+  display: flex;
+  justify-content: center;
+  gap: 12px;
+}
+
+/* 高亮元素样式 */
+.highlight-element {
+  position: fixed;
+  border: 2px solid #409EFF;
+  border-radius: 4px;
+  box-shadow: 0 0 0 9999px rgba(0, 0, 0, 0.4), 0 0 15px rgba(64, 158, 255, 0.5);
+  z-index: 9998;
+  pointer-events: none;
+  transition: all 0.3s ease;
+}
+
+/* 被高亮元素的样式 */
+.guidance-highlight {
+  position: relative;
+  z-index: 10001;
+}
 </style>

src/components/Course/courseTag.vue

@@ -0,0 +1,397 @@
+<template>
+  <div class="tag-container"  @click="handleContainerClick">
+    <el-select style="width: 100%;"
+               v-model="selectedTags"
+               multiple
+               filterable
+               value-key="id"
+               remote
+               reserve-keyword
+               :remote-method="debouncedSearch"
+               :loading="loading"
+               :placeholder="'回车创建新标签'"
+               :no-data-text="'无此标签，按回车键创建'"
+               @remove-tag="handleTagRemove"
+               @change="handleSelectionChange"
+               @keyup.enter.native="handleEnterKey"
+               @keyup.delete.native="handleDeleteKey"
+               @focus="handleFocus"
+               ref="tagSelect"
+    >
+      <el-option
+        v-for="item in searchResults"
+        :key="item.id"
+        :label="item.tagName"
+        :value="item"
+        :disabled="isTagDisabled(item)"
+      />
+    </el-select>
+    <!-- 添加标签计数显示 -->
+    <div class="tag-count">
+      {{ selectedTags.length }}/5
+    </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: 5
+    },
+    // 添加：接收初始标签数据的props
+    initialTags: {
+      type: Array,
+      default: () => []
+    }
+  },
+  data() {
+    return {
+      selectedTags: [],
+      searchResults: [],
+      loading: false,
+      tagMap: new Map(),
+      inputBuffer: '',
+      params: {},
+      tag: {},
+      // 添加临时存储用于回滚
+      previousTags: []
+    }
+  },
+  computed: {
+    ...mapGetters(['userInfo']),
+    displayTags() {
+      return this.selectedTags.map(tag =>
+        typeof tag === 'object' ? tag : this.tagMap.get(tag)
+      ).filter(Boolean)
+    }
+  },
+  created() {
+    this.debouncedSearch = debounce(this.doSearch, 500)
+    console.log("----------sysTypeList.length---------->"+this.sysTypeList.length)
+    console.log("----------sysTypeList.length---------->"+(this.sysTypeList.length===0))
+  },
+  // 添加：挂载时初始化标签数据
+  mounted() {
+    if (this.initialTags && this.initialTags.length > 0) {
+      this.selectedTags = this.initialTags;
+      this.searchResults = this.initialTags;
+      // 将初始标签添加到tagMap中，确保删除功能正常
+      this.initialTags.forEach(tag => {
+        if (tag.id) {
+          this.tagMap.set(tag.id, tag);
+        }
+      });
+    }
+  },
+  watch: {
+    // 监听课程ID变化，重置所有状态
+    courseId(newVal) {
+      this.resetTagState();
+    },
+    // 监听初始标签变化，重新加载
+    initialTags(newVal) {
+      this.selectedTags = newVal || [];
+      this.searchResults = newVal || [];
+      this.tagMap.clear(); // 清空旧缓存
+      newVal.forEach(tag => {
+        if (tag.id) this.tagMap.set(tag.id, tag);
+      });
+    },
+    // 监听分类变化，重新加载搜索结果
+    sysTypeList: {
+      handler() {
+        // 只有在已选择分类且有焦点时才重新加载
+        if (this.sysTypeList.length > 0 && this.$refs.tagSelect && this.$refs.tagSelect.visible) {
+          this.doSearch('');
+        }
+      },
+      deep: true
+    }
+  },
+  methods: {
+    // 新增：检查标签是否应该被禁用
+    isTagDisabled(tag) {
+      // 如果标签已经被选中，不应该禁用（允许取消选择）
+      const isSelected = this.selectedTags.some(selectedTag => selectedTag.id === tag.id);
+      if (isSelected) {
+        return false;
+      }
+      // 如果标签未被选中且已达到最大数量，则禁用
+      return this.selectedTags.length >= this.maxTags;
+    },
+    // 新增：处理输入框获得焦点事件
+    async handleFocus() {
+      this.previousTags = [...this.selectedTags];
+      // 当输入框获得焦点时，加载默认的搜索结果
+      if (this.sysTypeList.length > 0) {
+        await this.doSearch('');
+      }
+      this.$emit('focus');
+    },
+    handleContainerClick() {
+      // 容器点击时也触发焦点事件
+      this.$emit('focus');
+    },
+    // 新增：重置标签状态的方法
+    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)
+      this.clearInput();
+    },
+    removeTag(tagId) {
+      this.handleTagRemove(tagId)
+    },
+
+    // 新增：处理删除键事件
+    handleDeleteKey(event) {
+      // 如果输入框内容为空，不执行任何搜索
+      if (!event.target.value.trim()) {
+        this.searchResults = []
+      }
+    },
+
+    //按回车键，创建新标签
+    handleEnterKey(event) {
+      const inputVal = event.target.value?.trim()
+      if (!inputVal) return;
+      // 检查是否与已选择的标签重复
+      const isDuplicate = this.selectedTags.some(tag => tag.tagName === inputVal);
+      if (isDuplicate) {
+        this.$message.warning('该标签已存在，无需重复创建');
+        event.target.value = '';
+        return;
+      }
+      if (!isDuplicate && inputVal && this.selectedTags.length < this.maxTags) {
+        this.createNewTag(event.target.value.trim())
+        this.clearInput();
+      } else if (this.selectedTags.length >= this.maxTags) {
+        this.$message.warning('最多只能添加5个标签')
+        this.clearInput();
+      } else {
+        this.clearInput();
+      }
+    },
+
+    // 新增：处理选择变化事件
+    handleSelectionChange(newValues) {
+
+      // 检查每个标签对象是否完整
+      newValues.forEach((tag, index) => {
+        if (!tag.tagName) {
+          console.error(`第${index}个标签缺少tagName:`, tag);
+        }
+      });
+
+      // 检查数量限制
+      if (newValues.length > this.maxTags) {
+        this.$message.warning(`最多只能选择${this.maxTags}个标签`);
+        // 回滚到之前的状态
+        this.selectedTags = [...this.previousTags];
+        return;
+      }
+
+      // 更新前保存当前状态
+      this.previousTags = [...newValues];
+      this.$emit('change', this.displayTags);
+
+      this.clearInput();
+    },
+
+    clearInput() {
+      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;
+      }
+      // 检查标签是否在下拉框中已存在
+      const isExistInSearch = this.searchResults.some(tag => tag.tagName === tagName);
+      if (isExistInSearch) {
+        this.$message.warning('已存在此标签，请选择');
+        return;
+      }
+      // 首先检查是否与已选择的标签重复
+      const isDuplicate = this.selectedTags.some(tag => tag.tagName === tagName);
+      if (isDuplicate) {
+        this.$message.warning('该标签已存在，无需重复创建');
+        return;
+      }
+      // 标签格式验证：仅支持中文、英文、数字、下划线、中横线
+      const tagPattern = /^[\u4e00-\u9fa5a-zA-Z0-9_-]+$/;
+      if (!tagPattern.test(tagName)) {
+        this.$message.error('标签名称仅支持中文、英文、数字、下划线(_)和中横线(-)，不支持空格、点和特殊字符');
+        return;
+      }
+      // 添加标签数量限制检查
+      if (this.selectedTags.length >= this.maxTags) {
+        this.$message.warning('最多只能添加5个标签')
+        return;
+      }
+      this.loading = true
+      try {
+        this.params.courseId = this.courseId;
+        this.params.tagName = tagName;
+        // 分类
+        if (this.sysTypeList.length > 0) {
+          this.params.sysType1 = this.sysTypeList[0]; //一级的id
+        }
+        if (this.sysTypeList.length > 1) {
+          this.params.sysType2 = this.sysTypeList[1]; //二级的id
+        }
+        if (this.sysTypeList.length > 2) {
+          this.params.sysType3 = this.sysTypeList[2]; //三级的id
+        }
+        const {result:newTag} = await apiCourseTag.createTag(this.params)
+        this.$message.success('标签创建成功',newTag);
+
+        this.selectedTags = [...this.selectedTags, newTag];
+        // 更新搜索结果的逻辑保持不变
+        this.searchResults = [newTag, ...this.searchResults];
+        this.tagMap.set(newTag.id, newTag)
+        this.$emit('change', this.displayTags)
+
+        this.$nextTick(() => {
+          // 强制重新设置selectedTags来触发更新
+          const tempTags = [...this.selectedTags];
+          this.selectedTags = [];
+          this.$nextTick(() => {
+            this.selectedTags = tempTags;
+          });
+          this.$refs.tagSelect.visible = false;
+        });
+      } finally {
+        this.loading = false
+      }
+    },
+    // 修改doSearch方法，添加搜索结果为空时的提示
+    async doSearch(query) {
+      // 不再在空查询时清空搜索结果
+      // if (!query.trim()) {
+      //   this.searchResults = []
+      //   return
+      // }
+      console.log("---- doSearch ------ query = " + query )
+      this.loading = true
+      try {
+        // 获取 typeId：取 sysTypeList 最后一个有效的值
+        const typeId =  this.sysTypeList.length > 2 ? this.sysTypeList[2] :
+          this.sysTypeList.length > 1 ? this.sysTypeList[1] :
+            this.sysTypeList.length > 0 ? this.sysTypeList[0] : null;
+        console.log("---- doSearch searchTags ------ query = " + query + " , typeId = " + typeId )
+        const {result:tags} = await apiCourseTag.searchTags({tagName:query,typeId:typeId})
+        console.log("-- searchTags 查询结果 tags = " + tags )
+
+        tags.forEach(item => {
+          this.tagMap.set(item.id, item)
+        })
+        this.searchResults = tags
+        // 当搜索结果为空时，提示用户可以按回车键创建标签
+        if (tags.length === 0) {
+          // this.$message.info('无此标签，按回车键创建')
+        }
+      } finally {
+        this.loading = false
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+.tag-container {
+  position: relative;
+}
+.tag-preview {
+  margin-top: 8px;
+}
+.el-tag {
+  margin-right: 6px;
+  margin-bottom: 6px;
+}
+
+/* 添加标签计数样式 */
+.tag-count {
+  position: absolute;
+  right: 10px;
+  top: 47%;
+  transform: translateY(-40%);
+  font-size: 12px;
+  color: #999;
+  background: white;
+  padding: 0 5px;
+  pointer-events: none;
+  /* 添加高度限制 */
+  height: 25px;
+  line-height: 25px; /* 垂直居中文字 */
+  box-sizing: border-box; /* 确保padding包含在height内 */
+}
+
+
+
+::v-deep(.el-select__tags) {
+  display: flex;
+  flex-wrap: wrap;
+  align-items: center;
+}
+/*
+::v-deep(.el-tag) {
+  flex: 0 0 calc(50% - 8px);
+  max-width: calc(50% - 8px);
+  box-sizing: border-box;
+  margin-right: 8px;
+  margin-bottom: 4px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}*/
+
+::v-deep(.el-tag) {
+  flex: 1 1 auto; /* 自动调整宽度 */
+  min-width: 30%; /* 设置最小宽度 */
+  max-width: 48%; /* 设置最大宽度，留出边距 */
+  box-sizing: border-box;
+  margin-right: 8px;
+  margin-bottom: 4px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  justify-content: center;
+  text-align: center;
+}
+
+::v-deep(.el-select__input) {
+  flex: 1;
+  min-width: 60px;
+}
+</style>

src/data/pages.js

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

src/views/portal/course/Detail.vue

@@ -30,13 +30,19 @@
                 <!-- <div class="course-title-right"> -->
                 <!-- <interactBar :readonly="!stuStusts || stuStusts==0" :type="1" :data="courseInfo" :comments="false" :views="false"></interactBar> -->
               <!-- </div> -->
+<!--              <div class="label-div">
+                <el-tag class="label-item" effect="plain" v-for="(item,tagIdx) in tagArray" :key="tagIdx">{{item}}</el-tag>
+              </div>-->
+              <div class="label-div">
+                <div v-for="(item, tagIdx) in tagArray" :key="tagIdx" class="keyword-tag">
+                  {{ item }}
+                </div>
+              </div>
               <div>
                 <div class="study-count">{{courseInfo.studys}}人学习</div>
                 <!-- <div><span style="font-size:20px;color:#ff8e00">{{courseInfo.score ? courseInfo.score.toFixed(1) : 0}}</span><span style="font-size:12px;color:#ff8e00">分</span></div> -->
               </div>
-              <div class="label-div">
+
-                <el-tag class="label-item" effect="plain" v-for="(item,tagIdx) in tagArray" :key="tagIdx">{{item}}</el-tag>
-               </div>
               <!-- <div style="width:160px;height:50px"> -->
               <!-- </div> -->
               <!-- <div class="label-div">
@@ -419,7 +425,7 @@ export default {
 
 .course-title{
   position: relative;
-  height: 90px;
+  height: auto;
   display: flex;
   justify-content: space-between;
   .title {
@@ -452,18 +458,43 @@ export default {
     padding: 24px 24px 5px 24px;
     // margin-right: 361px;
     .study-count {
-      margin-top: 10px;
+      margin-top: 30px;
       font-size: 16px;
       color: #444444;
     }
 
-    .label-div {
+    /*.label-div {
       margin: 5px 0;
       min-height: 20px;
       .label-item {
-        padding: 0 7px;
+        padding: 0px 8px;
+        margin-top: 5px;
+        float: left;
+        line-height: 24px;
+        font-size: 12px;
+        border-radius: 2px;
         margin-right: 8px;
-        margin-bottom: 0px;
+        color: #2C68FF;
+        height: 24px;
+        background: rgba(44, 104, 255, 0.06);
+        border: none; // 或者使用 border-color: transparent;
+      }
+    }*/
+    .label-div {
+      margin: 5px 0;
+      min-height: 20px;
+
+      .keyword-tag {
+        padding: 0px 10px;
+        margin-top: 7px;
+        float: left;
+        line-height: 24px;
+        font-size: 12px;
+        border-radius: 2px;
+        margin-right: 10px;
+        color: #2C68FF;
+        height: 24px;
+        background: rgba(44, 104, 255, 0.06);
       }
     }
   ::v-deep .el-rate__icon {

src/views/portal/course/qualityCourse.vue

@@ -6,29 +6,13 @@
     </div>
     <div style="padding-top:30px">
       <div class="xcontent2">
-        <!-- <div class="navTitle">
-          <a @click="handleClearTags">课程分类&nbsp;</a>
-          <span v-if="navTitle.length">></span>
-          <template v-if="navTitle.length">
-            <div class="oneTitle" v-for="(item, index) in navTitle" :key="item.id"
-              @click="handleOptionClick(item, index)">
-              <span class="titleName">&nbsp;{{ item.name }}&nbsp;</span>
-              <span v-if="index !== navTitle.length - 1">></span>
-            </div>
-          </template>
-        </div> -->
       </div>
       <div class="xcontent2">
         <!-- 左侧三级 -->
         <div class="xcontent2-minor" style="margin-right:36px;">
-          <!-- <router-link to="/courseRecommended" style="margin-bottom: 20px;" class="course-recommended-style">
-            <div class="imgTilte">
-            </div>
-          </router-link> -->
           <div class="course-title-style">
             <div class="imgTilte">
               <div>精品课程</div>
-              <!-- <div>COURSE</div> -->
             </div>
           </div>
           <div class="course-list">
@@ -70,8 +54,10 @@
 
           <!-- 内容导航 -->
           <div class="topNav" v-if="!newData" style="display: flex; flex-direction: row;background-color:#fff;">
-            <div>
+            <!-- 修改后 -->
-              <div class="search-div nav" style="height: 100px;flex: 1;">
+            <div class="search-div nav" style="flex: 1;height: auto;">
+              <div class="nav-primary" style="display: flex; justify-content: space-between; align-items: center;">
+                <div style="display: flex;">
                   <div @click="handleTypeClick(ctypeList[0], ctypeList)" class="option-item"
                        :class="{ 'option-active': ctypeList[0].checked }">
                     <a>全部</a>
@@ -79,21 +65,20 @@
                   </div>
 
                   <div @click="handleTypeClick(ctypeList[1], ctypeList)" class="option-item"
-                     :class="{ 'option-active': ctypeList[1].checked }">
+                       :class="{ 'option-active': ctypeList[1].checked }" style="padding-left: 15px;">
                     <a>内部专享</a>
                     <span :class="ctypeList[1].checked ? 'nav-bottbor' : ''"></span>
                   </div>
                   <div @click="handleTypeClick(ctypeList[2], ctypeList)" class="option-item"
-                     :class="{ 'option-active': ctypeList[2].checked }">
+                       :class="{ 'option-active': ctypeList[2].checked }" style="padding-left: 15px;">
                     <a>外部精选</a>
                     <span :class="ctypeList[2].checked ? 'nav-bottbor' : ''"></span>
                   </div>
                 </div>
-            </div>
 
-              <div style="display: flex;justify-content: space-between; align-items: center;">
+                <div style="display: flex; align-items: center;">
                   <span style="margin-right: 10px;" class="option-item">请选择年份 </span>
-                <el-select v-model="yearChosen" multiple>
+                  <el-select v-model="yearChosen" multiple style="width: 150px;">
                     <el-option
                       v-for="year in years"
                       v-if="year"
@@ -103,6 +88,37 @@
                     </el-option>
                   </el-select>
                 </div>
+              </div>
+
+              <div style="margin-top:10px;flex: 1;">
+                <!-- 修改热点标签容器，支持换行 -->
+                <div class="hot-tags-wrapper" style="display: flex;">
+                  <div class="hot-tags-wrapper" style="display: flex; align-items: center;">
+                    <div
+                      class="option-item"
+                      style=" padding-top: 2px; margin-left: 15px;"
+                      :class="{ 'option-active': isAllHotTagsSelected }"
+                      @click="handleClearHotTags"
+                    >
+                      <span>全部</span>
+                      <span :class="isAllHotTagsSelected ? 'nav-bottbor' : ''"></span>
+                    </div>
+
+                    <div
+                      class="option-item"
+                      style=" padding-top: 2px;"
+                      v-for="tag in hotTagsList"
+                      :key="tag.id"
+                      @click="handleTagClick(tag, hotTagsList,1)"
+                      :class="{ 'option-active': tag.checked }"
+                    >
+                      <span>{{tag.tagName}}</span>
+                      <span :class="tag.checked ? 'nav-bottbor' : ''"></span>
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </div>
 
 
           </div>
@@ -148,6 +164,18 @@
                       <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.courseName"></div>
+                    <!-- 添加标签显示区域 -->
+                    <div class="course-tags" v-if="cinfo.tagsList && cinfo.tagsList.length > 0">
+                      <el-tag
+                        v-for="(tag, tagIndex) in cinfo.tagsList"
+                        :key="tagIndex"
+                        size="mini"
+                        type="info"
+                        style="margin: 2px 2px; border-radius: 2px;"
+                      >
+                        <span v-html="highlightTagKeyword(tag)"></span>
+                      </el-tag>
+                    </div>
                     <!-- 关键字 -->
                     <div class="keywordInfo-every">
                       <div class="keywordInfo" v-for="(keyword, index) in cinfo.keywordsActive" :key="index">
@@ -160,7 +188,7 @@
                         </el-tooltip>
                       </div>
                     </div>
-<!--                    {{cinfo}}-->
+                    <!--                    {{cinfo}}-->
                     <div class="couresstartTime">
                       <span v-if="cinfo.type == 30 && cinfo.startTime">开课时间：{{ cinfo.startTime }}</span>
                     </div>
@@ -258,17 +286,6 @@
               <div class="text_msg">
                 创新力专区课程版权已到期！
               </div>
-              <!-- <div class="cyl" @click="cylClick">
-                <div class="tyl_title">
-                  <img src="../../../assets/images/cyl.png" alt="" class="tyl_title_img" />
-                  <span class="tyl_title_msg">创新力专区</span>
-                </div>
-                <div class="tyl_jy">激发创新潜力，拓视野、促思考！</div>
-                <div class="tyl_msg">
-                  内容涵盖：组合创新、单点破局、错位竞争、分形创新、第二曲线、数字化、元宇宙<br/>
-                  创新力专区课程版权将于2024年4月16日到期，逾期将无法继续访问，请尽快完成学习
-                </div>
-              </div> -->
             </div>
           </div>
         </div>
@@ -296,7 +313,7 @@ import {formatDate, formatUserNumber, toScore} from "@/utils/tools.js";
 import apiSearchterm from "@/api/modules/searchterm.js";
 import apiPlace from "@/api/phase2/place.js"
 import {qualityCourseTimeMark, qualityPageList} from "@/api/phase2"
-
+import apiCourseTag from '@/api/modules/courseTag.js'
 export default {
   name: "index",
   components: {
@@ -317,7 +334,7 @@ export default {
 
     },
     // 取消搜索条件标签展示
-    stagList() { //计算出选择的内容
+    /*stagList() { //计算出选择的内容
       let list = [];
       if (this.keyword) {
         list.push({
@@ -327,12 +344,6 @@ export default {
           checked: true
         })
       }
-      // 取消 全部 内部专享 外部精选 三种的显示
-      // this.ctypeList.forEach(item => {
-      //   if (item.checked) {
-      //     list.push(item);
-      //   }
-      // });
       this.oneList.forEach(one => {
         var twoChildChecked = false;//是否有下级
         one.children.forEach(two => {
@@ -354,22 +365,77 @@ export default {
           list.push(one);
         }
       })
-      // this.oneList.forEach(item=>{
+      return list;
-      //   if(item.checked){
+    },*/
-      //     list.push(item);
+
-      //   }
+    stagList() {
-      // });
+      let list = [];
-      // this.twoList.forEach(item=>{
+
-      //   if(item.checked){
+      // 关键词
-      //     list.push(item);
+      if (this.keyword) {
-      //   }
+        list.push({
-      // });
+          type: 0,
-      // this.threeList.forEach(item=>{
+          id: 'keyword',
-      //   if(item.checked){
+          name: this.keyword,
-      //     list.push(item);
+          tagName: this.keyword,
-      //   }
+          checked: true
-      // });
+        });
-      //console.log(list,'list');
+      }
+
+      // 课程类型
+      this.ctypeList.forEach(item => {
+        if (item.checked) {
+          list.push({
+            ...item,
+            tagName: item.name
+          });
+        }
+      });
+
+      // 热点标签 - 这是关键修复
+      this.hotTagsList.forEach(item => {
+        if (item.checked) {
+          list.push({
+            ...item,
+            name: item.tagName || item.name,
+            tagName: item.tagName || item.name,
+            type: 14
+          });
+        }
+      });
+
+      // 三级分类
+      this.oneList.forEach(one => {
+        var twoChildChecked = false;
+        one.children.forEach(two => {
+          if (two.checked) {
+            twoChildChecked = true;
+          }
+          var threeChildChecked = false;
+          two.children.forEach(three => {
+            if (three.checked) {
+              list.push({
+                ...three,
+                tagName: three.name
+              });
+              threeChildChecked = true;
+            }
+          });
+          if (two.checked && !threeChildChecked) {
+            list.push({
+              ...two,
+              tagName: two.name
+            });
+          }
+        });
+        if (one.checked && !twoChildChecked) {
+          list.push({
+            ...one,
+            tagName: one.name
+          });
+        }
+      });
+
       return list;
     },
     ctypeTagAll() {
@@ -378,24 +444,6 @@ export default {
       });
       return !flag;
     },
-    // oneTagAll() {
-    //   let flag = this.oneList.some(item => {
-    //     return item.checked;
-    //   });
-    //   return !flag;
-    // },
-    // twoTagAll() {
-    //   let flag = this.twoList.some(item => {
-    //     return item.checked;
-    //   });
-    //   return !flag;
-    // },
-    // threeTagAll() {
-    //   let flag = this.threeList.some(item => {
-    //     return item.checked;
-    //   });
-    //   return !flag;
-    // }
   },
   data() {
     return {
@@ -463,7 +511,9 @@ export default {
       searchRecords: [],
       hotList: [],
       totalPages: 1,
-      localSessionKey: this.$xpage.constants.localCourseFiltersKey
+      localSessionKey: this.$xpage.constants.localCourseFiltersKey,
+      hotTagsList: [],
+      // isAllHotTagsSelected: true,
     };
   },
   // 受众需要每次刷新
@@ -483,17 +533,6 @@ export default {
     qualityCourseTimeMark().then(response=>{
       this.years = response.data.result
     })
-    // let screenWidth = window.screen.availWidth;
-    // if (screenWidth < 1280) {
-    //   this.course.pageSize = 9;
-    //   this.columns = 3;
-    // } else if (screenWidth < 1600) {
-    //   this.course.pageSize = 12;
-    //   this.columns = 3;
-    // } else if (screenWidth >= 1600) {
-    //   this.course.pageSize = 15;
-    //   this.columns = 3;
-    // }
 
     let el_top = document.querySelector("#searchbar");
     let el_search = document.querySelector("#searchbar");
@@ -519,8 +558,6 @@ export default {
     this.loadSysTypes();
     this.getScoreList();
     this.getHotList();
-    // this.toCourseDetail(item);
-    // this.orderChange(id);
     //查询排行榜，页面打开只查询一次
     let localKey = "user_" + this.userInfo.sysId + "_gids";
     if (this.audiences.length == 0) {
@@ -539,30 +576,176 @@ export default {
           }
           this.search();
         })
-        // Promise.all([apiOldCourse.audience(this.userInfo.sysId),apiUserGroup.userGroupIds()]).then(rs=>{
-        //    //console.log(rs,'rs');
-        //    let aids=[];
-        //    if(rs[0].status==200){
-        //      aids.push(rs[0].result);
-        //    }
-        //    if(rs[1].status==200){
-        //      aids.push(rs[1].result);
-        //    }
-        //    this.audiences=aids;
-        //    sessionStorage.setItem(localKey,this.audiences);
-        //    this.search();
-        // })
       }
     }
-
-    //this.searchterm();//搜索词已经没有了
     this.couresreso();//广告位
-
   },
   beforeDestroy() {
     // window.removeEventListener("scroll", this.handleScroll);
   },
   methods: {
+    getSearchMode() {
+      const hasKeyword = this.keyword && this.keyword.trim() !== '';
+
+      // 检查是否有导航标签被选中
+      const hasNavigationTags = this.stagList.some(tag => {
+        // 课程类型(1)、热点标签(14)、分类标签(11,12,13)
+        return [1, 11, 12, 13, 14].includes(tag.type) && tag.checked;
+      });
+
+      if (hasKeyword && hasNavigationTags) {
+        return 'mixed'; // 混合模式：关键字 + 导航标签
+      } else if (hasKeyword) {
+        return 'keyword'; // 纯关键字搜索
+      } else if (hasNavigationTags) {
+        return 'navigation'; // 纯导航标签搜索
+      } else {
+        return 'none'; // 无搜索条件
+      }
+    },
+
+    // 高亮标签关键字
+    highlightTagKeyword(tag) {
+      const searchMode = this.getSearchMode();
+
+      switch (searchMode) {
+        case 'keyword':
+          return this.highlightPartialMatch(tag);
+        case 'navigation':
+          return this.highlightExactMatch(tag);
+        case 'mixed':
+          return this.highlightMixedMode(tag);
+        default:
+          return tag;
+      }
+    },
+
+    // 部分匹配高亮（纯关键字搜索模式）
+    highlightPartialMatch(tag) {
+      const searchKeywords = this.stagList
+        .filter(searchTag => searchTag.type === 0) // 只处理关键字类型
+        .map(searchTag => searchTag.tagName || searchTag.name)
+        .filter(keyword => keyword && keyword.trim());
+
+      if (searchKeywords.length === 0) {
+        return tag;
+      }
+
+      let highlightedTag = tag;
+
+      searchKeywords.forEach(keyword => {
+        if (tag.includes(keyword)) {
+          const regex = new RegExp(`(${this.escapeRegExp(keyword)})`, 'gi');
+          highlightedTag = highlightedTag.replace(regex, '<span class="keyword-highlight">$1</span>');
+        }
+      });
+
+      return highlightedTag;
+    },
+
+    // 完全匹配高亮（纯导航标签模式）
+    highlightExactMatch(tag) {
+      const isMatched = this.stagList.some(searchTag => {
+        // 只检查导航标签类型
+        if (searchTag.type === 0) return false;
+
+        const searchName = searchTag.tagName || searchTag.name;
+        return searchName === tag;
+      });
+
+      if (isMatched) {
+        return `<span class="exact-match-highlight">${tag}</span>`;
+      }
+
+      return tag;
+    },
+
+    // 混合模式高亮（关键字 + 导航标签）
+    highlightMixedMode(tag) {
+      // 1. 先检查是否完全匹配导航标签
+      const exactMatched = this.stagList.some(searchTag => {
+        if (searchTag.type === 0) return false;
+
+        const searchName = searchTag.tagName || searchTag.name;
+        return searchName === tag;
+      });
+
+      // 2. 如果完全匹配导航标签，整个标签高亮
+      if (exactMatched) {
+        return `<span class="exact-match-highlight">${tag}</span>`;
+      }
+
+      // 3. 否则检查是否包含关键字，进行部分高亮
+      const searchKeywords = this.stagList
+        .filter(searchTag => searchTag.type === 0)
+        .map(searchTag => searchTag.tagName || searchTag.name)
+        .filter(keyword => keyword && keyword.trim());
+
+      if (searchKeywords.length === 0) {
+        return tag;
+      }
+
+      let highlightedTag = tag;
+      let hasKeywordMatch = false;
+
+      searchKeywords.forEach(keyword => {
+        if (tag.includes(keyword)) {
+          const regex = new RegExp(`(${this.escapeRegExp(keyword)})`, 'gi');
+          highlightedTag = highlightedTag.replace(regex, '<span class="keyword-highlight">$1</span>');
+          hasKeywordMatch = true;
+        }
+      });
+
+      // 4. 如果有关键字匹配，返回部分高亮结果
+      if (hasKeywordMatch) {
+        return highlightedTag;
+      }
+
+      // 5. 都不匹配，返回原标签
+      return tag;
+    },
+
+    // 辅助方法：转义正则表达式特殊字符
+    escapeRegExp(string) {
+      return string.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+    },
+
+
+    // isAllHotTagsSelected() {
+    //   return !this.hotTagsList.some(tag => tag.checked);
+    // },
+    handleClearHotTags() {
+      // 清除所有热点标签的选中状态
+      this.hotTagsList.forEach(tag => {
+        tag.checked = false;
+      });
+      this.isAllHotTagsSelected = true;
+      // 清空course.tags
+      this.course.tags = '';
+
+      // 触发搜索
+      this.searchData();
+    },
+    handleTagClick(item, list,type) {
+      console.info('切换标签 item = ' + item)
+      // this.isAllHotTagsSelected = false;
+
+      item.checked = !item.checked;
+
+      // 更新course.tags
+      const checkedTags = this.hotTagsList.filter(tag => tag.checked);
+      let tagIds = checkedTags.map(tag => tag.id).join(',');
+      this.course.tags = tagIds;
+      // this.$forceUpdate();
+      this.searchData(type);
+
+      // 强制触发stagList重新计算
+      // this.$nextTick(() => {
+      //   this.searchData(type);
+      // });
+    },
+
+
     // 改变分页
     currentChange(val) {
       this.course.pageIndex = val
@@ -644,16 +827,61 @@ export default {
       }
     },
     //搜索条件
+    // 搜索条件
     stagClose(tag, tagIndex) {
       this.courseChosen = void 0;
       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.searchData();
     },
 
+    isTagMatched(tag) {
+      // 检查stagList中是否有匹配的标签
+      return this.stagList.some(searchTag =>
+        searchTag.tagName === tag || searchTag.name === tag
+      );
+    },
     // 导航全选
     handleTypeAllClick(t) {
       if (t == 1) {
@@ -691,10 +919,23 @@ export default {
     handleClearTags() {
       //清空所有的条件
       this.keyword = '';
-      // 取消搜索条件标签展示
+
-      // this.ctypeList.forEach(item => {
+      // 清除课程类型
-      //   item.checked = false;
+      this.ctypeList.forEach(item => {
-      // });
+        item.checked = false;
+      });
+
+      // 清除热点标签
+      this.hotTagsList.forEach(item => {
+        item.checked = false;
+      });
+      // 清空course.tags
+      this.course.tags = '';
+
+      // 清除年份选择
+      this.yearChosen = [];
+
+      // 清除三级分类
       this.oneList.forEach(one => {
         one.checked = false;
         one.children.forEach(two => {
@@ -704,6 +945,7 @@ export default {
           })
         })
       });
+
       // 清除左侧被选中的内容
       this.courseChosen = void 0;
       this.twoList = [];
@@ -713,6 +955,7 @@ export default {
       sessionStorage.removeItem(this.localSessionKey)
       this.searchData();
     },
+
     // 导航切换(录播课，线下课，学习项目)
     handleTypeClick(item, list) {
       // item.checked = !item.checked;
@@ -751,57 +994,6 @@ export default {
           })
         })
       })
-
-      // item.checked = !item.checked;
-      //使用上面一行是可以多选，使用下面是单选
-      // list.forEach(row => {
-      //   row.checked = false;
-      // })
-      // item.checked = true;
-      // //以下是新的规则的修改，
-      // if (!item.checked) {
-      //   //清空它下面的所有的中的
-      //   item.children.forEach(subItem => {
-      //     subItem.checked = false;
-      //     if (subItem.children) {
-      //       subItem.children.forEach(sub => {
-      //         sub.checked = false;
-      //       })
-      //     }
-      //   });
-      //   if (level == 1) {
-      //     this.twoList = [];
-      //     this.threeList = [];
-      //   }
-      //   if (level == 2) {
-      //     this.threeList = [];
-      //   }
-      //   this.searchData();
-      //   return;
-      // }
-
-      // let $this = this;
-      // if (level == 1) { //一级的情况
-      //   this.twoList = [];
-      //   this.threeList = [];
-      //   let lastCheked = null;
-      //   item.children.forEach(two => {
-      //     $this.twoList.push(two);
-      //     if (two.checked) {
-      //       lastCheked = two;
-      //     }
-      //   });
-      //   if (lastCheked != null) {
-      //     $this.threeList = lastCheked.children;
-      //     item.children.forEach(three => {
-      //     });
-      //   }
-      // } else if (level == 2) { //二级的情况
-      //   this.threeList = item.children;
-      // } else if (level == 3) { //三级的情况
-
-      // }
-      //this.handleChangeTypes(item);
       this.searchData();
     },
     // 无用
@@ -811,18 +1003,6 @@ export default {
       this.twoList = [];
       this.threeList = [];
       let $this = this;
-      // this.oneList.forEach(one=>{
-      //   if(one.checked){
-      //      one.children.forEach(two=>{
-      //        $this.twoList.push(two);
-      //        if(two.checked){
-      //           two.children.forEach(three=>{
-      //             $this.threeList.push(three);
-      //           })
-      //        }
-      //      });
-      //   }
-      // })
       this.oneList.forEach(one => {
         if (one.checked) {
           one.children.forEach(two => {
@@ -853,15 +1033,6 @@ export default {
               checked: false
             }
             if (item.children) {
-              //增加死数据
-              // item.children.push({
-              //   type: 12,
-              //   id: item.id * (index + 200),
-              //   name: '线上品牌系列课程',
-              //   children: [],
-              //   checked: false,
-              //   newData: true
-              // })
               item.children.forEach(subItem => {
                 let newSubItem = {
                   type: 12,
@@ -928,47 +1099,16 @@ export default {
       this.keyword = val;
       this.searchData();
     },
-
+    toNeedCourse() {
-    // 滚动
-    // handleScroll() {
-    //   if (this.courseList.length > 6) {
-
-    //     let innerHeight = document.querySelector("#couser-list-content").clientHeight;
-    //     let outerHeight = document.documentElement.clientHeight;
-    //     let scrollTop = document.documentElement.scrollTop;
-    //     let outerWidth = document.querySelector(".xcontent2-minor").clientWidth;
-    //     if (outerHeight + scrollTop + 350 >= innerHeight) {
-    //       if (this.moreState == 1 && this.course.pageIndex < 4) {
-    //         this.loadMore();
-    //       }
-    //     }
-    //     //console.log(this.course.pageIndex,'this.course.pageIndex');
-    //     //加此判断，是为了没有数据时的闪动问题
-    //     //if(this.course.pageIndex >1){
-    //     if (scrollTop > 1176) {
-    //       document.querySelector("#fixd-box").style.cssText =
-    //         "position: fixed;top: -882px;width:" + outerWidth + "px";
-    //     } else {
-    //       document.querySelector("#fixd-box").style.cssText = "position: static";
-    //     }
-    //     //}
-    //   }
-    // },
-
-    toNeedCourse() {// 上传
-      // 需要先切换标签
-      //this.$store.dispatch('SetCurIdentity',2);
-      //this.$router.push('/need/course?open=new');
       this.$refs.floatTools.toNeedCourse();
-
     },
-    searchData() {
+    searchData(type) {
       this.course.pageIndex = 1;
       this.noPageList = true; //判断接口是否还有数据
       this.noDataList = true; //判断接口是否还有数据
       this.courseList = [];
       this.totalPages = 4;
-      this.search();
+      this.search(type);
     },
     inputOn() {
       this.$forceUpdate();
@@ -1128,17 +1268,12 @@ export default {
       return list;
     },
     // 查询
-    async search () {
+    async search (type) {
-      //
       if (this.searching) {
         this.$message.warning("正在搜索中，请待搜索完成后再重新搜索");
         return;
       }
       this.searching = true;
-      //测试时间格式化
-      // let s=1650973801;
-      // var d = new Date(1650973801*1000);
-      // console.log(formatDateByFmt(d,'yyyy-MM-dd hh:mm'),'data');
       this.saveLocalFilters();
       let that = this;
       if (this.keyword) {
@@ -1149,7 +1284,6 @@ export default {
         this.course.audiences = this.audiences.join(",");
       }
       //console.log(this.userInfo)
-      //this.course.companyId=this.userInfo.companyId;
       this.course.type = "";//不使用单查询了
       this.course.types = "";
       this.course.sysType1 = "";
@@ -1172,6 +1306,20 @@ export default {
           that.course.sysType3 += item.id;
         }
       });
+      if (!type && type !== 1){
+        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;
@@ -1191,6 +1339,9 @@ export default {
       params.pageNum = pageIndex
       params.orderByType = orderField
       params.courseSource = this.ctypeList.findIndex(e => e.checked)
+      if (params.courseSource === -1) {
+        params.courseSource = 0
+      }
       this.yearChosen.length && (params.years = this.yearChosen)
       params.courseName = this.keyword
       delete params.userId
@@ -1203,44 +1354,8 @@ export default {
         console.log(res.status)
         if (res.status === 200) {
           this.totalPages = res.data.result.pages;
-          // res.result.list.forEach(item => {
-          //   if (item.startTime != '') {
-          //     item.startTime = formatDateByFmt(new Date(item.startTime * 1000), 'yyyy-MM-dd hh:mm')
-          //     //let time = item.startTime.split('-');
-          //     //item.startTime = `${time[0]}年${time[1]}月${time[2]}日`
-          //   }
-          //   //教师转化
-          //   if (item.teacher) {
-          //     item.teacher = item.teacher.split(',').filter(itemValue => itemValue !== 'BOE教师').join(',');
-          //     // if (dotIdx > 0) {
-          //     // item.teacher = item.teacher.substring(0, dotIdx);
-          //     // }
-          //   }
-          //   if (item.teacher && item.teacher == 'BOE教师') {
-          //     item.teacher = '';
-          //   }
-          //
-          //   //转化标红显示
-          //   item.title = item.name;
-          //   if (that.course.keyword) {
-          //     item.name = that.brightenKeyword(item.name, that.course.keyword);
-          //     item.keywordsActive = that.brightenKeywords(item.keywordsList, that.course.keyword)
-          //     console.log(item.keywordsActive);
-          //   } else {
-          //     item.name = item.name;
-          //   }
-          // });
 
           const list = res.data.result.records ?? []
-          // list.forEach(course=>{
-          //   const id = course.courseId
-          //
-          //   apiCourse.getTeacherByCourseIDs([id]).then(res=>{
-          //     console.log(res, "ids res")
-          //     course.teacher = res.result[0].names[0]
-          //     console.log(`course.teacher`, course.teacher)
-          //   })
-          // })
 
           this.courseList = list
           if (this.newData) {
@@ -1301,18 +1416,7 @@ export default {
           this.moreState = 2;
         });
     },
-    // showInApply() {
+
-    //   this.inapply.show = true;
-    // },
-    // pushEnter(type) {
-    //   this.type1.push(type);
-    // },
-    // deleteOut(type) {
-    //   this.type1 = this.type.filter(item => item != type);
-    // },
-    // chooseShow(type) {
-    //   return this.type1.some(item => item == type);
-    // },
     getAnkingData() {
       apiCourse.ranking().then(res => {
         if (res.status == 200) {
@@ -1887,7 +1991,7 @@ export default {
         right: 23.5%;
         // bottom: 26%;
         top: 0;
-        height: 20;
+        height: 20px;
         line-height: 20px;
         font-size: 12px;
         color: #FFFFFF;
@@ -2117,7 +2221,7 @@ export default {
     border-radius: 8px;
 
     ::v-deep .el-input {
-      width: 420px;
+      //width: 420px;
       height: 38px;
       //margin-bottom: 13px;
 
@@ -2202,30 +2306,18 @@ export default {
     }
   }
 }
-
+.hot-tags-wrapper {
-// .course-form {
+  display: flex;
-//   width: 100%;
+  flex-wrap: wrap;
-//   margin: 10px 0;
+  gap: 15px;
-//   ::v-deep.el-button {
+  align-items: center;
-//     width: 100%;
+  padding-top: 2px;
-//     color: #fff;
+}
-//   }
+.search-div.nav {
-// }
+  display: block;
-
+  width: 100%;
-// .right-box {
+  clear: both;
-//   .add-btn {
+}
-//     width: 100%;
-//     padding: 15px 0;
-//   }
-//   .ranking-card {
-//     margin-top: 0px;
-//   }
-
-//   .ranking-data {
-//     margin: 10px 0;
-//     color: #999999;
-//   }
-// }]
 .search-item-type {
   line-height: 25px;
   padding-right: 10px;
@@ -2239,6 +2331,7 @@ export default {
   display: inline-block;
   font-size: 14px;
   margin: 0px 15px;
+  cursor: pointer
 }
 
 .option-border {
@@ -2251,4 +2344,40 @@ export default {
 
 .option-active {
   color: #387DF7;
-}</style>
+}
+
+
+
+/* 关键字部分匹配高亮样式 */
+.keyword-highlight {
+  color: #387DF7 !important;
+  font-weight: bold;
+  background-color: transparent !important;
+}
+/* 导航标签完全匹配高亮样式 */
+.exact-match-highlight {
+  color: #387DF7 !important;
+  font-weight: bold;
+  background-color: transparent !important;
+}
+/* 混合模式下的特殊样式（可选） */
+.mixed-exact-highlight {
+  color: #387DF7 !important;
+  font-weight: bold;
+  background-color: #f0f7ff !important;
+  padding: 1px 3px;
+  border-radius: 2px;
+}
+/* 确保标签基础样式 */
+.course-tags ::v-deep .el-tag {
+  color: #333333;
+  background-color: #f4f4f5;
+  border-color: #e9e9eb;
+}
+.course-tags ::v-deep .el-tag .keyword-highlight,
+.course-tags ::v-deep .el-tag .exact-match-highlight {
+  color: #387DF7 !important;
+  font-weight: bold;
+  background-color: transparent !important;
+}
+</style>

src/views/tag/TagManageList.vue

@@ -0,0 +1,389 @@
+<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-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>-->
+    </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: {
+
+    //重置搜索条件
+    resetSearch() {
+      this.pageData.id = '';
+      this.pageData.tagName = '';
+      this.pageData.isHot = '';
+      this.pageData.pageIndex = 1;
+      this.getCourseTagList(); // 重置后重新加载列表
+    },
+
+    //初始化：课程标签列表
+    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).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;
+        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>