Quellcode durchsuchen

裂解巡检修改

wangggziwen vor 2 Wochen
Ursprung
Commit
ecdde9f341

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

@@ -3558,7 +3558,7 @@ public class TFurnancePressureController extends BaseController {
     @GetMapping("/coilAnalysis")
     public AjaxResult coilAnalysis(TFurnancePressure tFurnancePressure) {
         String furnace = tFurnancePressure.getFurnanceName();
-        String pass = "pass" + tFurnancePressure.getPass();
+        String pass = "pass" + tFurnancePressure.getPassNo();
         Date startDate = tFurnancePressure.getStartDate();
         Date endDate = tFurnancePressure.getEndDate();
         TFurnancePressure pressure = new TFurnancePressure();//查询对象

+ 2 - 2
master/src/main/java/com/ruoyi/project/production/controller/TFurnanceTemperatureController.java

@@ -1308,11 +1308,11 @@ public class TFurnanceTemperatureController extends BaseController
     @GetMapping("/coilAnalysis")
     public AjaxResult coilAnalysis(TFurnanceTemperature tFurnanceTemperature) {
         logger.info("开始执行查询裂解炉炉管测温COIL趋势分析接口,入参: furnanceName={}, pass={}, startDate={}, endDate={}", 
-                   tFurnanceTemperature.getFurnanceName(), tFurnanceTemperature.getPass(), 
+                   tFurnanceTemperature.getFurnanceName(), tFurnanceTemperature.getPassNo(),
                    tFurnanceTemperature.getStartDate(), tFurnanceTemperature.getEndDate());
         try {
             String furnace = tFurnanceTemperature.getFurnanceName();
-            String pass = "pass" + tFurnanceTemperature.getPass();
+            String pass = "pass" + tFurnanceTemperature.getPassNo();
             Date startDate = tFurnanceTemperature.getStartDate();
             Date endDate = tFurnanceTemperature.getEndDate();
             TFurnanceTemperature temperature = new TFurnanceTemperature();//查询对象

+ 5 - 5
master/src/main/java/com/ruoyi/project/production/domain/TFurnancePressure.java

@@ -183,7 +183,7 @@ public class TFurnancePressure extends BaseEntity
     @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
     private Date endDate;
 
-    private String pass;
+    private String passNo;
 
     private double progress;
 
@@ -235,12 +235,12 @@ public class TFurnancePressure extends BaseEntity
 
     private boolean isPass8RatioExceeded;
 
-    public String getPass() {
-        return pass;
+    public String getPassNo() {
+        return passNo;
     }
 
-    public void setPass(String pass) {
-        this.pass = pass;
+    public void setPassNo(String passNo) {
+        this.passNo = passNo;
     }
 
     public String getRemarks1() {

+ 5 - 5
master/src/main/java/com/ruoyi/project/production/domain/TFurnanceTemperature.java

@@ -35,7 +35,7 @@ public class TFurnanceTemperature extends BaseEntity
     @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
     private Date endDate;
 
-    private String pass;
+    private String passNo;
 
     /** PASS1 */
     @Excel(name = "PASS1")
@@ -149,12 +149,12 @@ public class TFurnanceTemperature extends BaseEntity
 
     private boolean isPass16Complete;
 
-    public String getPass() {
-        return pass;
+    public String getPassNo() {
+        return passNo;
     }
 
-    public void setPass(String pass) {
-        this.pass = pass;
+    public void setPassNo(String passNo) {
+        this.passNo = passNo;
     }
 
     public Date getStartDate() {

+ 9 - 9
ui/src/views/production/pressure/coil.vue

@@ -140,10 +140,10 @@
     data() {
       return {
         furnace: null,
-        pass: null,
+        passNo: null,
         analysisQueryParams: {
           furnanceName: null,
-          pass: null,
+          passNo: null,
           startDate: null,
           endDate: null,
         },
@@ -338,22 +338,22 @@
       disposeChart() {
         this.echarts.dispose(this.chart);
         this.analysisQueryParams.furnanceName = null;
-        this.analysisQueryParams.pass = null;
+        this.analysisQueryParams.passNo = null;
         this.analysisQueryParams.startDate = null;
         this.analysisQueryParams.endDate = null;
         this.furnace = null;
-        this.pass = null;
+        this.passNo = null;
       },
-      handleCoilAnalysis(furnace, pass) {
+      handleCoilAnalysis(furnace, passNo) {
         if (furnace != null) {
           this.analysisQueryParams.furnanceName = furnace;
           this.furnace = furnace;
         }
-        if (pass != null) {
-          this.analysisQueryParams.pass = pass;
-          this.pass = pass;
+        if (passNo != null) {
+          this.analysisQueryParams.pass = passNo;
+          this.passNo = passNo;
         }
-        this.analysis.title = "炉管测压趋势分析(" + this.analysisQueryParams.furnanceName + " PASS " + this.analysisQueryParams.pass + ")";
+        this.analysis.title = "炉管测压趋势分析(" + this.analysisQueryParams.furnanceName + " PASS " + this.analysisQueryParams.passNo + ")";
         this.analysis.open = true;
         this.draw();
       },

+ 9 - 9
ui/src/views/production/temperature/coil.vue

@@ -151,10 +151,10 @@
     data() {
       return {
         furnace: null,
-        pass: null,
+        passNo: null,
         analysisQueryParams: {
           furnanceName: null,
-          pass: null,
+          passNo: null,
           startDate: null,
           endDate: null,
         },
@@ -349,22 +349,22 @@
       disposeChart() {
         this.echarts.dispose(this.chart);
         this.analysisQueryParams.furnanceName = null;
-        this.analysisQueryParams.pass = null;
+        this.analysisQueryParams.passNo = null;
         this.analysisQueryParams.startDate = null;
         this.analysisQueryParams.endDate = null;
         this.furnace = null;
-        this.pass = null;
+        this.passNo = null;
       },
-      handleCoilAnalysis(furnace, pass) {
+      handleCoilAnalysis(furnace, passNo) {
         if (furnace != null) {
           this.analysisQueryParams.furnanceName = furnace;
           this.furnace = furnace;
         }
-        if (pass != null) {
-          this.analysisQueryParams.pass = pass;
-          this.pass = pass;
+        if (passNo != null) {
+          this.analysisQueryParams.pass = passNo;
+          this.passNo = passNo;
         }
-        this.analysis.title = "炉管测温趋势分析(" + this.analysisQueryParams.furnanceName + " PASS " + this.analysisQueryParams.pass + ")";
+        this.analysis.title = "炉管测温趋势分析(" + this.analysisQueryParams.furnanceName + " PASS " + this.analysisQueryParams.passNo + ")";
         this.analysis.open = true;
         this.draw();
       },