From b00e2c80b083dfb3adabd1b60f547f0af08f891d Mon Sep 17 00:00:00 2001
From: 670788339 <670788339@qq.com>
Date: Mon, 3 Nov 2025 13:24:48 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=98=E5=8E=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Course/courseForm.vue | 553 +++++++++++++++++++--------
 src/components/Course/courseTag.vue  | 139 +++----
 2 files changed, 449 insertions(+), 243 deletions(-)

diff --git a/src/components/Course/courseForm.vue b/src/components/Course/courseForm.vue
index 876ce236..1641dfc3 100644
--- a/src/components/Course/courseForm.vue
+++ b/src/components/Course/courseForm.vue
@@ -10,16 +10,37 @@
               <el-radio v-model="courseInfo.type" :label="10">否</el-radio>
             </div>
           </el-form-item>
+          <!--  <div style="margin-top:40px">适合您<span style="color:#e83d3a;font-size: 16px;">快速</span>分享<span style="color:#e83d3a;font-size: 16px;">单一</span>的视频、音频或者文档制作说明</div> -->
+          <!-- <div v-show="courseExample == 1">适合您<span class="tip">快速</span>分享<span class="tip">单一</span>的视频、音频或者文档制作说明</div>
+          <div v-show="courseExample == 2">适合您分享<span class="tip">体系化</span>、<span class="tip">结构化</span>的课程内容制作说明</div>
+          -->
         </el-form>
       </div>
+      <!-- <div style="height:100px"></div> -->
       <div style="text-align: center;height: 80px;padding-top:30px">
            <span slot="footer" class="dialog-footer">
             <el-button @click="courseChooseShow = false">取 消</el-button>
             <el-button @click="toInputCourse()" type="primary">确定</el-button>
           </span>
-      </div>
-    </el-dialog>
+        <!-- style="height: 200px;" -->
+        <!-- 微课示意图 -->
+        <!-- <div v-if="courseExample == 1">
 
+          <div class="example"><el-image style="width: 100%; height: 100% ; vertical-align: top; " fit="contain" :src="`${webBaseUrl}/images/weiSketch.svg`"></el-image></div>
+        </div> -->
+        <!-- 录播课示意图 -->
+        <!-- <div v-if="courseExample == 2">
+          <div class="example">
+            <el-image style="width: 100%; height: 100%" fit="contain" :src="`${webBaseUrl}/images/luSketch.svg`"></el-image>
+
+          </div>
+        </div> -->
+      </div>
+      <!-- <span slot="footer" class="dialog-footer">
+        <el-button @click="courseChooseShow = false">取 消</el-button>
+        <el-button @click="toInputCourse()" type="primary">确定</el-button>
+      </span> -->
+    </el-dialog>
     <!--微课-->
     <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;">
@@ -32,8 +53,10 @@
             </div>
             <el-form-item label="名称" required><el-input maxlength="90" v-model="courseInfo.name" show-word-limit placeholder="课程名称(限90字以内)"></el-input></el-form-item>
             <el-form-item label="封面图片" v-show="!weike.onlyRequired">
+              <!-- 上传封面图-->
               <div style="display:flex">
                 <div @click.stop="chooseFile">
+                  <!-- <image :src="courseCoverurl" style="width:160px;height:90px" width="160px" height="90px"></image> -->
                   <imageUpload :disabled="true" :value="courseCoverurl" width="160px" height="90px" @success="uploadCoverImgSuccess" @remove="removeCoverImgSuccess"></imageUpload>
                 </div>
                 <span style="margin-left:10px;font-size: 12px;">
@@ -67,6 +90,22 @@
               <el-col :span="6"><el-checkbox v-model="courseInfo.openCourse" :true-label="1" :false-label="0">公开课</el-checkbox></el-col>
             </el-form-item>
             <el-form-item label="授课教师" required>
+              <!--授课老师默认是当前操作人-->
+              <!-- <el-select
+                style="width: 100%;"
+                v-model="teacherValues"
+                multiple
+                filterable
+                remote
+                value-key="teacherId"
+                ref="elSelect"
+                reserve-keyword
+                placeholder="请输入授课教师姓名"
+                @change="changeTeachers"
+                :remote-method="remoteFindTeacher"
+                :loading="loading">
+                <el-option v-for="item in teacherDownList" :key="item.teacherId" :label="item.teacherName + item.teacherCode" :value="item"></el-option>
+              </el-select> -->
               <choice :teacherValue="teacherValues" @getTeacherList="getTeacherList"></choice>
             </el-form-item>
             <el-form-item label="目标人群" required>
@@ -83,7 +122,21 @@
             <el-form-item label="课程价值" v-if="!weike.onlyRequired">
               <el-input maxlength="200" v-model="courseInfo.value" show-word-limit placeholder="课程价值(限200字以内)"></el-input>
             </el-form-item>
+            <!-- <el-form-item label="系统标签" v-if="!weike.onlyRequired">
+                    <el-select style="width: 100%;" :allow-create="true"
+                      v-model="showTags"
+                      multiple
+                      filterable
+                      remote
+                      reserve-keyword
+                      placeholder="请输入关键词"
+                      :remote-method="remoteTagMethod"
+                      :loading="loading">
+                      <el-option  v-for="item in tagList" :key="item.id"  :label="item.name" :value="item.name"> </el-option>
+                    </el-select>
+                </el-form-item> -->
             <el-form-item  v-if="!weike.onlyRequired" label="关键字">
+              <!-- <el-input v-model="courseInfo.keywords" maxlength="100" show-word-limit placeholder="请输入关键字(限100字以内)"></el-input> -->
               <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)">{{ tag }}</el-tag>
             </el-form-item>
@@ -111,6 +164,25 @@
           <el-col :span="14">
             <div @click="checkCourse"><weikeContent ref="weikeContent" :reset="weikeReset" :contents="contentInfo.list" :course="courseInfo" min-height="644px"></weikeContent></div>
           </el-col>
+          <!-- <el-form-item label="完成规则" v-if="!weike.onlyRequired"><el-input maxlength="50" v-model="courseInfo.passFormula"  placeholder="可基于组织树或受众选择"></el-input></el-form-item> -->
+          <!-- <el-form-item label="开放权限" v-if="!weike.onlyRequired"><el-input maxlength="50" v-model="courseInfo.openObject"  placeholder="可基于组织树或受众选择"></el-input></el-form-item> -->
+          <!-- <el-col :span="24">
+            <el-form-item v-if="!weike.onlyRequired" label="课程简介">
+              <el-input
+                type="textarea"
+                maxlength="150"
+                show-word-limit
+                :rows="2"
+                v-model="courseInfo.summary"
+                placeholder="请尽量填写课程简介(限255字以内)，用于列表中显示，可以让用户更容易了解课程信息"
+              ></el-input>
+            </el-form-item>
+          </el-col> -->
+          <!-- <el-col :span="24">
+              <el-form-item v-if="!weike.onlyRequired" label="课程描述">
+                <WxEditor v-model="courseInfo.overview" :minHeight="50"></WxEditor>
+              </el-form-item>
+            </el-col> -->
         </el-row>
       </el-form>
 
@@ -118,15 +190,16 @@
       <span slot="footer" class="dialog-footer">
         <span class="red-tip">注：有分项内容保存的，请先保存分项内容再提交</span>
          <el-checkbox style="margin-right:10px" v-if="curCourseId != ''" v-model="checked"></el-checkbox><span v-if="curCourseId != ''" style="font-size:14px;color:#787878;">我已阅读并遵守<span style="color:#588afc;margin-right:10px;cursor: pointer;" @click="courseInfoFormCheckedShow = true">平台内容发布要求</span></span>
+        <!-- <el-button v-if="curCourseId!=''  && contentInfo.list.length>0">预览</el-button> -->
         <el-button :loading="btnLoading" v-if="curCourseId != ''" :disabled="!checked" @click="submitCourse()" type="primary">提交审核</el-button>
         <el-button @click="closeForm()">关闭</el-button>
       </span>
     </el-dialog>
-
     <!--录播课-->
     <el-dialog v-if="biaoke.dlgShow" width="980px" :title="curCourseId == '' ? '新建课程' : '编辑课程'" :visible.sync="biaoke.dlgShow" :close-on-click-modal="false" custom-class="g-dialog" top="8vh">
       <el-tabs v-model="biaoke.tabIndex" @tab-click="changeBiaokeTab" style="min-height: 600px;">
         <el-tab-pane label="课程信息" name="base" style="width: 90%;">
+          <!-- :rules="rulesTwo" -->
           <el-form label-width="80px" size="mini">
             <el-form-item label="名称" required>
               <el-col :span="18">
@@ -137,11 +210,13 @@
             <el-form-item label="封面图片">
               <el-col :span="12">
                 <div style="display:flex">
+                  <!-- 上传图片 -->
+                  <!-- {{courseCoverurl}} -->
                   <div @click.stop="chooseFile">
                     <imageUpload :disabled="true" :value="courseCoverurl" width="160px" height="90px" @subimage="acceptimage" @success="uploadCoverImgSuccess" @remove="removeCoverImgSuccess"></imageUpload>
                   </div>
                   <span style="margin-left:20px">
-                    高宽比为16:9 (如:800 * 450)<br/>png或jpg图片<br/>不要大于2M
+                    高宽比为16:9 (如:800*450)<br/>png或jpg图片<br/>不要大于2M
                   </span>
                 </div>
               </el-col>
@@ -163,6 +238,22 @@
                   </el-select>
                 </el-form-item>
                 <el-form-item label="授课教师" required>
+                  <!--授课老师默认是当前操作人-->
+                  <!-- <el-select
+                    style="width: 100%;"
+                    v-model="teacherValues"
+                    multiple
+                    filterable
+                    remote
+                    value-key="teacherId"
+                    ref="elSelect"
+                    reserve-keyword
+                    placeholder="请输入授课教师姓名"
+                    @change="changeTeachers"
+                    :remote-method="remoteFindTeacher"
+                    :loading="loading">
+                    <el-option v-for="item in teacherDownList" :key="item.teacherId" :label="item.teacherName + item.teacherCode" :value="item"></el-option>
+                  </el-select> -->
                   <choice :teacherValue="teacherValues" @getTeacherList="getTeacherList"></choice>
                 </el-form-item>
                 <el-form-item label="标签" required>
@@ -191,12 +282,30 @@
                 </el-form-item>
               </el-col>
             </el-form-item>
-            <el-form-item label="受众">
+            <el-form-item label="受众"><!--:disabled="item.disabled"-->
               <el-select value-key="id" style="width: 100%;" v-model="courseCrowds" filterable multiple :clearable="false" @remove-tag="removeCrowd"  placeholder="请选择">
                 <el-option v-for="item in userGroupList" :key="item.id"  :label="item.name" :value="item"></el-option>
               </el-select>
             </el-form-item>
             <el-form-item label="课程价值"><el-input maxlength="200" v-model="courseInfo.value" show-word-limit placeholder="课程价值(限200字以内)"></el-input></el-form-item>
+            <!-- <el-form-item label="系统标签" >
+              <el-col :span="14">
+                <el-select style="width: 100%;" :allow-create="true"
+                  v-model="showTags"
+                  multiple
+                  filterable
+                  remote
+                  reserve-keyword
+                  placeholder="请输入关键词"
+                  :remote-method="remoteTagMethod"
+                  :loading="loading">
+                  <el-option  v-for="item in tagList" :key="item.id"  :label="item.name" :value="item.name"> </el-option>
+                </el-select>
+              </el-col>
+              <el-col :span="10">
+                <el-form-item label="关键字"><el-input v-model="courseInfo.keywords"  maxlength="50" placeholder="关键字"></el-input></el-form-item>
+              </el-col>
+            </el-form-item> -->
             <el-form-item label="观看设置">
               <el-col :span="14">
                 <el-radio v-model="courseInfo.device" :label="1">PC端可见</el-radio>
@@ -212,6 +321,8 @@
                 </el-form-item>
               </el-col>
             </el-form-item>
+            <!-- <el-form-item label="完成规则" ><el-input maxlength="50" v-model="courseInfo.passFormula"  placeholder="可基于组织树或受众选择"></el-input></el-form-item> -->
+            <!-- <el-form-item label="开放权限" ><el-input maxlength="50" v-model="courseInfo.openObject"  placeholder="可基于组织树或受众选择"></el-input></el-form-item> -->
             <el-form-item label="课程简介">
               <el-input
                 type="textarea"
@@ -222,6 +333,10 @@
                 placeholder="请尽量填写课程简介，用于列表中显示，可以让用户更容易了解课程信息">
               </el-input>
             </el-form-item>
+            <!-- v-if="!weike.onlyRequired" -->
+            <!-- <el-form-item  label="课程描述">
+              <WxEditor v-model="courseInfo.overview" :minHeight="50"></WxEditor>
+            </el-form-item> -->
           </el-form>
         </el-tab-pane>
         <el-tab-pane label="课程内容" name="content" :disabled="curCourseId == ''">
@@ -229,6 +344,7 @@
             <el-aside width="300px">
               <div style="padding-left: 6px;height:30px">
                 <el-checkbox v-model="courseInfo.orderStudy">按顺序学习</el-checkbox>
+                <!-- <span class="cctree-title" style="margin-left:10px">课程内容</span> -->
                 <el-button type="text" icon="el-icon-setting" @click="catalogSortDialogOpen" style="float:right;margin-right:10px;height: 30px;">章节排序</el-button>
               </div>
               <div class="cctree" style="max-height: 470px;overflow: auto;">
@@ -273,7 +389,6 @@
         <el-button type="info" @click="closeForm()">关闭</el-button>
       </span>
     </el-dialog>
-
     <el-dialog title="章节排序" :visible.sync="catalogSortDialogShow" :close-on-click-modal="false" width="800px" custom-class="g-dialog">
       <div><catalogSort ref="catalogSort" v-if="catalogSortDialogShow" :treeData="catalogTree" :courseId="curCourseId"></catalogSort></div>
       <span slot="footer" class="dialog-footer">
@@ -281,20 +396,17 @@
         <el-button @click="saveCatalogSort" type="primary">确定</el-button>
       </span>
     </el-dialog>
-
     <el-dialog  class="checked-show"  :visible.sync="courseInfoFormCheckedShow" top="14vh" width="800px" :show-close="false" :modal="false">
       <agreement></agreement>
       <span slot="footer" class="dialog-footer">
           <el-button style="margin-right:10px" type="primary" @click="courseInfoFormCheckedShow = false">确 定</el-button>
         </span>
     </el-dialog>
-
     <!--选择图片-->
     <filecloud :show="dlgFileChoose.show" @choose="changeCourseImage" @close="choseChoose"></filecloud>
     <chooseOrg ref="refChooseOrg" @confirm="confirmChooseOrg"></chooseOrg>
   </div>
 </template>
-
 <script>
 import courseTag from "@/components/Course/courseTag.vue";
 import choice from '@/components/Course/choice.vue';
@@ -320,7 +432,6 @@ import { courseType, getType } from '../../utils/tools.js';
 import { mapGetters, mapActions } from 'vuex';
 import filecloud from '@/components/FileCloud/index.vue';
 import chooseOrg from '@/components/System/chooseOrg.vue';
-
 export default {
   props: {},
   components: { courseTag, weikeContent, catalogCourseware, imageUpload, WxEditor, catalogSort,agreement,filecloud,choice,chooseOrg},
@@ -348,6 +459,8 @@ export default {
         // 10微课，21在线课(直播)；20:在线课( 录播)；30:面授课；40:混合式，
         { id: 1, img: this.webBaseUrl + '/images/ctype1.png', name: '微课', info: '一种单一课件的课程', type: 10 },
         { id: 2, img: this.webBaseUrl + '/images/ctype20.png', name: '在线课', info: '在线-录播课', type: 20 }
+        // { id:3, img: '/temp/record.png', name: '在线课', info: '在线-直播课' ,type: 21},
+        // { id:4, img: '/images/ctype4.png', name: '面授课', info: 'XXXX',type: 30 }
       ],
       curCourseId: '', //当前课程的id
       curStepIndex: 1, //当前位于哪一步
@@ -462,7 +575,7 @@ export default {
     if(extendFlag && extendFlag=='choose'){
       this.visibleShow=true;
     }
-
+    //console.log("url参数",extendFlag,this.extendRefId,this.extendRefType)
     this.curStepIndex = 1; //回到第一步
     this.btnLoading = false;
     this.getResOwnerTree().then(rs => {
@@ -477,21 +590,6 @@ export default {
     this.loadUserGroup();
   },
   methods: {
-    // 修改：处理标签变化事件
-    handleTagsChange(tags, tagIdsString) {
-      console.log("父组件接收标签变化:", tags, "ID字符串:", tagIdsString);
-
-      // 限制最多5个标签
-      if (tags.length > 5) {
-        this.$message.warning('最多只能选择5个标签')
-        return
-      }
-
-      // 更新courseInfo.tags为ID字符串格式
-      this.courseInfo.tags = tagIdsString;
-      console.log("更新courseInfo.tags:", this.courseInfo.tags);
-    },
-
     // 关键字的更改
     changeKeywords(option){
       if(option.target.value){
@@ -499,44 +597,66 @@ export default {
       }
       this.keywords = ''
     },
-
     //关闭关键字
     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;
     },
-
     removeCrowd(e){
+      //console.log(e);
       if(e.disabled){
         this.$message.error("您不能移除创建人加的受众");
         this.courseCrowds.push(e);
         return false;
       }
     },
-
     confirmChooseOrg(orgInfo,parentInfo){
+      //console.log(orgInfo,'orgInfo');
+      // let hrbpData=orgInfo;
+      // if(!orgInfo.hrbpId){
+      //     hrbpData=parentInfo;
+      //     //没有，就直接找此机构的上级，如果没有上线就提示，如果有就不提示
+
+      // }
+      // if(hrbpData && (!hrbpData.hrbpId || hrbpData.hrbpId=='-1')){
+      //   this.$message.error("此机构及上级都无HRBP审核人信息，请重新选择");
+      //   return;
+      // }
       this.orgName=orgInfo.name;
-      this.orgKid=orgInfo.kid;
+      this.orgKid=orgInfo.kid; //kid已不存在
       this.courseInfo.orgId=orgInfo.id;
       this.courseInfo.orgName=orgInfo.name;
       this.$refs.refChooseOrg.dlgShow = false;
     },
-
     getTeacherList(res) {
       this.teacherValues = res;
     },
-
     chooseFile(){
       this.dlgFileChoose.show=true;
     },
-
     choseChoose(){
       this.dlgFileChoose.show=false;
     },
-
     changeCourseImage(img){
       if(!img.path){
         return;
@@ -545,19 +665,16 @@ export default {
       this.courseInfo.coverImg = img.path;
       this.courseCoverurl = this.fileUrl+img.path;
     },
-
     acceptimage(value){
       this.courseInfo.coverImg = value.path;
       this.courseCoverurl = value.path;
     },
-
     ...mapActions({
       getResOwnerTree: 'resOwner/getResOwnerTree',
       loadResOwners: 'resOwner/loadResOwners',
       getSysTypeTree: 'sysType/getSysTypeTree',
       loadSysTypes: 'sysType/loadSysTypes'
     }),
-
     loadUserGroup(){
       let $this=this;
       let params = {
@@ -565,7 +682,19 @@ export default {
         page:1,
         pageSize:500
       }
-
+      // apiUserGroup.findByName('').then(rs=>{
+      //    if(rs.status==200){
+      //      let crowdList=[];
+      //      rs.result.forEach(item=>{
+      //         crowdList.push({
+      //            id:item.key,
+      //            name:item.value,
+      //            disabled:false
+      //          })
+      //      })
+      //      this.userGroupList=crowdList;
+      //    }
+      // });
       apiUserBasic.getUserAudiences(params).then(rs=>{
         if(rs.status==200){
           let crowdList=[];
@@ -580,21 +709,18 @@ export default {
         }
       })
     },
-
     resOwnerName(code) {
       if (code == '') {
         return '';
       }
       return this.resOwnerMap.get(code);
     },
-
     sysTypeName(code) {
       if (code == '') {
         return '';
       }
       return this.sysTypeMap.get(code);
     },
-
     checkCourse() {
       if (this.courseInfo.id == '') {
         if (this.courseInfo.name == '') {
@@ -604,9 +730,10 @@ export default {
         this.saveAndNext(0);
       }
     },
-
     // 场景过滤
     sceneFilter(forScene) {
+      // sceneList
+      // this.courseInfo.forScene
       let name = '';
       this.sceneList.forEach(item => {
         if (item.id === forScene) {
@@ -615,16 +742,19 @@ export default {
       });
       return name;
     },
-
     closeForm() {
       this.weike.dlgShow = false;
       this.biaoke.dlgShow = false;
+      // this.courseInfo.checked = false;
       this.$emit('close');
     },
-
     initShow(editData) {
       console.log('初始化显示内容============', editData)
-
+      //console.log(this.$refs.weikePanel,'this.$refs.weikePanel');
+      //this.$refs.weikePanel.init();
+      //this.$refs.onlineCourse.resetData();
+      //刷新用户受众
+      //初始化显示内容
       this.btnLoading = false;
       this.curStepIndex = 1; //打开都是第一步
       this.courseCoverurl = '';
@@ -651,11 +781,9 @@ export default {
         refId:this.extendRefId,
         refType:this.extendRefType
       };
-
       if(this.extendRefId){
         this.courseInfo.visible=false;
       }
-
       this.contentInfo.list = [];
       this.sectionInfo.list = [];
       this.courseTeachers = [];
@@ -665,12 +793,14 @@ export default {
       this.teacherValues = [];
       this.courseCrowds=[];
       this.courseCoverurl = '';
+      // 关键字的清空
       this.tips=[];
 
       if (!editData) {
         this.tips=[];
         this.courseTags=[],
-
+          //console.log("新建课程？");
+          //以下为了保证初始化处理
           this.weikeReset = Math.round(Math.random()) + '';
         this.onlineReset = Math.round(Math.random()) + '';
         this.courseChooseShow = true;
@@ -683,35 +813,58 @@ export default {
         }
         this.orgKid='';
         if(this.courseInfo.orgId){
+          // apiOrg.getSimple(this.courseInfo.orgId).then(rrs=>{
+          //    if(rrs.status==200){
+          //      this.orgName=rrs.result.name;
+          //      this.orgKid=rrs.result.kid;
+          //      this.orgNamePath=rrs.result.namePath;
+          //    }
+          // });
           apiUserBasic.getOrgInfo(this.courseInfo.orgId).then(rs=>{
             if(rs.status==200){
               this.orgName=rs.result.name;
               this.courseInfo.orgName=rs.result.name;
+              //this.orgKid=rs.result.kid;
               this.orgNamePath=rs.result.namePath;
             }
           });
         }
 
       } else {
+        //console.log(editData,'editData');
         this.weikeReset = editData.id;
         this.onlineReset = editData.id;
+        //console.log("编辑课程？");
         this.courseInfo.orgId=editData.orgId;
-        this.curCourseId = editData.id;
-        this.courseInfo.type = editData.type;
-        this.getDetail(editData.id);
-
+        this.curCourseId = editData.id; //设置
+        this.courseInfo.type = editData.type; //设置课程类型，因为这里的课程对象可能不全，所以只能设置值，不能整个对象附值
+        this.getDetail(editData.id); //获取课程的详细信息
+        //设置,显示哪个
         if (editData.type === 10) {
           this.weike.dlgShow = true;
         } else if (editData.type === 20 || editData.type === 21) {
           this.biaoke.dlgShow = true;
         }
       }
-    },
 
+    },
     resetCurCourseContent() {
       this.curContent = { id: '', contentType: 0, contentName: '', content: '', csectionId: '', contentName: '', contentRefId: '', courseId: this.courseInfo.id };
     },
-
+    // chooseCourseType(item, idx, open) {
+    //   this.courseChooseId = item.id;
+    //   this.curDialogId = item.id;
+    //   this.courseInfo.type = item.type;
+    //   if (open) {
+    //     this.toInputCourse();
+    //   }
+    // },
+    showExample(ct) {
+      this.courseExample = ct.id;
+    },
+    // hideExample() {
+    //   this.courseExample = this.courseChooseId;
+    // },
     toInputCourse() {
       if (this.courseInfo.name == '') {
         this.$message.error('请填写课程名称');
@@ -726,7 +879,18 @@ export default {
       } else if(this.courseInfo.type == 20){
         this.courseChooseId = 2;
       }
-
+      // if (this.courseChooseId == 1) {
+      //   //点击确定的处理，打开微课的需要做哪些初始化
+      //   this.courseInfo.type = 10;
+      //   //this.$refs.weikePanel.init();
+      // } else if (this.courseChooseId == 2) {
+      //   //要开标课（录播课）需要哪些处理
+      //   this.courseInfo.type = 20;
+      //   //this.$refs.onlineCourse.resetData();
+      // } else {
+      //   this.$message.error('未指定课程类型');
+      //   return;
+      // }
       apiCourse.saveOnlyCourse(this.courseInfo).then(rs => {
         if (rs.status == 200) {
           this.courseChooseShow = false;
@@ -746,27 +910,25 @@ export default {
         }
       });
     },
-
     // 新增初始化标签方法
     initTagComponent() {
       if (this.$refs.courseTag) {
+        // 确保组件已渲染后再调用搜索
         setTimeout(() => {
           this.$refs.courseTag.debouncedSearch('');
         }, 100);
       }
     },
-
     //上传课程图片处理
     uploadCoverImgSuccess(res) {
+      //console.log(res,'res');
       this.courseInfo.coverImg = res.result.filePath;
       this.courseCoverurl = res.result.httpPath;
     },
-
     removeCoverImgSuccess() {
       this.courseCoverurl = '';
       this.courseInfo.coverImg = '';
     },
-
     //获取课程信息
     async getDetail(id) {
       this.curCourseId = id;
@@ -777,49 +939,71 @@ export default {
         if (status === 200) {
           this.courseTags = result.tagList;
           console.log('获取课程信息成功', this.courseTags);
-
+          //把数据附给三个对象
           if(result.course.visible==''){
             result.course.visible=false;
           }
-
+          // 给关键字赋值
           if(result.course.keywords){
             this.tips = result.course.keywords.split(',') || []
           }
-
           this.courseInfo = result.course;
           this.checked = false;
           this.contentInfo.list = result.contents;
           this.sectionInfo.list = result.sections;
-          this.courseTeachers = result.teachers;
+          this.courseTeachers = result.teachers; //课程的老师信息
 
           if(!this.courseInfo.orgId){
+            //根据课程创建者获取机构id
             apiUser.getOrgSimpleByUserId(result.course.sysCreateAid).then(ors=>{
               if(ors.status==200){
                 $this.courseInfo.orgId=ors.result.id;
+                // apiOrg.getSimple(ors.result.id).then(rrs=>{
+                //     if(rrs.status==200){
+                //       $this.orgName=rrs.result.name;
+                //       $this.orgKid=rrs.result.kid;
+                //       $this.orgNamePath=rrs.result.namePath;
+                //     }
+                //  })
                 apiUserBasic.getOrgInfo(ors.result.id).then(rrs=>{
                   if(rrs.status==200){
                     $this.orgName=rrs.result.name;
                     this.courseInfo.orgName=rrs.result.name;
+                    //$this.orgKid=rrs.result.kid;
                     $this.orgNamePath=rrs.result.namePath;
                   }else{
                     this.courseInfo.orgId='';
+                    //this.$message.error('资源归属已变更，请重新选择');
                   }
                 })
+              }else{
+                //this.$message.error('无机构关联，不需要提示');
               }
             })
+
           }else{
+            // apiOrg.getSimple(this.courseInfo.orgId).then(rrs=>{
+            //    if(rrs.status==200){
+            //      $this.orgName=rrs.result.name;
+            //      $this.orgKid=rrs.result.kid;
+            //      $this.orgNamePath=rrs.result.namePath;
+            //    }else{
+            //      $this.courseInfo.orgId='';
+            //      $this.$message.error('资源归属已变更，请重新选择');
+            //    }
+            // });
             apiUserBasic.getOrgInfo(this.courseInfo.orgId).then(rs=>{
               if(rs.status==200){
                 $this.orgName=rs.result.name;
-                this.courseInfo.orgName=rs.result.name;
+                $this.courseInfo.orgName=rs.result.name;
+                //$this.orgKid=rs.result.kid;
                 $this.orgNamePath=rs.result.namePath;
               }else{
                 $this.courseInfo.orgId='';
-                this.$message.error('资源归属已变更，请重新选择');
+                $this.$message.error('资源归属已变更，请重新选择');
               }
             });
           }
-
           this.resOwnerArray=[];
           if (result.course.resOwner1 == '') {
             this.resOwnerArray.push(result.course.resOwner1);
@@ -830,7 +1014,6 @@ export default {
           if(result.course.resOwner3 == ''){
             this.resOwnerArray.push(result.course.resOwner3);
           }
-
           this.sysTypeList=[];
           if(result.course.sysType1!='' && result.course.sysType1!='0'){
             this.sysTypeList.push(result.course.sysType1);
@@ -841,7 +1024,8 @@ export default {
           if(result.course.sysType3!='' && result.course.sysType3!='0'){
             this.sysTypeList.push(result.course.sysType3);
           }
-
+          //console.log(this.sysTypeList,'this.sysTypeList');
+          //受众处理，crowds
           let crowdList=[];
           if(result.crowds && result.crowds.length>0){
             result.crowds.forEach(crowd=>{
@@ -861,10 +1045,13 @@ export default {
             });
           }
           this.courseCrowds=crowdList;
+          //反向看userGroupList是否有
 
+          //课程图片
           if (this.courseInfo.coverImg != '') {
             this.courseCoverurl = this.fileUrl+this.courseInfo.coverImg;
           }
+          //处理显示的教师信息
 
           let tnames = [],
             tlist = [];
@@ -884,20 +1071,20 @@ export default {
           this.$nextTick(function() {
             $this.requireSaveCourse = false;
           });
+          //this.requireSaveCourse=false;//不需要保存
         }
       } catch (error) {
         console.log(error);
       }
     },
-
     changeTeachers(t) {
+      //用于监听教师列表的选择变化
       this.requireSaveCourse = true;
       this.$refs.elSelect.query = '';
     },
-
     formartTeacher() {},
-
     addNewSection() {
+      //以后需要加inputPattern，inputErrorMessage 验证
       let $this = this;
       this.$prompt('请输入新章的名称', '添加章', {
         confirmButtonText: '确定',
@@ -917,7 +1104,6 @@ export default {
         })
         .catch(() => {});
     },
-
     editSection(sec) {
       let $this = this;
       this.$prompt('', '修改章的名称', {
@@ -933,8 +1119,8 @@ export default {
         })
         .catch(() => {});
     },
-
     delSection(sec, idx) {
+      //检查是否有内容，对于有内容的不能删除
       let has = this.contentInfo.list.some(con => {
         return con.csectionId == sec.id;
       });
@@ -950,10 +1136,10 @@ export default {
         }
       });
     },
-
     saveSection(section) {
       let addNew = section.id ? false : true;
       if (addNew) {
+        //设置显示顺序
         let maxOrder = 1;
         this.sectionInfo.list.forEach(sec => {
           if (sec.orderIndex > maxOrder) {
@@ -971,14 +1157,14 @@ export default {
           this.$message.error(res.message);
         }
       });
+      //设置状态
     },
-
     addNewContent(sec) {
+      //console.log(sec,'sec');
       this.resetCurCourseContent();
       this.curContent.csectionId = sec.id;
       this.orderValue(sec.id);
     },
-
     // 计算新增节的顺序
     orderValue(id) {
       let cha = this.catalogTree.find(item=>{return item.section.id == id});
@@ -993,7 +1179,6 @@ export default {
         this.addOrder = 1;
       }
     },
-
     // 控制  过滤
     deviceFilter(num) {
       let name = '';
@@ -1013,7 +1198,6 @@ export default {
       }
       return name;
     },
-
     // 标签远程查询
     async remoteTagMethod(query) {
       if (query) {
@@ -1029,23 +1213,39 @@ export default {
         this.tagList = [];
       }
     },
-
     // 上一步
     previousStep() {
+      //this.curStepIndex=1;
       this.biaoke.tabIndex = 'base';
+      //以下几项都是要删除的
+      // this.isModify = !this.isModify;
+      // this.isModifyEdit = !this.isModifyEdit;
     },
-
     //保存课程信息并进入下一步
     saveAndNext(btnType) {
       console.log("courseForm 保存课程信息 btnType = " + btnType);
+      //if(this.courseInfo.type)
+      //console.log(this.courseCrowds,'courseCrowds');
+      //标签,多个，转化为逗号分隔的
 
-      // 更新关键字
-      this.courseInfo.keywords = this.tips.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){
+      // this.curStepIndex=2;//转到第二步处理
+      // this.biaoke.tabIndex='content';//对于录博课转到内容的tab, 以后是不是可以去掉Tab. 因为有无tab都一样
+      //this.$message.success('保存成功，未修改课程基本信息不需要多次保存');
+      // return;
+      // }
+      //设置保存状态
       this.btnLoading = true;
-
       //处理资源归属
+      //下面是初始化的数据
       let ownerCode=this.resOwnerListMap[0].code;
       this.resOwnerArray=[];
       this.resOwnerArray.push(ownerCode);
@@ -1054,29 +1254,27 @@ export default {
       this.courseInfo.resOwner2 = '';
       this.courseInfo.resOwner3 = '';
       if (this.resOwnerArray.length > 0) {
-        this.courseInfo.resOwner1 = this.resOwnerArray[0];
+        this.courseInfo.resOwner1 = this.resOwnerArray[0]; //资源归属一级的id
       }
       if (this.resOwnerArray.length > 1) {
-        this.courseInfo.resOwner2 = this.resOwnerArray[1];
+        this.courseInfo.resOwner2 = this.resOwnerArray[1]; //资源归属二级的id
       }
       if (this.resOwnerArray.length > 2) {
-        this.courseInfo.resOwner3 = this.resOwnerArray[2];
+        this.courseInfo.resOwner3 = this.resOwnerArray[2]; //资源归属三级的id
       }
-
       // 分类
       this.courseInfo.sysType1 = '';
       this.courseInfo.sysType2 = '';
       this.courseInfo.sysType3 = '';
       if (this.sysTypeList.length > 0) {
-        this.courseInfo.sysType1 = this.sysTypeList[0];
+        this.courseInfo.sysType1 = this.sysTypeList[0]; //一级的id
       }
       if (this.sysTypeList.length > 1) {
-        this.courseInfo.sysType2 = this.sysTypeList[1];
+        this.courseInfo.sysType2 = this.sysTypeList[1]; //二级的id
       }
       if (this.sysTypeList.length > 2) {
-        this.courseInfo.sysType3 = this.sysTypeList[2];
+        this.courseInfo.sysType3 = this.sysTypeList[2]; //三级的id
       }
-
       //受众的处理
       let crowds=[];
       this.courseCrowds.forEach(item=>{
@@ -1085,38 +1283,42 @@ export default {
           groupName:item.name
         })
       });
-
-      //老师内容的处理
+      //以下是老师内容的处理
       let saveTeachers = [];
       this.teacherValues.forEach(item => {
         saveTeachers.push(item);
       });
-
       let postData = {
         course: this.courseInfo,
         teachers: saveTeachers,
         crowds:crowds
       };
-
-      console.log("保存课程数据:", postData);
-
+      console.log(postData);
+      //this.btnLoading=false;
       apiCourse
         .saveBase(postData)
         .then(res => {
           this.btnLoading = false;
           if (res.status === 200) {
+            // let checked = this.courseInfo.checked;
             let result = res.result;
             this.courseInfo = result.course;
-            this.curCourseId = result.course.id;
+            // if(checked) {
+            //   this.courseInfo.checked = true;
+            // }
+            this.curCourseId = result.course.id; //设置当前课程的id
             this.courseTeachers = result.teachers;
 
-            this.requireSaveCourse = false;
+            //this.curStepIndex=2;//转到第二步处理
+            this.requireSaveCourse = false; //不需要再保存，点下一步时不保存
             this.biaoke.tabIndex = 'content';
-
+            //注意下次不修改之前不需要保存
             this.$nextTick(function() {
               this.requireSaveCourse = false;
             });
-
+            if (btnType == 1) {
+              //this.weike.dlgShow=false;
+            }
             if (btnType > 0) {
               this.$message.success('保存成功');
             }
@@ -1129,42 +1331,53 @@ export default {
           this.btnLoading = false;
         });
     },
-
     // 判断是否有未保存的内容
     unsavedContent() {
       const courseware = this.$refs.courseware;
+      //console.log(courseware,'courseware');
       let pass = true;
 
-      if(this.curContent.id == '') {
-        if(this.curContent.contentType == 60) {
+      if(this.curContent.id == '') {// 新增
+        if(this.curContent.contentType == 60) { // 判断作业是否保存
           if(courseware.homework.content || courseware.homework.name || courseware.homework.deadTime){
             pass = false;
           }
-        } else if(this.curContent.contentType == 61) {
-        } else if(this.curContent.contentType == 41) {
+        } else if(this.curContent.contentType == 61) { //考试
+
+          // if(courseware.exam.paperContent != '') {
+          //   pass = false;
+          // }
+          // if(courseware.examPaper.items.length >0) {
+          //   pass = false;
+          // }
+        }else if(this.curContent.contentType == 41) { //图文
           if(courseware.htmlContent.length > 7){
             pass = false;
           }
-        } else if(this.curContent.contentType == 52) {
+        }else if(this.curContent.contentType == 52) { //外部链接
           if(courseware.linkInfo.url != '') {
             pass = false;
           }
         }
-      } else {
-        if(this.curContent.contentType == 60) {
+      } else {// 编辑
+        if(this.curContent.contentType == 60) { // 判断作业是否保存
           if(JSON.stringify(courseware.homeworkChange) !== JSON.stringify(courseware.homework)) {
             pass = false;
           }
-        } else if(this.curContent.contentType == 61) {
-        } else if(this.curContent.contentType == 41) {
+        } else if(this.curContent.contentType == 61) { //考试
+          // console.log(courseware.exam,'courseware.exam');
+          // if(courseware.exam.paperContent !== courseware.examChange.paperContent || JSON.stringify(courseware.examPaper) != JSON.stringify(courseware.examPaperChange)) {
+          //   pass = false;
+          // }
+        } else if(this.curContent.contentType == 41) { //图文
           if(this.curContent.content !== courseware.htmlContent) {
             pass = false;
           }
-        } else if(this.curContent.contentType == 52) {
+        } else if(this.curContent.contentType == 52) { //外部链接
           if(this.curContent.content !== JSON.stringify(courseware.linkInfo)) {
             pass = false;
           }
-        } else if(this.curContent.contentType == 10 || this.curContent.contentType == 20) {
+        } else if(this.curContent.contentType == 10 || this.curContent.contentType == 20) {// 视频
           if(this.curContent.content !== JSON.stringify(courseware.curriculumData)) {
             pass = false;
           }
@@ -1172,34 +1385,39 @@ export default {
       }
       return pass;
     },
-
     unsavedWeiContent() {
+      // console.log(this.contentInfo.list,'contentInfo.list');
+      // console.log(this.courseInfo,'courseInfo');
+      //console.log(this.$refs.weikeContent,'weikeContent');
       const courseware = this.$refs.weikeContent;
+      //console.log(this.catalogTree,'this.catalogTree');
       if(courseware.cware.content.id==''){
         this.$message.error('无课件内容，请先添加课件内容保存后再提交');
         return false;
       }
-      if(courseware.homework.show == 2) {
+      if(courseware.homework.show == 2) { // 作业
         this.$message.error('请先保存作业再提交');
         return false;
       }
 
       let pass = true;
-      if(courseware.homework.show == 2) {
+      if(courseware.homework.show == 2) { // 作业
         this.$message.error('请先保存作业再提交');
         return false;
       }
-      if(courseware.assess.show == 2) {
+      if(courseware.assess.show == 2) { // 评估
+        //this.$message.error('请先保存评估再提交');
+        //return false;
       }
-      if(courseware.exam.show == 3) {
+      if(courseware.exam.show == 3) { // 评估
         this.$message.error('请先保存考试再提交');
         return false;
       }
       return true;
     },
-
     submitCourse() {
-      console.log("courseForm 课程提交审核 tags:", this.courseInfo.tags);
+      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('您有未保存的内容，请先保存');
@@ -1209,31 +1427,53 @@ export default {
         return;
       }
 
+      //console.log(this.courseInfo.orgId,'this.courseInfo.orgId');
+      //console.log(this.orgKid,'this.orgKid');
       if(!this.courseInfo.orgId){
         this.$message.error('请选择资源归属');
         return;
       }
+      // if(!this.orgKid){
+      //   this.$message.error('资源归属无关联HRBP信息');
+      //   return;
+      // }
 
+      //console.log(this.resOwnerListMap[0],'this.resOwnerListMap[0]');
+      //return;
       let ownerCode=this.resOwnerListMap[0].code;
       this.resOwnerArray=[];
       this.resOwnerArray.push(ownerCode);
+      //console.log(ownerCode,'ownerCode');
+      //提交课程，需要验证,这个是单独的处理，
+      this.courseInfo.status = 2; //提交状态
+      //if(this.resOwnerArray.length==0){
 
+      //}
+      //console.log(this.resOwnerArray,'this.resOwnerArray');
+      //return;
       if(this.resOwnerArray.length < 1) {
         this.$message.error('请选择资源归属');
         return;
       }
-
+      if (this.showTags.length > 0) {
+        // this.courseInfo.tags = this.showTags.join();
+      }
       if (this.sysTypeList.length < 1) {
         this.$message.error('请选择内容分类');
         return;
       }
-
       if (this.teacherValues.length == 0) {
         this.$message.error('请选择课程教师');
         return;
       }
-
-      if (this.courseInfo.type == 20) {
+      //在子组件中无法检查的到，所这里在后台进行检查 了
+      // if(this.contentInfo.list.length==0){
+      //     this.$message.error("还没有课程内容，请先完善课程内容");
+      //     return;
+      //   }
+      if (this.courseInfo.type == 10) {
+        //if(this.cware.)
+      } else if (this.courseInfo.type == 20) {
         if (this.sectionInfo.list.length == 0) {
           this.$message.error('还没有课程内容，请先完善课程内容');
           return;
@@ -1251,33 +1491,31 @@ export default {
           return;
         }
       }
-
-      //填充内容，提交
+      //以下是填充内容，交提交，与前面的保存同相同的代码
       this.courseInfo.resOwner1 = '';
       this.courseInfo.resOwner2 = '';
       this.courseInfo.resOwner3 = '';
       if (this.resOwnerArray.length > 0) {
-        this.courseInfo.resOwner1 = this.resOwnerArray[0];
+        this.courseInfo.resOwner1 = this.resOwnerArray[0]; //资源归属一级的id
       }
       if (this.resOwnerArray.length > 1) {
-        this.courseInfo.resOwner2 = this.resOwnerArray[1];
+        this.courseInfo.resOwner2 = this.resOwnerArray[1]; //资源归属二级的id
       }
       if (this.resOwnerArray.length > 2) {
-        this.courseInfo.resOwner3 = this.resOwnerArray[2];
+        this.courseInfo.resOwner3 = this.resOwnerArray[2]; //资源归属三级的id
       }
-
       // 分类
       this.courseInfo.sysType1 = '';
       this.courseInfo.sysType2 = '';
       this.courseInfo.sysType3 = '';
       if (this.sysTypeList.length > 0) {
-        this.courseInfo.sysType1 = this.sysTypeList[0];
+        this.courseInfo.sysType1 = this.sysTypeList[0]; //一级的id
       }
       if (this.sysTypeList.length > 1) {
-        this.courseInfo.sysType2 = this.sysTypeList[1];
+        this.courseInfo.sysType2 = this.sysTypeList[1]; //二级的id
       }
       if (this.sysTypeList.length > 2) {
-        this.courseInfo.sysType3 = this.sysTypeList[2];
+        this.courseInfo.sysType3 = this.sysTypeList[2]; //三级的id
       }
 
       //受众的处理
@@ -1293,23 +1531,22 @@ export default {
       this.teacherValues.forEach(item => {
         saveTeachers.push(item);
       });
-
       let postData = {
         course: this.courseInfo,
         teachers: saveTeachers,
         crowds:crowds
       };
-
       this.btnLoading = true;
       let $this = this;
-
+      //2023-1-5 对于默认管理员，不需要提交hrbp。直接提交并发布
       let adminType=this.userInfo.adminType;
-      if(adminType==1){
+      if(adminType==1){ //默认管理员,直接审核通过
         apiCourseAudit.submitAndPublish(postData).then(res=>{
           setTimeout(function() {
             $this.btnLoading = false;
           }, 1000);
           if (res.status === 200) {
+            //提交成功，直接关闭当前窗口
             this.$message.success('提交成功！！！');
           } else {
             this.$message.error(res.message);
@@ -1319,6 +1556,7 @@ export default {
           this.$emit('submitSuccess');
         });
       }else{
+        //先获取HRBP审核 人员信息，姓名，机构路径，工号，用于邮件中的信息
         apiUserBasic.getOrgHrbpInfo(this.courseInfo.orgId).then(rs=>{
           if(rs.status==200 && rs.result){
             postData.auditUser={
@@ -1328,16 +1566,19 @@ export default {
               aid:rs.result.id,
               orgId:rs.result.orgId
             }
+            //下面的机构名称，路径不对，应该取课程的资源归属（机构）的路径
             postData.course.orgName=rs.result.orgNamePath+'/'+rs.result.orgName;
-
             apiCourse.submitCourse(postData).then(res => {
+              //this.btnLoading=false;
               setTimeout(function() {
                 $this.btnLoading = false;
               }, 1000);
               if (res.status === 200) {
+                //提交成功，直接关闭当前窗口
                 this.$message.success('提交成功！！！');
                 this.biaoke.dlgShow = false;
                 this.weike.dlgShow = false;
+                //提交成功回调处理
                 this.$emit('submitSuccess');
               } else {
                 this.$message.error(res.message);
@@ -1351,12 +1592,12 @@ export default {
             this.$message.error('获取审核HRBP失败:'+rs.message);
           }
         }).catch(err=>{
+          //this.$message.error('获取审核HRBP失败:'+err);
           this.$message.error('获取审核HRBP失败，请检查资源归属下是否有HRBP审核人员');
           $this.btnLoading = false;
         })
       }
     },
-
     // 教师列标，远程查询
     async remoteFindTeacher(query) {
       if (query) {
@@ -1384,8 +1625,7 @@ export default {
         this.teacherDownList = [];
       }
     },
-
-    //获取场景
+    //获取场景，保留
     async getSceneData() {
       try {
         const { result, status } = await scene.list(1);
@@ -1396,12 +1636,12 @@ export default {
         console.log(error);
       }
     },
-
     setCurContent(item) {
+      //此方法应该是设置内容，curContent, 设置了它，右边就会自动变化
       this.curContent = item;
     },
-
     changeBiaokeTab(tab) {
+      //检查保存的情况
       if (this.curCourseId == '') {
         return;
       }
@@ -1411,9 +1651,9 @@ export default {
         this.curStepIndex = 2;
       }
     },
-
     saveCurContent(cc) {
       this.curContent = cc;
+      //检查 是否存在
       let index = -1;
       this.contentInfo.list.some((con, conIdx) => {
         if (con.id == cc.id) {
@@ -1426,11 +1666,13 @@ export default {
       if (index == -1) {
         this.contentInfo.list.push(cc);
       } else {
+        // this.contentInfo.list[index] = cc;
         this.contentInfo.list.splice(index,1,cc);
       }
+      //计算顺序值
     },
-
     delCurContent() {
+      //从列表中移除
       let $this = this;
       let id = this.curContent.id;
       let secId = this.curContent.csectionId;
@@ -1444,12 +1686,12 @@ export default {
           return false;
         }
       });
-    },
 
+      //this.curContent.id='';
+    },
     catalogSortDialogOpen() {
       this.catalogSortDialogShow = true;
     },
-
     // 保存章节排序
     saveCatalogSort() {
       let that = this;
@@ -1484,18 +1726,22 @@ export default {
 }
 .el-dialog__body {
   padding: 10px 10px;
+  // overflow-y: auto;
   max-height: calc(70vh - 140px);
 }
 .example {
   height: 100%;
   border: 1px solid #9d9d9d;
   text-align: center;
+  // padding-top: 50px;
 }
 .el-container .el-aside {
   padding: 5px 0px;
 }
 .course-types {
   display: flex;
+  // padding: 15px;
+
   .course-type {
     margin: 0 10px;
     text-align: center;
@@ -1540,9 +1786,11 @@ export default {
 .cctree {
   .cctree-chapter {
     .cctree-chapter-name {
+      // text-align: right;
       border-bottom: 1px solid #dddddd;
       padding: 0px 6px;
       display: flex;
+
     }
     .cctree-chapter-cells {
       margin: 0px;
@@ -1556,6 +1804,7 @@ export default {
     }
   }
 }
+
 </style>
 <style lang="scss">
 .cusprompt{
@@ -1563,12 +1812,8 @@ export default {
   .el-message-box__content{
     margin-top: 30px;
     .el-message-box__input{
+
     }
   }
 }
 </style>
-
-
-
-
-
diff --git a/src/components/Course/courseTag.vue b/src/components/Course/courseTag.vue
index 11c76058..dd4ca575 100644
--- a/src/components/Course/courseTag.vue
+++ b/src/components/Course/courseTag.vue
@@ -1,7 +1,8 @@
+
 <template>
   <div class="tag-container">
     <el-select style="width: 100%;"
-               v-model="selectedTagIds"
+               v-model="selectedTags"
                multiple
                filterable
                value-key="id"
@@ -21,13 +22,13 @@
         v-for="item in searchResults"
         :key="item.id"
         :label="item.tagName"
-        :value="item.id"
+        :value="item"
         :disabled="isTagDisabled(item)"
       />
     </el-select>
     <!-- 添加标签计数显示 -->
     <div class="tag-count">
-      {{ selectedTagIds.length }}/5
+      {{ selectedTags.length }}/5
     </div>
   </div>
 </template>
@@ -60,7 +61,7 @@ export default {
   },
   data() {
     return {
-      selectedTagIds: [], // 修改：存储标签ID数组
+      selectedTags: [],
       searchResults: [],
       loading: false,
       tagMap: new Map(),
@@ -73,13 +74,10 @@ export default {
   },
   computed: {
     ...mapGetters(['userInfo']),
-    // 修改：计算属性，返回完整的标签对象数组用于显示
     displayTags() {
-      return this.selectedTagIds.map(tagId => this.tagMap.get(tagId)).filter(Boolean)
-    },
-    // 新增：计算标签ID字符串，用于传参
-    tagIdsString() {
-      return this.selectedTagIds.join(',')
+      return this.selectedTags.map(tag =>
+        typeof tag === 'object' ? tag : this.tagMap.get(tag)
+      ).filter(Boolean)
     }
   },
   created() {
@@ -90,7 +88,14 @@ export default {
   // 添加：挂载时初始化标签数据
   mounted() {
     if (this.initialTags && this.initialTags.length > 0) {
-      this.initTags(this.initialTags);
+      this.selectedTags = this.initialTags;
+      this.searchResults = this.initialTags;
+      // 将初始标签添加到tagMap中，确保删除功能正常
+      this.initialTags.forEach(tag => {
+        if (tag.id) {
+          this.tagMap.set(tag.id, tag);
+        }
+      });
     }
   },
   watch: {
@@ -100,13 +105,12 @@ export default {
     },
     // 监听初始标签变化，重新加载
     initialTags(newVal) {
-      if (newVal && newVal.length > 0) {
-        this.initTags(newVal);
-      } else {
-        this.selectedTagIds = [];
-        this.searchResults = [];
-        this.tagMap.clear();
-      }
+      this.selectedTags = newVal || [];
+      this.searchResults = newVal || [];
+      this.tagMap.clear(); // 清空旧缓存
+      newVal.forEach(tag => {
+        if (tag.id) this.tagMap.set(tag.id, tag);
+      });
     },
     // 监听分类变化，重新加载搜索结果
     sysTypeList: {
@@ -117,37 +121,22 @@ export default {
         }
       },
       deep: true
-    },
-    // 监听标签ID变化，触发change事件
-    tagIdsString(newVal) {
-      this.$emit('change', this.displayTags, newVal);
     }
   },
   methods: {
-    // 新增：初始化标签方法
-    initTags(tags) {
-      this.selectedTagIds = tags.map(tag => tag.id);
-      this.searchResults = [...tags];
-      this.tagMap.clear();
-      tags.forEach(tag => {
-        if (tag.id) {
-          this.tagMap.set(tag.id, tag);
-        }
-      });
-    },
     // 新增：检查标签是否应该被禁用
     isTagDisabled(tag) {
       // 如果标签已经被选中，不应该禁用（允许取消选择）
-      const isSelected = this.selectedTagIds.some(selectedTagId => selectedTagId === tag.id);
+      const isSelected = this.selectedTags.some(selectedTag => selectedTag.id === tag.id);
       if (isSelected) {
         return false;
       }
       // 如果标签未被选中且已达到最大数量，则禁用
-      return this.selectedTagIds.length >= this.maxTags;
+      return this.selectedTags.length >= this.maxTags;
     },
     // 新增：处理输入框获得焦点事件
     async handleFocus() {
-      this.previousTags = [...this.selectedTagIds];
+      this.previousTags = [...this.selectedTags];
       // 当输入框获得焦点时，加载默认的搜索结果
       if (this.sysTypeList.length > 0) {
         await this.doSearch('');
@@ -155,15 +144,15 @@ export default {
     },
     // 新增：重置标签状态的方法
     resetTagState() {
-      this.selectedTagIds = [];
+      this.selectedTags = [];
       this.searchResults = [];
       this.tagMap.clear();
       this.loading = false;
       this.params = {};
     },
     handleTagRemove(tagId) {
-      this.selectedTagIds = this.selectedTagIds.filter(id => id !== tagId)
-      this.$emit('change', this.displayTags, this.tagIdsString)
+      this.selectedTags = this.selectedTags.filter(id => id !== tagId)
+      this.$emit('change', this.displayTags)
       this.clearInput();
     },
     removeTag(tagId) {
@@ -182,19 +171,17 @@ export default {
     handleEnterKey(event) {
       const inputVal = event.target.value?.trim()
       if (!inputVal) return;
-
       // 检查是否与已选择的标签重复
-      const isDuplicate = this.displayTags.some(tag => tag.tagName === inputVal);
+      const isDuplicate = this.selectedTags.some(tag => tag.tagName === inputVal);
       if (isDuplicate) {
         this.$message.warning('该标签已存在，无需重复创建');
         event.target.value = '';
         return;
       }
-
-      if (!this.searchResults.length && inputVal && this.selectedTagIds.length < this.maxTags) {
+      if (!this.searchResults.length && inputVal && this.selectedTags.length < this.maxTags) {
         this.createNewTag(event.target.value.trim())
         this.clearInput();
-      } else if (this.selectedTagIds.length >= this.maxTags) {
+      } else if (this.selectedTags.length >= this.maxTags) {
         this.$message.warning('最多只能添加5个标签')
         this.clearInput();
       } else {
@@ -202,20 +189,20 @@ export default {
       }
     },
 
-    // 修改：处理选择变化事件
+    // 新增：处理选择变化事件
     handleSelectionChange(newValues) {
       // 检查数量限制
       if (newValues.length > this.maxTags) {
         this.$message.warning(`最多只能选择${this.maxTags}个标签`);
         // 回滚到之前的状态
-        this.selectedTagIds = [...this.previousTags];
+        this.selectedTags = [...this.previousTags];
         return;
       }
 
       // 更新前保存当前状态
       this.previousTags = [...newValues];
+      this.$emit('change', this.displayTags);
 
-      // 自动触发change事件，通过watch监听tagIdsString的变化
       this.clearInput();
     },
 
@@ -228,34 +215,30 @@ export default {
       }
     },
 
-    //修改：创建新标签 - 修复显示问题
+    //创建新标签
     async createNewTag(tagName) {
       // 标签不能超过八个字
       if (tagName.length > 8) {
         this.$message.error('标签不能超过8个字')
         return;
       }
-
       // 首先检查是否与已选择的标签重复
-      const isDuplicate = this.displayTags.some(tag => tag.tagName === tagName);
+      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.selectedTagIds.length >= this.maxTags) {
+      if (this.selectedTags.length >= this.maxTags) {
         this.$message.warning('最多只能添加5个标签')
         return;
       }
-
       this.loading = true
       try {
         this.params.courseId = this.courseId;
@@ -270,39 +253,23 @@ export default {
         if (this.sysTypeList.length > 2) {
           this.params.sysType3 = this.sysTypeList[2]; //三级的id
         }
-
         const {result:newTag} = await apiCourseTag.createTag(this.params)
-        this.$message.success('标签创建成功');
-
-        // 修改：将新标签添加到选中列表和搜索结果中
-        this.selectedTagIds.push(newTag.id);
-
-        // 创建完整的标签对象，包含id和tagName
-        const completeTag = {
-          id: newTag.id,
-          tagName: newTag.tagName
-        };
-
-        this.searchResults.push(completeTag);
-        this.tagMap.set(newTag.id, completeTag);
-
-        console.log("----------新创建标签---------->", completeTag)
-        console.log("----------当前选中标签ID---------->", this.selectedTagIds)
-        console.log("----------标签映射表---------->", this.tagMap)
-
-        // 触发change事件，传递标签对象数组和ID字符串
-        this.$emit('change', this.displayTags, this.tagIdsString);
-
-        // 清空输入框
-        this.clearInput();
-
+        this.$message.success('标签创建成功',newTag);
+        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
+      // }
       console.log("---- doSearch ------ query = " + query )
       this.loading = true
       try {
@@ -314,18 +281,12 @@ export default {
         const {result:tags} = await apiCourseTag.searchTags({tagName:query,typeId:typeId})
         console.log("-- searchTags 查询结果 tags = " + tags )
 
-        // 确保每个标签对象都有完整的属性
-        const completeTags = tags.map(tag => ({
-          id: tag.id,
-          tagName: tag.tagName
-        }));
-
-        completeTags.forEach(item => {
+        tags.forEach(item => {
           this.tagMap.set(item.id, item)
         })
-        this.searchResults = completeTags
+        this.searchResults = tags
         // 当搜索结果为空时，提示用户可以按回车键创建标签
-        if (tags.length === 0 && query.trim()) {
+        if (tags.length === 0) {
           this.$message.info('无此标签，按回车键创建')
         }
       } finally {