From d1807075581920a8c94a409b11a9c88dd869be1e Mon Sep 17 00:00:00 2001
From: ningshuxia <ningshuxia0927@outlook.com>
Date: 星期四, 20 三月 2025 16:57:33 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/IBox.WinFrmUI/Form/IBoxFormLog.cs | 23 ++++++++++++-----------
1 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/WinFrmUI/IBox.WinFrmUI/Form/IBoxFormLog.cs b/WinFrmUI/IBox.WinFrmUI/Form/IBoxFormLog.cs
index f499f2d..9284079 100644
--- a/WinFrmUI/IBox.WinFrmUI/Form/IBoxFormLog.cs
+++ b/WinFrmUI/IBox.WinFrmUI/Form/IBoxFormLog.cs
@@ -3,13 +3,10 @@
using Yw;
using Yw.WinFrmUI;
-
namespace IBox.WinFrmUI
{
public partial class IBoxFormLog : DocumentPage
{
-
-
public IBoxFormLog()
{
this.PageTitle.Caption = "鏃ュ織绠＄悊";
@@ -19,7 +16,8 @@
public void HideButton()
{
//simpleButton1.Visible = simpleButton2.Visible = false;
- layoutControlItem2.Visibility = layoutControlItem3.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
+ /*layoutControlItem2.Visibility =*/
+ layoutControlItem3.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
}
private void EboxFormLog_Load(object sender, EventArgs e)
@@ -55,16 +53,15 @@
imageComboBoxEdit1.SelectedIndex = 0;
imageComboBoxEdit2.SelectedIndex = 0;
-
}
public event EventHandler<string> SendData;
+
private void SendText(string content)
{
if (SendData != null)
{
SendData?.Invoke(null, content);
-
}
else
{
@@ -84,7 +81,7 @@
if (!string.IsNullOrEmpty(result))
{
var model = JsonHelper.Json2Object<List<IBoxLogViewModel>>(result);
- BindData(model,false);
+ BindData(model, false);
}
break;
}
@@ -143,7 +140,6 @@
private void gridView1_CustomDrawCell(object sender, DevExpress.XtraGrid.Views.Base.RowCellCustomDrawEventArgs e)
{
-
if (e.Column.FieldName == "LogResult")
{
var celValue = e.CellValue.ToString();
@@ -154,14 +150,17 @@
celNewValue = "鎻愮ず";
e.Appearance.ForeColor = Color.Blue;
break;
+
case "fail":
celNewValue = "澶辫触";
e.Appearance.ForeColor = Color.Coral;
break;
+
case "error":
celNewValue = "寮傚父";
e.Appearance.ForeColor = Color.Red;
break;
+
default:
celNewValue = "鎴愬姛";
e.Appearance.ForeColor = Color.Green;
@@ -173,7 +172,6 @@
private Dictionary<string, string> GetDic()
{
-
return new Dictionary<string, string>
{
{ "controll", "鏅鸿兘鎺у埗" },
@@ -182,6 +180,7 @@
{ "datadocking", "鏁版嵁閲囬泦" },
};
}
+
private void gridView1_CustomColumnDisplayText(object sender, DevExpress.XtraGrid.Views.Base.CustomColumnDisplayTextEventArgs e)
{
if (e.Column.FieldName == "LogEvent")
@@ -209,19 +208,21 @@
case "info":
celNewValue = "鎻愮ず";
break;
+
case "fail":
celNewValue = "澶辫触";
break;
+
case "error":
celNewValue = "寮傚父";
break;
+
default:
celNewValue = "鎴愬姛";
break;
}
e.DisplayText = celNewValue;
}
-
}
/// <summary>
@@ -246,4 +247,4 @@
}
}
}
-}
+}
\ No newline at end of file
--
Gitblit v1.9.3