Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0

qin

2025-03-20 330002911a64ea58d6834b64228870228eb75391

 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 @@
            }
        }
    }
}
}