From fd681339c81201ed6fb3303647ecab89e3e6c0c1 Mon Sep 17 00:00:00 2001
From: Shuxia Ning <NingShuxia0927@outlook.com>
Date: 星期三, 17 七月 2024 09:50:11 +0800
Subject: [PATCH] 调度逻辑修改，新增笛卡尔积过滤循环
---
Test/IStation.Win/View/ModelValidView.cs | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/Test/IStation.Win/View/ModelValidView.cs b/Test/IStation.Win/View/ModelValidView.cs
index 6ad706b..8a944f7 100644
--- a/Test/IStation.Win/View/ModelValidView.cs
+++ b/Test/IStation.Win/View/ModelValidView.cs
@@ -19,8 +19,8 @@
}
var year = 2024;
- var month = 1;
- this.dateEditStart.DateTime = new DateTime(year, month, 2);
+ var month = 7;
+ this.dateEditStart.DateTime = new DateTime(year, month, 10);
ShowWaterLevel(false);
//this.dateEditStart.DateTime = new DateTime(year, month, 1);
@@ -116,7 +116,7 @@
model_valid_vm.ValueType = hydraulic_model_record.ValueType;
model_valid_vm.ModelId = hydraulic_model_record.ModelId;
model_valid_vm.ScadaId = hydraulic_model_record.ScadaId;
- model_valid_vm.ModeValue = hydraulic_model_record.ModeValue;
+ model_valid_vm.ModelValue = hydraulic_model_record.ModelValue;
model_valid_vm.ScadaValue = hydraulic_model_record.ScadaValue;
model_valid_vm.DifferenceValue = hydraulic_model_record.DifferenceValue;
model_valid_vm.Round();
@@ -149,7 +149,7 @@
var hydraulic_model_records = hydraulic_model_record_group.Where(x => x.Key == time).SelectMany(x => x).ToList();
if (hydraulic_model_records == null || !hydraulic_model_records.Any())
continue;
- var model_record_dict = hydraulic_model_records.ToDictionary(x => x.ModelId, x => x.ModeValue);
+ var model_record_dict = hydraulic_model_records.ToDictionary(x => x.ModelId, x => x.ModelValue);
var vm = new ModelScadaValidViewModel();
@@ -269,14 +269,14 @@
private void cekShowWaterLevel_CheckedChanged(object sender, EventArgs e)
{
- var is_show=this.cekShowWaterLevel.Checked;
+ var is_show = this.cekShowWaterLevel.Checked;
ShowWaterLevel(is_show);
}
private void ShowWaterLevel(bool is_show)
{
- this.gbWL1.Visible=is_show;
- this.gbWL2.Visible=is_show;
+ this.gbWL1.Visible = is_show;
+ this.gbWL2.Visible = is_show;
//this.colR1s.Visible = is_show;
//this.colR2s.Visible = is_show;
//this.colR3s.Visible = is_show;
--
Gitblit v1.9.3