修改资料学习只能看一次，重新看为复习；

新增学习记录页面

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

@@ -39,7 +39,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>  
             <if test="uploader != null "> and r.uploader = #{uploader}</if>
             <if test="uploadDept != null "> and r.upload_dept = #{uploadDept}</if>
-            <if test="title != null  and title != ''"> and r.title = #{title}</if>
+            <if test="title != null  and title != ''"> and r.title like concat('%', #{title}, '%')</if>
             <if test="sourcePath != null  and sourcePath != ''"> and r.source_path = #{sourcePath}</if>
             <if test="type != null  and type != ''"> and r.type = #{type}</if>
             <if test="field != null  and field != ''"> and r.field = #{field}</if>

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,.mp4,.mkv">
+      accept=".doc,.docx,.xls,.xlsx,.pdf,.rar,.zip,.mp4">
       <!-- 上传按钮 -->
       <el-button size="mini" type="primary" :disabled="disabled">选取文件</el-button>
       <!-- 上传提示 -->

oa-ui/src/router/index.js

@@ -352,6 +352,19 @@ export const constantRoutes = [
     ],
     hidden: true
   },
+  {
+    path: '/reviewStudy/:id',
+    component: Layout,
+    children: [
+      {
+        path: '',
+        component: () => import('@/views/oa/study/components/reviewStudy'),
+        name: 'reviewStudy',
+        meta: { title: '视频复习', icon: '' }
+      }
+    ],
+    hidden: true
+  },
   {
     path: '/pdfStudy/:id',
     component: Layout,

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

@@ -2,27 +2,31 @@
  * @Author: ysh
  * @Date: 2025-03-06 14:38:35
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2025-03-11 16:16:33
+ * @LastEditTime: 2025-03-12 11:01:28
 -->
 <template>
   <div>
-    <div class="return-btn">
-      <div>
-        <el-button type="primary" size="mini" icon="el-icon-d-arrow-left"
-          @click="$router.push({ path: '/oa/study/myStudy' })">返回我的学习</el-button>
+    <div v-if="boxShow">
+      <div class="return-btn">
+        <div>
+          <el-button type="primary" size="mini" icon="el-icon-d-arrow-left"
+            @click="$router.push({ path: '/oa/study/myStudy' })">返回我的学习</el-button>
+        </div>
+        <div class="mt20">
+          学习进度：
+          <el-progress :text-inside="true" :status="formatStatus(percentage)" text-color="#fff" :stroke-width="26"
+            :percentage="percentage"></el-progress>
+        </div>
+        <div class="mt20" style="color:#E23D28;font-size:12px;line-height:30px;">
+          tips:鼠标滚动过快将导致进度计算失败，请隔2秒滚动一次页面。若一直未到100%，请返回我的学习重新进入课程。
+        </div>
       </div>
-      <div class="mt20">
-        学习进度：
-        <el-progress :text-inside="true" :status="formatStatus(percentage)" text-color="#fff" :stroke-width="26"
-          :percentage="percentage"></el-progress>
-      </div>
-      <div class="mt20" style="color:#E23D28;font-size:12px;line-height:30px;">
-        tips:鼠标滚动过快将导致进度计算失败，请隔2秒滚动一次页面。若一直未到100%，请返回我的学习重新进入课程。
+      <div id="pdf-container">
+        <div id="viewer" class="pdfViewer"></div>
       </div>
     </div>
-    <div id="pdf-container">
-
-      <div id="viewer" class="pdfViewer"></div>
+    <div class="mt20 text-center" v-else>
+      抱歉，暂不支持手机端，请前往电脑端观看学习
     </div>
   </div>
 </template>
@@ -35,6 +39,12 @@ import { PDFViewer } from 'pdfjs-dist/web/pdf_viewer'
 GlobalWorkerOptions.workerSrc = require('pdfjs-dist/build/pdf.worker.min');
 export default {
   async mounted() {
+    if (this.$store.getters.device === 'mobile') {
+      this.boxShow = false;
+      return
+    } else {
+      this.boxShow = true;
+    }
     await this.getData();
     this.initPDFViewer()
   },
@@ -52,6 +62,7 @@ export default {
       observers: new Map(),
       isComplete: false,
       percentage: 0,
+      boxShow: false,
     }
   },
   methods: {

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

@@ -0,0 +1,164 @@
+<template>
+  <div>
+    <div class="video-container">
+      <div class="return-btn">
+        <el-button type="primary" size="mini" icon="el-icon-d-arrow-left"
+          @click="$router.push({ path: '/oa/study/myStudy' })">返回我的学习</el-button>
+      </div>
+      <video ref="reviewPlayer" width="1300" height="750" class="custom-video video-js vjs-big-play-centered"
+        @play="handlePlay" @pause="handlePause" @ended="handleEnd">
+      </video>
+    </div>
+  </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, //是否已经看完
+      resource: {},
+      // 禁用功能配置
+      disabledControls: [
+        'progressControl', // 隐藏进度条
+        'seekBar',         // 禁用拖拽
+        'remainingTimeDisplay',
+        'playbackRateMenuButton'
+      ],
+      videoDuration: undefined,
+      percentage: 0,
+      boxShow: false,
+    };
+  },
+  watch: {
+    videoPath() {
+      this.$nextTick(() => {
+        const video = this.$refs.reviewPlayer;
+        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() {
+    if (this.$store.getters.device === 'mobile') {
+      this.boxShow = false;
+      return
+    } else {
+      this.boxShow = true;
+    }
+    this.getData();
+  },
+  mounted() {
+    this.initPlayer();
+  },
+  methods: {
+    async getData() {
+      let studyId = this.$route.params.id;
+      let resData = await getStudy(studyId);
+      let data = resData.data
+      this.resource = data.resource;
+      this.videoPath = data.resource.sourcePath;
+      this.percentage = Number(data.lastPoint);
+    },
+    // 初始化播放器
+    initPlayer() {
+      const self = this;
+      this.player = videojs(this.$refs.reviewPlayer, {
+        // 增加错误处理回调
+        errorDisplay: false,
+        autoplay: false,
+        controls: true,
+        sources: [{ src: this.fullVideoPath, type: 'video/mp4' }],
+        controlBar: {
+          // children: this.disabledControls,
+          // 自定义禁止拖拽的进度条
+          progressControl: true, // 关闭进度条
+          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++;
+        }
+      });
+    },
+    // 处理播放事件
+    handlePlay() {
+    },
+
+    // 处理暂停事件
+    handlePause() {
+
+    },
+
+    // 处理视频结束
+    async handleEnd() {
+
+    },
+  },
+  beforeDestroy() {
+    if (this.player) {
+      this.player.dispose();
+    }
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+.video-container {
+  position: relative;
+
+  .return-btn {
+    position: absolute;
+    left: 20px;
+    top: 30px;
+    width: 130px;
+  }
+
+  .custom-video {
+    position: absolute;
+    left: 50%;
+    top: 50%;
+    transform: translate(-50%, 0%);
+  }
+
+  .progress-alert {
+    position: absolute;
+    bottom: 40px;
+    width: 100%;
+    z-index: 1;
+  }
+}
+</style>

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

@@ -2,10 +2,24 @@
  * @Author: ysh
  * @Date: 2025-03-05 15:01:52
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2025-03-11 16:47:24
+ * @LastEditTime: 2025-03-13 16:09:55
 -->
 <template>
   <div>
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" 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="title">
+        <el-select v-model="queryParams.type" @change="handleQuery" clearable>
+          <el-option label="视频" value="视频"></el-option>
+          <el-option label="文档" value="文档"></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+      </el-form-item>
+    </el-form>
     <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" />
@@ -22,7 +36,7 @@
       <el-table-column align="center" label="操作" width="100px">
         <template slot-scope="{row}">
           <el-button type="text" @click="startStudy(row)">
-            {{ row.lastPoint == 0 ? '开始学习' : '继续学习' }}
+            {{ row.lastPoint == 0 ? '开始学习' : row.lastPoint == 100 ? '复习' : '继续学习' }}
           </el-button>
           <el-button style="color: #F56C6C;" type="text" @click="cancelStudy(row)">
             取消学习
@@ -64,7 +78,19 @@ export default {
         this.loading = false;
       });
     },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getRecordsList();
+    },
     startStudy(record) {
+      if (record.lastPoint == 100 && record.resource.type === '视频') {
+        this.$router.push({
+          name: 'reviewStudy',
+          params: { id: record.studyId }
+        })
+        return
+      }
       const routeName = record.resource.type === '视频' ? 'VideoStudy' : 'PdfStudy';
       this.$router.push({
         name: routeName,

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

@@ -2,16 +2,25 @@
  * @Author: ysh
  * @Date: 2025-03-05 15:36:17
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2025-03-11 16:48:55
+ * @LastEditTime: 2025-03-13 16:13:05
 -->
 <template>
   <div class="right-box">
     <div class="video">
       <el-tabs v-model="videoTab" type="card">
+        <el-form :model="videoParams" size="small" :inline="true" label-width="68px" @submit.native.prevent>
+          <el-form-item label="视频名称" prop="title">
+            <el-input v-model="videoParams.title" placeholder="请输入资料名称" clearable
+              @keyup.enter.native="handleVideoQuery" />
+          </el-form-item>
+          <el-form-item>
+            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleVideoQuery">搜索</el-button>
+          </el-form-item>
+        </el-form>
         <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="title" />
             <el-table-column align="center" label="学时" prop="hours" />
             <el-table-column align="center" label="操作">
               <template slot-scope="{row}">
@@ -29,10 +38,18 @@
     </div>
     <div class="pdf">
       <el-tabs v-model="pdfTab" type="card">
+        <el-form :model="pdfParams" size="small" :inline="true" label-width="68px">
+          <el-form-item label="文档名称" prop="title">
+            <el-input v-model="pdfParams.title" placeholder="请输入资料名称" clearable @keyup.enter.native="handlePdfQuery" />
+          </el-form-item>
+          <el-form-item>
+            <el-button type="primary" icon="el-icon-search" size="mini" @click="handlePdfQuery">搜索</el-button>
+          </el-form-item>
+        </el-form>
         <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="title" />
             <el-table-column align="center" label="学时" prop="hours" />
             <el-table-column align="center" label="操作">
               <template slot-scope="{row}">
@@ -87,8 +104,22 @@ export default {
         this.pdfTotal = response.total;
       });
     },
+    handleVideoQuery() {
+      this.videoParams.pageNum = 1;
+      this.getVideoList();
+    },
+    handlePdfQuery() {
+      this.pdfParams.pageNum = 1;
+      this.getPdfList();
+    },
     addToStudy(row) {
-      this.$modal.confirm('是否添加资料名称为"' + row.title + '"到我的学习记录？').then(res => {
+      this.$modal.confirm('是否添加资料名称为"' + row.title + '"到我的学习记录？').then(async res => {
+        let isRead = await listStudy({ userId: this.$store.getters.userId, resourceId: row.resourceId });
+        console.log(isRead);
+        if (isRead.total >= 1) {
+          this.$message.error('该课程已添加到我的学习记录里，不可再添加，可前往学习记录进行复习。')
+          return
+        }
         let obj = {
           resourceId: row.resourceId,
           userId: this.$store.getters.userId,

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

@@ -1,23 +1,28 @@
 <template>
-  <div class="video-container">
-    <div class="return-btn">
-      <el-button type="primary" size="mini" icon="el-icon-d-arrow-left"
-        @click="$router.push({ path: '/oa/study/myStudy' })">返回我的学习</el-button>
-      <div class="mt20">
-        学习进度：
-        <el-progress :text-inside="true" :status="formatStatus(percentage)" text-color="#fff" :stroke-width="26"
-          :percentage="percentage"></el-progress>
-      </div>
-      <div class="mt20" style="color:#E23D28;font-size:12px;line-height:30px;">
-        tips:视频不可拖动进度条，每隔30秒会自动保存，暂停也会保存视频进度，若出现学习进度一直不到100%，请退出后重新进入课程。
+  <div>
+    <div class="video-container" v-if="boxShow">
+      <div class="return-btn">
+        <el-button type="primary" size="mini" icon="el-icon-d-arrow-left"
+          @click="$router.push({ path: '/oa/study/myStudy' })">返回我的学习</el-button>
+        <div class="mt20">
+          学习进度：
+          <el-progress :text-inside="true" :status="formatStatus(percentage)" text-color="#fff" :stroke-width="26"
+            :percentage="percentage"></el-progress>
+        </div>
+        <div class="mt20" style="color:#E23D28;font-size:12px;line-height:30px;">
+          tips:视频不可拖动进度条，每隔30秒会自动保存，暂停也会保存视频进度，若出现学习进度一直不到100%，请退出后重新进入课程。
+        </div>
       </div>
+      <video ref="videoPlayer" width="1300" height="750" class="custom-video 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>
+    <div class="mt20 text-center" v-else>
+      抱歉，暂不支持手机端，请前往电脑端观看学习
     </div>
-    <video ref="videoPlayer" width="1300" height="750" class="custom-video 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>
 
@@ -48,6 +53,7 @@ export default {
       ],
       videoDuration: undefined,
       percentage: 0,
+      boxShow: false,
     };
   },
   watch: {
@@ -71,6 +77,12 @@ export default {
     }
   },
   created() {
+    if (this.$store.getters.device === 'mobile') {
+      this.boxShow = false;
+      return
+    } else {
+      this.boxShow = true;
+    }
     this.getData();
   },
   mounted() {
@@ -91,7 +103,7 @@ export default {
       if (Number(data.lastPoint) == 100) {
         this.isComplete = true;
         this.getHours = data.resource.hours;
-        this.$message.warning('视频已学习完毕，若要再次学习，请在学习记录里重新添加该课程。')
+        this.$message.warning('视频已学习完毕，若要再次学习，请重新点击复习。')
       }
     },
     // 初始化播放器
@@ -172,7 +184,7 @@ export default {
 
     // 处理视频结束
     async handleEnd() {
-      this.$message.warning('视频已学习完毕，若要再次学习，请在学习记录里重新添加该课程。')
+      this.$message.warning('视频已学习完毕，若要再次学习，请重新点击复习。')
       await updateStudy({
         studyId: this.videoId,
         lastPoint: 100,

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

@@ -2,12 +2,12 @@
  * @Author: ysh
  * @Date: 2025-03-05 14:00:18
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2025-03-05 15:26:03
+ * @LastEditTime: 2025-03-12 10:43:08
 -->
 <template>
   <div>
     <study-head></study-head>
-    <div class="main app-contrainer">
+    <!-- <div class="main app-contrainer">
       <div class="left">
         <div class="title">
           我的学习记录
@@ -15,8 +15,6 @@
         </div>
         <study-left ref="studyLeft"></study-left>
       </div>
-      <!-- <div class="center">
-      </div> -->
       <div class="right">
         <div class="title">
           学习资料库
@@ -24,7 +22,26 @@
         </div>
         <study-right ref="studyRight" @refreshList="getStudyList"></study-right>
       </div>
+    </div> -->
+    <div class="main app-container">
+      <el-row>
+        <el-col :md="12" :sm="24" class="left">
+          <div class="title">
+            我的学习记录
+            <div class="line"></div>
+          </div>
+          <study-left ref="studyLeft"></study-left>
+        </el-col>
+        <el-col :md="12" :sm="24" class="right">
+          <div class="title">
+            学习资料库
+            <div class="line"></div>
+          </div>
+          <study-right ref="studyRight" @refreshList="getStudyList"></study-right>
+        </el-col>
+      </el-row>
     </div>
+
   </div>
 </template>
 
@@ -45,23 +62,19 @@ export default {
 
 <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;
   }
 }

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

@@ -0,0 +1,290 @@
+<!--
+ * @Author: ysh
+ * @Date: 2025-03-12 10:06:03
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2025-03-13 16:20:48
+-->
+<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="title">
+        <el-select v-model="queryParams.type" @change="handleQuery" clearable>
+          <el-option label="视频" value="视频"></el-option>
+          <el-option label="文档" value="文档"></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="姓名" prop="userId">
+        <el-select v-model="queryParams.userId" clearable filterable placeholder="请输入姓名" style="width: 160px"
+          @change="handleQuery">
+          <el-option v-for="item in $store.state.user.userList" :key="item.userId" :label="item.nickName"
+            :value="item.userId">
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="学习年份" prop="lastTime" label-width="100px">
+        <el-date-picker clearable v-model="queryParams.lastTime" type="year" value-format="yyyy-MM-dd"
+          placeholder="请选择学习年份" @change="handleQuery">
+        </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:study: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:study: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:study: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:study:export']">导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+    <el-row>
+      <el-col :span="14" class="left">
+        <el-table v-loading="loading" :data="studyList" @selection-change="handleSelectionChange">
+          <el-table-column type="selection" width="55" align="center" />
+          <el-table-column type="index" label="序号" width="55" align="center" />
+          <!-- <el-table-column label="学习id" align="center" prop="studyId" /> -->
+          <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 label="姓名" align="center" prop="user.nickName" />
+          <el-table-column label="上次学习时间" align="center" prop="lastTime" width="180">
+            <template slot-scope="scope">
+              <span>{{ parseTime(scope.row.lastTime, '{y}-{m}-{d}') }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="已获学时" align="center" prop="getHours" />
+          <!-- <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:study:edit']">修改</el-button>
+              <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+                v-hasPermi="['oa:study: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" />
+      </el-col>
+      <el-col :span="10">
+        
+      </el-col>
+    </el-row>
+
+
+
+
+    <!-- 添加或修改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="学习资料id" prop="resourceId">
+          <el-input v-model="form.resourceId" placeholder="请输入学习资料id" />
+        </el-form-item>
+        <el-form-item label="用户id" prop="userId">
+          <el-input v-model="form.userId" placeholder="请输入用户id" />
+        </el-form-item>
+        <el-form-item label="上次位置" prop="lastPoint">
+          <el-input v-model="form.lastPoint" placeholder="请输入上次位置" />
+        </el-form-item>
+        <el-form-item label="上次时间" prop="lastTime">
+          <el-date-picker clearable v-model="form.lastTime" type="date" value-format="yyyy-MM-dd" placeholder="请选择上次时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="可获学时" prop="getHours">
+          <el-input v-model="form.getHours" placeholder="请输入可获学时" />
+        </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 { listStudy, getStudy, delStudy, addStudy, updateStudy } from "@/api/oa/study/myStudy";
+
+export default {
+  name: "Study",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // cmc学习记录表格数据
+      studyList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        resourceId: null,
+        userId: null,
+        lastPoint: null,
+        lastTime: null,
+        getHours: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询cmc学习记录列表 */
+    getList() {
+      this.loading = true;
+      listStudy(this.queryParams).then(response => {
+        this.studyList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        studyId: null,
+        resourceId: null,
+        userId: null,
+        lastPoint: null,
+        lastTime: null,
+        getHours: 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.studyId)
+      this.single = selection.length !== 1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加cmc学习记录";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const studyId = row.studyId || this.ids
+      getStudy(studyId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改cmc学习记录";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.studyId != null) {
+            updateStudy(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addStudy(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const studyIds = row.studyId || this.ids;
+      this.$modal.confirm('是否确认删除cmc学习记录编号为"' + studyIds + '"的数据项？').then(function () {
+        return delStudy(studyIds);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => { });
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('oa/study/export', {
+        ...this.queryParams
+      }, `study_${new Date().getTime()}.xlsx`)
+    },
+
+    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>
+.left {
+  padding: 10px;
+  border-right: 1px solid #ececec;
+}
+</style>

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

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2025-03-05 09:15:54
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2025-03-05 13:58:28
+ * @LastEditTime: 2025-03-12 10:02:46
 -->
 <template>
   <div class="app-container">
@@ -94,7 +94,7 @@
         </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">
+            :filePathName="'教育学习/学习资料'" :fileType="['pdf', 'mp4']" :fileSize="10240" @input="getDocumentPath">
           </FileUpload>
           <div v-if="form.sourcePath">
             <el-link type="primary" @click="reviewWord(`${baseUrl}${'/profile/upload' + form.sourcePath}`)">
@@ -112,7 +112,7 @@
               :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf', 'rar', 'zip']" @input="getDocumentPath"></FileUpload> -->
           </div>
           <div style="font-size:12px;color:#e45656">
-            tips:文档请上传pdf格式，视频请上传mp4格式
+            tips:文档仅支持pdf格式，视频仅支持mp4格式
           </div>
         </el-form-item>
         <el-form-item label="资料类型" prop="type">
@@ -192,6 +192,21 @@ export default {
       }
     };
   },
+  watch: {
+    'form.sourcePath'(val) {
+      console.log(val);
+      if (val) {
+        let name = this.getFileName(val);
+        if (name.includes('pdf')) {
+          this.form.type = '文档'
+        } else {
+          this.form.type = '视频'
+        }
+      } else {
+        this.form.type = ''
+      }
+    }
+  },
   created() {
     this.getList();
   },
@@ -308,7 +323,7 @@ export default {
         this.form.sourcePath = '';
       }).catch(() => { });
     },
-    formatterPath(row){
+    formatterPath(row) {
       let name = this.getFileName(row.sourcePath)
       return name
     }