裂解巡检 - 测压台账COIL趋势分析不计算PASS第一列入口

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

@@ -3618,6 +3618,18 @@ public class TFurnancePressureController extends BaseController {
         return AjaxResult.success(coilVoList);
     }
 
+    /**
+     * 去除非空Pass数值中的最后一位Input入口值
+     * eg. 1, 2, 3, 4, 5 -> 1, 2, 3, 4
+     */
+    public String avoidPassInput(String passString) {
+        if (StringUtils.isNotNull(passString)) {
+            return passString.substring(0, passString.lastIndexOf(","));
+        } else {
+            return passString;
+        }
+    }
+
     public int setPassMaxValueH109(TFurnancePressure pressure, String pass) {
         String pass1 = this.checkNull(pressure.getPass1());
         String pass2 = this.checkNull(pressure.getPass2());
@@ -3636,14 +3648,14 @@ public class TFurnancePressureController extends BaseController {
         String pass15 = this.checkNull(pressure.getPass15());
         String pass16 = this.checkNull(pressure.getPass16());
         switch (pass) {
-            case "pass1": return this.getMaxValue(pass1 + "," + pass2);
-            case "pass2": return this.getMaxValue(pass3 + "," + pass4);
-            case "pass3": return this.getMaxValue(pass5 + "," + pass6);
-            case "pass4": return this.getMaxValue(pass7 + "," + pass8);
-            case "pass5": return this.getMaxValue(pass9 + "," + pass10);
-            case "pass6": return this.getMaxValue(pass11 + "," + pass12);
-            case "pass7": return this.getMaxValue(pass13 + "," + pass14);
-            case "pass8": return this.getMaxValue(pass15 + "," + pass16);
+            case "pass1": return this.getMaxValue(this.avoidPassInput(pass1) + "," + this.avoidPassInput(pass2));
+            case "pass2": return this.getMaxValue(this.avoidPassInput(pass3) + "," + this.avoidPassInput(pass4));
+            case "pass3": return this.getMaxValue(this.avoidPassInput(pass5) + "," + this.avoidPassInput(pass6));
+            case "pass4": return this.getMaxValue(this.avoidPassInput(pass7) + "," + this.avoidPassInput(pass8));
+            case "pass5": return this.getMaxValue(this.avoidPassInput(pass9) + "," + this.avoidPassInput(pass10));
+            case "pass6": return this.getMaxValue(this.avoidPassInput(pass11) + "," + this.avoidPassInput(pass12));
+            case "pass7": return this.getMaxValue(this.avoidPassInput(pass13) + "," + this.avoidPassInput(pass14));
+            case "pass8": return this.getMaxValue(this.avoidPassInput(pass15) + "," + this.avoidPassInput(pass16));
         }
         return 0;
     }
@@ -3662,18 +3674,18 @@ public class TFurnancePressureController extends BaseController {
         String pass11 = this.checkNull(pressure.getPass11());
         String pass12 = this.checkNull(pressure.getPass12());
         switch (pass) {
-            case "pass1": return this.getMaxValue(pass1);
-            case "pass2": return this.getMaxValue(pass2);
-            case "pass3": return this.getMaxValue(pass3);
-            case "pass4": return this.getMaxValue(pass4);
-            case "pass5": return this.getMaxValue(pass5);
-            case "pass6": return this.getMaxValue(pass6);
-            case "pass7": return this.getMaxValue(pass7);
-            case "pass8": return this.getMaxValue(pass8);
-            case "pass9": return this.getMaxValue(pass9);
-            case "pass10": return this.getMaxValue(pass10);
-            case "pass11": return this.getMaxValue(pass11);
-            case "pass12": return this.getMaxValue(pass12);
+            case "pass1": return this.getMaxValue(this.avoidPassInput(pass1));
+            case "pass2": return this.getMaxValue(this.avoidPassInput(pass2));
+            case "pass3": return this.getMaxValue(this.avoidPassInput(pass3));
+            case "pass4": return this.getMaxValue(this.avoidPassInput(pass4));
+            case "pass5": return this.getMaxValue(this.avoidPassInput(pass5));
+            case "pass6": return this.getMaxValue(this.avoidPassInput(pass6));
+            case "pass7": return this.getMaxValue(this.avoidPassInput(pass7));
+            case "pass8": return this.getMaxValue(this.avoidPassInput(pass8));
+            case "pass9": return this.getMaxValue(this.avoidPassInput(pass9));
+            case "pass10": return this.getMaxValue(this.avoidPassInput(pass10));
+            case "pass11": return this.getMaxValue(this.avoidPassInput(pass11));
+            case "pass12": return this.getMaxValue(this.avoidPassInput(pass12));
         }
         return 0;
     }
@@ -3688,14 +3700,14 @@ public class TFurnancePressureController extends BaseController {
         String pass7 = this.checkNull(pressure.getPass7());
         String pass8 = this.checkNull(pressure.getPass8());
         switch (pass) {
-            case "pass1": return this.getMaxValue(pass1);
-            case "pass2": return this.getMaxValue(pass2);
-            case "pass3": return this.getMaxValue(pass3);
-            case "pass4": return this.getMaxValue(pass4);
-            case "pass5": return this.getMaxValue(pass5);
-            case "pass6": return this.getMaxValue(pass6);
-            case "pass7": return this.getMaxValue(pass7);
-            case "pass8": return this.getMaxValue(pass8);
+            case "pass1": return this.getMaxValue(this.avoidPassInput(pass1));
+            case "pass2": return this.getMaxValue(this.avoidPassInput(pass2));
+            case "pass3": return this.getMaxValue(this.avoidPassInput(pass3));
+            case "pass4": return this.getMaxValue(this.avoidPassInput(pass4));
+            case "pass5": return this.getMaxValue(this.avoidPassInput(pass5));
+            case "pass6": return this.getMaxValue(this.avoidPassInput(pass6));
+            case "pass7": return this.getMaxValue(this.avoidPassInput(pass7));
+            case "pass8": return this.getMaxValue(this.avoidPassInput(pass8));
         }
         return 0;
     }

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

@@ -273,6 +273,7 @@
       draw() {
         this.valueList = [];
         this.dateList = [];
+        console.log(this.analysisQueryParams.passNo)
         listCoilAnalysis(this.analysisQueryParams).then(response => {
           let data = response.data;
           this.maxValue = 0;
@@ -350,7 +351,7 @@
           this.furnace = furnace;
         }
         if (passNo != null) {
-          this.analysisQueryParams.pass = passNo;
+          this.analysisQueryParams.passNo = passNo;
           this.passNo = passNo;
         }
         this.analysis.title = "炉管测压趋势分析（" + this.analysisQueryParams.furnanceName + " PASS " + this.analysisQueryParams.passNo + "）";

ui/src/views/production/temperature/coil.vue

@@ -361,7 +361,7 @@
           this.furnace = furnace;
         }
         if (passNo != null) {
-          this.analysisQueryParams.pass = passNo;
+          this.analysisQueryParams.passNo = passNo;
           this.passNo = passNo;
         }
         this.analysis.title = "炉管测温趋势分析（" + this.analysisQueryParams.furnanceName + " PASS " + this.analysisQueryParams.passNo + "）";