-导师带徒bugfix

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

@@ -228,6 +228,7 @@ public class TTsApproveController extends BaseController {
                         item.setUpdaterCode(null);
                         item.setPlanStatus(0L);
                         item.setScorePass(null);
+                        item.setTimer(0L);
                         item.setSortTmpl(item.getSortTmpl() + 1);//排序往后顺延1
 
                         tTsLjplanService.insertTTsLjplan(item);
@@ -290,6 +291,7 @@ public class TTsApproveController extends BaseController {
                         item.setUpdaterCode(null);
                         item.setPlanStatus(0L);
                         item.setScorePass(null);
+                        item.setTimer(0L);
                         item.setSortTmpl(item.getSortTmpl() + 1);//排序往后顺延1
 
                         tTsYsplanService.insertTTsYsplan(item);
@@ -352,6 +354,7 @@ public class TTsApproveController extends BaseController {
                         item.setUpdaterCode(null);
                         item.setPlanStatus(0L);
                         item.setScorePass(null);
+                        item.setTimer(0L);
                         item.setSortTmpl(item.getSortTmpl() + 1);//排序往后顺延1
 
                         tTsFlplanService.insertTTsFlplan(item);
@@ -414,6 +417,7 @@ public class TTsApproveController extends BaseController {
                         item.setUpdaterCode(null);
                         item.setPlanStatus(0L);
                         item.setScorePass(null);
+                        item.setTimer(0L);
                         item.setSortTmpl(item.getSortTmpl() + 1);//排序往后顺延1
 
                         tTsFtplanService.insertTTsFtplan(item);

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

@@ -117,7 +117,7 @@
                :visible.sync="pdf.open" width="1300px" height="800px" :center="true" append-to-body
                @close="handleClose">
       <div style="margin-top: -60px;float: right;margin-right: 40px;">
-        <br/>累计学习时长：{{learnTime}} min
+        <br/>累计学习时长：{{learnTime == null ? "0" : learnTime}} min
       </div>
       <div style="margin-top: -30px">
         <iframe id="iFrame" class="iframe-html" :src="pdf.pdfUrl" frameborder="0" width="100%" height="700px"
@@ -421,8 +421,8 @@ export default {
         timer = window.setInterval(function () {
           updateLjLearnTime(row).then(res => {
             this.$nextTick(() => {
-              this.file.data.timer = res.data
-              this.learnTime+=res.data;
+              _this.file.data.timer = res.data
+              _this.learnTime=res.data;
             })
           })
         }, 60000);
@@ -430,8 +430,8 @@ export default {
         timer = window.setInterval(function () {
           updateYsLearnTime(row).then(res => {
             this.$nextTick(() => {
-              this.file.data.timer = res.data
-              this.learnTime+=res.data;
+              _this.file.data.timer = res.data
+              _this.learnTime=res.data;
             })
           })
         }, 60000);
@@ -439,8 +439,8 @@ export default {
         timer = window.setInterval(function () {
           updateFlLearnTime(row).then(res => {
             this.$nextTick(() => {
-              this.file.data.timer = res.data
-              this.learnTime+=res.data;
+              _this.file.data.timer = res.data
+              _this.learnTime=res.data;
             })
           })
         }, 60000);
@@ -448,8 +448,8 @@ export default {
         timer = window.setInterval(function () {
           updateFtLearnTime(row).then(res => {
             this.$nextTick(() => {
-              this.file.data.timer = res.data
-              this.learnTime+=res.data;
+              _this.file.data.timer = res.data
+              _this.learnTime=res.data;
             })
           })
         }, 60000);
@@ -712,7 +712,7 @@ export default {
     //合并单元格
     mergeMethod({row, column, rowIndex, columnIndex}) {
       // console.log(row)
-      if ([1, 3, 6, 7, 8, 9, 10, 11, 12, 13, 14].includes(columnIndex)) {
+      if ([1, 3, 5,6, 7, 8, 9, 10, 11, 12, 13].includes(columnIndex)) {
         const _row = this.setTable(this.dsdtList).merge[rowIndex];
         const _col = _row > 0 ? 1 : 0;
         return {