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

src/api/httpAjax.js

@@ -1,208 +0,0 @@
-import axios from 'axios'
-import qs from 'qs'
-import {Notification, MessageBox, Message} from 'element-ui'
-import store from '@/store'
-import {getToken} from '@/utils/token'
-import errorCode from '@/utils/errorCode'
-
-/**
- *request请求 axios.request(config)
- *requestJson请求 axios.request(config)
- *get请求 axios.get(url[, config])
- *post请求 axios.post(url[, data[, config]])
- *postJson请求 axios.post(url[, data[, config]])
- *put请求 axios.put(url[, data[, config]])
- *putJson请求 axios.put(url[, data[, config]])
- *patch请求 axios.patch(url[, data[, config]])
- *patchJson请求 axios.patch(url[, data[, config]])
- *delete请求 axios.delete(url[, config])
- */
-
-
-// const ReLoginUrl=process.env.VUE_APP_LOGIN_URL;
-const TokenName = 'token';
-/**axios.defaults.headers['Content-Type'] = 'application/x-www-form-urlencoded'**/
-//只是用于发送json对象数据时使用post,put,patch
-/**axios.defaults.headers['Content-Type'] = 'application/x-www-form-urlencoded'**/
-//只是用于发送json对象数据时使用post,put,patch
-//用于普通的发送请求
-const formRequest = axios.create({
-  //headers:{'Content-Type':'application/x-www-form-urlencoded'},
-  // axios中请求配置有baseURL选项，表示请求URL公共部分
-  // baseURL: process.env.VUE_APP_CESOURCE_BASE_API,
-  //超时
-  timeout: 10000,
-})
-//发送json对象的拦截器
-formRequest.interceptors.request.use(config => {
-  //是否需要设置 token
-  const isToken = (config.headers || {}).isToken === false
-  let curToken = getToken();
-  //curToken='eyJ0eXBlIjoidG9rZW4iLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC91LmJvZS5jb20iLCJpYXQiOjE2NzIzMTE2MTIsImV4cCI6MTY3MjMxODgxMiwiR2l2ZW5OYW1lIjoiYm9ldSIsInVzZXJJZCI6IjZCMDQ5RkFGLUMzMTQtN0NDRi0wRDI4LTBEMjNGNEM0MjUzMSIsInVJZCI6Ijk2NTM0MjAyNzQ5NzYwNzE2OCIsInBlcm1pc3Npb24iOiIifQ==.a4f41376e994c5fcd3ab537ce17572ef4c633863f87785cf7b6ffa353e2ed51c';
-  if (curToken && !isToken) {
-    config.headers[TokenName] = curToken // 让每个请求携带自定义token 请根据实际情况自行修改
-  }
-  return config
-}, error => {
-  console.log(error)
-  Promise.reject(error)
-});
-formRequest.interceptors.response.use(res => {
-    //console.log(res);
-    const code = res.data.status || 200;
-    if (code === 200) {
-      return res.data
-    } else {
-      if (code === 401) {
-        // store.dispatch('LogOut').then(() => {
-        //    location.href = this.webBaseUrl + ReLoginUrl;
-        // })
-        console.error('', res.data);
-        return Promise.reject(new Error('接口返回未登录'))
-      } else if (code === 403) {
-        var msg = '当前操作没有权限';
-        Message({message: msg, type: 'error'});
-        return Promise.reject(new Error(msg))
-      } else {
-        //Message({message: res.data.message, type: 'error'});
-        //console.log('err' + res.data.error);
-        return res.data
-      }
-    }
-  },
-  error => {
-    console.log('err', error)
-    let {message} = error;
-    if (message == "Network Error") {
-      message = "网络异常，请稍后重试";
-    } else if (message.includes("timeout")) {
-      message = "网络异常或接口错误，请求超时";
-    } else if (message.includes("Request failed with status code")) {
-      message = "系统接口" + message.substr(message.length - 3) + "异常";
-    }
-    Message({
-      message: message,
-      type: 'error',
-      duration: 5 * 1000
-    })
-    return Promise.reject(error)
-  }
-)
-
-/**
- * request请求,可以自定义参数
- */
-const request = formRequest.request;
-
-/**
- * get请求 ,只有url
- */
-const get = function (baseURL, url) {
-  return request({
-    baseURL,
-    url: url,
-    method: 'get',
-    headers: {'Content-Type': 'application/json'}
-  })
-}
-
-/**
- * post请求
- * @param {Object} url
- * @param {Object} postData
- */
-const post = function (baseURL, url, postData) {
-  // if (postData) {
-  //   postData = qs.stringify(postData);
-  // }
-  return request({
-    baseURL,
-    url: url,
-    method: 'post',
-    data: postData,
-    headers: {'Content-Type': 'application/json'}
-  })
-}
-//post请求
-const postForm = function (baseURL, url, data) {
-  return request({
-    baseURL,
-    url,
-    data,
-    method: 'post',
-    headers: {'Content-Type': 'application/x-www-form-urlencoded'}
-  });
-}
-//  const postJson=jsonRequest.post;
-
-const postJson = function (baseURL, url, postData) {
-  return request({
-    baseURL,
-    url: url,
-    method: 'post',
-    data: postData,
-    headers: {'Content-Type': 'application/json;charset=utf-8'},
-  })
-}
-
-// 导出文件请求定义
-const postJsonToFile = function (baseURL, url, postData) {
-  return request({
-    baseURL,
-    url: url,
-    method: 'post',
-    data: postData,
-    headers: {'Content-Type': 'application/json;charset=utf-8'},
-    responseType: 'blob'
-  })
-}
-
-const getJsonToFile = function (baseURL, url, postData) {
-  return request({
-    baseURL,
-    url: url,
-    method: 'get',
-    data: postData,
-    headers: {'Content-Type': 'application/json;charset=utf-8'},
-    responseType: 'blob'
-  })
-}
-
-/**
- * put请求
- */
-const put = function (baseURL, url, data) {
-  if (data) {
-    data = qs.stringify(data);
-  }
-  return request({
-    baseURL,
-    url: url,
-    method: 'put',
-    data: data,
-    headers: {'Content-Type': 'application/x-www-form-urlencoded'}
-  })
-}
-
-const putJson = function (baseURL, url, data) {
-  return request({
-    baseURL,
-    url: url,
-    method: 'put',
-    data: data,
-    headers: {'Content-Type': 'application/json;charset=utf-8'},
-  })
-}
-
-
-export default {
-  tokenName: TokenName,
-  request,
-  get,
-  post,
-  postJson,
-  postJsonToFile,
-  put,
-  putJson,
-  getJsonToFile
-}

src/api/modules/courseTag.js

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

src/api/phase2/index.js

@@ -1,7 +1,5 @@
 import ajax from '@/utils/xajax.js'
 import http from '../unionAjax'
-import httpAjax from '../httpAjax'
-
 const baseURL = process.env.VUE_APP_MANAGER_API_PATH;
 
 
@@ -49,18 +47,6 @@ const articlelist=function (type){
 const courselist=function (data){
   return ajax.post('/xboe/portal/index/courselist',data);
 }
-// 精品课信息列表
-const qualitylist=function (data){
-  return httpAjax.post(baseURL,'/quality/home/qualityItem',data);
-}
-// 精品课分页查询
-export const qualityPageList=function (data){
-  return httpAjax.post(baseURL,'/quality/home/qualityPages',data);
-}
-// 课程精品课标记时间年份列表
-export const qualityCourseTimeMark=function (){
-  return httpAjax.post(baseURL,'/quality/manage/qualityYearList',{});
-}
 /**
  * 首页新课程推荐列表
  */
@@ -75,7 +61,5 @@ export default {
   articlelist,
   courselist,
   newCases,
-  getRecommendList,
-  qualitylist,
-  qualityPageList
+  getRecommendList
 }

src/components/Course/courseForm.vue

@@ -73,6 +73,9 @@
                 :props="{ value: 'id', label: 'name' }"
                 :options="sysTypeListMap"></el-cascader>
             </el-form-item>
+            <el-form-item label="标签" required>
+              <courseTag ref="courseTag" :courseId="curCourseId" :sysTypeList="sysTypeList" :initialTags="courseTags" @change="handleTagsChange"></courseTag>
+            </el-form-item>
             <el-form-item label="资源归属" required>
                 <el-input placeholder="请选择" v-model="orgName" >
                     <el-button v-if="identity==3 || identity==5" @click="showChooseOrg()" slot="append" icon="el-icon-search">选择</el-button>
@@ -141,7 +144,6 @@
               <el-radio style="margin-right: 10px;" v-model="courseInfo.device" :label="1">PC端可见</el-radio>
               <el-radio style="margin-right: 10px;" v-model="courseInfo.device" :label="2">移动端可见</el-radio>
               <el-radio style="margin-right: 10px;" v-model="courseInfo.device" :label="3">多端可见</el-radio>
-              <el-radio style="margin-right: 10px;" v-model="courseInfo.device" v-if="isPermission" :label="4">仅内网访问</el-radio>
             </el-form-item>
             <el-form-item v-if="!weike.onlyRequired" label="课程来源">
               <el-radio-group v-model="courseInfo.source">
@@ -254,6 +256,9 @@
                   </el-select> -->
                   <choice :teacherValue="teacherValues" @getTeacherList="getTeacherList"></choice>
                 </el-form-item>
+                <el-form-item label="标签" required>
+                  <courseTag ref="courseTag" :courseId="curCourseId" :sysTypeList="sysTypeList" :initialTags="courseTags" @change="handleTagsChange"></courseTag>
+                </el-form-item>
                 <el-form-item label="关键字">
                   <el-input v-model.trim="keywords" maxlength="100" @keyup.enter.native="changeKeywords"  placeholder="请输入关键字"></el-input>
                       <el-tag v-for="(tag,index) in tips" size="small" :key="index" closable type="info" @close="closeKeywordsTag(tag,index)">
@@ -306,7 +311,6 @@
                 <el-radio v-model="courseInfo.device" :label="1">PC端可见</el-radio>
                 <el-radio v-model="courseInfo.device" :label="2">移动端可见</el-radio>
                 <el-radio v-model="courseInfo.device" :label="3">多端可见</el-radio>
-                <el-radio style="margin-right: 10px;" v-model="courseInfo.device" v-if="isPermission" :label="4">仅内网访问</el-radio>
               </el-col>
               <el-col :span="10">
                 <el-form-item label="课程来源">
@@ -404,6 +408,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 +425,7 @@ import apiCourse from '../../api/modules/course.js';
 import apiCourseAudit from '../../api/modules/courseAudit.js';
 import apiOrg from '../../api/system/organiza.js';
 import apiUser from '../../api/system/user.js';
+import apiCourseTag from '../../api/modules/courseTag.js';
 import WxEditor from '@/components/Editor/index.vue';
 import catalogSort from '@/components/Course/catalogSort.vue';
 import { courseType, getType } from '../../utils/tools.js';
@@ -428,7 +434,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 +474,7 @@ export default {
       orgName:'',
       orgNamePath:'',
       orgKid:'',
+      courseTags:[],
       courseInfo: {
         id: '',
         name: '',
@@ -490,8 +497,6 @@ export default {
         refType:''
       },
       visibleShow:false,
-      isPermission:false,
-      dicts:[],
       extendRefId:'',
       extendRefType:'',
       courseTeachers: [], //课程的老师
@@ -531,11 +536,7 @@ export default {
         dlgShow: false
       },
       rightTypeId: {},
-      catalogSortDialogShow: false,
-      selectedOrg: {
-        orgId: null,
-        name: ''
-      }
+      catalogSortDialogShow: false
     };
   },
   created() {
@@ -560,18 +561,14 @@ export default {
   },
   watch: {
     courseInfo: {
-      handler(newVal, oldVal) {
-        // 需要保存
+      handler(newVal) {
+        //需要保存
         this.requireSaveCourse = true;
-
-        console.log("--- watch比较 = ", oldVal.orgId, newVal.orgId);
-        this.checkOrgPermission(newVal.orgId);
       },
       deep: true
     }
   },
   mounted() {
-    this.getDictIds();
     let extendFlag=this.$route.query.f; //是否是管理端过来的
     this.extendRefId=this.$route.query.refId;
     this.extendRefType=this.$route.query.refType;
@@ -593,19 +590,6 @@ export default {
     this.loadUserGroup();
   },
   methods: {
-    // 检查机构权限
-    checkOrgPermission(orgId) {
-      console.log("--- 监测组织id orgId  = ",orgId)
-      console.log("--- this.isPermission  = ",this.isPermission)
-      console.log("--- device  = ",this.courseInfo.device)
-      if (!orgId) {
-        this.isPermission = false;
-        return;
-      }
-      console.log("--- this.dicts  = ",this.dicts)
-      this.isPermission = this.dicts.includes(orgId);
-      console.log("--- 监听结束 this.isPermission  = ",this.isPermission)
-    },
     // 关键字的更改
     changeKeywords(option){
       if(option.target.value){
@@ -617,6 +601,15 @@ export default {
     closeKeywordsTag(item,index){
       this.tips.splice(index, 1);
     },
+    // 处理标签变化事件
+    handleTagsChange(tags) {
+      console.log("父组件:",tags)
+      let ids = "";
+      tags.forEach(tag=>{
+        ids += tag.id + ',';
+      })
+      this.courseInfo.tags = ids;
+    },
     showChooseOrg(){
        this.$refs.refChooseOrg.dlgShow = true;
     },
@@ -747,6 +740,7 @@ export default {
       this.$emit('close');
     },
     initShow(editData) {
+      console.log('初始化显示内容============', editData)
       //console.log(this.$refs.weikePanel,'this.$refs.weikePanel');
       //this.$refs.weikePanel.init();
       //this.$refs.onlineCourse.resetData();
@@ -794,6 +788,8 @@ export default {
       this.tips=[];
 
       if (!editData) {
+        this.tips=[];
+        this.courseTags=[],
         //console.log("新建课程？");
         //以下为了保证初始化处理
         this.weikeReset = Math.round(Math.random()) + '';
@@ -890,6 +886,8 @@ export default {
         if (rs.status == 200) {
           this.courseChooseShow = false;
           this.courseInfo = rs.result;
+          this.curCourseId = this.courseInfo.id
+          console.log('保存课程成功',this.curCourseId)
           if (this.courseChooseId == 1) {
             this.weike.dlgShow = true;
           } else {
@@ -910,30 +908,16 @@ export default {
       this.courseCoverurl = '';
       this.courseInfo.coverImg = '';
     },
-    //获取字典信息
-    async getDictIds() {
-      console.log("--- 获取字典信息 1  = ", this.dicts);
-      try {
-        const response = await apiCourse.getDictIds(637, 1); // 确保返回 Promise
-        console.log("--- 获取字典信息 2 result= ", response);
-
-        if (response.status === 200) {
-          this.dicts = response.result.dicts; // 正确提取 dicts
-          console.log("--- 获取字典信息 3 = ", this.dicts);
-        }
-      } catch (error) {
-        console.error("获取字典信息失败：", error);
-      }
-    },
     //获取课程信息
     async getDetail(id) {
       this.curCourseId = id;
       this.orgName='';
-      this.isPermission = false;
-        let $this = this;
+      let $this = this;
       try {
         const { result, status } = await apiCourse.detail(id);
         if (status === 200) {
+          this.courseTags = result.tagList;
+          console.log('获取课程信息成功', this.courseTags);
           //把数据附给三个对象
           if(result.course.visible==''){
             result.course.visible=false;
@@ -947,10 +931,7 @@ export default {
           this.contentInfo.list = result.contents;
           this.sectionInfo.list = result.sections;
           this.courseTeachers = result.teachers; //课程的老师信息
-          this.isPermission = result.isPermission; //课程的老师信息
-          this.dicts = result.dicts; //课程的老师信息
-          console.log("--- 编辑查看 this.isPermission  = ",this.isPermission)
-          console.log("--- 编辑查看 this.dicts  = ",this.dicts)
+
           if(!this.courseInfo.orgId){
             //根据课程创建者获取机构id
             apiUser.getOrgSimpleByUserId(result.course.sysCreateAid).then(ors=>{
@@ -1002,7 +983,6 @@ export default {
                }
             });
           }
-
           this.resOwnerArray=[];
           if (result.course.resOwner1 == '') {
             this.resOwnerArray.push(result.course.resOwner1);
@@ -1287,7 +1267,7 @@ export default {
         teachers: saveTeachers,
         crowds:crowds
       };
-      //console.log(postData);
+      console.log(postData);
       //this.btnLoading=false;
       apiCourse
         .saveBase(postData)

src/components/Course/courseTag.vue

@@ -0,0 +1,229 @@
+
+<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="sysTypeList.length === 0 ? '请先选择课程分类' : '请输入标签名称'"
+      @remove-tag="handleTagRemove"
+      @change="handleSelectionChange"
+      @keyup.enter.native="handleEnterKey"
+      @keyup.delete.native="handleDeleteKey"
+      ref="tagSelect"
+    >
+      <el-option
+        v-for="item in searchResults"
+        :key="item.id"
+        :label="item.tagName"
+        :value="item"
+      />
+    </el-select>
+  </div>
+</template>
+
+<script>
+import { debounce } from 'lodash'
+import apiCourseTag from '@/api/modules/courseTag.js'
+import { mapGetters } from 'vuex';
+
+export default {
+  props: {
+    courseId:{
+      type:String,
+      require:true,
+    },
+    sysTypeList:{
+      type:Array,
+      require:true,
+      default: []
+    },
+    maxTags: {
+      type: Number,
+      default: 10
+    },
+    // 添加：接收初始标签数据的props
+    initialTags: {
+      type: Array,
+      default: () => []
+    }
+  },
+  data() {
+    return {
+      selectedTags: [],
+      searchResults: [],
+      loading: false,
+      tagMap: new Map(),
+      inputBuffer: '',
+      params: {},
+      tag: {}
+    }
+  },
+  computed: {
+    ...mapGetters(['userInfo']),
+    displayTags() {
+      return this.selectedTags.map(tag =>
+        typeof tag === 'object' ? tag : this.tagMap.get(tag)
+      ).filter(Boolean)
+    }
+  },
+  created() {
+    this.debouncedSearch = debounce(this.doSearch, 500)
+    console.log("----------sysTypeList.length---------->"+this.sysTypeList.length)
+    console.log("----------sysTypeList.length---------->"+(this.sysTypeList.length===0))
+  },
+  // 添加：挂载时初始化标签数据
+  mounted() {
+    if (this.initialTags && this.initialTags.length > 0) {
+      this.selectedTags = this.initialTags;
+      this.searchResults = this.initialTags;
+      // 将初始标签添加到tagMap中，确保删除功能正常
+      this.initialTags.forEach(tag => {
+        if (tag.id) {
+          this.tagMap.set(tag.id, tag);
+        }
+      });
+    }
+  },
+  watch: {
+    // 监听课程ID变化，重置所有状态
+    courseId(newVal) {
+      this.resetTagState();
+    },
+    // 监听初始标签变化，重新加载
+    initialTags(newVal) {
+      this.selectedTags = newVal || [];
+      this.searchResults = newVal || [];
+      this.tagMap.clear(); // 清空旧缓存
+      newVal.forEach(tag => {
+        if (tag.id) this.tagMap.set(tag.id, tag);
+      });
+    }
+  },
+  methods: {
+    // 新增：重置标签状态的方法
+    resetTagState() {
+      this.selectedTags = [];
+      this.searchResults = [];
+      this.tagMap.clear();
+      this.loading = false;
+      this.params = {};
+    },
+    handleTagRemove(tagId) {
+      this.selectedTags = this.selectedTags.filter(id => id !== tagId)
+      this.$emit('change', this.displayTags)
+      // 清空输入框内容
+      if (this.$refs.tagSelect) {
+        const input = this.$refs.tagSelect.$refs.input
+        if (input) {
+          input.value = ''
+        }
+      }
+    },
+    removeTag(tagId) {
+      this.handleTagRemove(tagId)
+    },
+
+    // 新增：处理删除键事件
+    handleDeleteKey(event) {
+      // 如果输入框内容为空，不执行任何搜索
+      if (!event.target.value.trim()) {
+        this.searchResults = []
+      }
+    },
+
+    //按回车键，创建新标签
+    handleEnterKey(event) {
+      const inputVal = event.target.value?.trim()
+      if (!this.searchResults.length && inputVal && this.selectedTags.length < this.maxTags) {
+        this.createNewTag(event.target.value.trim())
+        event.target.value = ''
+      }
+    },
+
+    // 新增：处理选择变化事件
+    handleSelectionChange() {
+      this.$emit('change', this.displayTags)
+      // 选择标签后清空输入框
+      if (this.$refs.tagSelect) {
+        const input = this.$refs.tagSelect.$refs.input
+        if (input) {
+          input.value = ''
+        }
+      }
+    },
+    //创建新标签
+    async createNewTag(tagName) {
+      // 标签不能超过八个字
+      if (tagName.length > 8) {
+        this.$message.error('标签不能超过8个字')
+        return;
+      }
+      this.loading = true
+      try {
+        this.params.courseId = this.courseId;
+        this.params.tagName = tagName;
+        // 分类
+        if (this.sysTypeList.length > 0) {
+          this.params.sysType1 = this.sysTypeList[0]; //一级的id
+        }
+        if (this.sysTypeList.length > 1) {
+          this.params.sysType2 = this.sysTypeList[1]; //二级的id
+        }
+        if (this.sysTypeList.length > 2) {
+          this.params.sysType3 = this.sysTypeList[2]; //三级的id
+        }
+        const {result:newTag} = await apiCourseTag.createTag(this.params)
+        this.$message.success('标签创建成功');
+        this.searchResults.push(newTag)
+        console.log("----------newTag---------->",this.searchResults)
+        this.tagMap.set(newTag.id, newTag)
+        this.$emit('change', this.displayTags)
+      } finally {
+        this.loading = false
+      }
+    },
+    // 修改doSearch方法，添加搜索结果为空时的提示
+    async doSearch(query) {
+      if (!query.trim()) {
+        this.searchResults = []
+        return
+      }
+
+      this.loading = true
+      try {
+        const {result:tags} = await apiCourseTag.searchTags({tagName:query})
+        tags.forEach(item => {
+          this.tagMap.set(item.id, item)
+        })
+        this.searchResults = tags
+        // 当搜索结果为空时，提示用户可以按回车键创建标签
+        if (tags.length === 0) {
+          this.$message.info('无此标签，按回车键创建')
+        }
+      } finally {
+        this.loading = false
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+.tag-container {
+  position: relative;
+}
+.tag-preview {
+  margin-top: 8px;
+}
+.el-tag {
+  margin-right: 6px;
+  margin-bottom: 6px;
+}
+</style>

src/components/Portal/interactBar.vue

@@ -44,7 +44,7 @@
           <!-- <svg-icon v-else style="margin-right: 0;" :style="{'font-size':(size+2)+'px'}" :icon-class="isFavorite?'scactive2':'xihuan'"></svg-icon> -->
            <div v-else class="is_favorite" :class="isFavorite?'is_favorite_a':'is_favorite'"></div>
         </el-tooltip>
-        <span v-if="!courseExclusive" class="interact-bar-value"> {{ data.favorites? data.favorites:data.hasCollect?number(data.hasCollect):1}}</span>
+        <span v-if="!courseExclusive" class="interact-bar-value"> {{ data.favorites? data.favorites:0}}</span>
       </div>
       <div v-if="shares" @click="addShare()" :style="`min-width: ${nodeWidth};`" class="interact-bar-btn" :class="{cursor:!readonly}">
         <el-tooltip effect="light" content="分享" placement="top" :visible-arrow="false" popper-class="text-tooltip">
@@ -114,8 +114,6 @@ export default {
             shares:0,
             praises:0,
             views:0,
-             courseId:'',
-            courseName:''
           }
       }
     },
@@ -236,7 +234,7 @@ export default {
   created(){
   },
   mounted() {
-    if(this.data && (this.data.id||this.data.courseId) && !this.readonly){
+    if(this.data && this.data.id && !this.readonly){
        this.checkHas();
     }
 
@@ -310,7 +308,7 @@ export default {
         }
       let msgPageParams=this.pageParams;
       if(!msgPageParams){
-        msgPageParams=this.data.id ?this.data.id: this.data.courseId;
+        msgPageParams=this.data.id;
       }
       let message={
         content,
@@ -333,9 +331,9 @@ export default {
       })
     },
     checkHas(){
-      if(this.type>0 && !this.readonly && (this.data.id||this.data.courseId)){
+      if(this.type>0 && !this.readonly && this.data.id){
         if(this.favorites){
-          apiFavorites.has(this.type,(this.data.id || this.data.courseId)).then(rs=>{
+          apiFavorites.has(this.type,this.data.id).then(rs=>{
             if(rs.status==200 && rs.result){
               this.isFavorite=true;
             }else{
@@ -508,11 +506,9 @@ export default {
         return;
        }
       //需要判断是否已点赞，已点赞的不再加
-      console.log(this.data,'---------------');
-      
       let postData={
         objType:this.type,
-        objId:this.data.id ?this.data.id: this.data.courseId,
+        objId:this.data.id,
         title:'',
       }
       if(this.loading) {
@@ -520,7 +516,7 @@ export default {
         }
         this.loading=true;
       if(this.type==1){
-        postData.title=this.data.name?this.data.name:this.data.courseName;
+        postData.title=this.data.name;
       }else if(this.type==60){
         postData.title=this.data.content;
       } else if(this.type==5){
@@ -529,7 +525,7 @@ export default {
         postData.title=this.data.title;
       }
       if(this.isFavorite) {// 已经收藏，再次点击取消收藏
-        apiFavorites.remove(this.type,this.data.id ?this.data.id: this.data.courseId).then(res=>{
+        apiFavorites.remove(this.type,this.data.id).then(res=>{
           this.loading=false;
         if(res.status==200){
           this.isFavorite=false;
@@ -558,7 +554,7 @@ export default {
             this.$store.dispatch("unicomFavorites",true)
           }
           //if(this.type===2||this.type===4){
-            this.messageSave(this.data.id ?this.data.id: this.data.courseId,this.data.title,this.userInfo.name,this.data.sysCreateBy,this.data.sysCreateAid,'收藏了我发布的');
+            this.messageSave(this.data.id,this.data.title,this.userInfo.name,this.data.sysCreateBy,this.data.sysCreateAid,'收藏了我发布的');
           //}
           this.$message({message:'已加入收藏',type:'success'});
           //this.$emit('addFavorite',res.result);//添加收藏,如果是true代表添加成功，false代表已存在

src/components/PortalHeader.vue

@@ -13,9 +13,9 @@
               </router-link>
             </div>
             <div class="top-nav" :style="{color:textColor}" :class="current == 'course' ? activeNav : ''">
-              <a @click="handleChangeCourse">课程
+              <router-link to="/course">课程
                 <div :class="current == 'course' ? 'nav-bottbor' : ''"></div>
-              </a>
+              </router-link>
             </div>
             <div class="top-nav" :style="{color:textColor}" :class="current == 'case' ? activeNav : ''">
               <router-link to="/case">案例
@@ -214,12 +214,6 @@ export default {
     //this.loadPopupConfig();
   },
   methods: {
-    handleChangeCourse() {
-      const paths = ["/course","/qualityCourse"]
-      // 如果是 课程 和 精品课程， 那么就不再重定向
-      const needReload = paths.findIndex(e=> e === this.$route.path) === -1
-      if (needReload) this.$router.push({path: paths[0]})
-    },
 
     setCurIdentity(iden){
         this.$store.dispatch('SetCurIdentity',iden);

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/router/index.js

@@ -2,6 +2,7 @@ import Vue from 'vue'
 import VueRouter from 'vue-router'
 /* Layout */
 import Layout from '@/layout/index'
+import LayoutPortal from '@/layout/portal'
 import Grateful from '@/views/grateful'
 
 Vue.use(VueRouter)
@@ -361,15 +362,7 @@ export const constantRoutes = [{
     path: '/500',
     component: (resolve) => require(['@/views/error/500'], resolve),
     hidden: true
-  },
-  {
-    path: '/qualityCourse',
-    hidden: true,
-    component: (resolve) => require(['@/views/portal/course/qualityCourse'], resolve),
-    name: 'qualityCourse',
-    meta: {title: '精品课课程', keepAlive: true, icon: 'dashboard', noCache: true, affix: false},
   }
-
 ]
 
 const router = new VueRouter({

src/views/Index.vue

@@ -153,86 +153,9 @@
       </div>
     </div>
     <div class="xindex-content">
-      
       <!-- 推荐课程 -->
       <div class="modules xcontent2">
-        <!-- <div class="xcontent2-main"> -->
-          <!--内容块-->
-        
-          <!-- </div> -->
-           <!-- 精品课模块 -->
         <div class="xcontent2-main">
-          <div class="modules-title xindex-main" v-if="this.qusisityList.list.length > 0">
-            <!-- <span class="jin-text">精品课</span> -->
-             <div class="jin-zhe"></div>
-            <span class="quyer-tag" style="margin-left: 0px;">
-              <img class="modules-text" style="height: 28px;" src="../assets/images/course/courseTitle.png" alt="">
-            </span>
-            
-            <span class="more">
-              <router-link to="/qualityCourse">查看更多>></router-link>
-            </span>
-          </div>
-
-
-          
-          <div
-              v-for="(course, eIndex) in exquisiteList"
-              :key="'cc' + eIndex"
-              class="xindex-course courseBg"
-              style="position: relative;margin-top: 20px;"
-            >
-              <div style="position: absolute; right: 25px; bottom: 72px">
-                <interactBar
-                  nodeWidth="20px"
-                  :courseExclusive="true"
-                  :type="1"
-                  :data="course"
-                  :comments="false"
-                  :praises="false"
-                  :shares="false"
-                  :views="false"
-                >
-                </interactBar>
-                <!-- <svg-icon style="font-size: 32px;margin-top: -5px;" icon-class="collectedCourse"></svg-icon> -->
-              </div>
-              <a @click="toCourseDetail(course)">
-                <div class="xindex-course-image">
-                  <course-image :course="course"></course-image>
-                  <!-- <span v-if="course.type == 20 || 10" class="course-type"
-                    >录播课</span
-                  > -->
-                  <img v-if="course.type == 20 || 10" src="../assets/images/course/courseTag.png" class="course-type" style="background: none;" alt="">
-                </div>
-                <div
-                  style="width: 80%"
-                  :title="course.courseName"
-                  class="course-title portal-title-tow two-line-ellipsis"
-                >
-                  {{ course.courseName }}
-                </div>
-                <div class="course-author">
-                  <div class="course-author-left">
-                    {{ course.authorInfo.name }}
-
-                    <span class="study-num"
-                      >{{ formatNum(course.studyNum) }}人学习</span
-                    >
-                  </div>
-                  <div style="display: flex">
-                    <div v-if="course.courseScore">
-                      <span class="course-score-value" style="margin-left: 10px"
-                        >{{ toScore(course.courseScore) }}分</span
-                      >
-                    </div>
-                    <div v-else class="course-score-no">未评分</div>
-                  </div>
-                </div>
-              </a>
-            </div>
-
-
-        
           <!--内容块-->
           <div class="modules-title xindex-main">
             <span class="modules-text">推荐课程</span>
@@ -1214,9 +1137,6 @@ export default {
         orderType: 2,
         list: [],
       },
-      qusisityList: {
-        list: [],
-      },
       // 推荐课程
       recommendedList:{
         list: [],
@@ -1244,7 +1164,6 @@ export default {
   },
   mounted() {
     this.getCourseData(1);
-    this.getEsqusiteList();
     this.getRecommendList();
     this.getPositive()
     this.getCaseData();
@@ -1308,10 +1227,6 @@ export default {
     courseComputedTwoList(){
       return this.courseList.list.slice(3)
     },
-    // 精品课展示
-    exquisiteList() { 
-      return this.qusisityList.list.slice(0,3)
-    },
   },
   methods: {
     getPositive() {
@@ -1506,27 +1421,21 @@ export default {
       //二期调整，直接改成一个地址
       //return this.webBaseUrl + '/course/detail?id=' + item.id;
       let $this = this;
-      let cId = "";
-      if (item.id) {
-        cId = item.id;
-      } else {
-        cId = item.courseId;
-      }
       if (item.type == 10) {
         //return this.webBaseUrl + "/course/studyindex?id=" + item.id;
         //console.log("直接进入学习页面");
-        this.$router.push("/course/studyindex?id=" + cId);
+        this.$router.push("/course/studyindex?id=" + item.id);
       } else if (item.type == 20) {
-        apiCourseStudy.hasSignup(cId).then((rs) => {
+        apiCourseStudy.hasSignup(item.id).then((rs) => {
           if (rs.status == 200) {
-            //return $this.webBaseUrl + "/course/studyindex?id=" + cId;
-            this.$router.push("/course/studyindex?id=" + cId);
+            //return $this.webBaseUrl + "/course/studyindex?id=" + item.id;
+            this.$router.push("/course/studyindex?id=" + item.id);
           } else {
-            //return $this.webBaseUrl + "/course/detail?id=" + cId;
-            this.$router.push("/course/detail?id=" + cId);
+            //return $this.webBaseUrl + "/course/detail?id=" + item.id;
+            this.$router.push("/course/detail?id=" + item.id);
           }
         });
-        //return $this.webBaseUrl + "/course/detail?id=" + cId;
+        //return $this.webBaseUrl + "/course/detail?id=" + item.id;
       }
     },
     orderTypeFilter(val) {
@@ -1563,29 +1472,6 @@ export default {
         }
       })
     },
-    //精品课展示
-    getEsqusiteList(){
-      let course = {
-        aid: this.userInfo.aid,
-      }
-      apiIndex.qualitylist(course).then((res) => { 
-         let courseIds = [];
-          res.data.result.forEach((item) => {
-            item.authorInfo = {
-              aid: "",
-              name: "",
-              orgInfo: "",
-              avatar: "",
-              code: "",
-              sex: null,
-            };
-            courseIds.push(item.courseId);
-          });
-          this.loadCouserTeacher(res.data.result, courseIds);
-        console.log(res.data.result,'--------------------------');
-        this.qusisityList.list = res.data.result;
-      })
-    },
     getCourseData(pageIndex) {
       this.isNext = false;
       let { orderType, num } = this.courseList;
@@ -1785,7 +1671,7 @@ export default {
           let userIds = [];
           list.forEach((item, index) => {
             cres.result.some((courseTeahcer) => {
-              if (courseTeahcer.courseId == (item.id||item.courseId)) {
+              if (courseTeahcer.courseId == item.id) {
                 if (courseTeahcer.teacherIds) {
                   userIds.push(courseTeahcer.teacherIds[0]);
                   item.authorInfo.aid = courseTeahcer.teacherIds[0];
@@ -2775,7 +2661,6 @@ export default {
     // padding-bottom: 10px;
     display: flex;
     justify-content: space-between;
-    margin-bottom: 20px;
 
     .course-author-left {
       font-size: 14px;
@@ -2827,15 +2712,6 @@ export default {
   display: flex;
 
   .modules-title {
-    position: relative;
-    .jin-zhe{
-      width: 410px;
-      height: 30px;
-      background: #f7f7f9;
-      position: absolute;
-      left: 86px;
-
-}
     .modules-text {
       height: 28px;
       font-size: 20px;
@@ -3133,26 +3009,4 @@ export default {
     }
   }
 }
-.courseBg{
-  // width: 332px;
-  // height: 323px;
-  // background: url("../assets/images/course/courseBackground.png") no-repeat;
-  // background-size: 100% 100%; /* 或 use 'contain' */
-  // background-position: center;
-  // border: none;
-  border-radius: 12px;
-  background: linear-gradient(135deg, #e6f7ff, #f0f8ff, #ffffff);
-  box-shadow: 0 4px 12px rgba(0, 0, 0, 0.05);
-  border: 1px solid #d9edf7;
-  //overflow: hidden;
-}
-.jin-text{
-  font-family: "Source Han Sans CN", "SourceHanSansCN", sans-serif !important;
-  font-weight: bold;
-  font-size: 20px;
-  color: #3E87F5;
-  // line-height: 29px;/
-  text-align: justify;
-  font-style: normal;
-}
 </style>

src/views/grateful/TeacherOpinion.vue

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

src/views/portal/course/Index.vue

@@ -43,7 +43,7 @@
                   :disabled="!twoList.children.length" :open-delay="0" :close-delay="0" trigger="hover"
                   :visible-arrow="false" @hide="leaveIndex" @show="changeIndex(twoList.id)" transition="none">
                   <div class="course-two-content" slot="reference">{{
-                    twoList.name }}</div>
+                    twoList.name }}</div>-
                   <!-- 内容 -->
                   <div class="course-three-box">
                     <div class="course-three-box-title">
@@ -284,32 +284,40 @@
           <!-- 内容导航 -->
           <div class="topNav" v-if="!newData">
             <div class="search-div nav" style="height: 100px;flex: 1;">
-              <div @click="handleTypeAllClick(1)" class="option-item" :class="{ 'option-active': ctypeTagAll }">
+              <div @click="handleTypeAllClick(1)" class="option-item" style="font-weight: bold" :class="{ 'option-active': ctypeTagAll }">
                 <a>全部</a>
                 <span :class="ctypeTagAll ? 'nav-bottbor' : ''"></span>
               </div>
-              <div @click="handleTypeClick(ctypeList[0], ctypeList)" class="option-item"
+              <div @click="handleTypeClick(ctypeList[0], ctypeList)" class="option-item" style="font-weight: bold"
                 :class="{ 'option-active': ctypeList[0].checked }">
                 <a>录播课</a>
                 <span :class="ctypeList[0].checked ? 'nav-bottbor' : ''"></span>
               </div>
-              <div @click="handleTypeClick(ctypeList[1], ctypeList)" class="option-item"
+              <div @click="handleTypeClick(ctypeList[1], ctypeList)" class="option-item" style="font-weight: bold"
                 :class="{ 'option-active': ctypeList[1].checked }">
                 <a>线下课</a>
                 <span :class="ctypeList[1].checked ? 'nav-bottbor' : ''"></span>
               </div>
-              <div @click="handleTypeClick(ctypeList[2], ctypeList)" class="option-item"
+              <div @click="handleTypeClick(ctypeList[2], ctypeList)" class="option-item" style="font-weight: bold"
                 :class="{ 'option-active': ctypeList[2].checked }">
                 <a>学习项目</a>
                 <span :class="ctypeList[2].checked ? 'nav-bottbor' : ''"></span>
               </div>
               <a class="option-item">
-                <span @click="uClassClick" class="Uxtext" style=""> U选小课堂
+                <span @click="uClassClick" class="Uxtext" style="font-weight: bold"> U选小课堂
                   <span class="uxicon">
                     <svg-icon icon-class="hot" style="font-size:22px"></svg-icon>
                   </span>
                 </span>
               </a>
+              <!-- 热点标签 add by zhengsongbo on 2025-08-01 -->
+              <div style="margin-top:10px;flex: 1;">
+                <div  class="option-item" style="padding-top: 2px"
+                     v-for="tag in hotTagsList" :key="tag.id"
+                      @click="handleTagClick(tag, hotTagsList)">
+                  <a class="custom" :class="tag.checked ? 'custom2' : ''">{{tag.tagName}}</a>
+                </div>
+              </div>
             </div>
             <div id="fixd-box" class="upload" style="margin-left: 26px;">
               <div v-if="identity == 2 || identity == 3 || identity == 5">
@@ -325,9 +333,11 @@
           <div v-if="stagList.length > 0 && !newData" class="search-div" style="padding: 0;margin-bottom: 20px;">
             <div class="searchbar" style="background-color:#f6f7fb;display: flex;justify-content: space-between;">
               <div style="line-height: 30px;">
-                <span class="item-title"> 搜索条件</span>
-                <el-tag closable v-for="(tag, tagIdx) in stagList" :key="'t' + tagIdx" @close="stagClose(tag, tagIdx)">{{
-                  tag.name }}</el-tag>
+                <span class="item-title"> 搜索条件:</span>
+                <el-tag closable v-for="(tag, tagIdx) in stagList" :key="'t' + tagIdx" @close="stagClose(tag, tagIdx)"
+                  :style="{ color: tag.type === 0 ? '#ff0000' : '' }">
+                  {{ tag.tagName }}
+                </el-tag>
               </div>
               <div>
                 <el-button type="primary" size="mini" @click="handleClearTags">清除</el-button>
@@ -361,6 +371,9 @@
                       <span v-if="cinfo.type == 40" class="course-type-left">学习项目</span>
                     </div>
                     <div class="course-title two-line-ellipsis" :title="cinfo.title" v-html="cinfo.name"></div>
+                    <el-tag v-for="tag in cinfo.tagList" v-if="cinfo.tagList && cinfo.tagList.length > 0" :style="{ color: '',margin: '5px'}">
+                      {{tag.tagName}}
+                    </el-tag>
                     <!-- 关键字 -->
                     <div class="keywordInfo-every">
                       <div class="keywordInfo" v-for="(keyword, index) in cinfo.keywordsActive" :key="index">
@@ -507,12 +520,14 @@ import apiTeacher from "@/api/modules/teacher.js";
 import apiUser from "@/api/system/user.js";
 import scene from "@/api/modules/scene.js";
 import apiUserbasic from "@/api/boe/userbasic.js";
+import apiManage from '@/api/manage/manage.js';
 import interactBar from "@/components/Portal/interactBar.vue";
 import courseImage from "@/components/Course/courseImage.vue";
 import { courseType, getType, toScore, formatDate, formatUserNumber, formatDateByFmt } from "@/utils/tools.js";
 import { deepClone, param } from "../../../utils";
 import apiSearchterm from "@/api/modules/searchterm.js";
 import apiPlace from "@/api/phase2/place.js"
+import apiCourseTag from '@/api/modules/courseTag.js'
 export default {
   name: "index",
   components: {
@@ -534,21 +549,43 @@ export default {
     },
     stagList() { //计算出选择的内容
       let list = [];
+
+      // 关键词
       if (this.keyword) {
         list.push({
           type: 0,
           id: 'keyword',
           name: this.keyword,
+          tagName: this.keyword,
           checked: true
-        })
+        });
       }
+
+      // 课程类型
       this.ctypeList.forEach(item => {
         if (item.checked) {
-          list.push(item);
+          list.push({
+            ...item,
+            tagName: item.name
+          });
         }
       });
+
+      // 热点标签 - 这是关键修复
+      this.hotTagsList.forEach(item => {
+        if (item.checked) {
+          list.push({
+            ...item,
+            name: item.tagName || item.name,
+            tagName: item.tagName || item.name,
+            type: 14
+          });
+        }
+      });
+
+      // 三级分类
       this.oneList.forEach(one => {
-        var twoChildChecked = false;//是否有下级
+        var twoChildChecked = false;
         one.children.forEach(two => {
           if (two.checked) {
             twoChildChecked = true;
@@ -556,34 +593,28 @@ export default {
           var threeChildChecked = false;
           two.children.forEach(three => {
             if (three.checked) {
-              list.push(three);
+              list.push({
+                ...three,
+                tagName: three.name
+              });
               threeChildChecked = true;
             }
           });
           if (two.checked && !threeChildChecked) {
-            list.push(two);
+            list.push({
+              ...two,
+              tagName: two.name
+            });
           }
         });
         if (one.checked && !twoChildChecked) {
-          list.push(one);
+          list.push({
+            ...one,
+            tagName: one.name
+          });
         }
-      })
-      // this.oneList.forEach(item=>{
-      //   if(item.checked){
-      //     list.push(item);
-      //   }
-      // });
-      // this.twoList.forEach(item=>{
-      //   if(item.checked){
-      //     list.push(item);
-      //   }
-      // });
-      // this.threeList.forEach(item=>{
-      //   if(item.checked){
-      //     list.push(item);
-      //   }
-      // });
-      //console.log(list,'list');
+      });
+
       return list;
     },
     ctypeTagAll() {
@@ -613,12 +644,14 @@ export default {
   },
   data() {
     return {
+      hotTagsList: [],
       newData: false,//线上品牌系列隐藏
       navTitle: [],
       // 设置高亮
       twoId: '',
       count: 0,//分页总条条数
       showUClass: false,
+      projectDialogVisible: false,
       ctypeList: [
         { type: 1, id: 20, name: '录播课', checked: false },
         { type: 1, id: 30, name: '线下课', checked: false },
@@ -629,7 +662,7 @@ export default {
       twoList: [], //二级分类{type:12}
       threeList: [],//三级分类{type:13}
       searching: false,//是否正在搜索中
-
+      studentInfo: {},
       resonimg: {},
       formatDate,
       formatNum: formatUserNumber,
@@ -687,6 +720,17 @@ export default {
         console.log(rs.message);
       }
     })
+    //初始化:获取最新前10个热点标签
+      apiCourseTag.getHotTagList(null).then(rs => {
+      if (rs.status == 200) {
+        this.hotTagsList = rs.result.map(tag => ({
+          ...tag,
+          checked: false
+        }));
+      } else {
+        console.log(rs.message);
+      }
+    })
   },
   mounted() {
     let screenWidth = window.screen.availWidth;
@@ -852,10 +896,54 @@ export default {
     //搜索条件
     stagClose(tag, tagIndex) {
       tag.checked = false;
+
+      // 根据标签类型处理不同的清除逻辑
       if (tag.type == 0) {
+        // 关键词类型
         this.keyword = '';
+      } else if (tag.type == 1) {
+        // 课程类型（录播课、线下课、学习项目）
+        this.ctypeList.forEach(item => {
+          if (item.id == tag.id) {
+            item.checked = false;
+          }
+        });
+      } else if (tag.type == 14) {
+        // 热点标签类型
+        this.hotTagsList.forEach(item => {
+          if (item.id == tag.id) {
+            item.checked = false;
+          }
+        });
+
+        // 更新course.tags，移除被删除的热点标签
+        const checkedHotTags = this.hotTagsList.filter(tag => tag.checked);
+        let tagIds = checkedHotTags.map(tag => tag.id).join(',');
+        this.course.tags = tagIds;
+
+      } else if (tag.type == 11 || tag.type == 12 || tag.type == 13) {
+        // 三级分类标签
+        this.oneList.forEach(one => {
+          if (one.id == tag.id) {
+            one.checked = false;
+          }
+          one.children.forEach(two => {
+            if (two.id == tag.id) {
+              two.checked = false;
+            }
+            two.children.forEach(three => {
+              if (three.id == tag.id) {
+                three.checked = false;
+              }
+            });
+          });
+        });
       }
-      this.navTitle = []
+
+      // 重置导航标题
+      this.navTitle = [];
+
+      // 触发搜索更新
       this.searchData();
     },
 
@@ -893,28 +981,33 @@ export default {
       this.searchData();
     },
     // 清除
-    handleClearTags() {
-      //清空所有的条件
-      this.keyword = '';
-      this.ctypeList.forEach(item => {
-        item.checked = false;
+handleClearTags() {
+  //清空所有的条件
+  this.keyword = '';
+  this.ctypeList.forEach(item => {
+    item.checked = false;
+  });
+  this.hotTagsList.forEach(item => {
+    item.checked = false;
+  });
+  this.course.tags = ''; // 清空标签ID
+
+  // 添加清除三级分类的逻辑
+  this.oneList.forEach(one => {
+    one.checked = false;
+    one.children.forEach(two => {
+      two.checked = false;
+      two.children.forEach(three => {
+        three.checked = false;
       });
-      this.oneList.forEach(one => {
-        one.checked = false;
-        one.children.forEach(two => {
-          two.checked = false;
-          two.children.forEach(three => {
-            three.checked = false;
-          })
-        })
-      });
-      this.twoList = [];
-      this.threeList = [];
-      this.navTitle = [];
-      this.newData = false;
-      sessionStorage.removeItem(this.localSessionKey)
-      this.searchData();
-    },
+    });
+  });
+
+  // 清空导航标题
+  this.navTitle = [];
+
+  this.searchData();
+},
     // 导航切换(录播课，线下课，学习项目)
     handleTypeClick(item, list) {
       item.checked = !item.checked;
@@ -926,11 +1019,24 @@ export default {
 
       this.searchData();
     },
+    //点击标签
+    handleTagClick(item, list) {
+      item.checked = !item.checked;
+
+      // 更新course.tags
+      const checkedTags = this.hotTagsList.filter(tag => tag.checked);
+      let tagIds = checkedTags.map(tag => tag.id).join(',');
+      this.course.tags = tagIds;
+
+      // 强制触发stagList重新计算
+      this.$nextTick(() => {
+        this.searchData();
+      });
+    },
     //三级分类
     handleOptionClick(item, level, list) {
       // 线上品牌展示效果
       this.newData = item.newData;
-      console.log(this.newData);
       // 单选，排除法
       this.oneList.forEach(one => {
         one.checked = false;
@@ -1307,12 +1413,18 @@ export default {
     },
     getAllChecked() { //获取全部选中的标签
       let list = [];
-
+      //获取选中的课程类型
       this.ctypeList.forEach(item => {
         if (item.checked) {
           list.push(item);
         }
       });
+      //获取选中的热点标签
+      this.hotTagsList.forEach(item => {
+        if (item.checked) {
+          list.push(item);
+        }
+      });
       this.oneList.forEach(one => {
         one.children.forEach(two => {
           two.children.forEach(three => {
@@ -1375,7 +1487,18 @@ export default {
           that.course.sysType3 += item.id;
         }
       });
-
+      apiCourseTag.getHotTagList(that.course).then(rs => {
+        if (rs.status == 200) {
+          // 保留已选中标签的状态
+          const currentCheckedTags = this.hotTagsList.filter(tag => tag.checked);
+          this.hotTagsList = rs.result.map(tag => ({
+            ...tag,
+            checked: currentCheckedTags.some(checkedTag => checkedTag.id === tag.id)
+          }));
+        } else {
+          console.log(rs.message);
+        }
+      }),
       this.isFind = true;
       this.course.device = 1;
       if (this.course.pageIndex == 1) {
@@ -1417,7 +1540,7 @@ export default {
               item.name = item.name;
             }
           });
-console.log(res.result.list,'data')
+          console.log(res.result.list,'data')
           this.courseList = res?.result?.list ?? []
           console.log(this.courseList);
           if (this.newData) {
@@ -2421,4 +2544,73 @@ console.log(res.result.list,'data')
 
 .option-active {
   color: #387DF7;
-}</style>
+}
+  /* 项目简介 方法一：外部 CSS 类 */
+::v-deep.el-dialog {
+  border-radius: 3% 3% 1% 1%;
+  padding: 0;
+}
+::v-deep.custom-class .el-dialog__header {
+  height: 100px;
+  margin: 0 !important;
+  padding: 0 !important;
+  background-image: url('../../../assets/images/project/title-bg.png');
+  background-size: 100% 100%;  /* 完全填充 */
+  display: block;             /* 避免行内元素空隙 */
+}
+::v-deep.custom-class .el-dialog__header .el-dialog__title {
+  padding: 0 !important;
+  font-size: 35px;
+  font-weight: bold;
+  color: white;
+  margin: 60px;
+  line-height: 100px;
+}
+::v-deep.custom-class .el-dialog__body {
+  margin: 0 !important;
+  padding: 0 !important;
+}
+/* ---end--- */
+/* ---标签管理 added by zhengsongbo on 2025-08-01--- */
+.search-div.nav {
+  display: block;
+  width: 100%;
+  clear: both;
+}
+.option-item {
+  margin: 0px 5px;
+}
+/* 热点标签：自定义按钮样式 */
+a.custom {
+  /* 基础样式 */
+  display: inline-block; /* 使内边距生效 */
+  padding: 1px; /* 按钮内边距 */
+  margin: 1px 5px;
+  background-color: #F2F2F2; /* 淡灰色背景 */
+  color: #333; /* 文字颜色 */
+  text-decoration: none; /* 去除下划线 */
+  border-radius: 3px; /* 圆角设计 */
+  font-family: Arial, sans-serif; /* 字体 */
+  font-size: 14px; /* 文字大小 */
+  height: 24px;
+  line-height: 20px;
+  /* 过渡效果，使颜色变化更平滑 */
+  transition: background-color 0.2s ease;
+}
+
+/* 鼠标悬停效果 */
+a.custom:hover {
+  background-color: #DDEDFF; /* 浅蓝色背景 */
+}
+
+/* 可选：点击时效果 */
+a.custom:active {
+  background-color: #757575; /* 点击时更深的灰色 */
+}
+
+/* 鼠标悬停效果 */
+a.custom2 {
+  background-color: #DDEDFF; /* 浅蓝色背景 */
+}
+/* ---end--- */
+</style>

src/views/study/coursenew.vue

@@ -177,7 +177,7 @@
             </div>
             <!-- 课程单元  -->
             <div class="course-units" v-if="tab == 1">
-              <div :style="`height: ${controlHeight}px;overflow-y: auto;`">
+              <div style="min-height: 350px;max-height: 650px ;overflow-y: auto;">
                 <div class="catalog" v-if="courseInfo.type == 20">
                   <div  v-for="(item, index) in catalogTree" :key="index" :name="index">
                     <el-menu
@@ -816,7 +816,8 @@
           }else if(h>500){
             h=h+60;
           }
-          $this.controlHeight=h-95;
+          // 移除高度控制 防止内容塌陷
+            // $this.controlHeight=h-95;
         })
 
 
@@ -1689,9 +1690,9 @@
             courseId: this.courseId,
             cnum: this.totalContent
           }
-          this.contentData.status = 9;
           apiVideoStudy.finishStudyItem(params).then(res => {
             if (res.status == 200) {
+              this.contentData.status = 9;
               this.contentData.progress = 100;
             } else {
               console.log("记录完成学习失败:" + res.message + "，" + res.error);
@@ -1800,7 +1801,7 @@
     margin: 20px auto;
     .course-playbox {
       background-color: #fff;
-      min-height: 400px;
+      //min-height: 400px;
       display: flex;
       justify-content: space-between;
       .course-player-container {

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>