Sfoglia il codice sorgente

Merge remote-tracking branch 'origin/20230223_pad_vue_new_branch' into 20230223_pad_vue_new_branch

28169 5 giorni fa
parent
commit
80ea980be4
2 ha cambiato i file con 21 aggiunte e 6 eliminazioni
  1. 1 1
      build/cdn.json
  2. 20 5
      src/pages/main/newActionBar/monitoring.vue

+ 1 - 1
build/cdn.json Vedi File

@@ -1,3 +1,3 @@
1 1
 {
2
-  "version": "2999.999.13748"
2
+  "version": "2999.999.13754"
3 3
 }

+ 20 - 5
src/pages/main/newActionBar/monitoring.vue Vedi File

@@ -2047,7 +2047,12 @@ methods: {
2047 2047
       if(this.org_id == 10597 || this.org_id ==10599 || this.org_id ==10587 || this.org_id ==10571 || this.org_id==10579 || this.org_id ==10600 || this.org_id ==10612 || this.org_id ==10617 || this.org_id ==10580 || this.org_id ==10375 || this.org_id ==10629 || this.org_id ==10480  || this.org_id ==10414 || this.org_id ==10679 || this.org_id ==10693 || this.org_id == 10694 || this.org_id == 10697 || this.org_id ==10702 || this.org_id ==10723 || this.org_id == 10721){
2048 2048
 
2049 2049
         if(lastMonitorRecordList!=null){
2050
-          this.form.ultrafiltration_rate = lastMonitorRecordList.ultrafiltration_rate?lastMonitorRecordList.ultrafiltration_rate:this.today_last_monitor_record.ultrafiltration_rate
2050
+          if(this.org_id != 10721){
2051
+            this.form.ultrafiltration_rate = lastMonitorRecordList.ultrafiltration_rate?lastMonitorRecordList.ultrafiltration_rate:""
2052
+          }else{
2053
+            this.form.ultrafiltration_rate = lastMonitorRecordList.ultrafiltration_rate?lastMonitorRecordList.ultrafiltration_rate:this.today_last_monitor_record.ultrafiltration_rate
2054
+          }
2055
+         
2051 2056
           console.log("haaaaaaaaaaaaaaaa",this.form.ultrafiltration_rate)
2052 2057
           console.log("bbbbbbbbbbbbbbbbbbbbb",this.today_last_monitor_record.ultrafiltration_rate)
2053 2058
           this.form.replacement_rate = lastMonitorRecordList.replacement_rate?lastMonitorRecordList.replacement_rate:""
@@ -2079,19 +2084,29 @@ methods: {
2079 2084
             this.form.displacement_quantity = (lastMonitorRecordList.displacement_quantity + this.monitorRecords[1].displacement_quantity).toFixed(1)
2080 2085
           }
2081 2086
 
2082
-
2083
-
2084
-          this.form.ultrafiltration_volume = (this.form.replacement_rate + lastMonitorRecordList.ultrafiltration_volume).toFixed(0)
2085
-
2086 2087
           if(this.org_id == 10694){
2087 2088
             this.form.ultrafiltration_volume = this.form.ultrafiltration_volume.toFixed(0)
2088 2089
           }
2089 2090
 
2091
+          if(this.org_id == 10597){
2092
+            console.log("this.form.replacement_rate",this.form.ultrafiltration_rate)
2093
+            console.log("this.form.ultrafiltration_volume",this.form.ultrafiltration_volume)
2094
+            this.form.ultrafiltration_volume = (this.form.ultrafiltration_rate + lastMonitorRecordList.ultrafiltration_volume).toFixed(0)
2095
+
2096
+          }else{
2097
+            this.form.ultrafiltration_volume = (this.form.ultrafiltration_rate + lastMonitorRecordList.ultrafiltration_volume).toFixed(0)
2098
+          }
2099
+
2090 2100
           if(this.org_id == 10721){
2091 2101
 
2092 2102
             this.form.displacement_quantity =  resp.monitor.displacement_quantity
2103
+
2104
+            this.form.ultrafiltration_volume = resp.monitor.ultrafiltration_volume
2093 2105
           }
2094 2106
 
2107
+        
2108
+          
2109
+
2095 2110
         }
2096 2111
 
2097 2112