|
|
@@ -51,6 +51,13 @@ public partial class ProjectViewModel : ObservableObject, IDisposable
|
|
|
/// <summary>鏄惁鏈夊缓璁惎鍔ㄧ殑娉</summary>
|
|
|
public bool HasSuggestedPump => !string.IsNullOrEmpty(SuggestedPumpName);
|
|
|
|
|
|
+ /// <summary>
|
|
|
+ /// 鏁呴殰鐘舵佸尯鍩熸槸鍚︽湁鍐呭鍙樉绀
|
|
|
+ /// 锛堟湁娉 / 鏈夋暟瀛楅噺杈撳叆 / 鏈夋暟瀛楅噺杈撳嚭 / 鏈夋椿璺冩姤璀 鈫 鏄剧ず锛屽惁鍒欓殣钘忕┖闈㈡澘锛
|
|
|
+ /// </summary>
|
|
|
+ public bool HasFaultContent =>
|
|
|
+ Pumps.Count > 0 || DigitalInputs.Count > 0 || DigitalOutputs.Count > 0 || HasActiveAlarm;
|
|
|
+
|
|
|
// 鈹鈹鈹 鍔ㄦ 2D/3D 鎺т欢缁戝畾鐢ㄥ瓧鍏 鈹鈹鈹
|
|
|
|
|
|
/// <summary>椤圭洰妗ｆ锛堜緵鍔ㄦ佸竷灞寮曟搸浣跨敤锛</summary>
|
|
|
@@ -81,7 +88,11 @@ public partial class ProjectViewModel : ObservableObject, IDisposable
|
|
|
{
|
|
|
var operatorName = AuthService.CurrentUser?.DisplayName ?? "Operator";
|
|
|
await AlarmService.Instance.ResetAllAlarmsAsync(operatorName);
|
|
|
- RunOnUi(() => RecentAlarms.Clear());
|
|
|
+ RunOnUi(() =>
|
|
|
+ {
|
|
|
+ RecentAlarms.Clear();
|
|
|
+ OnPropertyChanged(nameof(HasFaultContent));
|
|
|
+ });
|
|
|
}
|
|
|
|
|
|
/// <summary>
|
|
|
@@ -133,7 +144,7 @@ public partial class ProjectViewModel : ObservableObject, IDisposable
|
|
|
Pumps.Add(new PumpItemViewModel(pump));
|
|
|
|
|
|
foreach (var tank in profile.Tanks)
|
|
|
- Tanks.Add(new TankItemViewModel(tank));
|
|
|
+ Tanks.Add(new TankItemViewModel(tank, profile.Pumps.Count));
|
|
|
|
|
|
foreach (var gauge in profile.Gauges)
|
|
|
Gauges.Add(new GaugeItemViewModel(gauge));
|
|
|
@@ -190,6 +201,7 @@ public partial class ProjectViewModel : ObservableObject, IDisposable
|
|
|
RecentAlarms.Insert(0, record);
|
|
|
while (RecentAlarms.Count > 6)
|
|
|
RecentAlarms.RemoveAt(RecentAlarms.Count - 1);
|
|
|
+ OnPropertyChanged(nameof(HasFaultContent));
|
|
|
});
|
|
|
}
|
|
|
|
|
|
@@ -208,6 +220,7 @@ public partial class ProjectViewModel : ObservableObject, IDisposable
|
|
|
{
|
|
|
HasActiveAlarm = AlarmService.Instance.HasActiveAlarm;
|
|
|
ActiveAlarmCount = AlarmService.Instance.ActiveAlarmCount;
|
|
|
+ OnPropertyChanged(nameof(HasFaultContent));
|
|
|
}
|
|
|
|
|
|
/// <summary>SuggestedPumpName 鍙樺寲鏃惰仈鍔ㄥ埛鏂 HasSuggestedPump</summary>
|
|
|
@@ -486,10 +499,11 @@ public partial class ProjectViewModel : ObservableObject, IDisposable
|
|
|
private void OnConnectionStateChanged(bool connected)
|
|
|
{
|
|
|
var mode = ConfigService.GetConfig()?.RunMode ?? "Direct";
|
|
|
- IsPlcConnected = mode == "Mock" || connected;
|
|
|
+ // Mock 妯″紡涓嬩笉浼杩炴帴鐘舵侊紝璇氬疄鏄剧ず"妯℃嫙妯″紡"
|
|
|
+ IsPlcConnected = mode != "Mock" && connected;
|
|
|
PlcStatusText = mode switch
|
|
|
{
|
|
|
- "Mock" => "妯℃嫙妯″紡",
|
|
|
+ "Mock" => "妯℃嫙妯″紡锛堟棤 PLC 杩炴帴锛",
|
|
|
_ => connected ? "PLC 宸茶繛鎺" : "PLC 鏈繛鎺"
|
|
|
};
|
|
|
}
|
|
|
@@ -836,12 +850,59 @@ public partial class PumpItemViewModel : ObservableObject
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+/// <summary>
|
|
|
+/// 姘寸闃堝艰 鈥 姣忚瀵瑰簲涓涓彲缂栬緫鐨勬恫浣嶉槇鍊硷紙鍚车N / 鍋滄车 / 淇濇姢娑蹭綅锛
|
|
|
+/// </summary>
|
|
|
+public partial class TankThresholdRow : ObservableObject
|
|
|
+{
|
|
|
+ /// <summary>琛屾爣绛撅紙濡 "鍚车1"銆"鍋滄车娑蹭綅"銆"淇濇姢娑蹭綅"锛</summary>
|
|
|
+ public string Label { get; }
|
|
|
+
|
|
|
+ /// <summary>PlcDataModel 瀵勫瓨鍣ㄩ敭锛堝 "闆嗘按姹.StartPump1Level"锛</summary>
|
|
|
+ public string RegisterKey { get; }
|
|
|
+
|
|
|
+ /// <summary>TankConfig 灞炴у悕锛堢敤浜庡洖鍐欓厤缃紝濡 "StartPump1Level"锛</summary>
|
|
|
+ public string? ConfigProperty { get; }
|
|
|
+
|
|
|
+ /// <summary>褰撳墠鍊硷紙浠 PLC 璇诲彇锛屽彧璇绘樉绀猴級</summary>
|
|
|
+ [ObservableProperty] private float _value;
|
|
|
+
|
|
|
+ /// <summary>鍙紪杈戝硷紙鐢ㄦ埛杈撳叆锛屽緟鍚屾鍒 PLC锛</summary>
|
|
|
+ [ObservableProperty] private float _editValue;
|
|
|
+
|
|
|
+ /// <summary>PLC 鍐欏叆鍦板潃锛堢┖鍒欓殣钘忚琛岋級</summary>
|
|
|
+ public string Address { get; }
|
|
|
+
|
|
|
+ /// <summary>鏄惁鏈夊彲鍐欏叆鐨勫湴鍧</summary>
|
|
|
+ public bool HasAddress => !string.IsNullOrEmpty(Address);
|
|
|
+
|
|
|
+ /// <summary>鏂囨湰棰滆壊椋庢牸閿紙null = 榛樿锛"warning" = 鐞ョ弨锛"danger" = 绾級</summary>
|
|
|
+ public string StyleKey { get; }
|
|
|
+
|
|
|
+ /// <summary>琛屾槸鍚﹀彲瑙侊紙鏈夊湴鍧锛屾垨鏈夐潪闆跺硷級</summary>
|
|
|
+ [ObservableProperty] private bool _isVisible = true;
|
|
|
+
|
|
|
+ /// <summary>琛屾槸鍚﹀彲缂栬緫锛堟湁鍦板潃鎵嶅彲缂栬緫锛屽惁鍒欏彧璇绘樉绀猴級</summary>
|
|
|
+ public bool IsEditable => HasAddress;
|
|
|
+
|
|
|
+ public TankThresholdRow(string label, string registerKey, string address, string styleKey = "", string? configProperty = null)
|
|
|
+ {
|
|
|
+ Label = label;
|
|
|
+ RegisterKey = registerKey;
|
|
|
+ Address = address;
|
|
|
+ StyleKey = styleKey;
|
|
|
+ ConfigProperty = configProperty;
|
|
|
+ IsVisible = HasAddress; // 鍒濆浠呭湪鏈夊湴鍧鏃跺彲瑙
|
|
|
+ }
|
|
|
+}
|
|
|
+
|
|
|
/// <summary>
|
|
|
/// 姘寸/姘存睜 ViewModel
|
|
|
/// </summary>
|
|
|
public partial class TankItemViewModel : ObservableObject
|
|
|
{
|
|
|
private readonly TankConfig _config;
|
|
|
+ private readonly int _pumpCount;
|
|
|
private bool _editInitialized;
|
|
|
|
|
|
public string Name => _config.Name;
|
|
|
@@ -853,24 +914,16 @@ public partial class TankItemViewModel : ObservableObject
|
|
|
[ObservableProperty] private float _stopLevel;
|
|
|
[ObservableProperty] private float _protectionLevel;
|
|
|
|
|
|
- // 鈹鈹鈹 鍙紪杈戦槇鍊硷紙渚涘弬鏁板悓姝ュ埌 PLC锛夆攢鈹鈹
|
|
|
+ // 鈹鈹鈹 鍔ㄦ侀槇鍊艰锛堟暟閲忚窡闅忛」鐩车鏁 + 鍋滄车 + 淇濇姢娑蹭綅锛夆攢鈹鈹
|
|
|
|
|
|
- [ObservableProperty] private float _editStartPump1Level;
|
|
|
- [ObservableProperty] private float _editStartPump2Level;
|
|
|
- [ObservableProperty] private float _editStartPump3Level;
|
|
|
- [ObservableProperty] private float _editStopLevel;
|
|
|
- [ObservableProperty] private float _editProtectionLevel;
|
|
|
+ /// <summary>鍙紪杈戦槇鍊艰闆嗗悎锛堝惎娉1~N + 鍋滄车娑蹭綅 + 淇濇姢娑蹭綅锛</summary>
|
|
|
+ public ObservableCollection<TankThresholdRow> ThresholdRows { get; } = new();
|
|
|
|
|
|
[ObservableProperty] private bool _isSyncing;
|
|
|
[ObservableProperty] private string _syncStatusText = "";
|
|
|
|
|
|
- /// <summary>鏄惁鏈夊彲鍐欏叆 PLC 鐨勫湴鍧閰嶇疆</summary>
|
|
|
- public bool HasWritableAddresses =>
|
|
|
- !string.IsNullOrEmpty(_config.StartPump1LevelAddress) ||
|
|
|
- !string.IsNullOrEmpty(_config.StartPump2LevelAddress) ||
|
|
|
- !string.IsNullOrEmpty(_config.StartPump3LevelAddress) ||
|
|
|
- !string.IsNullOrEmpty(_config.StopLevelAddress) ||
|
|
|
- !string.IsNullOrEmpty(_config.ProtectionLevelAddress);
|
|
|
+ /// <summary>鏄惁鏈夊彲鍐欏叆 PLC 鐨勫湴鍧閰嶇疆锛堜换涓琛屾湁鍦板潃鍗冲彲锛</summary>
|
|
|
+ public bool HasWritableAddresses => ThresholdRows.Any(r => r.HasAddress);
|
|
|
|
|
|
/// <summary>褰撳墠娑蹭綅宸ュ喌妗ｄ綅锛堜緷鎹恫浣嶄笌闃堝艰嚜鍔ㄥ垽瀹氾紝渚 UI 寰界珷灞曠ず锛</summary>
|
|
|
[ObservableProperty] private TankStage _currentStage = TankStage.Stop;
|
|
|
@@ -886,9 +939,42 @@ public partial class TankItemViewModel : ObservableObject
|
|
|
private int _trendIndex;
|
|
|
private int _trendCount;
|
|
|
|
|
|
- public TankItemViewModel(TankConfig config)
|
|
|
+ public TankItemViewModel(TankConfig config, int pumpCount)
|
|
|
{
|
|
|
_config = config;
|
|
|
+ _pumpCount = pumpCount;
|
|
|
+ BuildThresholdRows();
|
|
|
+ }
|
|
|
+
|
|
|
+ /// <summary>鏍规嵁娉垫暟閲忓姩鎬佹瀯寤洪槇鍊艰锛堝惎娉1~N + 鍋滄车 + 淇濇姢锛</summary>
|
|
|
+ private void BuildThresholdRows()
|
|
|
+ {
|
|
|
+ ThresholdRows.Clear();
|
|
|
+ // 鍚车闃堝硷細鏁伴噺 = max(3, pumpCount)锛屽吋瀹规棫閰嶇疆鐨 3 琛
|
|
|
+ var thresholdCount = Math.Max(3, _pumpCount);
|
|
|
+ for (int i = 1; i <= thresholdCount; i++)
|
|
|
+ {
|
|
|
+ var addr = _config.GetStartPumpLevelAddress(i);
|
|
|
+ ThresholdRows.Add(new TankThresholdRow(
|
|
|
+ label: $"鍚车{i}",
|
|
|
+ registerKey: $"{Name}.StartPump{i}Level",
|
|
|
+ address: addr,
|
|
|
+ styleKey: "",
|
|
|
+ configProperty: null
|
|
|
+ ));
|
|
|
+ }
|
|
|
+ // 鍋滄车娑蹭綅
|
|
|
+ ThresholdRows.Add(new TankThresholdRow(
|
|
|
+ label: "鍋滄车娑蹭綅",
|
|
|
+ registerKey: $"{Name}.StopLevel",
|
|
|
+ address: _config.StopLevelAddress,
|
|
|
+ styleKey: "warning"));
|
|
|
+ // 淇濇姢娑蹭綅
|
|
|
+ ThresholdRows.Add(new TankThresholdRow(
|
|
|
+ label: "淇濇姢娑蹭綅",
|
|
|
+ registerKey: $"{Name}.ProtectionLevel",
|
|
|
+ address: _config.ProtectionLevelAddress,
|
|
|
+ styleKey: "danger"));
|
|
|
}
|
|
|
|
|
|
public void UpdateFromData(PlcDataModel data)
|
|
|
@@ -901,16 +987,17 @@ public partial class TankItemViewModel : ObservableObject
|
|
|
ProtectionLevel = data.GetAnalogRegister($"{Name}.ProtectionLevel");
|
|
|
CurrentStage = CalculateStage();
|
|
|
|
|
|
- // 棣栨鏇存柊鏃跺垵濮嬪寲缂栬緫鍊硷紙鍚庣画杞涓嶈鐩栫敤鎴疯緭鍏ワ級
|
|
|
- if (!_editInitialized)
|
|
|
+ // 鏇存柊 ThresholdRows 鐨勫煎拰鍙鎬
|
|
|
+ foreach (var row in ThresholdRows)
|
|
|
{
|
|
|
- EditStartPump1Level = StartPump1Level;
|
|
|
- EditStartPump2Level = StartPump2Level;
|
|
|
- EditStartPump3Level = StartPump3Level;
|
|
|
- EditStopLevel = StopLevel;
|
|
|
- EditProtectionLevel = ProtectionLevel;
|
|
|
- _editInitialized = true;
|
|
|
+ row.Value = data.GetAnalogRegister(row.RegisterKey);
|
|
|
+ // 鍙鏉′欢锛氭湁鍦板潃 OR 鏈夐潪闆跺硷紙PLC 宸茶鍙栧埌鏁版嵁锛
|
|
|
+ row.IsVisible = row.HasAddress || Math.Abs(row.Value) > 0.001f;
|
|
|
+ // 棣栨鏇存柊鏃跺垵濮嬪寲缂栬緫鍊硷紙鍚庣画杞涓嶈鐩栫敤鎴疯緭鍏ワ級
|
|
|
+ if (!_editInitialized)
|
|
|
+ row.EditValue = row.Value;
|
|
|
}
|
|
|
+ _editInitialized = true;
|
|
|
|
|
|
// 杩藉姞瓒嬪娍閲囨牱锛堢幆褰㈢紦鍐诧級
|
|
|
_trendBuffer[_trendIndex] = Level;
|
|
|
@@ -927,15 +1014,19 @@ public partial class TankItemViewModel : ObservableObject
|
|
|
|
|
|
/// <summary>
|
|
|
/// 鎸夋车绔欒繍琛岄昏緫鍒ゅ畾褰撳墠娑蹭綅妗ｄ綅锛
|
|
|
- /// 淇濇姢娑蹭綅锛堟渶楂橈紝绱фラ闄╋級鈫 鍚车3 鈫 鍚车2 鈫 鍚车1 鈫 鍋滄车鍖恒
|
|
|
+ /// 淇濇姢娑蹭綅锛堟渶楂橈紝绱фラ闄╋級鈫 鍚车N 鈫 ... 鈫 鍚车1 鈫 鍋滄车鍖恒
|
|
|
/// 闃堝间紭鍏堝彇閰嶇疆鍊硷紝鏈厤缃(鈮0)鐨勬。浣嶈嚜鍔ㄨ烦杩囥
|
|
|
/// </summary>
|
|
|
private TankStage CalculateStage()
|
|
|
{
|
|
|
if (ProtectionLevel > 0 && Level >= ProtectionLevel) return TankStage.Protection;
|
|
|
- if (StartPump3Level > 0 && Level >= StartPump3Level) return TankStage.Pump3;
|
|
|
- if (StartPump2Level > 0 && Level >= StartPump2Level) return TankStage.Pump2;
|
|
|
- if (StartPump1Level > 0 && Level >= StartPump1Level) return TankStage.Pump1;
|
|
|
+ // 鍔ㄦ佹鏌ュ悇鍚车闃堝硷紙鍙嶅悜閬嶅巻锛屼粠楂樺埌浣庯級
|
|
|
+ for (int i = Math.Min(3, ThresholdRows.Count(r => r.Label.StartsWith("鍚车"))); i >= 1; i--)
|
|
|
+ {
|
|
|
+ var level = i switch { 1 => StartPump1Level, 2 => StartPump2Level, 3 => StartPump3Level, _ => 0f };
|
|
|
+ if (level > 0 && Level >= level)
|
|
|
+ return i switch { 1 => TankStage.Pump1, 2 => TankStage.Pump2, _ => TankStage.Pump3 };
|
|
|
+ }
|
|
|
return TankStage.Stop;
|
|
|
}
|
|
|
|
|
|
@@ -953,14 +1044,22 @@ public partial class TankItemViewModel : ObservableObject
|
|
|
IsSyncing = true;
|
|
|
try
|
|
|
{
|
|
|
- // 鏇存柊 config 涓殑鍊
|
|
|
- _config.StartPump1Level = EditStartPump1Level;
|
|
|
- _config.StartPump2Level = EditStartPump2Level;
|
|
|
- _config.StartPump3Level = EditStartPump3Level;
|
|
|
- _config.StopLevel = EditStopLevel;
|
|
|
- _config.ProtectionLevel = EditProtectionLevel;
|
|
|
-
|
|
|
- var result = await ParameterSyncService.Instance.SyncTankThresholdsAsync(_config);
|
|
|
+ // 鏇存柊 config 涓殑鍊硷紙閬嶅巻 ThresholdRows 鍔ㄦ佸洖鍐欙級
|
|
|
+ int pumpIndex = 0;
|
|
|
+ foreach (var row in ThresholdRows)
|
|
|
+ {
|
|
|
+ if (row.Label.StartsWith("鍚车"))
|
|
|
+ {
|
|
|
+ pumpIndex++;
|
|
|
+ _config.SetStartPumpLevel(pumpIndex, row.EditValue);
|
|
|
+ }
|
|
|
+ else if (row.Label == "鍋滄车娑蹭綅")
|
|
|
+ _config.StopLevel = row.EditValue;
|
|
|
+ else if (row.Label == "淇濇姢娑蹭綅")
|
|
|
+ _config.ProtectionLevel = row.EditValue;
|
|
|
+ }
|
|
|
+
|
|
|
+ var result = await ParameterSyncService.Instance.SyncTankThresholdsAsync(_config, _pumpCount);
|
|
|
SyncStatusText = result.Summary;
|
|
|
Log.Information("姘寸鍙傛暟鍚屾: {Tank} 鈥 {Summary}", Name, result.Summary);
|
|
|
}
|
