导师带徒 修改培训内容

master/src/main/java/com/ruoyi/project/training/bccnew/controller/TTsFirstplanController.java

@@ -53,7 +53,14 @@ public class TTsFirstplanController extends BaseController {
      */
 //    @PreAuthorize("@ss.hasPermi('bccnew:firstplan:list')")
     @GetMapping("/list")
-    public AjaxResult list(TTsFirstplan tTsFirstplan) {
+    public TableDataInfo list(TTsFirstplan tTsFirstplan) {
+        startPage();
+        List<TTsFirstplan> list = tTsFirstplanService.selectTTsFirstplanList(tTsFirstplan);
+        return getDataTable(list);
+    }
+
+    @GetMapping("/listAll")
+    public AjaxResult listAll(TTsFirstplan tTsFirstplan) {
         return AjaxResult.success(tTsFirstplanService.selectTTsFirstplanList(tTsFirstplan));
     }
 

master/src/main/java/com/ruoyi/project/training/bccnew/controller/TTsNewController.java

@@ -83,6 +83,18 @@ public class TTsNewController extends BaseController {
     @Autowired
     private ITTsFtplanService tTsFtplanService;
 
+    @Autowired
+    private ITTsFtplanContentService tTsFtplanContentService;
+
+    @Autowired
+    private ITTsFlplanContentService tTsFlplanContentService;
+
+    @Autowired
+    private ITTsLjplanContentService tTsLjplanContentService;
+
+    @Autowired
+    private ITTsYsplanContentService tTsYsplanContentService;
+
     @Autowired
     private ISysUserService sysUserService;
 
@@ -122,7 +134,7 @@ public class TTsNewController extends BaseController {
                     TTsFirstplan tTsFirstplan = new TTsFirstplan();
                     tTsFirstplan.setNewId(t.getNewId());
                     List<TTsFirstplan> firstplanAll = tTsFirstplanService.selectTTsFirstplanListByNewId(tTsFirstplan);
-                    tTsFirstplan.setPlanStatus(3l);
+                    tTsFirstplan.setPlanStatus(5L);
                     List<TTsFirstplan> firstplanNow = tTsFirstplanService.selectTTsFirstplanListByNewId(tTsFirstplan);
                     Integer firstAll = firstplanAll.size();
                     Integer firstNow = firstplanNow.size();
@@ -132,7 +144,7 @@ public class TTsNewController extends BaseController {
                         TTsLjplan tTsLjplan = new TTsLjplan();
                         tTsLjplan.setNewId(t.getNewId());
                         List<TTsLjplan> ljPlansAll = tTsLjplanService.selectTTsLjplanListByNewId(tTsLjplan);
-                        tTsLjplan.setPlanStatus(3l);
+                        tTsLjplan.setPlanStatus(5L);
                         List<TTsLjplan> ljPlansNow = tTsLjplanService.selectTTsLjplanListByNewId(tTsLjplan);
                         secAll = ljPlansAll.size();
                         secNow = ljPlansNow.size();
@@ -140,7 +152,7 @@ public class TTsNewController extends BaseController {
                         TTsYsplan tTsYsplan = new TTsYsplan();
                         tTsYsplan.setNewId(t.getNewId());
                         List<TTsYsplan> ysPlansAll = tTsYsplanService.selectTTsYsplanListByNewId(tTsYsplan);
-                        tTsYsplan.setPlanStatus(3l);
+                        tTsYsplan.setPlanStatus(5L);
                         List<TTsYsplan> ysPlansNow = tTsYsplanService.selectTTsYsplanListByNewId(tTsYsplan);
                         secAll = ysPlansAll.size();
                         secNow = ysPlansNow.size();
@@ -148,7 +160,7 @@ public class TTsNewController extends BaseController {
                         TTsFlplan tTsFlplan = new TTsFlplan();
                         tTsFlplan.setNewId(t.getNewId());
                         List<TTsFlplan> flPlansAll = tTsFlplanService.selectTTsFlplanListByNewId(tTsFlplan);
-                        tTsFlplan.setPlanStatus(3l);
+                        tTsFlplan.setPlanStatus(5L);
                         List<TTsFlplan> flPlansNow = tTsFlplanService.selectTTsFlplanListByNewId(tTsFlplan);
                         secAll = flPlansAll.size();
                         secNow = flPlansNow.size();
@@ -156,7 +168,7 @@ public class TTsNewController extends BaseController {
                         TTsFtplan tTsFtplan = new TTsFtplan();
                         tTsFtplan.setNewId(t.getNewId());
                         List<TTsFtplan> ftPlansAll = tTsFtplanService.selectTTsFtplanListByNewId(tTsFtplan);
-                        tTsFtplan.setPlanStatus(3l);
+                        tTsFtplan.setPlanStatus(5L);
                         List<TTsFtplan> ftPlansNow = tTsFtplanService.selectTTsFtplanListByNewId(tTsFtplan);
                         secAll = ftPlansAll.size();
                         secNow = ftPlansNow.size();
@@ -387,7 +399,8 @@ public class TTsNewController extends BaseController {
             int i = 0;
             for (TTsLjplan plan : tTsLjplans) {
                 i++;
-                planList[i] = Rows.create(plan.getDetailPlan(), "", plan.getTopic(), "学习结束考核，且考试成绩达到80分以上");
+                String dateStr = getPlanDate(1, plan.getId());//获取整个内容的周期
+                planList[i] = Rows.create(plan.getDetailPlan(),dateStr, plan.getTopic(), "学习结束考核，且考试成绩达到80分以上");
             }
         } else if (planType == 2L) {
             post = "压缩";
@@ -399,7 +412,8 @@ public class TTsNewController extends BaseController {
             int i = 0;
             for (TTsYsplan plan : tTsYsplans) {
                 i++;
-                planList[i] = Rows.create(plan.getDetailPlan(), "", plan.getTopic(), "学习结束考核，且考试成绩达到80分以上");
+                String dateStr = getPlanDate(2, plan.getId());//获取整个内容的周期
+                planList[i] = Rows.create(plan.getDetailPlan(), dateStr, plan.getTopic(), "学习结束考核，且考试成绩达到80分以上");
             }
         } else if (planType == 3L) {
             post = "分离";
@@ -411,7 +425,8 @@ public class TTsNewController extends BaseController {
             int i = 0;
             for (TTsFlplan plan : tTsFlplans) {
                 i++;
-                planList[i] = Rows.create(plan.getDetailPlan(), "", plan.getTopic(), "学习结束考核，且考试成绩达到80分以上");
+                String dateStr = getPlanDate(3, plan.getId());//获取整个内容的周期
+                planList[i] = Rows.create(plan.getDetailPlan(), dateStr, plan.getTopic(), "学习结束考核，且考试成绩达到80分以上");
             }
         } else if (planType == 4L) {
             post = "芳烃";
@@ -423,7 +438,8 @@ public class TTsNewController extends BaseController {
             int i = 0;
             for (TTsFtplan plan : tTsFtplans) {
                 i++;
-                planList[i] = Rows.create(plan.getDetailPlan(), "", plan.getTopic(), "学习结束考核，且考试成绩达到80分以上");
+                String dateStr = getPlanDate(4, plan.getId());//获取整个内容的周期
+                planList[i] = Rows.create(plan.getDetailPlan(), dateStr, plan.getTopic(), "学习结束考核，且考试成绩达到80分以上");
             }
         }
         params.put("tutorPost", Texts.of(post).create());
@@ -466,8 +482,8 @@ public class TTsNewController extends BaseController {
             List<TTsLjplan> tTsLjplans = tTsLjplanService.selectTTsLjplanListByNewId(ljplan);
             planList.add(Rows.create("Training Topics 培训主题", "", "Training Date 培训日期", "Training Effectiveness Evaluation* 培训效果评价*", "Training Effectiveness Acknowledgement 培训效果确认", "", "Mentor comment 导师意见"));
             planList.add(Rows.create("", "", "", "", "Trainee 学徒", "Tutor 导师", "Proceed to next topic or not 是否转至下一主题"));
-            for (TTsLjplan plan : tTsLjplans) {
-                String dateStr = plan.getCourseDate() == null ? "" : formatter.format(plan.getCourseDate());
+            for (TTsLjplan plan : tTsLjplans) {//如果有多次成绩，则将每次成绩都展示
+                String dateStr = getPlanDate(1, plan.getId());//获取整个内容的周期
                 if (StringUtils.isNotEmpty(plan.getScore1())) {
                     planList.add(Rows.create(plan.getDetailPlan(), plan.getTopic(), dateStr, plan.getScore1(), apprentice.getNickName(), mentor.getNickName(), plan.getScore1().equals("好") ? "是" : "否"));
                 } else {
@@ -477,7 +493,7 @@ public class TTsNewController extends BaseController {
                     planList.add(Rows.create(plan.getDetailPlan(), plan.getTopic(), dateStr, plan.getScore2(), apprentice.getNickName(), mentor.getNickName(), plan.getScore2().equals("好") ? "是" : "否"));
                 }
                 if (StringUtils.isNotEmpty(plan.getScore3())) {
-                    planList.add(Rows.create(plan.getDetailPlan(), plan.getTopic(), formatter.format(plan.getCourseDate()), plan.getScore3(), apprentice.getNickName(), mentor.getNickName(), plan.getScore3().equals("好") ? "是" : "否"));
+                    planList.add(Rows.create(plan.getDetailPlan(), plan.getTopic(), dateStr, plan.getScore3(), apprentice.getNickName(), mentor.getNickName(), plan.getScore3().equals("好") ? "是" : "否"));
                 }
             }
         } else if (planType == 2L) {
@@ -489,7 +505,7 @@ public class TTsNewController extends BaseController {
             planList.add(Rows.create("", "", "", "", "Trainee 学徒", "Tutor 导师", "Proceed to next topic or not 是否转至下一主题"));
 
             for (TTsYsplan plan : tTsYsplans) {
-                String dateStr = plan.getCourseDate() == null ? "" : formatter.format(plan.getCourseDate());
+                String dateStr = getPlanDate(2, plan.getId());
                 if (StringUtils.isNotEmpty(plan.getScore1())) {
                     planList.add(Rows.create(plan.getDetailPlan(), plan.getTopic(), dateStr, plan.getScore1(), apprentice.getNickName(), mentor.getNickName(), plan.getScore1().equals("好") ? "是" : "否"));
                 } else {
@@ -499,7 +515,7 @@ public class TTsNewController extends BaseController {
                     planList.add(Rows.create(plan.getDetailPlan(), plan.getTopic(), dateStr, plan.getScore2(), apprentice.getNickName(), mentor.getNickName(), plan.getScore2().equals("好") ? "是" : "否"));
                 }
                 if (StringUtils.isNotEmpty(plan.getScore3())) {
-                    planList.add(Rows.create(plan.getDetailPlan(), plan.getTopic(), formatter.format(plan.getCourseDate()), plan.getScore3(), apprentice.getNickName(), mentor.getNickName(), plan.getScore3().equals("好") ? "是" : "否"));
+                    planList.add(Rows.create(plan.getDetailPlan(), plan.getTopic(), dateStr, plan.getScore3(), apprentice.getNickName(), mentor.getNickName(), plan.getScore3().equals("好") ? "是" : "否"));
                 }
             }
         } else if (planType == 3L) {
@@ -510,7 +526,7 @@ public class TTsNewController extends BaseController {
             planList.add(Rows.create("Training Topics 培训主题", "", "Training Date 培训日期", "Training Effectiveness Evaluation* 培训效果评价*", "Training Effectiveness Acknowledgement 培训效果确认", "", "Mentor comment 导师意见"));
             planList.add(Rows.create("", "", "", "", "Trainee 学徒", "Tutor 导师", "Proceed to next topic or not 是否转至下一主题"));
             for (TTsFlplan plan : tTsFlplans) {
-                String dateStr = plan.getCourseDate() == null ? "" : formatter.format(plan.getCourseDate());
+                String dateStr = getPlanDate(3, plan.getId());
                 if (StringUtils.isNotEmpty(plan.getScore1())) {
                     planList.add(Rows.create(plan.getDetailPlan(), plan.getTopic(), dateStr, plan.getScore1(), apprentice.getNickName(), mentor.getNickName(), plan.getScore1().equals("好") ? "是" : "否"));
                 } else {
@@ -520,7 +536,7 @@ public class TTsNewController extends BaseController {
                     planList.add(Rows.create(plan.getDetailPlan(), plan.getTopic(), dateStr, plan.getScore2(), apprentice.getNickName(), mentor.getNickName(), plan.getScore2().equals("好") ? "是" : "否"));
                 }
                 if (StringUtils.isNotEmpty(plan.getScore3())) {
-                    planList.add(Rows.create(plan.getDetailPlan(), plan.getTopic(), formatter.format(plan.getCourseDate()), plan.getScore3(), apprentice.getNickName(), mentor.getNickName(), plan.getScore3().equals("好") ? "是" : "否"));
+                    planList.add(Rows.create(plan.getDetailPlan(), plan.getTopic(), dateStr, plan.getScore3(), apprentice.getNickName(), mentor.getNickName(), plan.getScore3().equals("好") ? "是" : "否"));
                 }
             }
         } else if (planType == 4L) {
@@ -531,7 +547,7 @@ public class TTsNewController extends BaseController {
             planList.add(Rows.create("Training Topics 培训主题", "", "Training Date 培训日期", "Training Effectiveness Evaluation* 培训效果评价*", "Training Effectiveness Acknowledgement 培训效果确认", "", "Mentor comment 导师意见"));
             planList.add(Rows.create("", "", "", "", "Trainee 学徒", "Tutor 导师", "Proceed to next topic or not 是否转至下一主题"));
             for (TTsFtplan plan : tTsFtplans) {
-                String dateStr = plan.getCourseDate() == null ? "" : formatter.format(plan.getCourseDate());
+                String dateStr = getPlanDate(4, plan.getId());
                 if (StringUtils.isNotEmpty(plan.getScore1())) {
                     planList.add(Rows.create(plan.getDetailPlan(), plan.getTopic(), dateStr, plan.getScore1(), apprentice.getNickName(), mentor.getNickName(), plan.getScore1().equals("好") ? "是" : "否"));
                 } else {
@@ -541,7 +557,7 @@ public class TTsNewController extends BaseController {
                     planList.add(Rows.create(plan.getDetailPlan(), plan.getTopic(), dateStr, plan.getScore2(), apprentice.getNickName(), mentor.getNickName(), plan.getScore2().equals("好") ? "是" : "否"));
                 }
                 if (StringUtils.isNotEmpty(plan.getScore3())) {
-                    planList.add(Rows.create(plan.getDetailPlan(), plan.getTopic(), formatter.format(plan.getCourseDate()), plan.getScore3(), apprentice.getNickName(), mentor.getNickName(), plan.getScore3().equals("好") ? "是" : "否"));
+                    planList.add(Rows.create(plan.getDetailPlan(), plan.getTopic(), dateStr, plan.getScore3(), apprentice.getNickName(), mentor.getNickName(), plan.getScore3().equals("好") ? "是" : "否"));
                 }
             }
         }
@@ -557,6 +573,61 @@ public class TTsNewController extends BaseController {
         return params;
     }
 
+    private String getPlanDate(int planType, Long id) {
+        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+        StringBuilder sb = new StringBuilder();
+        if (planType == 1) {
+            TTsLjplanContent item = new TTsLjplanContent();
+            item.setPid(id);
+            List<TTsLjplanContent> list = tTsLjplanContentService.selectTTsLjplanContentList(item);
+            if (CollectionUtils.isNotEmpty(list)) {
+                if (list.get(0).getPlanDate() != null) {
+                    sb.append(format.format(list.get(0).getPlanDate())).append(" ~ ");
+                }
+                if (list.get(list.size() - 1).getPlanDate() != null) {
+                    sb.append(format.format(list.get(list.size() - 1).getPlanDate()));
+                }
+            }
+        } else if (planType == 2) {
+            TTsYsplanContent item = new TTsYsplanContent();
+            item.setPid(id);
+            List<TTsYsplanContent> list = tTsYsplanContentService.selectTTsYsplanContentList(item);
+            if (CollectionUtils.isNotEmpty(list)) {
+                if (list.get(0).getPlanDate() != null) {
+                    sb.append(format.format(list.get(0).getPlanDate())).append(" ~ ");
+                }
+                if (list.get(list.size() - 1).getPlanDate() != null) {
+                    sb.append(format.format(list.get(list.size() - 1).getPlanDate()));
+                }
+            }
+        } else if (planType == 3) {
+            TTsFlplanContent item = new TTsFlplanContent();
+            item.setPid(id);
+            List<TTsFlplanContent> list = tTsFlplanContentService.selectTTsFlplanContentList(item);
+            if (CollectionUtils.isNotEmpty(list)) {
+                if (list.get(0).getPlanDate() != null) {
+                    sb.append(format.format(list.get(0).getPlanDate())).append(" ~ ");
+                }
+                if (list.get(list.size() - 1).getPlanDate() != null) {
+                    sb.append(format.format(list.get(list.size() - 1).getPlanDate()));
+                }
+            }
+        } else if (planType == 4) {
+            TTsFtplanContent item = new TTsFtplanContent();
+            item.setPid(id);
+            List<TTsFtplanContent> list = tTsFtplanContentService.selectTTsFtplanContentList(item);
+            if (CollectionUtils.isNotEmpty(list)) {
+                if (list.get(0).getPlanDate() != null) {
+                    sb.append(format.format(list.get(0).getPlanDate())).append(" ~ ");
+                }
+                if (list.get(list.size() - 1).getPlanDate() != null) {
+                    sb.append(format.format(list.get(list.size() - 1).getPlanDate()));
+                }
+            }
+        }
+        return sb.toString();
+    }
+
     /**
      * 生成word
      *
@@ -636,7 +707,7 @@ public class TTsNewController extends BaseController {
         // 在图片上绘制文本
         // 注意：x和y坐标定义了文本左下角的位置
         int x = (width - textWidth) / 2; // 居中显示
-        int y = height - textHeight+70; // 距离底部10像素
+        int y = height - textHeight + 70; // 距离底部10像素
         g2d.drawString(nickName, x, y);
 
         // 释放图形上下文使用的系统资源

ui/src/api/training/bccnew/firstplan.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 查询进组培训列表
 export function listFirstplan(query) {
   return request({
-    url: '/bccnew/firstplan/list',
+    url: '/bccnew/firstplan/listAll',
     method: 'get',
     params: query
   })

ui/src/views/approve/approveDetail/dsdtTraining-detail.vue

@@ -28,7 +28,7 @@
       <el-descriptions-item label="导师姓名">
         {{ this.dataForm.tTsNew.mentorStaffName }}
       </el-descriptions-item>
-      <el-descriptions-item label="岗位" :span="2" :label-style="labelStyle">
+      <el-descriptions-item label="岗位" :label-style="labelStyle">
         <template>
           <span v-if="dataForm.tTsNew.planType == 1" size="small">裂解</span>
           <span v-else-if="dataForm.tTsNew.planType == 2" size="small">压缩</span>
@@ -36,6 +36,11 @@
           <span v-else-if="dataForm.tTsNew.planType == 4" size="small">芳烃</span>
         </template>
       </el-descriptions-item>
+      <el-descriptions-item label="考评表" :label-style="labelStyle">
+        <template>
+          <el-button  icon="el-icon-folder" style="color:#6e96fa;" @click="handleDownloadWord(dataForm.tTsNew, 'appraisalForm')" circle></el-button>
+        </template>
+      </el-descriptions-item>
       <el-descriptions-item label="备注" :span="2" :label-style="labelStyle">
         {{ this.dataForm.tTsNew.remarks }}
       </el-descriptions-item>
@@ -51,8 +56,8 @@
     <span slot="footer" class="dialog-footer">
       <el-button v-if="!this.taskForm.taskId == ''" type="primary"
                  @click="dataFormSubmit(1)" :disabled="submitDisabled">{{   $t('通过') }}</el-button>
-      <el-button v-if="!this.taskForm.taskId == ''&&taskName==='装置经理'" type="danger"
-                 @click="dataFormSubmit(0)" :disabled="submitDisabled">{{ $t('拒绝') }}</el-button>
+<!--      <el-button v-if="!this.taskForm.taskId == ''&&taskName==='装置经理'" type="danger"-->
+<!--                 @click="dataFormSubmit(0)" :disabled="submitDisabled">{{ $t('拒绝') }}</el-button>-->
       <el-button @click="visible = false">{{ $t('返回') }}</el-button>
     </span>
     <div>
@@ -74,7 +79,7 @@
 
 <script>
 import {getHistorylist} from "@/api/ehs/approvedanger";
-import {getTsnew, handleTsnew} from "@/api/training/bccnew/tsnew";
+import {genAppraisalFormWord, getTsnew, handleTsnew} from "@/api/training/bccnew/tsnew";
 import {getApprove} from "@/api/training/bccnew/tsApprove";
 
 export default {
@@ -198,6 +203,40 @@ export default {
       };
       this.resetForm("form");
     },
+    // 文件下载处理
+    handleDownloadWord(row, type) {
+      let name;
+      let url;
+      console.log(row)
+      if (type == 'mentorAgreement') {
+        name = row.mentorAgreementWordPath;
+        url = row.mentorAgreementWordPath;
+        const a = document.createElement('a')
+        a.setAttribute('download', name)
+        a.setAttribute('target', '_blank')
+        a.setAttribute('href', process.env.VUE_APP_BASE_API + url)
+        a.click()
+      } else if (type == 'targetPlan') {
+        name = row.targetPlanWordPath;
+        url = row.targetPlanWordPath;
+        const a = document.createElement('a')
+        a.setAttribute('download', name)
+        a.setAttribute('target', '_blank')
+        a.setAttribute('href', process.env.VUE_APP_BASE_API + url)
+        a.click()
+      } else if (type == 'appraisalForm') {
+        genAppraisalFormWord(row.newId).then(res=>{
+          name = res.msg;
+          url = res.msg;
+          console.log(url)
+          const a = document.createElement('a')
+          a.setAttribute('download', name)
+          a.setAttribute('target', '_blank')
+          a.setAttribute('href', process.env.VUE_APP_BASE_API + url)
+          a.click()
+        })
+      }
+    },
   }
 
 }

ui/src/views/training/bccnew/firstPlanTmpl/index.vue

@@ -99,7 +99,7 @@
       <el-table-column label="培训时长h" align="center" prop="courseHour" />
       <el-table-column label="讲师" align="center" prop="trainer" />
       <el-table-column label="考试评估方式" align="center" prop="examType" />
-      <el-table-column label="应学习时长" align="center" prop="timerNeed"/>
+      <el-table-column label="应学习时长（分）" align="center" prop="timerNeed"/>
       <el-table-column label="备注" align="center" prop="remarks" />
       <el-table-column label="操作" align="center" fixed="right" width="230" class-name="small-padding fixed-width">
         <template slot-scope="scope">
@@ -160,7 +160,7 @@
         <el-form-item label="考试评估方式" prop="examType">
           <el-input v-model="form.examType" placeholder="请输入考试评估方式"/>
         </el-form-item>
-        <el-form-item label="应学习时长" prop="timerNeed">
+        <el-form-item label="应学习时长（分）" prop="timerNeed">
           <el-input-number v-model="form.timerNeed" placeholder="请输入应学习时长" />
         </el-form-item>
         <el-form-item label="培训排序" prop="sortTmpl">

ui/src/views/training/bccnew/firstplan/index.vue

@@ -334,7 +334,7 @@
         type="primary"
         icon="el-icon-video-play"
         @click="handleStudy(file.data)"
-      >开始学习
+      >查看附件
       </el-button>
     </el-dialog>
 

ui/src/views/training/bccnew/flPlan/index.vue

@@ -79,7 +79,7 @@
       <el-table-column label="培训主题" align="center" prop="topic"/>
       <el-table-column label="培训计划" align="center" prop="courseDay" />
       <el-table-column label="培训内容" align="center" prop="content"/>
-      <el-table-column label="应学习时长" align="center" prop="timerNeed"/>
+      <el-table-column label="应学习时长（分）" align="center" prop="timerNeed"/>
       <el-table-column label="备注" align="center" prop="remarks"/>
       <el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width">
         <template slot-scope="scope">
@@ -131,7 +131,7 @@
         <el-form-item label="培训排序" prop="sortTmpl">
           <el-input-number v-model="form.sortTmpl" placeholder="请输入培训排序" style="width:100%;"/>
         </el-form-item>
-        <el-form-item label="应学习时长（h）" prop="timerNeed">
+        <el-form-item label="应学习时长（分）" prop="timerNeed">
           <el-input-number v-model="form.timerNeed" placeholder="请输入应学习时长" style="width: 100%"/>
         </el-form-item>
         <el-form-item label="备注" prop="remarks">

ui/src/views/training/bccnew/ftPlan/index.vue

@@ -81,7 +81,7 @@
       />
       <el-table-column label="培训计划" align="center" prop="courseDay"/>
       <el-table-column label="培训内容" align="center" prop="content"/>
-      <el-table-column label="应学习时长" align="center" prop="timerNeed"/>
+      <el-table-column label="应学习时长（分）" align="center" prop="timerNeed"/>
       <el-table-column label="备注" align="center" prop="remarks"/>
       <el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width">
         <template slot-scope="scope">
@@ -133,7 +133,7 @@
         <el-form-item label="培训排序" prop="sortTmpl">
           <el-input-number v-model="form.sortTmpl" placeholder="请输入培训排序" style="width: 100%"/>
         </el-form-item>
-        <el-form-item label="应学习时长（h）" prop="timerNeed">
+        <el-form-item label="应学习时长（分）" prop="timerNeed">
           <el-input-number v-model="form.timerNeed" placeholder="请输入应学习时长" style="width: 100%"/>
         </el-form-item>
         <el-form-item label="备注" prop="remarks">

ui/src/views/training/bccnew/ljPlan/index.vue

@@ -75,7 +75,7 @@
                        />
       <el-table-column label="培训计划" align="center" prop="courseDay" />
       <el-table-column label="培训内容" align="center" prop="content" />
-      <el-table-column label="应学习时长" align="center" prop="timerNeed"/>
+      <el-table-column label="应学习时长（分）" align="center" prop="timerNeed"/>
       <el-table-column label="备注" align="center" prop="remarks"/>
       <el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width">
         <template slot-scope="scope">
@@ -125,7 +125,7 @@
         <el-form-item label="培训排序" prop="sortTmpl">
           <el-input-number v-model="form.sortTmpl" placeholder="请输入培训排序" style="width:100%;"/>
         </el-form-item>
-        <el-form-item label="应学习时长（h）" prop="timerNeed">
+        <el-form-item label="应学习时长（分）" prop="timerNeed">
           <el-input-number v-model="form.timerNeed" placeholder="请输入应学习时长" style="width: 100%"/>
         </el-form-item>
         <el-form-item label="备注" prop="remarks">

ui/src/views/training/bccnew/tsnew/score.vue

@@ -164,7 +164,7 @@
         <el-form-item label="培训排序" prop="sortTmpl">
           <el-input-number v-model="form.sortTmpl" placeholder="请输入培训排序" style="width:100%;"/>
         </el-form-item>
-        <el-form-item label="应学习时长（h）" prop="timerNeed">
+        <el-form-item label="应学习时长（分）" prop="timerNeed">
           <el-input-number v-model="form.timerNeed" placeholder="请输入应学习时长" style="width: 100%"/>
         </el-form-item>
         <el-form-item label="备注" prop="remarks">

ui/src/views/training/bccnew/ysPlan/index.vue

@@ -75,7 +75,7 @@
                        />
       <el-table-column label="培训计划" align="center" prop="courseDay" />
       <el-table-column label="培训内容" align="center" prop="content" />
-      <el-table-column label="应学习时长" align="center" prop="timerNeed"/>
+      <el-table-column label="应学习时长（分）" align="center" prop="timerNeed"/>
       <el-table-column label="备注" align="center" prop="remarks"/>
       <el-table-column label="操作" align="center" fixed="right"  class-name="small-padding fixed-width">
         <template slot-scope="scope">
@@ -125,7 +125,7 @@
         <el-form-item label="培训排序" prop="sortTmpl">
           <el-input-number v-model="form.sortTmpl" placeholder="请输入培训排序" style="width:100%;"/>
         </el-form-item>
-        <el-form-item label="应学习时长（h）" prop="timerNeed">
+        <el-form-item label="应学习时长（分）" prop="timerNeed">
           <el-input-number v-model="form.timerNeed" placeholder="请输入应学习时长" style="width: 100%"/>
         </el-form-item>
         <el-form-item label="备注" prop="remarks">