From 7ee0220b5f5626deef516b6e5c417bfa201e5a88 Mon Sep 17 00:00:00 2001
From: duheng <2286773002@qq.com>
Date: 星期二, 18 三月 2025 09:34:45 +0800
Subject: [PATCH] 冲突
---
WinFrmUI/IBox.WinFrmUI/Form/IBoxFormMonitor.cs | 17 +++++------------
1 files changed, 5 insertions(+), 12 deletions(-)
diff --git a/WinFrmUI/IBox.WinFrmUI/Form/IBoxFormMonitor.cs b/WinFrmUI/IBox.WinFrmUI/Form/IBoxFormMonitor.cs
index aa47245..08eb730 100644
--- a/WinFrmUI/IBox.WinFrmUI/Form/IBoxFormMonitor.cs
+++ b/WinFrmUI/IBox.WinFrmUI/Form/IBoxFormMonitor.cs
@@ -12,14 +12,7 @@
public partial class IBoxFormMonitor : DocumentPage
{
- private string startCode = "[&start&]";
- private string endCode = "[&end&]";
- private string paramCode = "[¶m&]";
- private string getbaseCode = "getbase";
- private string getrealrecordCode = "getrealrecord";
- private string gethistoryrecordCode = "gethistoryrecord";
- private string getalarmbydayCode = "getalarmbyday";
- private string getbysignalidofdayrangeCode = "getbysignalidofdayrange";
+
//Stopwatch sw = new Stopwatch();
//string swstr=string.Empty;
@@ -48,13 +41,13 @@
private void EboxForm_Load(object sender, EventArgs e)
{
Thread.Sleep(500);
- SendText(startCode + getbaseCode + paramCode + endCode);
+ SendText(IBoxHelper.startCode + IBoxHelper.getbaseCode + IBoxHelper.paramCode + IBoxHelper.endCode);
_diagram.EnableAxisXScrolling = true;
_diagram.EnableAxisYScrolling = true;
_diagram.EnableAxisXZooming = true;
_diagram.EnableAxisYZooming = true;
//SetTimer();
-
+
}
public void SetAlarmByDay(string l, bool isBlue = true)
@@ -280,12 +273,12 @@
StartTime = dateEdit1.Text,//.Equals(DateTime.Now.ToString("yyyy-MM-dd")) ? DateTime.Now.AddMinutes(-20).ToString("yyyy-MM-dd HH:mm:ss") : dateEdit1.Text,
EndTime = dateEdit2.Text//.Equals(DateTime.Now.ToString("yyyy-MM-dd")) ? DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") : dateEdit2.Text,
};
- SendText(startCode + gethistoryrecordCode + paramCode + JsonHelper.Object2Json(m) + endCode);
+ SendText(IBoxHelper.startCode + IBoxHelper.gethistoryrecordCode + IBoxHelper.paramCode + JsonHelper.Object2Json(m) + IBoxHelper.endCode);
}
private void GetRealData(object sender, EventArgs e)
{
- SendText(startCode + getrealrecordCode + paramCode + endCode);
+ SendText(IBoxHelper.startCode + IBoxHelper.getrealrecordCode + IBoxHelper.paramCode + IBoxHelper.endCode);
}
private void gridView1_CustomDrawCell(object sender, DevExpress.XtraGrid.Views.Base.RowCellCustomDrawEventArgs e)
--
Gitblit v1.9.3