From ad494f13d2ddf31f142cf7fb908b3a6e90395a1a Mon Sep 17 00:00:00 2001
From: ningshuxia <ningshuxia0927@outlook.com>
Date: 星期四, 01 十二月 2022 12:01:31 +0800
Subject: [PATCH] 苏州金庭10个泵站 对接程序写完
---
Application/IStation.Application.Eta/eta_analy_kpi/EtaAnalyKpi_Controller.cs | 34 +++++++++++++++++++++++++++++-----
1 files changed, 29 insertions(+), 5 deletions(-)
diff --git a/Application/IStation.Application.Eta/eta_analy_kpi/EtaAnalyKpi_Controller.cs b/Application/IStation.Application.Eta/eta_analy_kpi/EtaAnalyKpi_Controller.cs
index 32ce13c..02c92d1 100644
--- a/Application/IStation.Application.Eta/eta_analy_kpi/EtaAnalyKpi_Controller.cs
+++ b/Application/IStation.Application.Eta/eta_analy_kpi/EtaAnalyKpi_Controller.cs
@@ -155,7 +155,15 @@
standard_coal = double.Parse(eta_standard_coal.Value);
}
var run_coal = eta_pa_record_list.Sum(x => x.Pa.Value * x.Duration / 3600f);
- vm_item_coal.Value = ((run_coal / 10000f) * standard_coal).ToString("0.0000");
+ var run_coalStandard = ((run_coal / 10000f) * standard_coal);
+ if (run_coalStandard > 1)
+ {
+ vm_item_coal.Value = run_coalStandard.ToString("0.00");
+ }
+ else
+ {
+ vm_item_coal.Value = run_coalStandard.ToString("0.0000");
+ }
}
}
@@ -520,7 +528,7 @@
{
vm.ErrorMessage += item.Name + "/";
}
- vm.ErrorMessage = vm.ErrorMessage.Substring(0, vm.ErrorMessage.Length - 1) + "鏁版嵁寮傚父!";
+ vm.ErrorMessage = vm.ErrorMessage.Substring(0, vm.ErrorMessage.Length - 1) + "娴嬬偣寮傚父!";
}
}
}
@@ -692,7 +700,15 @@
standard_coal = double.Parse(eta_standard_coal.Value);
}
var run_coal = eta_run_pa_record_list.Sum(x => x.Pa.Value * x.Duration / 3600f);
- vm_item_coal.Value = ((run_coal / 10000f) * standard_coal).ToString("0.0000");
+ var run_coalStandard = ((run_coal / 10000f) * standard_coal);
+ if (run_coalStandard > 1)
+ {
+ vm_item_coal.Value = run_coalStandard.ToString("0.00");
+ }
+ else
+ {
+ vm_item_coal.Value = run_coalStandard.ToString("0.0000");
+ }
}
}
@@ -1095,7 +1111,7 @@
{
vm.ErrorMessage += item.Name + "/";
}
- vm.ErrorMessage = vm.ErrorMessage.Substring(0, vm.ErrorMessage.Length - 1) + "鏁版嵁寮傚父!";
+ vm.ErrorMessage = vm.ErrorMessage.Substring(0, vm.ErrorMessage.Length - 1) + "娴嬬偣寮傚父!";
}
}
}
@@ -1266,7 +1282,15 @@
standard_coal = double.Parse(eta_standard_coal.Value);
}
var run_coal = eta_run_pa_record_list.Sum(x => x.Pa.Value * x.Duration / 3600f);
- vm_item_coal.Value = ((run_coal / 10000f) * standard_coal).ToString("0.0000");
+ var run_coalStandard = ((run_coal / 10000f) * standard_coal);
+ if (run_coalStandard > 1)
+ {
+ vm_item_coal.Value = run_coalStandard.ToString("0.00");
+ }
+ else
+ {
+ vm_item_coal.Value = run_coalStandard.ToString("0.0000");
+ }
}
}
--
Gitblit v1.9.3