From e71088d7566e16f92ecd9a7f3c8703976debffb4 Mon Sep 17 00:00:00 2001
From: ningshuxia <ningshuxia0927@outlook.com>
Date: 星期一, 17 三月 2025 13:33:06 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/IBox.WinFrmUI/Form/IBoxFormDataFilter.cs | 47 +++++------------------------------------------
1 files changed, 5 insertions(+), 42 deletions(-)
diff --git a/WinFrmUI/IBox.WinFrmUI/Form/IBoxFormDataFilter.cs b/WinFrmUI/IBox.WinFrmUI/Form/IBoxFormDataFilter.cs
index 7c5a354..56ade62 100644
--- a/WinFrmUI/IBox.WinFrmUI/Form/IBoxFormDataFilter.cs
+++ b/WinFrmUI/IBox.WinFrmUI/Form/IBoxFormDataFilter.cs
@@ -22,22 +22,6 @@
}
- private void SetOrder(string order)
- {
- var smsg = order.Split(new string[] { paramCode }, StringSplitOptions.RemoveEmptyEntries);
- if (smsg.Length < 2)
- {
- return;
- }
-
- switch (smsg[0].Trim())
- {
- case "datadownload":
- //WaitFrmHelper.HideWaitForm();
- break;
- }
- }
-
private void EboxFormDataFilter_Load(object sender, EventArgs e)
{
SendText(startCode + getfilterCode + paramCode + endCode);
@@ -50,6 +34,11 @@
SendData?.Invoke(null, content);
}
+ /// <summary>
+ /// 缁戝畾鏁版嵁
+ /// </summary>
+ /// <param name="model"></param>
+ /// <param name="isBlue"></param>
public void BindData(IBoxFilterViewModel model, bool isBlue)
{
this.model = model;
@@ -169,32 +158,6 @@
model.IsFlowFilter = checkEditIsFlow.Checked;
model.IsPressFilter = checkEditIsPress.Checked;
SetValue();
- //var uv= imageComboBoxEdit1.EditValue.ToString();
- //if (model.IsFlowFilter)
- //{
- // model.FlowFilterConfig = new EboxFilterConfigViewModel()
- // {
- // IsControlInput = checkEditIsControlInput.Checked,
- // RValue = double.Parse(textEditRValue.Text),
- // QValue = double.Parse(textEditQValue.Text),
- // AValue = double.Parse(textEditAValue.Text),
- // HValue = double.Parse(textEditHValue.Text),
- // ControlInputValue = double.Parse(textEditControlInputValue.Text)
- // };
- //}
- //if (model.IsPressFilter)
- //{
- // model.PressFilterConfig = new EboxFilterConfigViewModel()
- // {
- // IsControlInput = checkEditIsControlInput.Checked,
- // RValue = double.Parse(textEditRValue.Text),
- // QValue = double.Parse(textEditQValue.Text),
- // AValue = double.Parse(textEditAValue.Text),
- // HValue = double.Parse(textEditHValue.Text),
- // ControlInputValue = double.Parse(textEditControlInputValue.Text)
- // };
- //}
-
SendText(startCode + savefilterCode + paramCode + JsonHelper.Object2Json(model) + endCode);
MessageBoxHelper.ShowInfo("淇濆瓨鎴愬姛");
}
--
Gitblit v1.9.3