feat: 右侧菜单高度调整为 650

src/api/modules/course.js

@@ -170,7 +170,9 @@ const updateContentOrders = function(cid,items) {
 const detail = function(id) {
     return ajax.get('/xboe/m/course/manage/detail?id=' + id);
 }
-
+const getDictIds = function(pid,type) {
+  return ajax.get(`/xboe/m/course/manage/getDictIds?pid=${pid}&type=${type}`);
+}
 /**
  * 更新内容的名称
  * @param {Object} data
@@ -446,6 +448,7 @@ export default {
     findUpdateLogs,
     getUpdateLog,
     detail,
+    getDictIds,
     saveContent,
     pageList,
     setEnabled,

src/components/Course/courseForm.vue

@@ -565,15 +565,13 @@ export default {
         this.requireSaveCourse = true;
 
         console.log("--- watch比较 = ", oldVal.orgId, newVal.orgId);
-        if (newVal.orgId !== oldVal.orgId) {
-          console.log("--- watch newVal.orgId = ", newVal.orgId);
         this.checkOrgPermission(newVal.orgId);
-        }
       },
       deep: true
     }
   },
   mounted() {
+    this.getDictIds();
     let extendFlag=this.$route.query.f; //是否是管理端过来的
     this.extendRefId=this.$route.query.refId;
     this.extendRefType=this.$route.query.refType;
@@ -604,11 +602,8 @@ export default {
         this.isPermission = false;
         return;
       }
+      console.log("--- this.dicts  = ",this.dicts)
       this.isPermission = this.dicts.includes(orgId);
-      this.courseInfo.device = 3;
-      if(this.isPermission){
-        this.courseInfo.device = 4;
-      }
       console.log("--- 监听结束 this.isPermission  = ",this.isPermission)
     },
     // 关键字的更改
@@ -915,6 +910,21 @@ 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;

src/components/VideoPlayer/index.vue

@@ -317,7 +317,7 @@ export default {
     }
 
     setInterval(() => {
-        // console.log('this.currentProgress::',this.currentProgress,this.isDrag,this.videoDom.currentTime , this.videoDom.readyState)
+          console.log('当前状态:',this.currentProgress,this.isDrag,this.videoDom.currentTime , this.videoDom.duration)
           // 视频播放时本地记录视频实时播放时长,视频设置了禁止拖动时执行
           if(!this.isDrag){
             var time = localStorage.getItem('videoProgressData')
@@ -364,10 +364,10 @@ export default {
       }
       // 根据视频的readyState判断下一帧是否已加载，并控制loading的显示
       this.isShowLoading = this.videoDom.readyState < 3;
-      // console.log("当前缓存:"+this.videoDom.readyState)
+      console.log("当前缓存:"+this.videoDom.readyState)
-      if (this.videoDom.readyState < 1){
+      if (this.videoDom.readyState < 3){
-        // console.log("详细信息",this.videoDom)
+        console.log("详细信息",this.videoDom)
-        // console.log("卡了",this.videoDom.readyState)
+        console.log("卡了",this.videoDom.readyState)
       }
       //if()
       //console.log(this.videoDom.readyState,'this.videoDom.readyState');

src/components/VideoPlayer/progress-bar.vue

@@ -37,7 +37,6 @@ export default {
     },
     isDrag:{
       type: Boolean,
-      default: true,
     },
     blobId:{
       type: String,
@@ -86,9 +85,10 @@ export default {
         if(current<0) current = 0;
         var time = localStorage.getItem('videoProgressData');
         var arr = time&&JSON.parse(time) || {}
-        console.log('down arr:',this.isDrag,this.blobId,arr,arr[this.blobId],current)
+        //console.log('down arr:',this.isDrag,this.blobId,arr,arr[this.blobId],current)
-        // 禁止拖动 true:禁止拖动，false:允许拖动
+        // 禁止拖动
         if(!this.isDrag && time && arr[this.blobId] < current) return;
+
         this.$emit("updateProgress", current);
       // }
 
@@ -102,7 +102,7 @@ export default {
         if(current<0) current = 0;
         var time = localStorage.getItem('videoProgressData');
         var arr = time&&JSON.parse(time) || {}
-        console.log('move arr:',this.isDrag,this.blobId,arr,arr[this.blobId],current)
+        //console.log('move arr:',this.isDrag,this.blobId,arr,arr[this.blobId],current)
         // 禁止拖动
         if(!this.isDrag && time && arr[this.blobId] < current) return;
         this.$emit("updateProgress", current);
@@ -118,12 +118,12 @@ export default {
         if(current<0) current = 0;
         var time = localStorage.getItem('videoProgressData');
         var arr = time&&JSON.parse(time) || {}
-        console.log('up arr:',this.isDrag,this.blobId,arr,arr[this.blobId],current)
+        //console.log('up arr:',this.isDrag,this.blobId,arr,arr[this.blobId],current)
         this.$emit("getMouseDownStatus", false);
         // 禁止拖动
         if(!this.isDrag && time && arr[this.blobId] < current) return;
         this.$emit("updateProgress", current);
-        this.$emit("getMouseDownStatus", false);
+
       }
     },
   },

src/views/grateful/GratefulHomePage.vue

@@ -5,8 +5,8 @@
         <!-- 当轮播图等于一张时 -->
         <swiper :options="swiperOptiontwo">
           <swiper-slide style="margin: 0 auto" v-for="(item, idx) in resonimg" :key="'a' + idx"
-            class="swiper-slide games pointer">
+            class="swiper-slide games pointer"  >
-            <div class="bannbox" :style="{
+            <div class="bannbox" @click="handleCarouselClick(item)" :style="{
               background: `url(${fileBaseUrl + item.image
                 }) center center no-repeat`,
             }"></div>
@@ -17,8 +17,8 @@
       <div id="container" style="z-index: 99" v-else>
         <swiper :options="swiperOption" ref="mySwiper" v-if="resonimg.length > 1">
           <swiper-slide style="margin: 0 auto" v-for="(item, idx) in resonimg" :key="'b' + idx"
-            class="swiper-slide games pointer">
+            class="swiper-slide games pointer"  >
-            <div class="bannbox" :style="{
+            <div class="bannbox" @click="handleCarouselClick(item)"  :style="{
               background: `url(${fileBaseUrl + item.image
                 })  center center no-repeat`,
             }"></div>
@@ -220,7 +220,7 @@ export default {
         autoplay: false,
         // noSwiping: true,
       },
-      resonimg: [],
+      // resonimg: [],
       swiperOption: {
         autoplay: {
           delay: 2000,
@@ -249,6 +249,13 @@ export default {
     this.getToolData()
   },
   methods: {
+    // 添加点击轮播图跳转的方法
+    handleCarouselClick(item) {
+      if (item.url) {
+        window.open(item.url, '_blank');
+      }
+    },
+
     downTool(toolInfo) {
       console.log(toolInfo);
       window.open(`/activityApi/xboe/m/boe/tools/url/download?urlStr=${process.env.VUE_APP_BOE_WEB_URL}/upload${toolInfo.filePath}&fileName=${toolInfo.name}`)

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/case/Detail.vue

@@ -20,7 +20,7 @@
               </div>
               <div class="label">
                 <author :aid="caseDetail.sysCreateAid" :onlyAvatar="true" :avatar="authorInfo.avatar"
-                  :sex="authorInfo.sex"></author>
+                  :sex="authorInfo.sex" :name="authorInfo.name"></author>
                 <span>案主：{{ authorInfo.name }} ({{ authorInfo.orgInfo }})</span>
                 <!-- <span>案主：{{ authorInfo.name }}</span>
                     <span>工号：{{ authorInfo.code }}</span>

src/views/portal/case/Index.vue

@@ -1609,7 +1609,7 @@ export default {
           })
           console.log(res?.result?.list ,'有没有数据2');
           this.caseList.list = res.result.list
-          // this.getCaseUserData(res.result.list);
+          this.getCaseUserData(res.result.list);
           // 给所有的赋值
           this.caseList.count = res.result.count;
           this.caseList.showPagCount = res.result.count;

src/views/study/coursenew.vue

@@ -22,7 +22,7 @@
       <div class="course-playbox" ref="coursePlayerBox" id="id_course_player_box">
         <div class="course-player" ref="coursePlayer" id="id_course_player">
           <div>
-            <div v-if="false">
+            <div v-if="renderCourse">
               <div v-if="resType == null || resType == 0">
                 <!--先显示视频图片-->
                 <course-image v-if="courseInfo.id != ''" :course="courseInfo"></course-image>
@@ -110,11 +110,11 @@
                 </assess>
               </div>
             </div>
-            <div v-if="true" style="margin:350px 250px" class="jianjie pdftext" id="pdfPreview">
+            <div v-if="!renderCourse && Internet ==2" style="margin:350px 250px" class="jianjie pdftext" id="pdfPreview">
               <div style="margin-top:40px;font-weight:700;font-size: 22px;color: #ccc">
-                <span>十分抱歉，您当前的网络环境不符合观看要求。为了保障案例信息的安全，您需要接入公司内网才能观看。</span>
+                <span>十分抱歉，您当前的网络环境不符合观看要求。为了保障课程信息的安全，您需要接入公司内网才能观看。</span>
               </div>
-              <div style="margin-top:20px;text-align:center" @click="getInternet" >
+              <div style="margin-top:20px;text-align:center" @click="refreshPage">
                 <el-button type="primary">重新检测</el-button>
               </div>
             </div>
@@ -177,7 +177,7 @@
             </div>
             <!-- 课程单元  -->
             <div class="course-units" v-if="tab == 1">
-              <div :style="`height: ${controlHeight}px;overflow-y: auto;`">
+              <div style="min-height: 350px;max-height: 650px ;overflow-y: auto;">
                 <div class="catalog" v-if="courseInfo.type == 20">
                   <div  v-for="(item, index) in catalogTree" :key="index" :name="index">
                     <el-menu
@@ -454,6 +454,7 @@
         getType: getType,
         ctabName: 'catalog',
         resType: null,
+        renderCourse: true,
         activeNames: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9],
         scoreInfo: {
           dlgShow: false,
@@ -482,6 +483,7 @@
       }
     },
     mounted() {
+      this.getInternet();
       // 增加的用户受众id
       let localKey = "user_" + this.userInfo.sysId + "_gids";
       let hasIds = sessionStorage.getItem(localKey);
@@ -529,10 +531,6 @@
         return treeList;
       }
     },
-    destroyed(){
-      this.cleanAppendTime();
-      this.stopStudyTime();
-    },
     methods: {
       handleOpen(key,path){
         if(this.isFalse){
@@ -818,7 +816,8 @@
           }else if(h>500){
             h=h+60;
           }
-            $this.controlHeight=h-95;
+          // 移除高度控制 防止内容塌陷
+            // $this.controlHeight=h-95;
         })
 
 
@@ -1324,6 +1323,17 @@
           audiences:this.audiences
         }).then(rs => {
           if (rs.status == 200) {
+            if(rs.result.isPermission){
+              this.protocolDialogVisible=true
+            }
+            if (!rs.result.isPermission || (rs.result.isPermission && this.Internet==1)){
+              // this.getInternet()
+              this.renderCourse = true
+            }else{
+              // this.Internet=1;
+              this.renderCourse = false
+              this.protocolDialogVisible=true
+            }
             if(rs.result.contents.length==0){
               $this.$message.error('课程内容已删除或课程已不再使用');
               return;
@@ -1412,16 +1422,17 @@
             this.totalContent = rs.result.contents.length;
             //加载学习的数据
             this.loadStudyData(rs.result);
-            if (rs.result.isPermission){
-            // if (true){
-              this.getInternet()
-              console.log('需要内网环境')
-            }
           } else {
             this.$message.error(rs.message);
           }
+
         });
       },
+      refreshPage() {
+        location.reload();
+        // this.getInternet();
+        // this.loadData();
+      },
       getXmlHttpRequest() {
         if (window.XMLHttpRequest) {
           return new XMLHttpRequest();
@@ -1439,7 +1450,7 @@
         let timer = setTimeout(function () {
           timedOut = true;
           xmlhttp.abort();
-        }, 5000);
+        }, 1000);
         xmlhttp.open("HEAD", window.location.protocol + "//uapi.boe.com.cn/500.html", true);
         xmlhttp.send();
         xmlhttp.onreadystatechange = function () {
@@ -1447,9 +1458,9 @@
             if (xmlhttp.status == 200) {
               clearTimeout(timer);
               $this.Internet = 1;
-              $this.protocolDialogVisible=true
             } else {
               clearTimeout(timer);
+              // $this.protocolDialogVisible=true
               $this.Internet = 2;
             }
           } else {
@@ -1750,6 +1761,10 @@
         }
       },
     },
+    destroyed(){
+      this.cleanAppendTime();
+      this.stopStudyTime();
+    },
   }
 </script>
 
@@ -1786,24 +1801,46 @@
     margin: 20px auto;
     .course-playbox {
       background-color: #fff;
-      min-height: 400px;
+      //min-height: 400px;
       display: flex;
       justify-content: space-between;
+      .course-player-container {
+        display: flex;
+        flex-direction: column;
+        height: 100%;
+      }
       .course-player{ //内容播放区域
-        background-color: rgb(238, 238, 238);
+        flex: 4; // 80%高度
-        flex:1;
         min-width: 700px;
-        min-height: 400px;
+        // min-height: 400px;
-        max-height: 800px;
+        // max-height: 800px;
-        //height: 100%;
+        height: 80%;
         border: 1px solid #ffffff;
         padding-right: 20px;
+        background-color: rgb(238, 238, 238);
         // overflow: auto;
       }
       .course-control{ //内容控制区域
         width: 420px;
       }
     }
+
+    @media screen and (max-width: 1200px) {
+      .course-playbox,
+      .course-infobox {
+        flex-direction: column;
+      }
+      .course-player,
+      .course-info {
+        min-width: 100%;
+        padding-right: 0;
+      }
+      .course-control,
+      .course-teacher {
+        width: 100%;
+        margin-top: 20px;
+      }
+    }
     .course-infobox {
       margin-top: 20px;
       display: flex;
@@ -1923,13 +1960,10 @@
   }
 
   .player-box {
-    position: absolute;
+    position: relative;
-    // top: 62px;
+    width: 100%;
-    // left: 184px;
+    max-width: 300px;
-    width: 300px;
+    margin: 20px auto;
-    left: 50%;
-    top: 50%;
-    transform: translate(-50%, -50%);
     height: 187px;
     background: rgba(74, 74, 74, .5);
     border-radius: 33px;
@@ -2072,6 +2106,7 @@
   }
 
   .course-interact {
+    flex: 1; // 20%高度
     height: 54px;
     // padding-top: 10px;
     // padding-right: 10px;