新增我的学习，视频学习

oa-back/ruoyi-admin/src/main/resources/application.yml

@@ -59,9 +59,9 @@ spring:
   servlet:
     multipart:
       # 单个文件大小
-      max-file-size: 100MB
+      max-file-size: 1024MB
       # 设置总上传的文件大小
-      max-request-size: 200MB
+      max-request-size: 10240MB
   # 服务模块
   devtools:
     restart:

oa-back/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java

@@ -25,7 +25,7 @@ public class FileUploadUtils
     /**
      * 默认大小 50M
      */
-    public static final long DEFAULT_MAX_SIZE = 50 * 1024 * 1024;
+    public static final long DEFAULT_MAX_SIZE = 1024 * 1024 * 1024;
 
     /**
      * 默认的文件名最大长度 100

oa-back/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/MimeTypeUtils.java

@@ -24,7 +24,7 @@ public class MimeTypeUtils
     public static final String[] MEDIA_EXTENSION = { "swf", "flv", "mp3", "wav", "wma", "wmv", "mid", "avi", "mpg",
             "asf", "rm", "rmvb" };
 
-    public static final String[] VIDEO_EXTENSION = { "mp4", "avi", "rmvb" };
+    public static final String[] VIDEO_EXTENSION = { "mp4", "avi", "rmvb", "mkv" };
 
     public static final String[] DEFAULT_ALLOWED_EXTENSION = {
             // 图片
@@ -34,7 +34,7 @@ public class MimeTypeUtils
             // 压缩文件
             "rar", "zip", "gz", "bz2",
             // 视频格式
-            "mp4", "avi", "rmvb",
+            "mp4", "avi", "rmvb", "mkv",
             // pdf
             "pdf" };
 

oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcStudyMapper.xml

@@ -11,7 +11,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="lastPoint"    column="last_point"    />
         <result property="lastTime"    column="last_time"    />
         <result property="getHours"    column="get_hours"    />
-        <association property="user"    javaType="SysUser"         resultMap="userResult" />
+        <association property="user"    javaType="SysUser"         resultMap="UserResult" />
         <association property="dept"    javaType="SysDept"         resultMap="SysDeptResult" />
         <association property="resource"    javaType="CmcResource"         resultMap="CmcResourceResult" />
     </resultMap>
@@ -29,10 +29,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <resultMap type="CmcResource" id="CmcResourceResult">
         <result property="resourceId"    column="resource_id"    />
         <result property="title"    column="title"    />
+        <result property="type"    column="type"    />
+        <result property="sourcePath"    column="source_path"    />
+        <result property="hours"    column="hours"    />
     </resultMap>
 
     <sql id="selectCmcStudyVo">
-        select s.study_id, s.resource_id, r.tile, s.user_id, u.nick_name, d.dept_name, s.last_point, s.last_time, s.get_hours from cmc_study as s
+        select s.study_id, s.resource_id, r.title, r.type, r.source_path, r.hours, s.user_id, u.nick_name, d.dept_name, s.last_point, s.last_time, s.get_hours from cmc_study as s
         left join sys_user as u on u.user_id = s.user_id
         left join sys_dept as d on d.dept_id = u.dept_id
         left join cmc_resource as r on r.resource_id = s.resource_id

oa-ui-app/utils/storage.js

@@ -10,7 +10,7 @@ import constant from './constant'
 let storageKey = 'storage_data'
 
 // 存储节点变量名
-let storageNodeKeys = [constant.avatar, constant.name, constant.roles, constant.permissions, constant.userId]
+let storageNodeKeys = [constant.avatar, constant.name, constant.roles, constant.permissions, constant.userId, constant.deptId]
 
 // 存储的数据
 let storageData = uni.getStorageSync(storageKey) || {}

oa-ui/package.json

@@ -64,6 +64,7 @@
     "quill": "1.3.7",
     "screenfull": "5.0.2",
     "sortablejs": "1.10.2",
+    "video.js": "^8.21.0",
     "vkbeautify": "^0.99.3",
     "vue": "2.6.12",
     "vue-count-to": "1.0.13",

oa-ui/src/api/oa/study/myStudy.js

@@ -0,0 +1,50 @@
+/*
+ * @Author: ysh
+ * @Date: 2025-03-06 15:40:47
+ * @LastEditors: 
+ * @LastEditTime: 2025-03-06 15:40:53
+ */
+import request from '@/utils/request'
+
+// 查询cmc学习记录列表
+export function listStudy(query) {
+  return request({
+    url: '/oa/study/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询cmc学习记录详细
+export function getStudy(studyId) {
+  return request({
+    url: '/oa/study/' + studyId,
+    method: 'get'
+  })
+}
+
+// 新增cmc学习记录
+export function addStudy(data) {
+  return request({
+    url: '/oa/study',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改cmc学习记录
+export function updateStudy(data) {
+  return request({
+    url: '/oa/study',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除cmc学习记录
+export function delStudy(studyId) {
+  return request({
+    url: '/oa/study/' + studyId,
+    method: 'delete'
+  })
+}

oa-ui/src/api/oa/study/resource.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询cmc学习资料列表
+export function listResource(query) {
+  return request({
+    url: '/oa/resource/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询cmc学习资料详细
+export function getResource(resourceId) {
+  return request({
+    url: '/oa/resource/' + resourceId,
+    method: 'get'
+  })
+}
+
+// 新增cmc学习资料
+export function addResource(data) {
+  return request({
+    url: '/oa/resource',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改cmc学习资料
+export function updateResource(data) {
+  return request({
+    url: '/oa/resource',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除cmc学习资料
+export function delResource(resourceId) {
+  return request({
+    url: '/oa/resource/' + resourceId,
+    method: 'delete'
+  })
+}

oa-ui/src/components/FileUpload/index.vue

@@ -3,7 +3,7 @@
     <el-upload :action="uploadFileUrl" :data="additionalData" :before-upload="handleBeforeUpload" :file-list="fileList"
       :limit="limit" :on-error="handleUploadError" :on-exceed="handleExceed" :on-success="handleUploadSuccess"
       :show-file-list="false" :headers="headers" class="upload-file-uploader" ref="fileUpload"
-      accept=".doc,.docx,.xls,.xlsx,.pdf,.rar,.zip">
+      accept=".doc,.docx,.xls,.xlsx,.pdf,.rar,.zip,.mp4,.mkv">
       <!-- 上传按钮 -->
       <el-button size="mini" type="primary" :disabled="disabled">选取文件</el-button>
       <!-- 上传提示 -->

oa-ui/src/router/index.js

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-01-03 09:23:11
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-10-11 09:26:01
+ * @LastEditTime: 2025-03-06 14:59:47
  */
 import Vue from 'vue'
 import Router from 'vue-router'
@@ -338,7 +338,33 @@ export const constantRoutes = [
 
       }
     ]
-  }
+  },
+  {
+    path: '/videoStudy/:id',
+    component: Layout,
+    children: [
+      {
+        path: '',
+        component: () => import('@/views/oa/study/components/videoStudy'),
+        name: 'VideoStudy',
+        meta: { title: '视频学习', icon: '' }
+      }
+    ],
+    hidden: true
+  },
+  {
+    path: '/pdfStudy/:id',
+    component: Layout,
+    children: [
+      {
+        path: '',
+        component: () => import('@/views/oa/study/components/pdfStudy'),
+        name: 'PdfStudy',
+        meta: { title: '文档学习', icon: '' }
+      }
+    ],
+    hidden: true
+  },
 ]
 
 // 动态路由，基于用户权限动态去加载

oa-ui/src/utils/ruoyi.js

@@ -252,6 +252,9 @@ export function setArray(arr) {
 
 export function getUserName(userId) {
   if (userId) {
+    if (userId == 1) {
+      return '管理员'
+    }
     let user = this.$store.state.user.userList.find(item => item.userId === userId);
     // 如果找到了匹配的元素，返回其nickName  
     if (user) {
@@ -295,6 +298,7 @@ export function getDeptNames(ids) {
   }).join(',');
 }
 
+// 获取文件名
 export function getFileName(name) {
   if (name) {
     let arr = name.split("/");
@@ -302,6 +306,7 @@ export function getFileName(name) {
   }
 }
 
+// 在线预览
 export function reviewWord(url) {
   this.$router.push({
     path: '/preview',

oa-ui/src/views/oa/study/approval.vue

@@ -29,7 +29,7 @@
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
-          v-hasPermi="['oa:trainApproval:export']">导出</el-button>
+          v-hasPermi="['oa:study:export']">导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
@@ -57,9 +57,9 @@
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
-            v-hasPermi="['oa:trainApproval:edit']">修改</el-button>
+            v-hasPermi="['oa:study:edit']">修改</el-button>
           <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
-            v-hasPermi="['oa:trainApproval:remove']">删除</el-button>
+            v-hasPermi="['oa:study:remove']">删除</el-button>
         </template>
       </el-table-column>
     </el-table>

oa-ui/src/views/oa/study/components/studyHead.vue

@@ -0,0 +1,134 @@
+<!--
+ * @Author: ysh
+ * @Date: 2025-03-05 14:19:02
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2025-03-06 14:26:32
+-->
+<template>
+  <div class="head-bg">
+    <div class="user-info">
+      <div class="user-pic" data-is-fans="0" data-is-follows="">
+        <div class="user-pic-bg">
+          <img class="img" :src="$store.getters.avatar">
+        </div>
+      </div>
+      <div class="user-name">
+        {{ $store.getters.name }}
+      </div>
+      <div class="user-dept">
+        {{ getDeptName($store.getters.deptId) }}
+      </div>
+      <div class="user-study">
+        <div class="user-item">
+          <div class="u-info-learn" style="cursor:pointer;">
+            <em>{{ hours }}h</em>
+            <span>2025学时</span>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      hours: 0,
+    }
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+.head-bg {
+  background: url('~@/assets/images/temp1.png') no-repeat center top #000;
+  background-size: cover;
+  height: 100px;
+
+  .user-info {
+    display: flex;
+    position: relative;
+    width: 1200px;
+    margin: 0 auto;
+
+    .user-pic {
+      float: left;
+      width: 148px;
+      height: 148px;
+
+      .user-pic-bg {
+        border: 4px solid #fff;
+        box-shadow: 0 4px 8px 0 rgba(7, 17, 27, .1);
+        width: 120px;
+        height: 120px;
+        position: relative;
+        border-radius: 50%;
+        background: #fff;
+        top: 24px;
+
+        img {
+          text-align: center;
+          width: 115px;
+          height: 115px;
+          border-radius: 50%;
+        }
+      }
+    }
+
+    .user-name {
+      font-weight: 600;
+      text-align: left;
+      font-size: 24px;
+      color: #fff;
+      line-height: 28px;
+      margin-top: 48px;
+    }
+
+    .user-dept {
+      font-weight: 600;
+      text-align: left;
+      font-size: 16px;
+      color: #ebe7e7;
+      font-family: 'puhuiti';
+      line-height: 28px;
+      margin-top: 52px;
+      margin-left:20px;
+    }
+
+    .user-study {
+      position: absolute;
+      top: 31px;
+      right: 185px;
+      min-width: 200px;
+      text-align: right;
+
+      .user-item {
+        line-height: 48px;
+        vertical-align: middle;
+        height: 48px;
+        float: left;
+
+        em {
+          display: block;
+          text-align: center;
+          font-weight: 700;
+          font-size: 24px;
+          color: rgba(255, 255, 255, .8);
+          line-height: 28px;
+        }
+
+        span {
+          display: block;
+          text-align: center;
+          font-size: 14px;
+          color: rgba(255, 255, 255, .8);
+          line-height: 20px;
+          margin-top: 4px;
+        }
+      }
+    }
+  }
+
+}
+</style>

oa-ui/src/views/oa/study/components/studyLeft.vue

@@ -0,0 +1,96 @@
+<!--
+ * @Author: ysh
+ * @Date: 2025-03-05 15:01:52
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2025-03-07 15:03:55
+-->
+<template>
+  <div>
+    <right-toolbar :search="false" @queryTable="getRecordsList"></right-toolbar>
+    <el-table :data="studyList" style="width: 100%" v-loading="loading">
+      <el-table-column align="center" label="序号" type="index" />
+      <el-table-column align="center" label="资料名称" prop="resource.title" />
+      <el-table-column align="center" label="类型" prop="resource.type"></el-table-column>
+      <el-table-column align="center" label="学习进度" prop="lastPoint">
+        <template slot-scope="scope">
+          <el-progress :text-inside="true" :stroke-width="26" :status="formatStatus(scope.row.lastPoint)"
+            :percentage="Number(scope.row.lastPoint)" text-color="#fff"></el-progress>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" label="上次学习时间" prop="lastTime" />
+      <el-table-column align="center" label="获得学时" prop="getHours" />
+      <el-table-column align="center" label="操作" width="100px">
+        <template slot-scope="{row}">
+          <el-button type="text" @click="startStudy(row)">
+            {{ row.lastPoint == 0 ? '开始学习' : '继续学习' }}
+          </el-button>
+          <el-button style="color: #F56C6C;" type="text" @click="cancelStudy(row)">
+            取消学习
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+  </div>
+</template>
+
+<script>
+import { listStudy, getStudy, delStudy, addStudy, updateStudy } from "@/api/oa/study/myStudy";
+
+export default {
+  data() {
+    return {
+      loading: true,
+      studyList: [],
+      total: 0,
+      queryParams: {}
+    }
+  },
+  created() {
+    this.getRecordsList();
+  },
+  methods: {
+    getRecordsList() {
+      this.loading = true;
+      this.queryParams.userId = this.$store.getters.userId;
+      listStudy(this.queryParams).then(response => {
+        this.studyList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    startStudy(record) {
+      const routeName = record.resource.type === '视频' ? 'VideoStudy' : 'PdfStudy';
+      console.log(record);
+      this.$router.push({
+        name: routeName,
+        params: { id: record.studyId }
+      })
+    },
+    cancelStudy(row) {
+      this.$modal.confirm('是否删除资料名称为"' + row.resource.title + '"的学习记录？').then(res => {
+        delStudy(row.studyId).then(res => {
+          this.$message.success(res.msg);
+          this.getRecordsList();
+        });
+      })
+    },
+    formatStatus(row) {
+      if (!row) {
+        row = 0
+        return 'exception'
+      }
+      if (row <= 20) {
+        return 'exception'
+      } else if (row > 20 && row <= 50) {
+        return 'warning'
+      } else if (row > 50 && row <= 80) {
+        return null
+      } else {
+        return 'success'
+      }
+    },
+  },
+}
+</script>
+
+<style lang="scss" scoped></style>

oa-ui/src/views/oa/study/components/studyRight.vue

@@ -0,0 +1,158 @@
+<!--
+ * @Author: ysh
+ * @Date: 2025-03-05 15:36:17
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2025-03-06 16:00:55
+-->
+<template>
+  <div class="right-box">
+    <!-- <div class="material-list">
+      <el-card v-for="item in resourceList" :key="item.id" class="material-item">
+        <div class="material-content">
+          <i :class="item.type === '视频' ? 'el-icon-video-camera' : 'el-icon-document'"
+            style="font-size: 24px;margin-right: 15px" />
+          <div class="material-info">
+            <h4>名称：{{ item.title }}</h4>
+            <span>学时：{{ item.hours }}个学时</span>
+          </div>
+          <el-button type="primary" size="mini" @click="addToStudy(item)">
+            添加
+          </el-button>
+        </div>
+      </el-card>
+    </div> -->
+    <div class="video">
+      <el-tabs v-model="videoTab" type="card">
+        <el-tab-pane label="视频" name="video">
+          <el-table :data="videoList" style="width: 100%">
+            <el-table-column align="center" label="序号" type="index" />
+            <el-table-column align="center" label="资料名称" prop="title" />
+            <el-table-column align="center" label="学时" prop="hours" />
+            <el-table-column align="center" label="操作">
+              <template slot-scope="{row}">
+                <el-button type="text" @click="addToStudy(row)">
+                  添加课程
+                </el-button>
+              </template>
+            </el-table-column>
+          </el-table>
+          <pagination v-show="videoTotal > 0" :total="videoTotal" :page.sync="videoParams.pageNum"
+            :layout="'total, prev, pager, next,jumper'" :limit.sync="videoParams.pageSize" :autoScroll="false"
+            @pagination="getVideoList" />
+        </el-tab-pane>
+      </el-tabs>
+    </div>
+    <div class="pdf">
+      <el-tabs v-model="pdfTab" type="card">
+        <el-tab-pane label="文档" name="pdf">
+          <el-table :data="pdfList" style="width: 100%">
+            <el-table-column align="center" label="序号" type="index" />
+            <el-table-column align="center" label="资料名称" prop="title" />
+            <el-table-column align="center" label="学时" prop="hours" />
+            <el-table-column align="center" label="操作">
+              <template slot-scope="{row}">
+                <el-button type="text" @click="addToStudy(row)">
+                  添加课程
+                </el-button>
+              </template>
+            </el-table-column>
+          </el-table>
+          <pagination v-show="pdfTotal > 0" :total="pdfTotal" :page.sync="pdfParams.pageNum"
+            :layout="'total, prev, pager, next,jumper'" :limit.sync="pdfParams.pageSize" :autoScroll="false"
+            @pagination="getPdfList" />
+        </el-tab-pane>
+      </el-tabs>
+    </div>
+  </div>
+</template>
+
+<script>
+import { listResource, getResource, delResource, addResource, updateResource } from "@/api/oa/study/resource";
+import { listStudy, getStudy, delStudy, addStudy, updateStudy } from "@/api/oa/study/myStudy";
+
+export default {
+  data() {
+    return {
+      videoList: [],
+      pdfList: [],
+      videoTab: 'video',
+      pdfTab: 'pdf',
+      videoParams: {},
+      pdfParams: {},
+      videoTotal: 0,
+      pdfTotal: 0,
+    }
+  },
+  created() {
+    this.getVideoList();
+    this.getPdfList();
+  },
+  methods: {
+    getVideoList() {
+      this.videoParams.type = '视频'
+      listResource(this.videoParams).then(response => {
+        this.videoList = response.rows;
+        this.videoTotal = response.total;
+      });
+    },
+    getPdfList() {
+      this.pdfParams.type = '文档'
+      listResource(this.pdfParams).then(response => {
+        this.pdfList = response.rows;
+        this.pdfTotal = response.total;
+      });
+    },
+    addToStudy(row) {
+      console.log(row);
+      this.$modal.confirm('是否添加资料名称为"' + row.title + '"到我的学习记录？').then(res => {
+        let obj = {
+          resourceId: row.resourceId,
+          userId: this.$store.getters.userId,
+          lastPoint: 0,
+          getHours: 0
+        }
+        addStudy(obj).then(res => {
+          this.$message.success(res.msg);
+          this.$emit('refreshList');
+        });
+      })
+
+    }
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+.material-list {
+  display: grid;
+  grid-template-columns: repeat(auto-fill, minmax(300px, 1fr));
+  gap: 15px;
+}
+
+.material-content {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
+
+.material-info {
+  flex: 1;
+  margin-right: 15px;
+}
+
+
+.right-box {
+  display: flex;
+
+  .video {
+    flex: 1;
+    border-right: 1px solid #ececec;
+    padding: 5px;
+  }
+
+  .pdf {
+    flex: 1;
+    padding: 5px;
+  }
+}
+</style>

oa-ui/src/views/oa/study/components/videoStudy.vue

@@ -0,0 +1,216 @@
+<template>
+  <div class="video-container">
+    <el-button type="primary" @click="$router.push({ path: '/oa/study/myStudy' })">返回我的学习</el-button>
+    <video ref="videoPlayer" class="video-js vjs-big-play-centered" @play="handlePlay" @pause="handlePause"
+      @ended="handleEnd">
+    </video>
+    <el-alert v-if="showProgressTip" type="info" :closable="false" class="progress-alert">
+      已为您定位到上次播放位置：{{ formatTime(lastPosition) }}
+    </el-alert>
+  </div>
+</template>
+
+<script>
+import videojs from 'video.js';
+import 'video.js/dist/video-js.css';
+import { listResource, getResource, delResource, addResource, updateResource } from "@/api/oa/study/resource";
+import { listStudy, getStudy, delStudy, addStudy, updateStudy } from "@/api/oa/study/myStudy";
+
+export default {
+  data() {
+    return {
+      baseUrl: process.env.VUE_APP_BASE_API,
+      videoId: '',
+      videoPath: '',
+      player: null,
+      lastPosition: 0,
+      getHours: '', //可获得的学时
+      isComplete: false, //是否已经看完
+      showProgressTip: false,
+      // 禁用功能配置
+      disabledControls: [
+        'progressControl', // 隐藏进度条
+        'seekBar',         // 禁用拖拽
+        'remainingTimeDisplay',
+        'playbackRateMenuButton'
+      ],
+      videoDuration: undefined,
+    };
+  },
+  watch: {
+    videoPath() {
+      this.$nextTick(() => {
+        const video = this.$refs.videoPlayer;
+        if (!video) return;
+        video.pause();
+        video.removeAttribute("src");
+        video.load();
+        setTimeout(() => {
+          video.src = this.fullVideoPath;
+          video.load();
+        }, 100);
+      });
+    }
+  },
+  computed: {
+    fullVideoPath() {
+      return `/dev-api/profile/upload/${this.videoPath}`
+    }
+  },
+  created() {
+    this.getData();
+  },
+  mounted() {
+    this.initPlayer();
+    this.loadLastPosition();
+  },
+  methods: {
+    async getData() {
+      let studyId = this.$route.params.id;
+      let resData = await getStudy(studyId)
+      let data = resData.data
+      this.videoPath = data.resource.sourcePath;
+      if (Number(data.lastPoint) == 100) {
+        this.isComplete = true;
+        this.getHours = data.resource.hours;
+        console.log(data.resource);
+
+        this.$message.warning('视频已学习完毕，若要再次学习，请在学习记录里重新添加该课程。')
+      }
+    },
+    // 初始化播放器
+    initPlayer() {
+      const self = this;
+      this.player = videojs(this.$refs.videoPlayer, {
+        // 增加错误处理回调
+        errorDisplay: false,
+        autoplay: false,
+        controls: true,
+        sources: [{ src: this.fullVideoPath, type: 'video/mp4' }],
+        controlBar: {
+          // children: this.disabledControls,
+          // 自定义禁止拖拽的进度条
+          progressControl: false, // 关闭进度条
+          volumePanel: true      // 启用音量控制
+        },
+        userActions: {
+          hotkeys: false,
+          // 禁用双击全屏
+          doubleClick: false
+        }
+      });
+      let retryCount = 0;
+      // 增加错误监听
+      this.player.on('error', () => {
+        console.error('播放器错误:', this.player.error());
+        if (retryCount < 3) {
+          this.player.src(this.fullVideoPath);
+          this.player.load();
+          retryCount++;
+        }
+      });
+
+      // 节流保存（每10秒保存一次）
+      this.player.on('timeupdate', _.throttle(() => {
+        this.saveCurrentPosition();
+      }, 10000));
+    },
+    // 加载上次播放位置
+    async loadLastPosition() {
+      this.videoId = this.$route.params.id;
+      try {
+        const { data } = await getStudy(this.videoId);
+        const percentage = data.lastPoint || 0;
+        // 添加 readyState 检查
+        const checkReady = () => {
+          return new Promise(resolve => {
+            if (this.player.readyState() >= 2) { // HAVE_CURRENT_DATA
+              resolve();
+            } else {
+              this.player.one('loadedmetadata', resolve);
+            }
+          });
+        };
+        await checkReady();
+        const duration = this.player.duration();
+        const targetTime = duration * (percentage / 100);
+
+        // 使用播放器原生方法
+        this.player.currentTime(targetTime);
+        this.lastPosition = targetTime;
+
+      } catch (error) {
+        console.error('加载进度失败:', error);
+      }
+    },
+
+    // 处理播放事件
+    handlePlay() {
+      this.player.currentTime(this.lastPosition);
+    },
+
+    // 处理暂停事件
+    handlePause() {
+      this.saveCurrentPosition();
+    },
+
+    // 处理视频结束
+    handleEnd() {
+      this.saveCurrentPosition(true);
+    },
+    // 保存当前进度
+    async saveCurrentPosition(isEnd = false) {
+      const currentTime = this.player.currentTime();
+      const duration = this.player.duration();
+      let percentage = isEnd ? 100 : Number(((currentTime / duration) * 100).toFixed(2));
+      if (isNaN(percentage)) {
+        return
+      }
+      try {
+        if (!this.isComplete) {
+          await updateStudy({
+            studyId: this.videoId,
+            lastPoint: percentage
+          });
+        } else {
+          await updateStudy({
+            studyId: this.videoId,
+            getHours: this.getHours
+          });
+        }
+        // 始终更新 lastPosition（即使播放结束）
+        this.lastPosition = currentTime;
+      } catch (error) {
+        console.error('保存进度失败:', error);
+      }
+    },
+
+    // 时间格式化
+    formatTime(seconds) {
+      const date = new Date(0);
+      date.setSeconds(seconds);
+      return date.toISOString().substr(11, 8);
+    },
+  },
+  beforeDestroy() {
+    if (this.player) {
+      this.player.dispose();
+    }
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+.video-container {
+  position: relative;
+  width: 1000px;
+  // margin: 0 auto;
+
+  .progress-alert {
+    position: absolute;
+    bottom: 40px;
+    width: 100%;
+    z-index: 1;
+  }
+}
+</style>

oa-ui/src/views/oa/study/myStudy.vue

@@ -0,0 +1,87 @@
+<!--
+ * @Author: ysh
+ * @Date: 2025-03-05 14:00:18
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2025-03-05 15:26:03
+-->
+<template>
+  <div>
+    <study-head></study-head>
+    <div class="main app-contrainer">
+      <div class="left">
+        <div class="title">
+          我的学习记录
+          <div class="line"></div>
+        </div>
+        <study-left ref="studyLeft"></study-left>
+      </div>
+      <!-- <div class="center">
+      </div> -->
+      <div class="right">
+        <div class="title">
+          学习资料库
+          <div class="line"></div>
+        </div>
+        <study-right ref="studyRight" @refreshList="getStudyList"></study-right>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import StudyHead from './components/studyHead.vue'
+import StudyLeft from './components/studyLeft.vue'
+import StudyRight from './components/studyRight.vue'
+export default {
+  name: 'myStudy',
+  components: { StudyHead, StudyLeft, StudyRight },
+  methods: {
+    getStudyList() {
+      this.$refs.studyLeft.getRecordsList();
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.main {
+  display: flex;
+  margin-top: 50px;
+
+  .left {
+    flex: 1;
+    padding: 10px;
+    border-right: 1px solid #ececec;
+  }
+
+  .center {
+    flex: 1;
+    padding: 10px;
+    border-right: 1px solid #ececec;
+  }
+
+  .right {
+    flex: 1;
+    padding: 10px;
+  }
+}
+
+
+.title {
+  position: relative;
+  font-weight: bold;
+  font-size: 18px;
+  padding-left: 40px;
+  padding-bottom: 20px;
+
+  .line {
+    position: absolute;
+    left: 22px;
+    top: 3px;
+    width: 5px;
+    height: 20px;
+    border-radius: 10px;
+    background-color: #2893e5;
+  }
+}
+</style>

oa-ui/src/views/oa/study/resource.vue

@@ -0,0 +1,317 @@
+<!--
+ * @Author: ysh
+ * @Date: 2025-03-05 09:15:54
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2025-03-05 13:58:28
+-->
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="资料名称" prop="title">
+        <el-input v-model="queryParams.title" placeholder="请输入资料名称" clearable @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="上传人" prop="uploader">
+        <el-input v-model="queryParams.uploader" placeholder="请输入上传人" clearable @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="上传部门" prop="uploadDept">
+        <el-input v-model="queryParams.uploadDept" placeholder="请输入上传部门" clearable @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="专业领域" prop="field">
+        <el-input v-model="queryParams.field" placeholder="请输入专业领域" clearable @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="上传时间" prop="uploadTime">
+        <el-date-picker clearable v-model="queryParams.uploadTime" type="date" value-format="yyyy-MM-dd"
+          placeholder="请选择上传时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
+          v-hasPermi="['oa:resource:add']">新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
+          v-hasPermi="['oa:resource:edit']">修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
+          v-hasPermi="['oa:resource:remove']">删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
+          v-hasPermi="['oa:resource:export']">导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="resourceList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="资料id" align="center" prop="resourceId" />
+      <el-table-column label="上传人" align="center" prop="uploader">
+        <template slot-scope="scope">
+          {{ getUserName(scope.row.uploader) }}
+        </template>
+      </el-table-column>
+      <el-table-column label="上传部门" align="center" prop="uploadDept">
+        <template slot-scope="scope">
+          {{ getDeptName(scope.row.uploadDept) }}
+        </template>
+      </el-table-column>
+      <el-table-column label="标题" align="center" prop="title" />
+      <el-table-column label="上传附件" align="center" prop="sourcePath" :formatter="formatterPath" />
+      <el-table-column label="专业领域" align="center" prop="field" />
+      <el-table-column label="类型" align="center" prop="type" />
+      <el-table-column label="上传时间" align="center" prop="uploadTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.uploadTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="学时" align="center" prop="hours" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+            v-hasPermi="['oa:resource:edit']">修改</el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+            v-hasPermi="['oa:resource:remove']">删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+      @pagination="getList" />
+
+    <!-- 添加或修改cmc学习资料对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="资料名称" prop="title">
+          <el-input v-model="form.title" placeholder="请输入资料名称" />
+        </el-form-item>
+        <el-form-item label="上传附件" prop="sourcePath">
+          <FileUpload v-if="form.sourcePath == null || form.sourcePath == ''" :isShowTip="false" :limit="1"
+            :filePathName="'教育学习/学习资料'" :fileType="['pdf', 'mp4', 'mkv']" :fileSize="10240" @input="getDocumentPath">
+          </FileUpload>
+          <div v-if="form.sourcePath">
+            <el-link type="primary" @click="reviewWord(`${baseUrl}${'/profile/upload' + form.sourcePath}`)">
+              {{ getFileName(form.sourcePath) }}
+            </el-link>
+            <el-link class="ml20" type="warning" :href="`${baseUrl}${'/profile/upload' + form.sourcePath}`"
+              :underline="false" target="_blank">
+              <span class="el-icon-download">下载文件</span>
+            </el-link>
+            <el-link class="ml20" type="danger" @click="handleDeleteDocument" :underline="false"
+              v-hasPermi="['oa:resource:edit']">
+              <span class="el-icon-delete">删除文件</span>
+            </el-link>
+            <!-- <FileUpload v-if="taskName == '参培申请'" :limit="1" :filePathName="'参培/佐证附件'"
+              :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf', 'rar', 'zip']" @input="getDocumentPath"></FileUpload> -->
+          </div>
+          <div style="font-size:12px;color:#e45656">
+            tips:文档请上传pdf格式，视频请上传mp4格式
+          </div>
+        </el-form-item>
+        <el-form-item label="资料类型" prop="type">
+          <el-select v-model="form.type" clearable>
+            <el-option label="视频" value="视频"></el-option>
+            <el-option label="文档" value="文档"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="专业领域" prop="field">
+          <el-input v-model="form.field" placeholder="请输入专业领域" />
+        </el-form-item>
+        <el-form-item label="学时" prop="hours">
+          <el-input-number v-model="form.hours" :min="0" :precision="1" />
+        </el-form-item>
+        <el-form-item label="上传人" prop="uploader">
+          {{ getUserName(form.uploader) }}
+        </el-form-item>
+        <el-form-item label="上传部门" prop="uploadDept">
+          {{ getDeptName(form.uploadDept) }}
+        </el-form-item>
+        <el-form-item label="上传时间" prop="uploadTime">
+          {{ form.uploadTime }}
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listResource, getResource, delResource, addResource, updateResource } from "@/api/oa/study/resource";
+import { parseTime } from "@/utils/ruoyi";
+
+export default {
+  name: "Resource",
+  data() {
+    return {
+      baseUrl: process.env.VUE_APP_BASE_API,
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // cmc学习资料表格数据
+      resourceList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        uploader: null,
+        uploadDept: null,
+        title: null,
+        sourcePath: null,
+        field: null,
+        type: null,
+        uploadTime: null,
+        hours: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询cmc学习资料列表 */
+    getList() {
+      this.loading = true;
+      listResource(this.queryParams).then(response => {
+        this.resourceList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        resourceId: null,
+        uploader: null,
+        uploadDept: null,
+        title: null,
+        sourcePath: null,
+        field: null,
+        type: null,
+        uploadTime: null,
+        hours: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.resourceId)
+      this.single = selection.length !== 1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.form.uploader = this.$store.getters.userId;
+      this.form.uploadDept = this.$store.getters.deptId;
+      this.form.uploadTime = parseTime(new Date(), '{y}-{m}-{d}');
+      this.title = "新增学习资料";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const resourceId = row.resourceId || this.ids
+      getResource(resourceId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改cmc学习资料";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.resourceId != null) {
+            updateResource(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addResource(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const resourceIds = row.resourceId || this.ids;
+      this.$modal.confirm('是否确认删除cmc学习资料编号为"' + resourceIds + '"的数据项？').then(function () {
+        return delResource(resourceIds);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => { });
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('oa/resource/export', {
+        ...this.queryParams
+      }, `resource_${new Date().getTime()}.xlsx`)
+    },
+    getDocumentPath(val) {
+      let arr = val.split('/upload')
+      this.form.sourcePath = arr[1]
+      if (val == "") {
+        this.form.sourcePath = ""
+      }
+    },
+    handleDeleteDocument() {
+      this.$modal.confirm('是否确认删除该附件？').then(() => {
+        this.form.sourcePath = '';
+      }).catch(() => { });
+    },
+    formatterPath(row){
+      let name = this.getFileName(row.sourcePath)
+      return name
+    }
+  }
+};
+</script>