ly 1 jaar geleden
bovenliggende
commit
e4a4b86229

+ 5 - 0
master/src/main/java/com/ruoyi/project/training/controller/TTrainingbccDeviceController.java

@@ -63,6 +63,11 @@ public class TTrainingbccDeviceController extends BaseController
             SysUser user = sysUserMapper.selectUserById(getUserId());
             tTrainingbccDevice.setStaffId(user.getStaffId());
         }
+        try {
+            Thread.sleep(0);
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+        }
         startPage();
         List<TTrainingbccDevice> list = tTrainingbccDeviceService.selectTTrainingbccDeviceList(tTrainingbccDevice);
         for (TTrainingbccDevice t: list

+ 3 - 0
master/src/main/java/com/ruoyi/project/training/elearn/controller/TElExamController.java

@@ -1,6 +1,8 @@
 package com.ruoyi.project.training.elearn.controller;
 
 import java.util.List;
+
+import com.ruoyi.framework.interceptor.annotation.RepeatSubmit;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -70,6 +72,7 @@ public class TElExamController extends BaseController
      */
     @Log(title = "考试", businessType = BusinessType.INSERT)
     @PostMapping
+    @RepeatSubmit
     public AjaxResult add(@RequestBody TElExam tElExam)
     {
         return toAjax(tElExamService.insertTElExam(tElExam));

+ 2 - 2
master/src/main/resources/application.yml

@@ -9,7 +9,7 @@ ruoyi:
   # 实例演示开关
   demoEnabled: true
   # 文件路径 示例( Windows配置D:/ruoyi/uploadPath,Linux配置 /u03/cpmsfile/uploadPath)
-  profile: D:/ruoyi/uploadPath
+  profile: /u03/cpmsfile/uploadPath
   # 邮件中链接跳转路径 示例(本地:http://localhost/cpms/index.html#,服务器:http://47.114.101.16:8080/cpms/index.html# https://cpms.basf-ypc.net.cn/cpms/index.html#)
   requestJumpPath: https://cpms.basf-ypc.net.cn/cpms/index.html#
   # 图像识别地址
@@ -184,7 +184,7 @@ jodconverter:
     enabled: true
     # 设置LibreOffice主目录
     #    office-home: /opt/libreoffice7.2  C:/Program Files/LibreOffice
-    office-home: C:/Program Files/LibreOffice
+    office-home: /opt/libreoffice7.2
     max-tasks-per-process: 100
     port-numbers: 8100
     # 开启多个LibreOffice进程,每个端口对应一个进程

+ 1 - 1
master/src/main/resources/mybatis/training/elearn/TElExamMapper.xml

@@ -35,7 +35,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectTElExamVo"/>
         <where>
             <if test="examId != null "> and exam_id = #{examId}</if>
-            <if test="title != null  and title != ''"> and title = #{title}</if>
+            <if test="title != null  and title != ''"> and title like concat(concat('%', #{title}), '%')</if>
             <if test="content != null  and content != ''"> and content = #{content}</if>
             <if test="openType != null "> and open_type = #{openType}</if>
             <if test="examType != null "> and exam_type = #{examType}</if>

+ 17 - 0
ui/src/views/training/elearn/exam/index.vue

@@ -10,6 +10,23 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+
+      <el-form-item label="考试类型" prop="examType">
+        <el-radio-group v-model="queryParams.examType">
+          <el-radio
+            key="1"
+            :label="1"
+          >岗位培训</el-radio>
+          <el-radio
+            key="2"
+            :label="2"
+          >装置培训</el-radio>
+          <el-radio
+            key="3"
+            :label="3"
+          >导师带徒</el-radio>
+        </el-radio-group>
+      </el-form-item>
 <!--      <el-form-item label="1公开2部门3定员" prop="openType">-->
 <!--        <el-select v-model="queryParams.openType" placeholder="请选择1公开2部门3定员" clearable size="small">-->
 <!--          <el-option label="请选择字典生成" value="" />-->

+ 0 - 1
ui/src/views/training/elearn/userBook/train.vue

@@ -180,7 +180,6 @@ export default {
             message: '很遗憾,做错了呢,请参考答案解析!',
             type: 'error'
           })
-
         }
       }
     }