裂解炉炉管测温测压fvp页面早班/晚班

master/src/main/java/com/ruoyi/project/production/controller/TFurnancePressureController.java

@@ -1439,43 +1439,181 @@ public class TFurnancePressureController extends BaseController
                 || list109.size() == 0 || list109.size() == 0) {
             return AjaxResult.success("incompleteData");
         } else {
-            FurnancePressureFvpVO vo109A = this.calcRatio109A(list109);
-            FurnancePressureFvpVO vo109B = this.calcRatio109B(list109);
-            FurnancePressureFvpVO vo110 = this.calcRatio(list110);
-            FurnancePressureFvpVO vo111 = this.calcRatio(list111);
-            FurnancePressureFvpVO vo112 = this.calcRatio(list112);
-            FurnancePressureFvpVO vo113 = this.calcRatio(list113);
-            FurnancePressureFvpVO vo114 = this.calcRatio(list114);
-            FurnancePressureFvpVO vo115 = this.calcRatio(list115);
-            FurnancePressureFvpVO vo116 = this.calcRatio(list116);
-            FurnancePressureFvpVO vo117 = this.calcRatio(list117);
-            FurnancePressureFvpVO vo118 = this.calcRatio(list118);
-            FurnancePressureFvpVO vo130 = this.calcRatio130(list130);
-            vo110.setFurnanceName("H-110");
-            vo111.setFurnanceName("H-111");
-            vo112.setFurnanceName("H-112");
-            vo113.setFurnanceName("H-113");
-            vo114.setFurnanceName("H-114");
-            vo115.setFurnanceName("H-115");
-            vo116.setFurnanceName("H-116");
-            vo117.setFurnanceName("H-117");
-            vo118 .setFurnanceName("H-118");
-            vo130.setFurnanceName("H-130");
-            vo109A.setFurnanceName("H-109A");
-            vo109B.setFurnanceName("H-109B");
             List<FurnancePressureFvpVO> voList = new ArrayList<>();
-            voList.add(vo110);
-            voList.add(vo111);
-            voList.add(vo112);
-            voList.add(vo113);
-            voList.add(vo114);
-            voList.add(vo115);
-            voList.add(vo116);
-            voList.add(vo117);
-            voList.add(vo118);
-            voList.add(vo130);
-            voList.add(vo109A);
-            voList.add(vo109B);
+            for (TFurnancePressure pressure : list109) {
+                ArrayList<TFurnancePressure> list = new ArrayList<>();
+                list.add(pressure);
+                FurnancePressureFvpVO voA = this.calcRatio109A(list);
+                voA.setFurnanceName("H-109A");
+                FurnancePressureFvpVO voB = this.calcRatio109B(list);
+                voB.setFurnanceName("H-109B");
+                if (pressure.getRecordTime().getHours() == 20) {
+                    voA.setTime("晚班");
+                    voB.setTime("晚班");
+                } else {
+                    voA.setTime("早班");
+                    voB.setTime("早班");
+                }
+                voList.add(voA);
+                voList.add(voB);
+            }
+            for (TFurnancePressure pressure : list110) {
+                ArrayList<TFurnancePressure> list = new ArrayList<>();
+                list.add(pressure);
+                FurnancePressureFvpVO vo = this.calcRatio(list);
+                vo.setFurnanceName("H-110");
+                if (pressure.getRecordTime().getHours() == 20) {
+                    vo.setTime("晚班");
+                } else {
+                    vo.setTime("早班");
+                }
+                voList.add(vo);
+            }
+            for (TFurnancePressure pressure : list111) {
+                ArrayList<TFurnancePressure> list = new ArrayList<>();
+                list.add(pressure);
+                FurnancePressureFvpVO vo = this.calcRatio(list);
+                vo.setFurnanceName("H-111");
+                if (pressure.getRecordTime().getHours() == 20) {
+                    vo.setTime("晚班");
+                } else {
+                    vo.setTime("早班");
+                }
+                voList.add(vo);
+            }
+            for (TFurnancePressure pressure : list112) {
+                ArrayList<TFurnancePressure> list = new ArrayList<>();
+                list.add(pressure);
+                FurnancePressureFvpVO vo = this.calcRatio(list);
+                vo.setFurnanceName("H-112");
+                if (pressure.getRecordTime().getHours() == 20) {
+                    vo.setTime("晚班");
+                } else {
+                    vo.setTime("早班");
+                }
+                voList.add(vo);
+            }
+            for (TFurnancePressure pressure : list113) {
+                ArrayList<TFurnancePressure> list = new ArrayList<>();
+                list.add(pressure);
+                FurnancePressureFvpVO vo = this.calcRatio(list);
+                vo.setFurnanceName("H-113");
+                if (pressure.getRecordTime().getHours() == 20) {
+                    vo.setTime("晚班");
+                } else {
+                    vo.setTime("早班");
+                }
+                voList.add(vo);
+            }
+            for (TFurnancePressure pressure : list114) {
+                ArrayList<TFurnancePressure> list = new ArrayList<>();
+                list.add(pressure);
+                FurnancePressureFvpVO vo = this.calcRatio(list);
+                vo.setFurnanceName("H-114");
+                if (pressure.getRecordTime().getHours() == 20) {
+                    vo.setTime("晚班");
+                } else {
+                    vo.setTime("早班");
+                }
+                voList.add(vo);
+            }
+            for (TFurnancePressure pressure : list115) {
+                ArrayList<TFurnancePressure> list = new ArrayList<>();
+                list.add(pressure);
+                FurnancePressureFvpVO vo = this.calcRatio(list);
+                vo.setFurnanceName("H-115");
+                if (pressure.getRecordTime().getHours() == 20) {
+                    vo.setTime("晚班");
+                } else {
+                    vo.setTime("早班");
+                }
+                voList.add(vo);
+            }
+            for (TFurnancePressure pressure : list116) {
+                ArrayList<TFurnancePressure> list = new ArrayList<>();
+                list.add(pressure);
+                FurnancePressureFvpVO vo = this.calcRatio(list);
+                vo.setFurnanceName("H-116");
+                if (pressure.getRecordTime().getHours() == 20) {
+                    vo.setTime("晚班");
+                } else {
+                    vo.setTime("早班");
+                }
+                voList.add(vo);
+            }
+            for (TFurnancePressure pressure : list117) {
+                ArrayList<TFurnancePressure> list = new ArrayList<>();
+                list.add(pressure);
+                FurnancePressureFvpVO vo = this.calcRatio(list);
+                vo.setFurnanceName("H-117");
+                if (pressure.getRecordTime().getHours() == 20) {
+                    vo.setTime("晚班");
+                } else {
+                    vo.setTime("早班");
+                }
+                voList.add(vo);
+            }
+            for (TFurnancePressure pressure : list118) {
+                ArrayList<TFurnancePressure> list = new ArrayList<>();
+                list.add(pressure);
+                FurnancePressureFvpVO vo = this.calcRatio(list);
+                vo.setFurnanceName("H-118");
+                if (pressure.getRecordTime().getHours() == 20) {
+                    vo.setTime("晚班");
+                } else {
+                    vo.setTime("早班");
+                }
+                voList.add(vo);
+            }
+            for (TFurnancePressure pressure : list130) {
+                ArrayList<TFurnancePressure> list = new ArrayList<>();
+                list.add(pressure);
+                FurnancePressureFvpVO vo = this.calcRatio130(list);
+                vo.setFurnanceName("H-130");
+                if (pressure.getRecordTime().getHours() == 20) {
+                    vo.setTime("晚班");
+                } else {
+                    vo.setTime("早班");
+                }
+                voList.add(vo);
+            }
+//            FurnancePressureFvpVO vo109A = this.calcRatio109A(list109);
+//            FurnancePressureFvpVO vo109B = this.calcRatio109B(list109);
+//            FurnancePressureFvpVO vo110 = this.calcRatio(list110);
+//            FurnancePressureFvpVO vo111 = this.calcRatio(list111);
+//            FurnancePressureFvpVO vo112 = this.calcRatio(list112);
+//            FurnancePressureFvpVO vo113 = this.calcRatio(list113);
+//            FurnancePressureFvpVO vo114 = this.calcRatio(list114);
+//            FurnancePressureFvpVO vo115 = this.calcRatio(list115);
+//            FurnancePressureFvpVO vo116 = this.calcRatio(list116);
+//            FurnancePressureFvpVO vo117 = this.calcRatio(list117);
+//            FurnancePressureFvpVO vo118 = this.calcRatio(list118);
+//            FurnancePressureFvpVO vo130 = this.calcRatio130(list130);
+//            vo110.setFurnanceName("H-110");
+//            vo111.setFurnanceName("H-111");
+//            vo112.setFurnanceName("H-112");
+//            vo113.setFurnanceName("H-113");
+//            vo114.setFurnanceName("H-114");
+//            vo115.setFurnanceName("H-115");
+//            vo116.setFurnanceName("H-116");
+//            vo117.setFurnanceName("H-117");
+//            vo118 .setFurnanceName("H-118");
+//            vo130.setFurnanceName("H-130");
+//            vo109A.setFurnanceName("H-109A");
+//            vo109B.setFurnanceName("H-109B");
+//            List<FurnancePressureFvpVO> voList = new ArrayList<>();
+//            voList.add(vo110);
+//            voList.add(vo111);
+//            voList.add(vo112);
+//            voList.add(vo113);
+//            voList.add(vo114);
+//            voList.add(vo115);
+//            voList.add(vo116);
+//            voList.add(vo117);
+//            voList.add(vo118);
+//            voList.add(vo130);
+//            voList.add(vo109A);
+//            voList.add(vo109B);
             return AjaxResult.success(voList);
         }
     }

master/src/main/java/com/ruoyi/project/production/controller/vo/FurnancePressureFvpVO.java

@@ -12,6 +12,7 @@ import java.util.Date;
 public class FurnancePressureFvpVO extends BaseEntity {
 
     private String furnanceName;
+    private String time;
     private double pass1Inlet;
     private double pass1Out;
     private double pass1Ratio;
@@ -40,6 +41,14 @@ public class FurnancePressureFvpVO extends BaseEntity {
     private double allPassMaxOut;
     private double allPassMaxRatio;
 
+    public String getTime() {
+        return time;
+    }
+
+    public void setTime(String time) {
+        this.time = time;
+    }
+
     public String getFurnanceName() {
         return furnanceName;
     }

ui/src/views/production/pressure/fvp.vue

@@ -17,6 +17,7 @@
     </el-form>
     <el-table v-loading="loading" :data="pressureList" @selection-change="handleSelectionChange" border :cell-style="tableCellStyle">
       <el-table-column label="" align="center" prop="furnanceName" :show-overflow-tooltip="true" fixed="left"></el-table-column>
+      <el-table-column label="" align="center" prop="time" :show-overflow-tooltip="true" fixed="left"></el-table-column>
       <el-table-column label="PASS 1" align="center">
         <el-table-column label="INLET" align="center" prop="pass1Inlet" :show-overflow-tooltip="true"></el-table-column>
         <el-table-column label="OUT" align="center" prop="pass1Out" :show-overflow-tooltip="true"></el-table-column>

ui/src/views/training/elearn/learn/index.vue

@@ -140,7 +140,7 @@
     <el-dialog  :close-on-click-modal="false"  v-loading="loadingFlash" element-loading-background="rgba(0,0,0,0.2)" v-dialogDrag :title="pdf.title"
                 :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"
@@ -330,8 +330,7 @@
         let _this = this;
         timer = window.setInterval(function() {
           updateLearnTime(row).then(response => {
-            console.log(response)
-            this.learnTime = response.data.learnTime;
+              _this.learnTime = response.data.learnTime;
           });
         }, 60000);
       },