取消日志

Merge remote-tracking branch 'yx/master-0720-lyc' into master-110
修改前端进度条
2025-12-08 18:36:43 +08:00 · 2025-07-23 11:14:08 +08:00 · 2025-07-23 11:02:35 +08:00 · 2025-07-23 10:58:47 +08:00 · 2025-07-23 10:42:54 +08:00 · 2025-07-23 10:23:24 +08:00
21 changed files with 823 additions and 381 deletions
--- a/src/api/boe/courseRecord.js
+++ b/src/api/boe/courseRecord.js
@@ -62,15 +62,62 @@ const courseRecordList = function(data) {
    return ajax.postJson('/b1/system/teacher/teacher-course-list',data);
 }
 const getListByToken = function(data) {
-  return ajax2.get('/manageApi',`/admin/teacherRecord/getListByToken?courseName=${data.courseName}&page=${data.page}&pageSize=${data.pageSize}`);
+  return ajax2.get('/manageApi',`/admin/teacherRecord/getListByToken?courseName=${data.courseName}&pageNo=${data.pageNo}&pageSize=${data.pageSize}`);
+}
+
+/**
+ * 导出授课记录
+ *
+ * @param {Object} data
+ */
+const courseRecordExport2 = function(data) {
+  return axios.request({
+    baseURL: "/manageApi",
+    url: '/admin/export/exportInTeacherRecord',
+    method: 'get',
+    data:data,
+    headers:{'Content-Type':'application/json;charset=utf-8'},
+    responseType: 'blob'
+  })
+}
+
+/**
+ * 导出课程下的学员信息
+ *
+ */
+const exportStudentOfCourse2 = function(courseId,courseType) {
+  return axios.request({
+    baseURL: "/manageApi",
+    url: '/admin/export/exportTeacherRecordStudentInfo?courseId='+courseId+'&courseType='+courseType,
+    method: 'get'
+    // headers:{'Content-Type':'application/json;charset=utf-8'},
+    // responseType: 'blob'
+  })
+}
+
+/**
+ * 导出教师下的所有授课记录下的学员信息
+ *
+ */
+const exportStudentOfTearcher2 = function(userId) {
+  return axios.request({
+    baseURL: "/manageApi",
+    url: '/b1/system/teacher/teacher-course-student-export?userId='+userId,
+    method: 'post',
+    headers:{'Content-Type':'application/json;charset=utf-8'},
+    responseType: 'blob'
+  })
 }


 export default {
    courseRecordExport,
+    courseRecordExport2,
    courseRecordList,
    getListByToken,
    exportStudentOfCourse,
-    exportStudentOfTearcher
+    exportStudentOfCourse2,
+    exportStudentOfTearcher,
+    exportStudentOfTearcher2,

 }
--- a/src/api/modules/teacher.js
+++ b/src/api/modules/teacher.js
@@ -38,7 +38,7 @@ const detailTeacher=function (id){
 * tlevelId级别
 * salaryId发薪地
 * tsystemId
- 
+
 * } query
 * @returns
 */
--- a/src/assets/images/grateful/gratefulFooter20250613.png
+++ b/src/assets/images/grateful/gratefulFooter20250613.png
--- a/src/assets/images/hotforum/2024.png
+++ b/src/assets/images/hotforum/2024.png
--- a/src/assets/images/hotforum/2025.png
+++ b/src/assets/images/hotforum/2025.png
--- a/src/assets/images/hotforum/2501.jpg
+++ b/src/assets/images/hotforum/2501.jpg
--- a/src/assets/images/hotforum/2502.png
+++ b/src/assets/images/hotforum/2502.png
--- a/src/assets/images/hotforum/2503.png
+++ b/src/assets/images/hotforum/2503.png
--- a/src/assets/images/hotforum/back25.png
+++ b/src/assets/images/hotforum/back25.png
--- a/src/assets/images/hotforum/line.png
+++ b/src/assets/images/hotforum/line.png
--- a/src/components/Course/courseForm.vue
+++ b/src/components/Course/courseForm.vue
@@ -141,6 +141,7 @@
              <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">
@@ -305,6 +306,7 @@
                <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="课程来源">
@@ -488,6 +490,8 @@ export default {
        refType:''
      },
      visibleShow:false,
+      isPermission:false,
+      dicts:[],
      extendRefId:'',
      extendRefType:'',
      courseTeachers: [], //课程的老师
@@ -527,7 +531,11 @@ export default {
        dlgShow: false
      },
      rightTypeId: {},
-      catalogSortDialogShow: false
+      catalogSortDialogShow: false,
+      selectedOrg: {
+        orgId: null,
+        name: ''
+      }
    };
  },
  created() {
@@ -552,9 +560,15 @@ export default {
  },
  watch: {
    courseInfo: {
-      handler(newVal) {
-        //需要保存
+      handler(newVal, oldVal) {
+        // 需要保存
        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
    }
@@ -581,6 +595,22 @@ 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;
+      }
+      this.isPermission = this.dicts.includes(orgId);
+      this.courseInfo.device = 3;
+      if(this.isPermission){
+        this.courseInfo.device = 4;
+      }
+      console.log("--- 监听结束 this.isPermission  = ",this.isPermission)
+    },
    // 关键字的更改
    changeKeywords(option){
      if(option.target.value){
@@ -889,7 +919,8 @@ export default {
    async getDetail(id) {
      this.curCourseId = id;
      this.orgName='';
-      let $this = this;
+      this.isPermission = false;
+        let $this = this;
      try {
        const { result, status } = await apiCourse.detail(id);
        if (status === 200) {
@@ -906,7 +937,10 @@ 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!=''){
+            if(res.result.deadTime!='' && res.result.deadTime != null){
               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,8 +317,8 @@ export default {
    }

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

@@ -103,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);
@@ -119,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);
      }
    },
  },
--- a/src/views/course/Mylecnotes.vue
+++ b/src/views/course/Mylecnotes.vue
@@ -1,206 +1,276 @@
 <template>
  <div style="padding: 12px 32px 10px 12px;">
-   <div style="display: flex;justify-content: flex-start;">
+    <div style="display: flex;justify-content: flex-start;">

-     <div><el-input v-model="keyword" placeholder="输入课程名称搜索" clearable></el-input></div>
-     <div style="padding-left: 10px;"><el-button @click="recordList()" type="primary" icon="el-icon-search">搜索</el-button></div>
-     <div style="padding: 0px 5px;"><el-button icon="el-icon-refresh-right" @click="keyword = ''" type="primary" >重置</el-button></div>
-     <div style="padding: 0px 5px;"><el-button type="primary" @click="exportFile()" icon="el-icon-search" size="small" round>导出</el-button></div>
-     <div style="padding: 0px 5px;"><el-button type="primary" @click="exportStudentOfTearcher()" icon="el-icon-search" size="small" round>导出学员信息</el-button></div>
-   </div>
-   <div class="Export">
-     <!-- <div style="padding-left: 10px;"><el-button type="primary" @click="exportFile()" icon="el-icon-search" size="small" round>导出</el-button></div> -->
-     <!-- <div style="padding: 0px 5px;"><el-button icon="el-icon-refresh-right" type="primary" size="small" round>导出学员信息</el-button></div> -->
-   </div>
-   <div style="margin-top:20px;">
-     <el-table :data="pageData" border stripe>
-         <el-table-column
-         label="课程时间"
-         prop="courseTime"
-         width="200px">
-         </el-table-column>
-         <el-table-column
-         label="课程名称"
-         prop="courseName"
-         width="200px">
-         </el-table-column>
-         <el-table-column
-         label="开课场地"
-         prop="address"
-         width="240px">
-         </el-table-column>
-         <el-table-column
-         label="所属课程"
-         prop="parentCourse"
-         width="120px">
-         </el-table-column>
-         <el-table-column
-         label="所属项目"
-         prop="parentProject"
-         ></el-table-column>
-         <el-table-column
-         label="所属路径"
-         prop="parentRoute"
-         width="200px"
-         ></el-table-column>
-         <el-table-column
-         label="学习总人数"
-         prop="studentNumber"
-         width="100px"
-         ></el-table-column>
-         <el-table-column
-         label="时长(分钟)"
-         width="100px"
-         prop="period"
-         ></el-table-column>
-         <el-table-column
-         label="评分"
-         width="100px"
-         prop="score"
-          ></el-table-column>
-         <el-table-column
-         label="操作"
-         align="center"
-         width="150px"
-         prop="cz"
-         fixed="right"
-          >
+      <div>
+        <el-input v-model="keyword" placeholder="输入课程名称搜索" clearable></el-input>
+      </div>
+      <div style="padding-left: 10px;">
+        <el-button @click="recordList()" type="primary" icon="el-icon-search">搜索</el-button>
+      </div>
+      <div style="padding: 0px 5px;">
+        <el-button icon="el-icon-refresh-right" @click="keyword = ''" type="primary">重置</el-button>
+      </div>
+      <div style="padding: 0px 5px;">
+        <el-button type="primary" @click="exportFile()" icon="el-icon-search" size="small" round>导出</el-button>
+      </div>
+<!--      <div style="padding: 0px 5px;">-->
+<!--        <el-button type="primary" @click="exportStudentOfTearcher()" icon="el-icon-search" size="small" round>-->
+<!--          导出学员信息-->
+<!--        </el-button>-->
+<!--      </div>-->
+    </div>
+    <div class="Export">
+      <!-- <div style="padding-left: 10px;"><el-button type="primary" @click="exportFile()" icon="el-icon-search" size="small" round>导出</el-button></div> -->
+      <!-- <div style="padding: 0px 5px;"><el-button icon="el-icon-refresh-right" type="primary" size="small" round>导出学员信息</el-button></div> -->
+    </div>
+    <div style="margin-top:20px;">
+      <el-table :data="pageData" border stripe>
+        <el-table-column
+          label="序号"
+          prop="index"
+          width="100px">
          <template v-slot="scope">
-           <el-button type="text" @click="exportStudentOfCourse(scope.row.courseId)" size="small">导出学员信息</el-button>
-         </template>
-       </el-table-column>
-     </el-table>
-   </div>
+            <span>{{ scope.$index + 1 }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          label="讲师工号"
+          prop="userNo"
+          width="100px">
+        </el-table-column>
+        <el-table-column
+          label="讲师姓名"
+          prop="teacherName"
+          width="200px">
+        </el-table-column>
+        <el-table-column
+          label="课程名称"
+          prop="courseName"
+          width="200px">
+        </el-table-column>
+        <el-table-column
+          label="培训发生组织"
+          prop="trainOrgName"
+          width="200px">
+        </el-table-column>
+        <el-table-column label="课程类型" prop="type" width="120px">
+          <template v-slot="scope">
+                <span>{{
+                    {
+                      "0": "在线课",
+                      "1": "面授课",
+                      "2": "课程开发",
+                      "3": "作业员入模培训",
+                      "4": "其他",
+                    }[scope.row.type + '']
+                  }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          label="授课/课程日期"
+          prop="teachingDate"
+          width="200px">
+        </el-table-column>

- <div style="text-align: center; margin-top:57px">
-  <el-pagination
-   background
-     @size-change="handleSizeChange"
-     @current-change="handleCurrentChange"
-     :current-page="pageInfo.page"
-     :page-sizes="[10, 20, 30, 40]"
-     :page-size="pageInfo.pageSize"
-     layout="total, sizes, prev, pager, next, jumper"
-     :total="pageInfo.total"
-   ></el-pagination>
-   </div>
+        <el-table-column
+          label="内容分类"
+          prop="courseTypeName"
+          width="200px">
+        </el-table-column>
+        <el-table-column label="开课状态" width="100px" prop="courseStatus">
+          <template v-slot="scope">
+                <span>{{
+                    {
+                      "0": "未开课",
+                      "1": "已开课",
+                    }[scope.row.courseStatus + '']
+                  }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          label="授课时长(分钟)"
+          prop="teaching"
+          width="120px"
+        ></el-table-column>
+        <el-table-column
+          label="参训人数"
+          prop="studys"
+          width="120px"
+        ></el-table-column>
+        <el-table-column
+          label="评分"
+          prop="score"
+          width="100px"
+        ></el-table-column>
+        <el-table-column
+          label="是否生成讲师费"
+          prop="createdFee"
+          width="100px"
+        >
+          <template v-slot="scope">
+                <span>{{
+                    {
+                      "0": "否",
+                      "1": "是",
+                    }[scope.row.createdFee + '']
+                  }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          label="备注"
+          width="200px"
+          prop="remark"
+        ></el-table-column>
+        <el-table-column
+          label="操作"
+          align="center"
+          width="150px"
+          prop="cz"
+          fixed="right"
+        >
+          <template v-slot="scope">
+            <el-button type="text" @click="exportStudentOfCourse(scope.row.courseId, scope.row.type)"
+                       size="small">导出学员信息
+            </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>

- </div>
+    <div style="text-align: center; margin-top:57px">
+      <el-pagination
+        background
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+        :current-page="pageInfo.page"
+        :page-sizes="[10, 20, 30, 40]"
+        :page-size="pageInfo.pageSize"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="pageInfo.total"
+      ></el-pagination>
+    </div>
+
+  </div>
 </template>

 <script>
 import apiCourse from '../../api/boe/courseRecord.js';
-import { mapGetters } from 'vuex';
+import {mapGetters} from 'vuex';
+
 export default {
-data(){
- return {
-     pageData:[],
-     keyword:'',
-     pageInfo:{},
- }
-},
+  data() {
+    return {
+      pageData: [],
+      keyword: '',
+      pageInfo: {
+        pageIndex:1,
+        pageSize:10,
+      },
+    }
+  },
+  mounted() {
+    this.recordList();
+  },
+  computed: {
+    ...mapGetters(['userInfo'])
+  },
+  methods: {
+    // 导出所有记录
+    exportFile() {
+      // let req = {
+      // }
+      // apiCourse.courseRecordExport2(req).then(res => {
+      //   const link = document.createElement('a');// 创建a标签
+      //   let blob = new Blob([res.data], {type: 'application/vnd.ms-excel'}); // 设置文件类型
+      //   link.style.display = "none";
+      //   link.href = URL.createObjectURL(blob); // 创建URL
+      //   link.setAttribute("download", "授课记录.xls");
+      //   document.body.appendChild(link);
+      //   link.click();
+      //   document.body.removeChild(link);
+      // })
+      // 取pageData记录第一条
+      if (this.pageData.length > 0) {
+        let teacherId = this.pageData[0].teacherId;
+        window.open(
+          `/manageApi/admin/export/exportInTeacherRecord?teacherId=${teacherId}`
+        );
+      }
+    },

-mounted() {
- this.recordList(1);
+    // 导出课程下的学员信息
+    exportStudentOfCourse(courseId, courseType) {
+      // apiCourse.exportStudentOfCourse2(courseId, courseType).then(res => {
+      //   const link = document.createElement('a');// 创建a标签
+      //   let blob = new Blob([res.data], {type: 'application/vnd.ms-excel'}); // 设置文件类型
+      //   link.style.display = "none";
+      //   link.href = URL.createObjectURL(blob); // 创建URL
+      //   link.setAttribute("download", "授课记录.xls");
+      //   document.body.appendChild(link);
+      //   link.click();
+      //   document.body.removeChild(link);
+      // })

-},
-computed: {
- ...mapGetters(['userInfo'])
-},
+      window.open(
+        `/manageApi/admin/export/exportTeacherRecordStudentInfo?courseId=${courseId}&courseType=${courseType}`
+      );
+    },

-methods: {
+    // 导出教师下的所有授课记录下的学员信息
+    exportStudentOfTearcher() {
+      let userId = this.userInfo.sysId;
+      apiCourse.exportStudentOfTearcher2(userId).then(res => {
+        const link = document.createElement('a');// 创建a标签
+        let blob = new Blob([res.data], {type: 'application/vnd.ms-excel'}); // 设置文件类型
+        link.style.display = "none";
+        link.href = URL.createObjectURL(blob); // 创建URL
+        link.setAttribute("download", "授课记录.xls");
+        document.body.appendChild(link);
+        link.click();
+        document.body.removeChild(link);
+      })
+    },

-   // 导出所有记录
-   exportFile(){
-     let req = {
-       userId: this.userInfo.sysId
-       // userId:"70F80F4E-34BA-10AB-894A-8FA812B19637"
-     }
-     apiCourse.courseRecordExport(req).then(res=>{
-         const link = document.createElement('a');// 创建a标签
-         let blob = new Blob([res.data],{type: 'application/vnd.ms-excel'}); // 设置文件类型
-         link.style.display = "none";
-         link.href = URL.createObjectURL(blob); // 创建URL
-         link.setAttribute("download", "授课记录.xls");
-         document.body.appendChild(link);
-         link.click();
-         document.body.removeChild(link);
-     })
-   },
-
-
-   // 导出课程下的学员信息
-   exportStudentOfCourse(courseId){
-     let userId = this.userInfo.sysId;
-     apiCourse.exportStudentOfCourse(userId,courseId).then(res=>{
-         const link = document.createElement('a');// 创建a标签
-         let blob = new Blob([res.data],{type: 'application/vnd.ms-excel'}); // 设置文件类型
-         link.style.display = "none";
-         link.href = URL.createObjectURL(blob); // 创建URL
-         link.setAttribute("download", "授课记录.xls");
-         document.body.appendChild(link);
-         link.click();
-         document.body.removeChild(link);
-     })
-   },
-
-   // 导出教师下的所有授课记录下的学员信息
-   exportStudentOfTearcher(){
-     let userId = this.userInfo.sysId;
-     // let userId = '5D36C207-64F4-C512-312D-C9598257695C';
-     apiCourse.exportStudentOfTearcher(userId).then(res=>{
-         const link = document.createElement('a');// 创建a标签
-         let blob = new Blob([res.data],{type: 'application/vnd.ms-excel'}); // 设置文件类型
-         link.style.display = "none";
-         link.href = URL.createObjectURL(blob); // 创建URL
-         link.setAttribute("download", "授课记录.xls");
-         document.body.appendChild(link);
-         link.click();
-         document.body.removeChild(link);
-     })
-   },
-
-
-   recordList(pageIndex){
-     let req = {
-     //     userId:"6B049FAF-C314-7CCF-0D28-0D23F4C42531",
-         userId: this.userInfo.sysId,
-         keyword:this.keyword,
-         page:pageIndex,
-         pageSize:10
-     }
-     apiCourse.courseRecordList(req).then(res=>{
-       if(res.status == 200) {
-         this.pageData = res.result.list;
-         this.pageInfo = res.result.pageInfo;
-       } else {
+    recordList() {
+      let req = {
+        courseName: this.keyword,
+        pageNo: this.pageInfo.pageIndex,
+        pageSize: this.pageInfo.pageSize
+      }
+      apiCourse.getListByToken(req).then(res => {
+        if (res.status == 200) {
+          this.pageData = res.data.records;
+          this.pageInfo.pageSize = Number(res.data.size);
+          this.pageInfo.total = Number(res.data.total);
+          this.pageInfo.page = Number(res.data.current);
+        } else {
          this.$message({
-           type: 'error',
-           message: res.message
-         });
-       }
-     })
-   },
-
-   // 每页显示的条数事件
-   handleSizeChange(val){
-     this.pageInfo.pageSize = val;
-     this.recordList(1);
-   },
-   // 显示制定页的数据
-   handleCurrentChange(val){
-     this.pageInfo.pageIndex = val;
-     this.recordList(this.pageInfo.pageIndex);
-   },
-
-},
+            type: 'error',
+            message: res.message
+          });
+        }
+      })
+    },

+    // 每页显示的条数事件
+    handleSizeChange(val) {
+      this.pageInfo.pageIndex = 1;
+      this.pageInfo.pageSize = val;
+      this.recordList();
+    },
+    // 显示制定页的数据
+    handleCurrentChange(val) {
+      this.pageInfo.pageIndex = val;
+      this.recordList(this.pageInfo.pageIndex);
+    },
+  },
 }
 </script>

 <style lang="scss" scoped>
-.Export{
-display: flex;
-padding-top: 10px;
+.Export {
+  display: flex;
+  padding-top: 10px;
 }
 </style>
--- a/src/views/exam/ExamList.vue
+++ b/src/views/exam/ExamList.vue
@@ -954,7 +954,7 @@ export default {
    },
    findPapers() {
      let params={
-        pageSize:200,
+        pageSize:10000,
        name:''
      }
      apiPaper.querypaper(params).then((res) => {
--- a/src/views/grateful/index.vue
+++ b/src/views/grateful/index.vue
@@ -5,7 +5,7 @@
    <!-- </div> -->
    <!-- 底部 -->
    <div class="grateful">
-      <img src="../../assets/images/grateful/gratefulFooter.png" alt="" />
+      <img src="../../assets/images/grateful/gratefulFooter20250613.png" alt="" />
    </div>
  </div>
 </template>
--- a/src/views/hotforum/Index-bak.vue
+++ b/src/views/hotforum/Index-bak.vue
@@ -0,0 +1,179 @@
+<template>
+  <div class="hot">
+    <div>
+      <div class="center">
+        <div class="item" :style="{marginRight:(i%2==0||i==0)?'49px':'0'}" v-for="item,i in imgData" :key="i">
+          <img class="img" @click="goLearn(item.url)" :src="require(`../../assets/images/hotforum/${item.img}.png`)" alt="">
+        </div>
+      </div>
+      <div style="display: flex;justify-content: center;margin-bottom: 52px;">
+        <img src="../../assets/images/hotforum/foot.png" alt="">
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+  export default {
+    name: "hotforum",
+    data() {
+      return {
+        imgData:[
+          {img:'01',url:'1265897142383042560'},
+          {img:'02',url:'1265697724606210048'},
+          {img:'003',url:'1280185851054231552'},
+          {img:'04',url:'1321778585966247936'},
+        ],
+      }
+    },
+    methods: {
+      goLearn(item){
+        if(item){
+          // this.$router.push({path:'/course/detail',query:{id:item}})
+          window.open(`https://u.boe.com/pc/course/detail?id=${item}`)
+        }
+      },
+    },
+  }
+</script>
+
+<style lang="scss" scoped>
+.hot{
+  width: 100%;
+  // max-width: 1920px;
+  min-height: 100%;
+  // min-height: 1373px;
+  background: url("../../assets/images/hotforum/back.jpg") no-repeat;
+  background-size: 100% 100%;
+  display: flex;
+  justify-content: center;
+  .center{
+    max-width: 1270px;
+    max-height: 700px;
+    margin-bottom: 5%;
+    margin-top: 22%;
+    display: flex;
+    flex-wrap: wrap;
+    .item{
+      width: 610px;
+      height: 330px;
+      background: url("../../assets/images/hotforum/border.png") no-repeat;
+      background-size: 100%;
+      padding: 14px;
+      padding-top: 31px;
+      margin-bottom: 59px;
+      cursor: pointer;
+      .img{
+        width: 581px;
+        height: 283px;
+      }
+    }
+  }
+  /* 当窗口宽度大于3068px时的样式 */
+}
+@media (min-width: 3000px) {
+.hot{
+  width: 100%;
+  // max-width: 1920px;
+  min-height: 100%;
+  // min-height: 1373px;
+  background: url("../../assets/images/hotforum/back.jpg") no-repeat;
+  background-size: 100% 100%;
+  display: flex;
+  justify-content: center;
+  .center {
+    max-width: 2560px;
+    max-height: 1300px;
+    margin-bottom: 5%;
+    margin-top: 30vh;
+    display: flex;
+    flex-wrap: wrap;
+
+    .item {
+      width: 1220px;
+      height: 660px;
+      background: url("../../assets/images/hotforum/border.png") no-repeat;
+      background-size: 100%;
+      padding: 28px;
+      padding-top: 62px;
+      margin-bottom: 59px;
+
+      .img {
+        width: 100%; // 图片宽度占满item宽度
+        height: auto; // 自动调整高度
+      }
+    }
+  }
+}
+}
+@media (min-height: 1500px) {
+.hot{
+  width: 100%;
+  // max-width: 1920px;
+  min-height: 100%;
+  // min-height: 1373px;
+  background: url("../../assets/images/hotforum/back.jpg") no-repeat;
+  background-size: 100% 100%;
+  display: flex;
+  justify-content: center;
+  .center {
+    max-width: 1068px;
+    max-height: 580px;
+    margin-bottom: 5%;
+    margin-top: 30vh;
+    display: flex;
+    flex-wrap: wrap;
+
+    .item {
+      width: 500px;
+      height: 271px;
+      background: url("../../assets/images/hotforum/border.png") no-repeat;
+      background-size: 100%;
+      padding: 14px;
+      padding-top: 26px;
+      margin-bottom: 30px;
+
+      .img {
+        width: 100%; // 图片宽度占满item宽度
+        height: auto; // 自动调整高度
+      }
+    }
+  }
+}
+}
+@media (min-width: 1928px) and (max-width: 3000px) {
+.hot{
+  width: 100%;
+  // max-width: 1920px;
+  min-height: 100%;
+  // min-height: 1373px;
+  background: url("../../assets/images/hotforum/back.jpg") no-repeat;
+  background-size: 100% 100%;
+  display: flex;
+  justify-content: center;
+  .center {
+    max-width: 1800px;
+    max-height: 1100px;
+    margin-bottom: 5%;
+    margin-top: 35vh;
+    display: flex;
+    flex-wrap: wrap;
+
+    .item {
+      width: 860px;
+      height: 466px;
+      background: url("../../assets/images/hotforum/border.png") no-repeat;
+      background-size: 100%;
+      padding: 28px;
+      padding-top: 48px;
+      margin-bottom: 70px;
+
+      .img {
+        width: 100%; // 图片宽度占满item宽度
+        height: auto; // 自动调整高度
+      }
+    }
+  }
+}
+}
+</style>
--- a/src/views/hotforum/Index.vue
+++ b/src/views/hotforum/Index.vue
@@ -1,7 +1,24 @@
 <template>
-  <div class="hot">
+  <div class="hot25">
    <div>
-      <div class="center">
+      <div class="title25" style="">
+          <img class="img" src="../../assets/images/hotforum/2025.png" alt="">
+      </div>
+      <div class="center" style="margin-top: 60px;">
+        <div class="item" style="margin-right: 49px;">
+          <img class="img" @click="goLearn('1351506180295131136')" src="../../assets/images/hotforum/2501.jpg" alt="">
+        </div>
+        <div class="item">
+          <img class="img" @click="goLearn('1375146833375027200')" src="../../assets/images/hotforum/2503.png" alt="">
+        </div>
+      </div>
+      <div class="line" style="margin: 0 auto;margin-top: 60px;width: 100%;text-align: center;">
+        <img class="img" src="../../assets/images/hotforum/line.png" alt="">
+      </div>
+      <div class="title24" style="margin: 0 auto;margin-top: 60px;width: 100%;text-align: center;">
+        <img class="img" src="../../assets/images/hotforum/2024.png" alt="">
+      </div>
+      <div class="center" style="margin-top: 60px;">
        <div class="item" :style="{marginRight:(i%2==0||i==0)?'49px':'0'}" v-for="item,i in imgData" :key="i">
          <img class="img" @click="goLearn(item.url)" :src="require(`../../assets/images/hotforum/${item.img}.png`)" alt="">
        </div>
@@ -11,11 +28,12 @@
      </div>
    </div>
  </div>
+
 </template>

 <script>
  export default {
-    name: "hotforum",
+    name: "hotforumNew",
    data() {
      return {
        imgData:[
@@ -24,6 +42,10 @@
          {img:'003',url:'1280185851054231552'},
          {img:'04',url:'1321778585966247936'},
        ],
+        imgData25:[
+          {img:'2501',url:'1351506180295131136'},
+          {img:'2503',url:'1375146833375027200'},
+        ],
      }
    },
    methods: {
@@ -38,20 +60,22 @@
 </script>

 <style lang="scss" scoped>
-.hot{
+.hot25{
  width: 100%;
  // max-width: 1920px;
  min-height: 100%;
  // min-height: 1373px;
-  background: url("../../assets/images/hotforum/back.jpg") no-repeat;
-  background-size: 100% 100%;
+  background: url("../../assets/images/hotforum/back25.png") no-repeat;
+  background-size: cover;
  display: flex;
  justify-content: center;
+  .title25{
+    margin: 0 auto;margin-top: 100px;width: 100%;text-align: center;
+  }
  .center{
    max-width: 1270px;
    max-height: 700px;
    margin-bottom: 5%;
-    margin-top: 22%;
    display: flex;
    flex-wrap: wrap;
    .item{
@@ -71,109 +95,109 @@
  }
  /* 当窗口宽度大于3068px时的样式 */
 }
-@media (min-width: 3000px) {
-.hot{
-  width: 100%;
-  // max-width: 1920px;
-  min-height: 100%;
-  // min-height: 1373px;
-  background: url("../../assets/images/hotforum/back.jpg") no-repeat;
-  background-size: 100% 100%;
-  display: flex;
-  justify-content: center;
-  .center {
-    max-width: 2560px;
-    max-height: 1300px;
-    margin-bottom: 5%;
-    margin-top: 30vh;
-    display: flex;
-    flex-wrap: wrap;
+// @media (min-width: 3000px) {
+// .hot{
+//   width: 100%;
+//   // max-width: 1920px;
+//   min-height: 100%;
+//   // min-height: 1373px;
+//   background: url("../../assets/images/hotforum/back.jpg") no-repeat;
+//   background-size: 100% 100%;
+//   display: flex;
+//   justify-content: center;
+//   .center {
+//     max-width: 2560px;
+//     max-height: 1300px;
+//     margin-bottom: 5%;
+//     margin-top: 30vh;
+//     display: flex;
+//     flex-wrap: wrap;

-    .item {
-      width: 1220px;
-      height: 660px;
-      background: url("../../assets/images/hotforum/border.png") no-repeat;
-      background-size: 100%;
-      padding: 28px;
-      padding-top: 62px;
-      margin-bottom: 59px;
+//     .item {
+//       width: 1220px;
+//       height: 660px;
+//       background: url("../../assets/images/hotforum/border.png") no-repeat;
+//       background-size: 100%;
+//       padding: 28px;
+//       padding-top: 62px;
+//       margin-bottom: 59px;

-      .img {
-        width: 100%; // 图片宽度占满item宽度
-        height: auto; // 自动调整高度
-      }
-    }
-  }
-}
-}
-@media (min-height: 1500px) {
-.hot{
-  width: 100%;
-  // max-width: 1920px;
-  min-height: 100%;
-  // min-height: 1373px;
-  background: url("../../assets/images/hotforum/back.jpg") no-repeat;
-  background-size: 100% 100%;
-  display: flex;
-  justify-content: center;
-  .center {
-    max-width: 1068px;
-    max-height: 580px;
-    margin-bottom: 5%;
-    margin-top: 30vh;
-    display: flex;
-    flex-wrap: wrap;
+//       .img {
+//         width: 100%; // 图片宽度占满item宽度
+//         height: auto; // 自动调整高度
+//       }
+//     }
+//   }
+// }
+// }
+// @media (min-height: 1500px) {
+// .hot{
+//   width: 100%;
+//   // max-width: 1920px;
+//   min-height: 100%;
+//   // min-height: 1373px;
+//   background: url("../../assets/images/hotforum/back.jpg") no-repeat;
+//   background-size: 100% 100%;
+//   display: flex;
+//   justify-content: center;
+//   .center {
+//     max-width: 1068px;
+//     max-height: 580px;
+//     margin-bottom: 5%;
+//     margin-top: 30vh;
+//     display: flex;
+//     flex-wrap: wrap;

-    .item {
-      width: 500px;
-      height: 271px;
-      background: url("../../assets/images/hotforum/border.png") no-repeat;
-      background-size: 100%;
-      padding: 14px;
-      padding-top: 26px;
-      margin-bottom: 30px;
+//     .item {
+//       width: 500px;
+//       height: 271px;
+//       background: url("../../assets/images/hotforum/border.png") no-repeat;
+//       background-size: 100%;
+//       padding: 14px;
+//       padding-top: 26px;
+//       margin-bottom: 30px;

-      .img {
-        width: 100%; // 图片宽度占满item宽度
-        height: auto; // 自动调整高度
-      }
-    }
-  }
-}
-}
-@media (min-width: 1928px) and (max-width: 3000px) {
-.hot{
-  width: 100%;
-  // max-width: 1920px;
-  min-height: 100%;
-  // min-height: 1373px;
-  background: url("../../assets/images/hotforum/back.jpg") no-repeat;
-  background-size: 100% 100%;
-  display: flex;
-  justify-content: center;
-  .center {
-    max-width: 1800px;
-    max-height: 1100px;
-    margin-bottom: 5%;
-    margin-top: 35vh;
-    display: flex;
-    flex-wrap: wrap;
+//       .img {
+//         width: 100%; // 图片宽度占满item宽度
+//         height: auto; // 自动调整高度
+//       }
+//     }
+//   }
+// }
+// }
+// @media (min-width: 1928px) and (max-width: 3000px) {
+// .hot{
+//   width: 100%;
+//   // max-width: 1920px;
+//   min-height: 100%;
+//   // min-height: 1373px;
+//   background: url("../../assets/images/hotforum/back.jpg") no-repeat;
+//   background-size: 100% 100%;
+//   display: flex;
+//   justify-content: center;
+//   .center {
+//     max-width: 1800px;
+//     max-height: 1100px;
+//     margin-bottom: 5%;
+//     margin-top: 35vh;
+//     display: flex;
+//     flex-wrap: wrap;

-    .item {
-      width: 860px;
-      height: 466px;
-      background: url("../../assets/images/hotforum/border.png") no-repeat;
-      background-size: 100%;
-      padding: 28px;
-      padding-top: 48px;
-      margin-bottom: 70px;
+//     .item {
+//       width: 860px;
+//       height: 466px;
+//       background: url("../../assets/images/hotforum/border.png") no-repeat;
+//       background-size: 100%;
+//       padding: 28px;
+//       padding-top: 48px;
+//       margin-bottom: 70px;

-      .img {
-        width: 100%; // 图片宽度占满item宽度
-        height: auto; // 自动调整高度
-      }
-    }
-  }
-}
-}
+//       .img {
+//         width: 100%; // 图片宽度占满item宽度
+//         height: auto; // 自动调整高度
+//       }
+//     }
+//   }
+// }
+// }
 </style>
--- a/src/views/portal/case/Detail.vue
+++ b/src/views/portal/case/Detail.vue
@@ -651,6 +651,9 @@ export default {
      });
    },
    getCaseData() {
+      // 清空pdf数据
+      this.pdfPath = '';
+
      let $this = this;
      apiCase.details(this.resolveId, true).then(res => {
        if (res.status == 200) {
--- a/src/views/study/coursenew.vue
+++ b/src/views/study/coursenew.vue
@@ -22,91 +22,101 @@
      <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="resType == null || resType == 0">
-              <!--先显示视频图片-->
-              <course-image v-if="courseInfo.id != ''" :course="courseInfo"></course-image>
-            </div>
-            <div v-if="resType == 10" style="position: relative;">
-              <videoPlayer ref="myVideoPlayer" id="myVideoPlayer" @progress="progress" :src="blobUrl" :blobId="blobId" @onPlayerPlaying="onPlayerPlaying"
-                :initTime="contentData.lastStudyTime" :notePlay="notePlay" @onPlayerPlay="onPlayerPlay"
-                :isDrag="curriculumData.isDrag" @onFullscreen="onFullscreen" @onPlayerPause="onPlayerPause"
-                @onPlayerEnded="onPlayerEnded" :isCrowd="isCrowd" @onTimeUpdate="handleAudioTimeUpdate"></videoPlayer>
-              <div class="player-box" v-if="playerBoxShow">
-                <div class="player-praise" style="cursor: pointer;">
-                  <div @click="praiseContent">
-                    <img class="icon-small" v-if="isPraise" :src="require('@/assets/images/icon/praise-active.png')" />
-                    <img class="icon-small" v-else :src="require('@/assets/images/icon/zhan.png')" />
-                    <!-- {{ courseInfo.praises }} -->
-                    <div style="color:#fff;cursor: pointer;">赞</div>
+            <div v-if="false">
+              <div v-if="resType == null || resType == 0">
+                <!--先显示视频图片-->
+                <course-image v-if="courseInfo.id != ''" :course="courseInfo"></course-image>
+              </div>
+              <div v-if="resType == 10" style="position: relative;">
+                <videoPlayer ref="myVideoPlayer" id="myVideoPlayer" @progress="progress" :src="blobUrl" :blobId="blobId" @onPlayerPlaying="onPlayerPlaying"
+                             :initTime="contentData.lastStudyTime" :notePlay="notePlay" @onPlayerPlay="onPlayerPlay"
+                             :isDrag="curriculumData.isDrag" @onFullscreen="onFullscreen" @onPlayerPause="onPlayerPause"
+                             @onPlayerEnded="onPlayerEnded" :isCrowd="isCrowd" @onTimeUpdate="handleAudioTimeUpdate"></videoPlayer>
+                <div class="player-box" v-if="playerBoxShow">
+                  <div class="player-praise" style="cursor: pointer;">
+                    <div @click="praiseContent">
+                      <img class="icon-small" v-if="isPraise" :src="require('@/assets/images/icon/praise-active.png')" />
+                      <img class="icon-small" v-else :src="require('@/assets/images/icon/zhan.png')" />
+                      <!-- {{ courseInfo.praises }} -->
+                      <div style="color:#fff;cursor: pointer;">赞</div>
+                    </div>
+                    <div style="margin-left: 15px;cursor: pointer;" @click="treadContent">
+                      <img class="icon-small" v-if="isTrample"
+                           :src="require('@/assets/images/icon/trample-active.png')" />
+                      <img class="icon-small" v-else :src="require('@/assets/images/icon/cai.png')" />
+                      <!-- {{ courseInfo.trampleCount }} -->
+                      <div style="color:#fff;cursor: pointer;">踩</div>
+                    </div>
                  </div>
-                  <div style="margin-left: 15px;cursor: pointer;" @click="treadContent">
-                    <img class="icon-small" v-if="isTrample"
-                      :src="require('@/assets/images/icon/trample-active.png')" />
-                    <img class="icon-small" v-else :src="require('@/assets/images/icon/cai.png')" />
-                    <!-- {{ courseInfo.trampleCount }} -->
-                    <div style="color:#fff;cursor: pointer;">踩</div>
-                  </div>
-                </div>
-                <div v-if="!scoreInfo.has" class="player-rate">
+                  <div v-if="!scoreInfo.has" class="player-rate">

-                  <el-rate v-model="scoreInfo.score" text-color="#ff9900" score-template="{value}" void-color="#fff"  @change="addScore"></el-rate>
-                </div>
-                <div v-if="scoreInfo.has" style="padding-top: 5px;display: flex;">
-                  <div class="player-rate" style="padding-left: 35px;">
-                    <el-rate disabled v-model="courseInfo.score" :allow-half="true"></el-rate>
+                    <el-rate v-model="scoreInfo.score" text-color="#ff9900" score-template="{value}" void-color="#fff"  @change="addScore"></el-rate>
                  </div>
-                  <span class="score-text" style="margin-top:35px">
+                  <div v-if="scoreInfo.has" style="padding-top: 5px;display: flex;">
+                    <div class="player-rate" style="padding-left: 35px;">
+                      <el-rate disabled v-model="courseInfo.score" :allow-half="true"></el-rate>
+                    </div>
+                    <span class="score-text" style="margin-top:35px">
                    <span style="color:#ffb30f;">{{ toScore(courseInfo.score) }}</span>
                    <span style="font-size: 12px;color: #fff">分</span>
                  </span>

+                  </div>
                </div>
              </div>
-            </div>
-            <div v-if="resType == 20">
-              <div class="con-audio">
-                <div class="con-audio-title">{{ contentData.contentName }}</div>
-                <div class="con-audio-player">
-                  <audioPlayer v-if="resType == 20" :url="blobUrl" :name="contentData.contentName" @onPlaying="audioPlaying" :isDrag="curriculumData.isDrag"
-                    @onPlay="audioPlay" @onPause="audioPause" @onPlayEnd="audioEnd"></audioPlayer>
+              <div v-if="resType == 20">
+                <div class="con-audio">
+                  <div class="con-audio-title">{{ contentData.contentName }}</div>
+                  <div class="con-audio-player">
+                    <audioPlayer v-if="resType == 20" :url="blobUrl" :name="contentData.contentName" @onPlaying="audioPlaying" :isDrag="curriculumData.isDrag"
+                                 @onPlay="audioPlay" @onPause="audioPause" @onPlayEnd="audioEnd"></audioPlayer>
+                  </div>
                </div>
              </div>
-            </div>
-            <div v-if="resType == 40">
-              <div style="padding: 10px;color: #ed0000; " v-if="curCFile.converStatus < 2 && !contentData.content">
-                <div>此课程内容无法预览，请联系管理员</div>
-              </div>
-              <div style="padding: 10px;color: #ed0000;" v-if="curCFile.converStatus == 3 && !contentData.content">
-                此课程内容无法预览，请联系管理员
-              </div>
-              <pdfPreview :autoScroll="true" v-if="resType == 40" :filePath="fileBaseUrl + contentData.content">
-              </pdfPreview>
-            </div>
-            <div v-if="resType == 41">
-              <div style="padding: 20px;" v-html="contentData.content"></div>
-            </div>
-            <div v-if="resType == 50" style="min-height: 500px;">
-              <iframe v-if="scormUrl" :src="scormUrl" frameborder="0"  border="0px" style="width:100%;height:500px;border:0px;"></iframe>
-            </div>
-            <div v-if="resType == 52">
-              <div v-if="contentData.content != ''">
-                <div class="hyper-link" v-if="conLink.openType == 2">
-                  <div class="hyper-link-row">{{ contentData.contentName }}</div>
-                  <div class="hyper-link-row">{{ conLink.url }}</div>
+              <div v-if="resType == 40">
+                <div style="padding: 10px;color: #ed0000; " v-if="curCFile.converStatus < 2 && !contentData.content">
+                  <div>此课程内容无法预览，请联系管理员</div>
                </div>
-                <div v-if="conLink.openType == 1"><iframe :src="conLink.url"
-                    style="width: 100%;border:0px;min-height: 473px;" frameborder="0"></iframe></div>
+                <div style="padding: 10px;color: #ed0000;" v-if="curCFile.converStatus == 3 && !contentData.content">
+                  此课程内容无法预览，请联系管理员
+                </div>
+                <pdfPreview :autoScroll="true" v-if="resType == 40" :filePath="fileBaseUrl + contentData.content">
+                </pdfPreview>
+              </div>
+              <div v-if="resType == 41">
+                <div style="padding: 20px;" v-html="contentData.content"></div>
+              </div>
+              <div v-if="resType == 50" style="min-height: 500px;">
+                <iframe v-if="scormUrl" :src="scormUrl" frameborder="0"  border="0px" style="width:100%;height:500px;border:0px;"></iframe>
+              </div>
+              <div v-if="resType == 52">
+                <div v-if="contentData.content != ''">
+                  <div class="hyper-link" v-if="conLink.openType == 2">
+                    <div class="hyper-link-row">{{ contentData.contentName }}</div>
+                    <div class="hyper-link-row">{{ conLink.url }}</div>
+                  </div>
+                  <div v-if="conLink.openType == 1"><iframe :src="conLink.url"
+                                                            style="width: 100%;border:0px;min-height: 473px;" frameborder="0"></iframe></div>
+                </div>
+              </div>
+              <div v-if="resType == 60">
+                <homework @submit="homeWorkSubmit" v-if="resType == 60 && studyId != ''" :studyId="studyId" :content="contentData"></homework>
+              </div>
+              <div v-if="resType == 61">
+                <exam @startTest="startTest" v-if="resType == 61 && studyId != '' " :studyId="studyId" :content="contentData"></exam>
+              </div>
+              <div v-if="resType == 62" style="padding:5px">
+                <assess v-if="resType == 62 && studyId != '' && contentData.id" :studyId="studyId" :content="contentData">
+                </assess>
              </div>
            </div>
-            <div v-if="resType == 60">
-              <homework @submit="homeWorkSubmit" v-if="resType == 60 && studyId != ''" :studyId="studyId" :content="contentData"></homework>
-            </div>
-            <div v-if="resType == 61">
-              <exam @startTest="startTest" v-if="resType == 61 && studyId != '' " :studyId="studyId" :content="contentData"></exam>
-            </div>
-            <div v-if="resType == 62" style="padding:5px">
-              <assess v-if="resType == 62 && studyId != '' && contentData.id" :studyId="studyId" :content="contentData">
-              </assess>
+            <div v-if="true" 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="getInternet" >
+                <el-button type="primary">重新检测</el-button>
+              </div>
            </div>
          </div>
          <!--交互部分-->
@@ -303,6 +313,17 @@
        </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>
@@ -369,6 +390,7 @@
    },
    data() {
      return {
+        protocolDialogVisible: false,
        tentative: false,
        isContentTypeTwo: null,
        isContentType: null,
@@ -390,6 +412,7 @@
        curCFile: {
          converStatus: 4,
        },
+        Internet: 3,//1是成功 2是是失败 3是检测中
        radio: '',
        interactRuning: false,
        playerBoxShow: false,
@@ -454,6 +477,8 @@
        cumulativeDuration:0, //非音频累计时长
        maxDuration:0, //非音频最大时长
        defaultMaxTime:1800, //非音频默认最大时间
+        warn:"测试内容",
+        warnTitle:"测试标题",
      }
    },
    mounted() {
@@ -1357,7 +1382,8 @@
              }
            }
            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 = [];
@@ -1386,12 +1412,52 @@
            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);
          }
        });
      },
+      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();
+        }, 5000);
+        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;
+              $this.protocolDialogVisible=true
+            } else {
+              clearTimeout(timer);
+              $this.Internet = 2;
+            }
+          } else {
+            if (timedOut) return;//忽略中止请求
+            clearTimeout(timer);//取消等待的超时
+          }
+        }
+      },
      loadStudyData(result) {
        let $this=this;
        this.loadScorePraiseAndTrample();
@@ -1724,6 +1790,7 @@
      display: flex;
      justify-content: space-between;
      .course-player{ //内容播放区域
+        background-color: rgb(238, 238, 238);
        flex:1;
        min-width: 700px;
        min-height: 400px;
@@ -2368,4 +2435,18 @@
    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>
Author	SHA1	Message	Date
joshen	77a3c2759e	取消日志	2025-07-23 11:14:08 +08:00
joshen	0830c53840	Merge remote-tracking branch 'yx/master-0720-lyc' into master-110	2025-07-23 11:02:35 +08:00
王卓煜	f91e2f12dd	修改前端进度条	2025-07-23 10:58:47 +08:00
王卓煜	b8858348c0	Revert "修改前端进度条" This reverts commit `6208caf4ca`.	2025-07-23 10:42:54 +08:00
joshen	7bcff6bc85	Merge remote-tracking branch 'yx/master-0720-lyc' into master-110 # Conflicts: # src/components/VideoPlayer/index.vue	2025-07-23 10:23:24 +08:00
王卓煜	6208caf4ca	修改前端进度条	2025-07-23 10:14:14 +08:00
王卓煜	18324458f3	内网环境判断,修改前端	2025-07-21 18:31:13 +08:00
王卓煜	c24b54957a	内网环境判断	2025-07-21 14:57:51 +08:00
王卓煜	33c9d2140f	内网环境判断	2025-07-21 14:42:42 +08:00
王卓煜	afd1bec458	内网环境判断	2025-07-21 14:33:05 +08:00
王卓煜	81602506c7	内网环境判断	2025-07-21 11:00:33 +08:00
王卓煜	b9f23eb657	内网环境判断	2025-07-21 10:46:30 +08:00
王卓煜	147366f738	内网环境判断	2025-07-21 10:33:44 +08:00
670788339	3cfa3ffec3	仅内网可见-管理员端调试	2025-07-20 17:47:53 +08:00
670788339	a8bcd3832b	仅内网可见-管理员端调试	2025-07-20 16:56:47 +08:00
670788339	d9f69001a5	仅内网可见-管理员端调试	2025-07-20 16:38:42 +08:00
670788339	93e769be42	仅内网可见-管理员端调试	2025-07-20 16:15:02 +08:00
670788339	206f0e825d	仅内网可见-管理员端	2025-07-20 15:39:37 +08:00
670788339	3bb4b519f1	仅内网可见-管理员端	2025-07-20 14:16:02 +08:00
joshen	fe790389ca	日志打印	2025-07-17 11:24:07 +08:00
joshen	44a5baec18	日志打印	2025-07-17 10:14:42 +08:00
joshen	ce23930a04	test	2025-07-11 17:46:17 +08:00
670788339	ee8a76c4df	作业提交按钮判断	2025-07-09 13:48:31 +08:00
670788339	12c1bdb1a8	查询考试限制加大	2025-06-27 16:53:34 +08:00
670788339	df0e1ad0ed	Merge branch 'csg-250625-lyc' into master-0626	2025-06-26 15:47:36 +08:00
670788339	ea54ea2c20	热点-替换图片	2025-06-25 16:42:45 +08:00
670788339	5fe9d2eb96	热点-替换图片	2025-06-25 15:24:34 +08:00
chensg	b6562e5c9c	修改25年热点论坛组件名称	2025-06-16 14:07:25 +08:00
chensg	a0dcd27f8c	修改2025热点论坛	2025-06-16 13:37:22 +08:00
chensg	8bc2bc96a8	添加2025热点论坛	2025-06-16 11:25:28 +08:00
670788339	ab2ac961f5	替换图片	2025-06-13 09:17:26 +08:00
670788339	6727dd838b	替换图片	2025-06-12 09:36:58 +08:00
joshen	28aa639e1c	Merge remote-tracking branch 'yx/master-20250428-shl'	2025-05-13 15:42:12 +08:00
joshen	05d48f5313	Merge remote-tracking branch 'yx/250415-bugfix-shl'	2025-05-13 15:41:28 +08:00
sunhonglai	7a67aca620	修改教师端我的授课记录查询和导出	2025-04-29 16:33:42 +08:00
sunhonglai	a810da8978	修改教师端我的授课记录查询和导出	2025-04-29 16:29:36 +08:00
sunhonglai	b4538150df	修改教师端我的授课记录查询和导出	2025-04-29 16:20:57 +08:00
sunhonglai	e79abe7aee	修改教师端我的授课记录查询和导出	2025-04-29 16:07:35 +08:00
sunhonglai	65dfa4f0e3	修改教师端我的授课记录查询和导出	2025-04-29 16:01:30 +08:00
sunhonglai	4784b02ca4	修改教师端我的授课记录查询和导出	2025-04-29 15:44:55 +08:00
sunhonglai	45e006a4e7	修改教师端我的授课记录查询和导出	2025-04-29 15:34:09 +08:00
sunhonglai	577357ccd0	修改教师端我的授课记录查询和导出	2025-04-29 15:03:58 +08:00
sunhonglai	f92954aa6b	修改教师端我的授课记录查询和导出	2025-04-29 14:53:51 +08:00
sunhonglai	d59b5a9e06	修改教师端我的授课记录查询和导出	2025-04-29 14:53:24 +08:00
sunhonglai	4be009a6d8	修改教师端我的授课记录查询和导出	2025-04-29 14:13:34 +08:00
sunhonglai	b5f01c6357	修改教师端我的授课记录查询和导出	2025-04-29 13:55:05 +08:00
sunhonglai	78cbb21155	修改教师端我的授课记录查询和导出	2025-04-29 13:47:56 +08:00
sunhonglai	adc33e5892	修改教师端我的授课记录查询和导出	2025-04-29 13:36:24 +08:00
sunhonglai	a9de4ad77c	修改教师端我的授课记录查询和导出	2025-04-29 11:49:39 +08:00
sunhonglai	a3c85cbd19	修改教师端我的授课记录查询和导出	2025-04-29 11:46:40 +08:00
sunhonglai	9a6727e52f	修改教师端我的授课记录查询和导出	2025-04-29 11:40:29 +08:00
sunhonglai	7cee4b5ad1	修改教师端我的授课记录查询和导出	2025-04-29 11:33:51 +08:00
sunhonglai	c3b5f1baf0	修改教师端我的授课记录查询和导出	2025-04-29 11:23:45 +08:00
sunhonglai	213990a7b0	每次加载pdf前，清空路径	2025-04-23 14:16:21 +08:00