From 09b864e0e3b793187a606ffd0d829aef9511653a Mon Sep 17 00:00:00 2001
From: duheng <2286773002@qq.com>
Date: 星期二, 18 三月 2025 13:55:51 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/IBox.WinFrmUI/Form/IBoxFormDataFilter.cs | 60 +++++++++++-------------------------------------------------
1 files changed, 11 insertions(+), 49 deletions(-)
diff --git a/WinFrmUI/IBox.WinFrmUI/Form/IBoxFormDataFilter.cs b/WinFrmUI/IBox.WinFrmUI/Form/IBoxFormDataFilter.cs
index 029eb9f..fa7e3fd 100644
--- a/WinFrmUI/IBox.WinFrmUI/Form/IBoxFormDataFilter.cs
+++ b/WinFrmUI/IBox.WinFrmUI/Form/IBoxFormDataFilter.cs
@@ -9,38 +9,21 @@
{
public partial class IBoxFormDataFilter : DocumentPage
{
- private string startCode = "[&start&]";
- private string endCode = "[&end&]";
- private string paramCode = "[¶m&]";
- private string getfilterCode = "getfilter";
- private string savefilterCode = "savefilter";
+
public IBoxFormDataFilter()
{
InitializeComponent();
imageComboBoxEdit1.EditValue = "Flow";
InitChart();
}
-
-
- private void SetOrder(string order)
+ public void HideButton()
{
- var smsg = order.Split(new string[] { paramCode }, StringSplitOptions.RemoveEmptyEntries);
- if (smsg.Length < 2)
- {
- return;
- }
-
- switch (smsg[0].Trim())
- {
- case "datadownload":
- //WaitFrmHelper.HideWaitForm();
- break;
- }
+ simpleButton1.Visible = simpleButton2.Visible = simpleButton3.Visible = simpleButton4.Visible = false;
}
private void EboxFormDataFilter_Load(object sender, EventArgs e)
{
- SendText(startCode + getfilterCode + paramCode + endCode);
+ SendText(IBoxHelper.startCode + IBoxHelper.getfilterCode + IBoxHelper.paramCode + IBoxHelper.endCode);
}
public event EventHandler<string> SendData;
@@ -50,11 +33,16 @@
SendData?.Invoke(null, content);
}
+ /// <summary>
+ /// 缁戝畾鏁版嵁
+ /// </summary>
+ /// <param name="model"></param>
+ /// <param name="isBlue"></param>
public void BindData(IBoxFilterViewModel model, bool isBlue)
{
this.model = model;
checkEditIsFlow.Checked = model.IsFlowFilter;
- checkEditIsPress.Checked = model.IsPressFilter ;
+ checkEditIsPress.Checked = model.IsPressFilter;
imageComboBoxEdit1_SelectedIndexChanged(null, null);
}
private Series _seriesOld, _seriesNew;
@@ -169,33 +157,7 @@
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);
+ SendText(IBoxHelper.startCode + IBoxHelper.savefilterCode + IBoxHelper.paramCode + JsonHelper.Object2Json(model) + IBoxHelper.endCode);
MessageBoxHelper.ShowInfo("淇濆瓨鎴愬姛");
}
--
Gitblit v1.9.3