fix 35

2025-12-08 18:36:43 +08:00 · 2025-07-02 17:06:14 +08:00
11 changed files with 297 additions and 467 deletions
--- a/src/api/modules/course.js
+++ b/src/api/modules/course.js
@@ -170,9 +170,7 @@ 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
@@ -448,7 +446,6 @@ export default {
    findUpdateLogs,
    getUpdateLog,
    detail,
-    getDictIds,
    saveContent,
    pageList,
    setEnabled,
--- a/src/components/Course/courseForm.vue
+++ b/src/components/Course/courseForm.vue
@@ -141,7 +141,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">
@@ -306,7 +305,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="课程来源">
@@ -490,8 +488,6 @@ export default {
        refType:''
      },
      visibleShow:false,
-      isPermission:false,
-      dicts:[],
      extendRefId:'',
      extendRefType:'',
      courseTeachers: [], //课程的老师
@@ -531,11 +527,7 @@ export default {
        dlgShow: false
      },
      rightTypeId: {},
-      catalogSortDialogShow: false,
-      selectedOrg: {
-        orgId: null,
-        name: ''
-      }
+      catalogSortDialogShow: false
    };
  },
  created() {
@@ -560,18 +552,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 +581,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){
@@ -910,26 +885,10 @@ export default {
      this.courseCoverurl = '';
      this.courseInfo.coverImg = '';
    },
-    //获取字典信息
-    async getDictIds() {
-      console.log("--- 获取字典信息 1  = ", this.dicts);
-      try {
-        const response = await apiCourse.getDictIds(637, 1); // 确保返回 Promise
-        console.log("--- 获取字典信息 2 result= ", response);
-
-        if (response.status === 200) {
-          this.dicts = response.result.dicts; // 正确提取 dicts
-          console.log("--- 获取字典信息 3 = ", this.dicts);
-        }
-      } catch (error) {
-        console.error("获取字典信息失败：", error);
-      }
-    },
    //获取课程信息
    async getDetail(id) {
      this.curCourseId = id;
      this.orgName='';
-      this.isPermission = false;
      let $this = this;
      try {
        const { result, status } = await apiCourse.detail(id);
@@ -947,10 +906,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=>{
--- a/src/components/Course/homework.vue
+++ b/src/components/Course/homework.vue
@@ -109,7 +109,7 @@ export default {
         if(res.status==200){
             this.info=res.result;
             //检查是否过期
-            if(res.result.deadTime!='' && res.result.deadTime != null){
+            if(res.result.deadTime!=''){
               var d = new Date(res.result.deadTime);
               var now=new Date();
               if(now.getTime() > d.getTime()){
--- a/src/components/VideoPlayer/index.vue
+++ b/src/components/VideoPlayer/index.vue
@@ -317,7 +317,7 @@ export default {
    }

    setInterval(() => {
-          console.log('当前状态:',this.currentProgress,this.isDrag,this.videoDom.currentTime , this.videoDom.duration)
+          //console.log('this.currentProgress::',this.currentProgress,this.isDrag,this.videoDom.currentTime , this.videoDom.duration)
          // 视频播放时本地记录视频实时播放时长,视频设置了禁止拖动时执行
          if(!this.isDrag){
            var time = localStorage.getItem('videoProgressData')
@@ -364,11 +364,6 @@ export default {
      }
      // 根据视频的readyState判断下一帧是否已加载，并控制loading的显示
      this.isShowLoading = this.videoDom.readyState < 3;
-      console.log("当前缓存:"+this.videoDom.readyState)
-      if (this.videoDom.readyState < 3){
-        console.log("详细信息",this.videoDom)
-        console.log("卡了",this.videoDom.readyState)
-      }
      //if()
      //console.log(this.videoDom.readyState,'this.videoDom.readyState');
    }, 1000);
--- a/src/components/VideoPlayer/progress-bar.vue
+++ b/src/components/VideoPlayer/progress-bar.vue
@@ -37,6 +37,7 @@ export default {
    },
    isDrag:{
      type: Boolean,
+      default: true,
    },
    blobId:{
      type: String,
--- a/src/views/course/Courseware.vue
+++ b/src/views/course/Courseware.vue
@@ -624,8 +624,12 @@ export default {
        // if(item.minute){
        //    item.duration=parseFloat(item.minute)*60;
        // }
-        // 如果没有给一个默认值30分钟
-        item.duration = item.minute ? parseFloat(item.minute) * 60 : 1800;
+        // 视频文件才可以设置时长，其他类型直接赋值0
+        if (item.fileType === 'mp4' || item.fileType === 'mp3') {
+          item.duration = item.minute ? parseFloat(item.minute) * 60 : 0;
+        } else {
+          item.duration = 0;
+        }
      });
      this.loading = true;
      coueseFile.batchUpdate(this.fileList).then(rs => {
--- a/src/views/grateful/GratefulHomePage.vue
+++ b/src/views/grateful/GratefulHomePage.vue
@@ -6,7 +6,7 @@
        <swiper :options="swiperOptiontwo">
          <swiper-slide style="margin: 0 auto" v-for="(item, idx) in resonimg" :key="'a' + idx"
            class="swiper-slide games pointer">
-            <div class="bannbox" @click="handleCarouselClick(item)" :style="{
+            <div class="bannbox" :style="{
              background: `url(${fileBaseUrl + item.image
                }) center center no-repeat`,
            }"></div>
@@ -18,7 +18,7 @@
        <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">
-            <div class="bannbox" @click="handleCarouselClick(item)"  :style="{
+            <div class="bannbox" :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,13 +249,6 @@ 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}`)
--- a/src/views/grateful/TeacherOpinion.vue
+++ b/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">认证讲师库</span>
+              <span style="cursor: pointer;" class="nav">认证讲师库（2023）</span>
            </div>
            <div style="position: relative;">
              <el-input class="portal-input" placeholder="请输入课程名称" style="border-radius: 20px !important; "
--- a/src/views/portal/case/Detail.vue
+++ b/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" :name="authorInfo.name"></author>
+                  :sex="authorInfo.sex"></author>
                <span>案主：{{ authorInfo.name }} ({{ authorInfo.orgInfo }})</span>
                <!-- <span>案主：{{ authorInfo.name }}</span>
                    <span>工号：{{ authorInfo.code }}</span>
--- a/src/views/portal/case/Index.vue
+++ b/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;
--- a/src/views/study/coursenew.vue
+++ b/src/views/study/coursenew.vue
@@ -22,7 +22,6 @@
      <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="renderCourse">
            <div v-if="resType == null || resType == 0">
              <!--先显示视频图片-->
              <course-image v-if="courseInfo.id != ''" :course="courseInfo"></course-image>
@@ -110,15 +109,6 @@
              </assess>
            </div>
          </div>
-            <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>
-              </div>
-              <div style="margin-top:20px;text-align:center" @click="refreshPage">
-                <el-button type="primary">重新检测</el-button>
-              </div>
-            </div>
-          </div>
          <!--交互部分-->
          <div>
            <div class="course-interact">
@@ -177,7 +167,7 @@
            </div>
            <!-- 课程单元  -->
            <div class="course-units" v-if="tab == 1">
-              <div style="min-height: 350px;max-height: 650px ;overflow-y: auto;">
+              <div :style="`height: ${controlHeight}px;overflow-y: auto;`">
                <div class="catalog" v-if="courseInfo.type == 20">
                  <div  v-for="(item, index) in catalogTree" :key="index" :name="index">
                    <el-menu
@@ -313,17 +303,6 @@
        </div>
      </div>
    </div>
-    <el-dialog class="protocol" :close-on-click-modal="false" :visible="protocolDialogVisible" width="30%"
-               :show-close="false">
-      <div class="protocol-title">{{warnTitle}}</div>
-      <div class="protocol-content">
-        &emsp;&emsp;{{warn}}
-      </div>
-      <span slot="footer" class="dialog-footer">
-          <el-button type="primary" @click="protocolDialogVisible = false">确
-                定</el-button>
-      </span>
-    </el-dialog>
    <!-- <div><portal-footer></portal-footer></div> -->
  </div>
 </template>
@@ -390,7 +369,6 @@
    },
    data() {
      return {
-        protocolDialogVisible: false,
        tentative: false,
        isContentTypeTwo: null,
        isContentType: null,
@@ -412,7 +390,6 @@
        curCFile: {
          converStatus: 4,
        },
-        Internet: 3,//1是成功 2是是失败 3是检测中
        radio: '',
        interactRuning: false,
        playerBoxShow: false,
@@ -454,7 +431,6 @@
        getType: getType,
        ctabName: 'catalog',
        resType: null,
-        renderCourse: true,
        activeNames: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9],
        scoreInfo: {
          dlgShow: false,
@@ -478,12 +454,9 @@
        cumulativeDuration:0, //非音频累计时长
        maxDuration:0, //非音频最大时长
        defaultMaxTime:1800, //非音频默认最大时间
-        warn:"测试内容",
-        warnTitle:"测试标题",
      }
    },
    mounted() {
-      this.getInternet();
      // 增加的用户受众id
      let localKey = "user_" + this.userInfo.sysId + "_gids";
      let hasIds = sessionStorage.getItem(localKey);
@@ -531,6 +504,10 @@
        return treeList;
      }
    },
+    destroyed(){
+      this.cleanAppendTime();
+      this.stopStudyTime();
+    },
    methods: {
      handleOpen(key,path){
        if(this.isFalse){
@@ -816,8 +793,7 @@
            }else if(h>500){
              h=h+60;
            }
-          // 移除高度控制 防止内容塌陷
-            // $this.controlHeight=h-95;
+            $this.controlHeight=h-95;
        })


@@ -1323,17 +1299,6 @@
          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;
@@ -1392,8 +1357,7 @@
              }
            }
            this.courseInfo = rs.result.course;
-            this.warn = rs.result.warn;
-            this.warnTitle = rs.result.warnTitle;
+
            if (rs.result.teachers && rs.result.teachers.length > 0) {
              let userIds = [];
              let ctoUsers = [];
@@ -1422,53 +1386,12 @@
            this.totalContent = rs.result.contents.length;
            //加载学习的数据
            this.loadStudyData(rs.result);
+
          } else {
            this.$message.error(rs.message);
          }
-
        });
      },
-      refreshPage() {
-        location.reload();
-        // this.getInternet();
-        // this.loadData();
-      },
-      getXmlHttpRequest() {
-        if (window.XMLHttpRequest) {
-          return new XMLHttpRequest();
-        }
-        else if (window.ActiveXObject) {
-          return new ActiveXObject("Microsoft.XMLHTTP");
-        }
-      },
-      // 检测是否为内网
-      getInternet() {
-        this.Internet = 3;
-        let $this = this;
-        let xmlhttp = this.getXmlHttpRequest();
-        let timedOut = false;
-        let timer = setTimeout(function () {
-          timedOut = true;
-          xmlhttp.abort();
-        }, 1000);
-        xmlhttp.open("HEAD", window.location.protocol + "//uapi.boe.com.cn/500.html", true);
-        xmlhttp.send();
-        xmlhttp.onreadystatechange = function () {
-          if (xmlhttp.readyState == 4) {
-            if (xmlhttp.status == 200) {
-              clearTimeout(timer);
-              $this.Internet = 1;
-            } else {
-              clearTimeout(timer);
-              // $this.protocolDialogVisible=true
-              $this.Internet = 2;
-            }
-          } else {
-            if (timedOut) return;//忽略中止请求
-            clearTimeout(timer);//取消等待的超时
-          }
-        }
-      },
      loadStudyData(result) {
        let $this=this;
        this.loadScorePraiseAndTrample();
@@ -1761,10 +1684,6 @@
          }
      },
    },
-    destroyed(){
-      this.cleanAppendTime();
-      this.stopStudyTime();
-    },
  }
 </script>

@@ -1801,46 +1720,23 @@
    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{ //内容播放区域
-        flex: 4; // 80%高度
+        flex:1;
        min-width: 700px;
-        // min-height: 400px;
-        // max-height: 800px;
-        height: 80%;
+        min-height: 400px;
+        max-height: 800px;
+        //height: 100%;
        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;
@@ -1960,10 +1856,13 @@
  }

  .player-box {
-    position: relative;
-    width: 100%;
-    max-width: 300px;
-    margin: 20px auto;
+    position: absolute;
+    // top: 62px;
+    // left: 184px;
+    width: 300px;
+    left: 50%;
+    top: 50%;
+    transform: translate(-50%, -50%);
    height: 187px;
    background: rgba(74, 74, 74, .5);
    border-radius: 33px;
@@ -2106,7 +2005,6 @@
  }

  .course-interact {
-    flex: 1; // 20%高度
    height: 54px;
    // padding-top: 10px;
    // padding-right: 10px;
@@ -2470,18 +2368,4 @@
    height: 200px;
    background: url('../../../public/images/couresdetail.png');
  }
-
-.protocol {
-  .protocol-title {
-    font-size: 20px;
-    font-weight: 600;
-    text-align: center;
-    margin-bottom: 25px;
-  }
-
-  .protocol-content {
-    font-size: 14px;
-    line-height: 25px;
-  }
-}
 </style>