Merge branch 'dev_lilili' of https://gitea.star-rising.cn/xiaohuimin/DHDHSoftware into dev_lilili

DH.Commons/Base/GloablConfig.cs

@@ -1,12 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace DH.Commons.Base
-{
-    internal class GloablConfig
-    {
-    }
-}

DH.Commons/Base/GlobalConfig.cs

@@ -0,0 +1,131 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Xml.Linq;
+using AntdUI;
+
+namespace DH.Commons.Base
+{
+    public class GlobalConfig : NotifyProperty
+    {
+        string _name;
+        private BindingList<PLCItem> _InitProcessList = new BindingList<PLCItem>();
+        private BindingList<PLCItem> _StartProcessList = new BindingList<PLCItem>();
+        private BindingList<PLCItem> _StopProcessList = new BindingList<PLCItem>();
+        private BindingList<PLCItem> _StartResetList = new BindingList<PLCItem>();
+        private BindingList<PLCItem> _StopResetList = new BindingList<PLCItem>();
+        public string Name
+        {
+            get => _name;
+            set
+            {
+                if (_name != value)
+                {
+                    _name = value;
+                    OnPropertyChanged(nameof(Name));
+                }
+            }
+        }
+
+        public BindingList<PLCItem> InitProcessList
+        {
+            get => _InitProcessList;
+            set
+            {
+                if (_InitProcessList == value) return;
+                _InitProcessList = value;
+                OnPropertyChanged(nameof(InitProcessList));
+            }
+        }
+        public BindingList<PLCItem> StartProcessList
+        {
+            get => _StartProcessList;
+            set
+            {
+                if (_StartProcessList == value) return;
+                _StartProcessList = value;
+                OnPropertyChanged(nameof(StartProcessList));
+            }
+        }
+        public BindingList<PLCItem> StopProcessList
+        {
+            get => _StopProcessList;
+            set
+            {
+                if (_StopProcessList == value) return;
+                _StopProcessList = value;
+                OnPropertyChanged(nameof(StopProcessList));
+            }
+        }
+        public BindingList<PLCItem> StartResetList
+        {
+            get => _StartResetList;
+            set
+            {
+                if (_StartResetList == value) return;
+                _StartResetList = value;
+                OnPropertyChanged(nameof(StartResetList));
+            }
+        }
+        public BindingList<PLCItem> StopResetList
+        {
+            get => _StopResetList;
+            set
+            {
+                if (_StopResetList == value) return;
+                _StopResetList = value;
+                OnPropertyChanged(nameof(StopResetList));
+            }
+        }
+
+      
+        string _imgSavePath;
+        string _dbSavePath;
+        string _configSavePath;
+      
+        public string ImgSavePath
+        {
+            get => _imgSavePath;
+            set
+            {
+                if (_imgSavePath != value)
+                {
+                    _imgSavePath = value;
+                    OnPropertyChanged(nameof(ImgSavePath));
+                }
+            }
+        }
+
+        public string DbSavePath
+        {
+            get => _dbSavePath;
+            set
+            {
+                if (_dbSavePath != value)
+                {
+                    _dbSavePath = value;
+                    OnPropertyChanged(nameof(DbSavePath));
+                }
+            }
+        }
+
+        public string ConfigSavePath
+        {
+            get => _configSavePath;
+            set
+            {
+                if (_configSavePath != value)
+                {
+                    _configSavePath = value;
+                    OnPropertyChanged(nameof(ConfigSavePath));
+                }
+            }
+        }
+    }
+
+
+
+}

DH.Commons/Base/PLCBase.cs

@@ -20,7 +20,8 @@ namespace DH.Commons.Base
         private Parity _parity = Parity.None;
         private string _ip = "192.168.6.61";
         private int _port = 502;
-        private AntList<PLCItem> _PLCItemList = new AntList<PLCItem>();
+        private BindingList<PLCItem> _PLCItemList = new BindingList<PLCItem>();
+
         [Category("设备配置")]
         [DisplayName("是否启用")]
         [Description("是否启用")]
@@ -179,7 +180,7 @@ namespace DH.Commons.Base
         [Category("点位配置")]
         [DisplayName("点位配置")]
         [Description("点位配置")]
-        public AntList<PLCItem> PLCItemList
+        public BindingList<PLCItem> PLCItemList
         {
             get => _PLCItemList;
             set
@@ -189,6 +190,8 @@ namespace DH.Commons.Base
                 OnPropertyChanged(nameof(PLCItemList));
             }
         }
+
+    
         public virtual bool PLCConnect()
         {
             Connected = true;
@@ -201,14 +204,23 @@ namespace DH.Commons.Base
             return true;
         }
 
+        public virtual Int16 ReadInt16(string address) { return 0; }
 
-        public virtual ushort ReadShort(string address) { return 0; }
-        public virtual int ReadInt(string address) { return 0; }
+        public virtual Int32 ReadInt32(string address) { return 0; }
+
+        public virtual UInt16 ReadUInt16(string address) { return 0; }
+
+        public virtual UInt32 ReadUInt32(string address) { return 0; }
         public virtual float ReadFloat(string address) { return 0; }
         public virtual bool ReadBool(string address) { return false; }
-        public virtual bool WriteShort(string address, short value, bool waitForReply = true) { return false; }
-        public virtual bool WriteInt(string address, int value, bool waitForReply = true) { return false; }
-        public virtual bool WriteDInt(string address, int value, bool waitForReply = true) { return false; }
+
+        public virtual bool WriteInt16(string address, Int16 value, bool waitForReply = true) { return false; }
+        public virtual bool WriteInt32(string address, Int32 value, bool waitForReply = true) { return false; }
+
+
+        public virtual bool WriteUInt16(string address, UInt16 value, bool waitForReply = true) { return false; }
+        public virtual bool WriteUInt32(string address, UInt32 value, bool waitForReply = true) { return false; }
+   
         public virtual bool WriteFloat(string address, float value, bool waitForReply = true) { return false; }
         public virtual bool WriteBool(string address, bool value, bool waitForReply = true) { return false; }
     }
@@ -218,13 +230,10 @@ namespace DH.Commons.Base
     {
         private bool _selected;
         private string _name = string.Empty;
-        private string _type = string.Empty;
+        private EnumPLCDataType _type;
         private string _value = string.Empty;
         private bool _startexecute;
-        private bool _endexecute;
         private int _startindex;
-        private int _endindex;
-        private string _numtype;
         private string _address;
         /// <summary>
         /// 是否选中
@@ -257,7 +266,7 @@ namespace DH.Commons.Base
                 }
             }
         }
-        public string Type
+        public EnumPLCDataType Type
         {
             get => _type;
             set
@@ -284,18 +293,7 @@ namespace DH.Commons.Base
                 }
             }
         }
-        public string NumTpye
-        {
-            get => _numtype;
-            set
-            {
-                if (_numtype != value)
-                {
-                    _numtype = value;
-                    OnPropertyChanged(nameof(NumTpye));
-                }
-            }
-        }
+ 
         /// <summary>
         /// 参数值
         /// </summary>
@@ -313,7 +311,7 @@ namespace DH.Commons.Base
         }
 
         /// <summary>
-        /// 流程开启执行状态
+        /// 启用状态
         /// </summary>
         public bool StartExecute
         {
@@ -327,27 +325,13 @@ namespace DH.Commons.Base
                 }
             }
         }
-        /// <summary>
-        /// 流程结束执行状态
-        /// </summary>
-        public bool EndExecute
-        {
-            get => _endexecute;
-            set
-            {
-                if (_endexecute != value)
-                {
-                    _endexecute = value;
-                    OnPropertyChanged(nameof(EndExecute));
-                }
-            }
-        }
+
 
 
 
 
         /// <summary>
-        /// 流程开启顺序
+        /// 顺序
         /// </summary>
         public int StartIndex
         {
@@ -361,22 +345,7 @@ namespace DH.Commons.Base
                 }
             }
         }
-        /// <summary>
-        /// 流程结束顺序
-        /// </summary>
-        public int EndIndex
-        {
-            get => _endindex;
-            set
-            {
-                if (_endindex != value)
-                {
-                    _endindex = value;
-                    OnPropertyChanged(nameof(EndIndex));
-                }
-            }
-        }
-     
+       
         private CellLink[] cellLinks;
         [JsonIgnore]
         public CellLink[] CellLinks
@@ -390,18 +359,18 @@ namespace DH.Commons.Base
             }
         }
       
-        private CellTag[] cellTags;
-        [JsonIgnore]
-        public CellTag[] CellTags
-        {
-            get { return cellTags; }
-            set
-            {
-                if (cellTags == value) return;
-                cellTags = value;
-                OnPropertyChanged(nameof(CellTags));
-            }
-        }
+        //private CellTag[] cellTags;
+        //[JsonIgnore]
+        //public CellTag[] CellTags
+        //{
+        //    get { return cellTags; }
+        //    set
+        //    {
+        //        if (cellTags == value) return;
+        //        cellTags = value;
+        //        OnPropertyChanged(nameof(CellTags));
+        //    }
+        //}
     }
 
 

DH.Commons/Enums/Enum.cs

@@ -7,7 +7,13 @@ using System.Threading.Tasks;
 
 namespace DH.Commons.Enums
 {
-
+    public enum EnumStatus
+    {
+        未运行,
+        运行中,
+        警告,
+        异常
+    }
     public enum ModelType
     {
         图像分类 = 1,
@@ -91,10 +97,8 @@ namespace DH.Commons.Enums
         工位8 ,
         工位9 ,
         工位10 ,
-        OK料盒 ,
-        NG料盒,
-        OK吹气时间,
-        NG吹气时间,
+        相机触发时间,
+        吹气时间,
         产品计数,
         计数清零,
         工件最小值,
@@ -109,6 +113,9 @@ namespace DH.Commons.Enums
         挡料电机位置,
         OK脉冲,
         NG脉冲,
+        状态复位,
+        启用定位,
+        定位完成脉冲值
 
 
 
@@ -118,18 +125,22 @@ namespace DH.Commons.Enums
 
     public enum EnumPLCDataType
     {
-        HD,
-        D,
-        M
-    }
-    public enum EnumPLCINTType
-    {
-        单字16位,
-        单字32位,
-        双字16位,
-        双字32位
+        单字整型,
+        双字整型,
+        浮点型,
+        布尔型
     }
 
+    public enum EnumBool
+    {
+        关闭,
+        启用
+    }
+    public enum EnumBool1
+    {
+        False,
+        True
+    }
     public enum StreamFormat
     {
         [Description("8位图像")]

DH.Commons/Helper/ConfigHelper.cs

@@ -101,7 +101,8 @@ namespace DH.Commons.Helper
             {
                 ConfigModel.CameraBaseList,
                 ConfigModel.PLCBaseList,
-                ConfigModel.DetectionList
+                ConfigModel.DetectionList,
+                ConfigModel.GlobalList,
             }, _jsonOptions);
 
             // 写入新配置
@@ -157,8 +158,9 @@ namespace DH.Commons.Helper
             var data = JsonSerializer.Deserialize<ConfigData>(json, _jsonOptions);
 
             ConfigModel.CameraBaseList = data?.Cameras ?? new List<CameraBase>();
-            ConfigModel.PLCBaseList = data?.PLCs ?? new List<PLCBase>();
             ConfigModel.DetectionList = data?.Detections ?? new List<DetectionConfig>();
+            ConfigModel.PLCBaseList = data?.PLCs ?? new List<PLCBase>();
+            ConfigModel.GlobalList = data?.GlobalConfigs ?? new List<GlobalConfig>();
         }
 
         /// <summary>
@@ -261,6 +263,10 @@ namespace DH.Commons.Helper
 
             [JsonPropertyName("detectionList")]
             public List<DetectionConfig> Detections { get; set; } = new List<DetectionConfig>();
+            [JsonPropertyName("globalList")]
+            public List<GlobalConfig> GlobalConfigs { get; set; } = new List<GlobalConfig>();
+    
+        
         }
     }
 }

DH.Commons/Models/SystemModel.cs

@@ -4,6 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using DH.Commons.Base;
+using DH.Commons.Enums;
 
 namespace DH.Commons.Models
 {
@@ -14,7 +15,10 @@ namespace DH.Commons.Models
         /// </summary>
         public static string CurrentScheme=string.Empty;
 
-
+        /// <summary>
+        /// 当前状态
+        /// </summary>
+        public static EnumStatus CurrentStatus =EnumStatus.未运行;
     }
 
     /// <summary>
@@ -25,5 +29,6 @@ namespace DH.Commons.Models
         public static List<CameraBase> CameraBaseList = new List<CameraBase>();
         public static List<PLCBase> PLCBaseList = new List<PLCBase>();
         public static List<DetectionConfig> DetectionList = new List<DetectionConfig>();
+        public static List<GlobalConfig> GlobalList = new List<GlobalConfig>();
     }
 }

DH.Devices.Vision/SimboVisionDriver.cs

@@ -36,7 +36,20 @@ namespace DH.Devices.Vision
           //  ImageSaveHelper.OnImageSaveExceptionRaised += ImageSaveHelper_OnImageSaveExceptionRaised;
           //  base.Init();
         }
-
+        public  void Stop()
+        {
+            SimboStationMLEngineList.ToList().ForEach(sm =>
+            {
+                if (sm.IsUseGPU)
+                {
+                    sm.StationMLEngine.Dispose();
+                }
+                else
+                {
+                    sm.StationMLEngine.Dispose2();
+                }
+            });
+        }
         //private void ImageSaveHelper_OnImageSaveExceptionRaised(DateTime dt, string msg)
         //{
         //    LogAsync(new LogMsg(dt, LogLevel.Error, msg));
@@ -140,8 +153,8 @@ namespace DH.Devices.Vision
                     //  LogAsync(DateTime.Now, LogLevel.Information, $"{detectConfig.Name} 产品{detectResult.TempPid} RunInference BEGIN");
                     mlWatch.Start();
                     //20230802改成多线程推理 RunInferenceFixed
-
-                    var result = mlSet.StationMLEngine.RunInference(req);
+                   // MLResult result = new MLResult();
+                   var result = mlSet.StationMLEngine.RunInference(req);
                     // var result = mlSet.StationMLEngine.RunInferenceFixed(req);
                     mlWatch.Stop();
                     // LogAsync(DateTime.Now, LogLevel.Information, $"{detectConfig.Name} 产品{detectResult.TempPid} RunInference END");

DHSoftware/DHSoftware.csproj

@@ -12,6 +12,12 @@
 		<OutputType>WinExe</OutputType>
 	</PropertyGroup>
 
+	
+
+
+
+
+
 
 
 	

DHSoftware/Program.cs

@@ -1,6 +1,8 @@
 using System;
 using System.Drawing;
 using System.Windows.Forms;
+using AntdUI;
+using DH.Commons.Enums;
 using DH.Commons.Helper;
 using DH.Commons.Models;
 using DHSoftware.Utils;
@@ -36,15 +38,56 @@ namespace DHSoftware
             WelcomeWindow.Instance.Show();
             UpdateStep(0, "正在初始化", true);
             UpdateStep(10, "正在加载数据库", true);
-            DatabaseUtil.InitializeDatabase();
+            try
+            {
+                DatabaseUtil.InitializeDatabase();
+            }
+            catch (Exception ex)
+            {
+               SystemModel.CurrentStatus = EnumStatus.异常;
+               Modal.open(WelcomeWindow.Instance, "错误！", ex.ToString(), TType.Error);
+            }
+         
             UpdateStep(30, "正在加载解决方案", true);
-            MainWindow.Instance.LoadScheme();
+            try
+            {
+                MainWindow.Instance.LoadScheme();
+            }
+            catch (Exception ex)
+            {
+                SystemModel.CurrentStatus = EnumStatus.异常;
+                Modal.open(WelcomeWindow.Instance, "错误！", ex.ToString(), TType.Error); 
+            }
             UpdateStep(50, "正在连接相机", true);
-            MainWindow.Instance.ConnectCamera();
+            try
+            {
+                MainWindow.Instance.ConnectCamera();
+            }
+            catch(Exception ex)
+            {
+                SystemModel.CurrentStatus = EnumStatus.异常;
+                Modal.open(WelcomeWindow.Instance, "错误！", ex.ToString(), TType.Error);
+            }
             UpdateStep(70, "正在连接PLC", true);
-            MainWindow.Instance.ConnectPLC();
+            try
+            {
+                MainWindow.Instance.ConnectPLC();
+            }
+            catch (Exception ex)
+            {
+                SystemModel.CurrentStatus = EnumStatus.异常;
+                Modal.open(WelcomeWindow.Instance, "错误！", ex.ToString(), TType.Error);
+            }
             UpdateStep(80, "正在加载算法模型", true);
-            MainWindow.Instance.InitModel();
+            try
+            {
+                MainWindow.Instance.InitModel();
+            }
+            catch (Exception ex)
+            {
+                SystemModel.CurrentStatus = EnumStatus.异常;
+                Modal.open(WelcomeWindow.Instance, "错误！", ex.ToString(), TType.Error);
+            }
             UpdateStep(100, "程序初始化完成", true);
             Thread.Sleep(100);
             WelcomeWindow.Instance.Close();

DHSoftware/Views/CamConfigFrm.Designer.cs

@@ -1,150 +0,0 @@
-namespace DHSoftware.Views
-{
-    partial class CamConfigFrm
-    {
-       
-        /// <summary> 
-        /// 必需的设计器变量。
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary> 
-        /// 清理所有正在使用的资源。
-        /// </summary>
-        /// <param name="disposing">如果应释放托管资源，为 true；否则为 false。</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region 组件设计器生成的代码
-
-        /// <summary> 
-        /// 设计器支持所需的方法 - 不要修改
-        /// 使用代码编辑器修改此方法的内容。
-        /// </summary>
-        private void InitializeComponent()
-        {
-            AntdUI.Tabs.StyleLine styleLine1 = new AntdUI.Tabs.StyleLine();
-            tabs1 = new AntdUI.Tabs();
-            tabPage1 = new AntdUI.TabPage();
-            label1 = new Label();
-            btnRefreshCamList = new Button();
-            dgvCams = new DataGridView();
-            CamName = new DataGridViewTextBoxColumn();
-            Serinum = new DataGridViewTextBoxColumn();
-            IP = new DataGridViewTextBoxColumn();
-            COMBO_DEVICES = new ComboBox();
-            tabs1.SuspendLayout();
-            tabPage1.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)dgvCams).BeginInit();
-            SuspendLayout();
-            // 
-            // tabs1
-            // 
-            tabs1.Controls.Add(tabPage1);
-            tabs1.Dock = DockStyle.Fill;
-            tabs1.Location = new Point(0, 0);
-            tabs1.Name = "tabs1";
-            tabs1.Pages.Add(tabPage1);
-            tabs1.Size = new Size(489, 563);
-            tabs1.Style = styleLine1;
-            tabs1.TabIndex = 0;
-            tabs1.Text = "tabs1";
-            // 
-            // tabPage1
-            // 
-            tabPage1.Controls.Add(label1);
-            tabPage1.Controls.Add(btnRefreshCamList);
-            tabPage1.Controls.Add(dgvCams);
-            tabPage1.Controls.Add(COMBO_DEVICES);
-            tabPage1.Location = new Point(3, 28);
-            tabPage1.Name = "tabPage1";
-            tabPage1.Size = new Size(483, 532);
-            tabPage1.TabIndex = 0;
-            tabPage1.Text = "相机配置";
-            // 
-            // label1
-            // 
-            label1.AutoSize = true;
-            label1.Location = new Point(38, 15);
-            label1.Name = "label1";
-            label1.Size = new Size(56, 17);
-            label1.TabIndex = 3;
-            label1.Text = "相机类型";
-            // 
-            // btnRefreshCamList
-            // 
-            btnRefreshCamList.Location = new Point(36, 43);
-            btnRefreshCamList.Name = "btnRefreshCamList";
-            btnRefreshCamList.Size = new Size(423, 33);
-            btnRefreshCamList.TabIndex = 2;
-            btnRefreshCamList.Text = "刷新相机列表";
-            btnRefreshCamList.UseVisualStyleBackColor = true;
-            btnRefreshCamList.Click += btnRefreshCamList_Click;
-            // 
-            // dgvCams
-            // 
-            dgvCams.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.Fill;
-            dgvCams.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
-            dgvCams.Columns.AddRange(new DataGridViewColumn[] { CamName, Serinum, IP });
-            dgvCams.Location = new Point(38, 82);
-            dgvCams.Name = "dgvCams";
-            dgvCams.Size = new Size(421, 206);
-            dgvCams.TabIndex = 1;
-            // 
-            // CamName
-            // 
-            CamName.HeaderText = "相机名";
-            CamName.Name = "CamName";
-            // 
-            // Serinum
-            // 
-            Serinum.HeaderText = "序列号";
-            Serinum.Name = "Serinum";
-            // 
-            // IP
-            // 
-            IP.HeaderText = "相机IP";
-            IP.Name = "IP";
-            // 
-            // COMBO_DEVICES
-            // 
-            COMBO_DEVICES.DropDownStyle = ComboBoxStyle.DropDownList;
-            COMBO_DEVICES.FormattingEnabled = true;
-            COMBO_DEVICES.Location = new Point(100, 12);
-            COMBO_DEVICES.Name = "COMBO_DEVICES";
-            COMBO_DEVICES.Size = new Size(359, 25);
-            COMBO_DEVICES.TabIndex = 0;
-            // 
-            // CamConfigFrm
-            // 
-            AutoScaleDimensions = new SizeF(7F, 17F);
-            AutoScaleMode = AutoScaleMode.Font;
-            Controls.Add(tabs1);
-            Name = "CamConfigFrm";
-            Size = new Size(489, 563);
-            tabs1.ResumeLayout(false);
-            tabPage1.ResumeLayout(false);
-            tabPage1.PerformLayout();
-            ((System.ComponentModel.ISupportInitialize)dgvCams).EndInit();
-            ResumeLayout(false);
-        }
-
-        #endregion
-
-        private AntdUI.Tabs tabs1;
-        private AntdUI.TabPage tabPage1;
-        private ComboBox COMBO_DEVICES;
-        private Button btnRefreshCamList;
-        private DataGridView dgvCams;
-        private Label label1;
-        private DataGridViewTextBoxColumn CamName;
-        private DataGridViewTextBoxColumn Serinum;
-        private DataGridViewTextBoxColumn IP;
-    }
-}

DHSoftware/Views/CamConfigFrm.cs

@@ -1,178 +0,0 @@
-using DH.Commons.Base;
-using DH.Commons.Enums;
-using DVPCameraType;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Diagnostics;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-using static System.Windows.Forms.VisualStyles.VisualStyleElement;
-
-namespace DHSoftware.Views
-{
-
-    public partial class CamConfigFrm : UserControl
-    {
-        public int m_n_dev_count = 0;
-        public static int m_CamCount = 0;
-        public static dvpCameraInfo[] m_info = new dvpCameraInfo[16];
-
-        // 在窗体类中声明一个绑定列表（用于动态更新）
-        private BindingList<CameraBase> _cameraList = new BindingList<CameraBase>();
-        public CamConfigFrm()
-        {
-            InitializeComponent();
-            // 添加 ComboBox 的项
-            COMBO_DEVICES.Items.AddRange(new string[] { " 度申Do3", "海康Hik", "巴斯勒Basler", "虚拟相机" });
-
-            // 绑定 SelectedIndexChanged 事件
-            COMBO_DEVICES.SelectedIndexChanged += ComboBox_SelectedIndexChanged;
-
-            dgvCams.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.Fill;
-            dgvCams.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
-            dgvCams.DataSource = _cameraList; // 绑定数据源
-            dgvCams.Location = new Point(38, 82);
-            dgvCams.Name = "dgvCams";
-            dgvCams.Size = new Size(284, 206);
-            dgvCams.TabIndex = 1;
-        }
-        private void ComboBox_SelectedIndexChanged(object sender, EventArgs e)
-        {
-            if (COMBO_DEVICES.SelectedItem == null) return;
-
-            string selectedMethod = COMBO_DEVICES.SelectedItem.ToString();
-            switch (selectedMethod)
-            {
-                case "度申Do3":
-                    Do3Think();
-                    break;
-                case "海康Hik":
-                    HiK();
-                    break;
-                case "巴斯勒Basler":
-                    Basler();
-                    break;
-                case "虚拟相机":
-                    Virtul();
-                    break;
-                default:
-                    MessageBox.Show("未找到对应方法");
-                    break;
-            }
-        }
-
-        // 其他方法定义...
-        private void Do3Think()
-        {
-            InitDevList();
-        }
-
-        private void HiK()
-        {
-
-        }
-        private void Basler()
-        {
-
-        }
-
-        private void Virtul()
-        {
-
-        }
-        private void btnRefreshCamList_Click(object sender, EventArgs e)
-        {
-            //搜索度申相机
-            InitDevList();
-        }
-
-        /// <summary>
-        /// 搜索度申相机
-        /// </summary>
-        // Initialize the device list.
-        public void InitDevList()
-        {
-
-
-
-
-
-
-
-            dvpStatus status;
-            uint i, n = 0;
-            dvpCameraInfo dev_info = new dvpCameraInfo();
-
-            // 清空旧数据
-            _cameraList.Clear();
-
-            // Get the number of cameras that has been connected to a computer.
-            status = DVPCamera.dvpRefresh(ref n);
-            Debug.Assert(status == dvpStatus.DVP_STATUS_OK);
-            m_n_dev_count = (int)n;
-            if (status == dvpStatus.DVP_STATUS_OK)
-            {
-                m_CamCount = 0;
-                for (i = 0; i < n; i++)
-                {
-                    // Acquire each camera's information one by one.
-                    status = DVPCamera.dvpEnum(i, ref dev_info);
-
-                    if (status == dvpStatus.DVP_STATUS_OK)
-                    {
-                        m_info[m_CamCount] = dev_info;
-
-                        int item = -1;
-                        //if (!UserDefinedName.Checked)
-                        {
-                            // add FriendlyName
-                            item = COMBO_DEVICES.Items.Add(dev_info.FriendlyName);
-                            CameraBase info = new CameraBase
-                            {
-                                CameraName = dev_info.FriendlyName,
-                                SerialNumber = dev_info.SerialNumber,
-                                // IP = dev_info.IP
-                            };
-
-                            _cameraList.Add(info);
-
-
-                        }
-                        //else
-                        //{
-                        //    // add User Define Name
-                        //    item = COMBO_DEVICES.Items.Add(dev_info.UserID);
-                        //}
-
-                        m_CamCount++;
-                    }
-                    else
-                    {
-                        Debug.Assert(status == dvpStatus.DVP_STATUS_OK);
-                    }
-                }
-            }
-
-            if (n == 0)
-            {
-
-            }
-            else
-            {
-
-            }
-
-
-        }
-
-        private void btnsubmit_Click(object sender, EventArgs e)
-        {
-
-        }
-    }
-}

DHSoftware/Views/CamConfigFrm.resx

@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!--
-    Microsoft ResX Schema 
-
-    Version 2.0
-
-    The primary goals of this format is to allow a simple XML format
-    that is mostly human readable. The generation and parsing of the
-    various data types are done through the TypeConverter classes
-    associated with the data types.
-
-    Example:
-
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-
-    There are any number of "resheader" rows that contain simple
-    name/value pairs.
-
-    Each data row contains a name, and value. The row also contains a
-    type or mimetype. Type corresponds to a .NET class that support
-    text/value conversion through the TypeConverter architecture.
-    Classes that don't support this are serialized and stored with the
-    mimetype set.
-
-    The mimetype is used for serialized objects, and tells the
-    ResXResourceReader how to depersist the object. This is currently not
-    extensible. For a given mimetype the value must be set accordingly:
-
-    Note - application/x-microsoft.net.object.binary.base64 is the format
-    that the ResXResourceWriter will generate, however the reader can
-    read any of the formats listed below.
-
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <metadata name="CamName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="Serinum.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="IP.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-</root>

DHSoftware/Views/CameraConfigControl.Designer.cs

@@ -1,200 +0,0 @@
-namespace DHSoftware.Views
-{
-    partial class CameraConfigControl
-    {
-        /// <summary> 
-        /// 必需的设计器变量。
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary> 
-        /// 清理所有正在使用的资源。
-        /// </summary>
-        /// <param name="disposing">如果应释放托管资源，为 true；否则为 false。</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region 组件设计器生成的代码
-
-        /// <summary> 
-        /// 设计器支持所需的方法 - 不要修改
-        /// 使用代码编辑器修改此方法的内容。
-        /// </summary>
-        private void InitializeComponent()
-        {
-            label1 = new AntdUI.Label();
-            cbxCamName = new ComboBox();
-            switchCamEnable = new AntdUI.Switch();
-            label2 = new AntdUI.Label();
-            numExpose = new AntdUI.InputNumber();
-            numGain = new AntdUI.InputNumber();
-            label3 = new AntdUI.Label();
-            numRotate = new AntdUI.InputNumber();
-            label4 = new AntdUI.Label();
-            label5 = new AntdUI.Label();
-            label6 = new AntdUI.Label();
-            switchSaveCamPic = new AntdUI.Switch();
-            panel1 = new Panel();
-            panel1.SuspendLayout();
-            SuspendLayout();
-            // 
-            // label1
-            // 
-            label1.Location = new Point(15, 14);
-            label1.Name = "label1";
-            label1.Size = new Size(58, 23);
-            label1.TabIndex = 0;
-            label1.Text = "相机名";
-            // 
-            // cbxCamName
-            // 
-            cbxCamName.DropDownStyle = ComboBoxStyle.DropDownList;
-            cbxCamName.FormattingEnabled = true;
-            cbxCamName.Location = new Point(79, 12);
-            cbxCamName.Name = "cbxCamName";
-            cbxCamName.Size = new Size(165, 25);
-            cbxCamName.TabIndex = 1;
-            // 
-            // switchCamEnable
-            // 
-            switchCamEnable.Location = new Point(330, 12);
-            switchCamEnable.Name = "switchCamEnable";
-            switchCamEnable.Size = new Size(57, 23);
-            switchCamEnable.TabIndex = 2;
-            switchCamEnable.Text = "switch1";
-            // 
-            // label2
-            // 
-            label2.Location = new Point(15, 43);
-            label2.Name = "label2";
-            label2.Size = new Size(58, 38);
-            label2.TabIndex = 3;
-            label2.Text = "曝光时间";
-            // 
-            // numExpose
-            // 
-            numExpose.Location = new Point(79, 43);
-            numExpose.Maximum = new decimal(new int[] { 10000000, 0, 0, 0 });
-            numExpose.Minimum = new decimal(new int[] { 1, 0, 0, 0 });
-            numExpose.Name = "numExpose";
-            numExpose.Size = new Size(165, 38);
-            numExpose.TabIndex = 4;
-            numExpose.Text = "1";
-            numExpose.Value = new decimal(new int[] { 1, 0, 0, 0 });
-            // 
-            // numGain
-            // 
-            numGain.Location = new Point(79, 87);
-            numGain.Maximum = new decimal(new int[] { 16, 0, 0, 0 });
-            numGain.Minimum = new decimal(new int[] { 0, 0, 0, 0 });
-            numGain.Name = "numGain";
-            numGain.Size = new Size(165, 38);
-            numGain.TabIndex = 6;
-            numGain.Text = "0";
-            // 
-            // label3
-            // 
-            label3.Location = new Point(15, 87);
-            label3.Name = "label3";
-            label3.Size = new Size(58, 38);
-            label3.TabIndex = 5;
-            label3.Text = "增益";
-            // 
-            // numRotate
-            // 
-            numRotate.Increment = new decimal(new int[] { 90, 0, 0, 0 });
-            numRotate.Location = new Point(79, 131);
-            numRotate.Maximum = new decimal(new int[] { 360, 0, 0, 0 });
-            numRotate.Minimum = new decimal(new int[] { 0, 0, 0, 0 });
-            numRotate.Name = "numRotate";
-            numRotate.Size = new Size(165, 38);
-            numRotate.TabIndex = 8;
-            numRotate.Text = "0";
-            // 
-            // label4
-            // 
-            label4.Location = new Point(15, 131);
-            label4.Name = "label4";
-            label4.Size = new Size(58, 38);
-            label4.TabIndex = 7;
-            label4.Text = "旋转";
-            // 
-            // label5
-            // 
-            label5.Location = new Point(266, 5);
-            label5.Name = "label5";
-            label5.Size = new Size(58, 36);
-            label5.TabIndex = 9;
-            label5.Text = "相机启用";
-            // 
-            // label6
-            // 
-            label6.Location = new Point(266, 47);
-            label6.Name = "label6";
-            label6.Size = new Size(58, 36);
-            label6.TabIndex = 11;
-            label6.Text = "保存原图";
-            // 
-            // switchSaveCamPic
-            // 
-            switchSaveCamPic.Location = new Point(330, 54);
-            switchSaveCamPic.Name = "switchSaveCamPic";
-            switchSaveCamPic.Size = new Size(57, 23);
-            switchSaveCamPic.TabIndex = 10;
-            switchSaveCamPic.Text = "switch2";
-            // 
-            // panel1
-            // 
-            panel1.BorderStyle = BorderStyle.FixedSingle;
-            panel1.Controls.Add(cbxCamName);
-            panel1.Controls.Add(label6);
-            panel1.Controls.Add(label1);
-            panel1.Controls.Add(switchSaveCamPic);
-            panel1.Controls.Add(switchCamEnable);
-            panel1.Controls.Add(label5);
-            panel1.Controls.Add(label2);
-            panel1.Controls.Add(numRotate);
-            panel1.Controls.Add(numExpose);
-            panel1.Controls.Add(label4);
-            panel1.Controls.Add(label3);
-            panel1.Controls.Add(numGain);
-            panel1.Dock = DockStyle.Fill;
-            panel1.Location = new Point(0, 0);
-            panel1.Name = "panel1";
-            panel1.Size = new Size(620, 201);
-            panel1.TabIndex = 12;
-            // 
-            // CameraConfigControl
-            // 
-            AutoScaleDimensions = new SizeF(7F, 17F);
-            AutoScaleMode = AutoScaleMode.Font;
-            Controls.Add(panel1);
-            Name = "CameraConfigControl";
-            Size = new Size(620, 201);
-            panel1.ResumeLayout(false);
-            ResumeLayout(false);
-        }
-
-        #endregion
-
-        private AntdUI.Label label1;
-        private ComboBox cbxCamName;
-        private AntdUI.Switch switchCamEnable;
-        private AntdUI.Label label2;
-        private AntdUI.InputNumber numExpose;
-        private AntdUI.InputNumber numGain;
-        private AntdUI.Label label3;
-        private AntdUI.InputNumber numRotate;
-        private AntdUI.Label label4;
-        private AntdUI.Label label5;
-        private AntdUI.Label label6;
-        private AntdUI.Switch switchSaveCamPic;
-        private Panel panel1;
-    }
-}

DHSoftware/Views/CameraConfigControl.cs

@@ -1,127 +0,0 @@
-using AntdUI;
-using DH.Commons.Base;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-
-namespace DHSoftware.Views
-{
-    public partial class CameraConfigControl : UserControl
-    {
-        public CameraConfigControl()
-        {
-            InitializeComponent();
-           // InitTableColumns();
-            InitData();
-        }
-        AntList<CameraBase> antList = null;
-        CameraBase curUser;
-        //private void InitTableColumns()
-        //{
-        //    table_base.Columns = new ColumnCollection() {
-        //        new ColumnCheck("Selected"){Fixed = true},
-        //        new Column("CameraName", "相机名", ColumnAlign.Center)
-        //        {
-        //            Width="120",
-        //            //设置树节点，名称需和User里的User[]名称保持一致
-        //            KeyTree = "Users"
-        //        },
-        //        new Column("CameraIP", "相机IP",ColumnAlign.Center),
-        //        new Column("Gain", "增益"){
-        //            Width = "120",
-        //            LineBreak = true,
-        //        },
-        //        new ColumnSwitch("IsHardwareTrigger", "硬触发", ColumnAlign.Center){
-                   
-        //        },
-        //        new Column("RotateImage", "旋转",ColumnAlign.Center),
-        //        new Column("Exposure", "曝光",ColumnAlign.Center),
-        //        //new Column("CellBadge", "徽标",ColumnAlign.Center),
-        //        //new Column("CellText", "富文本")
-        //        //{
-        //        //    ColAlign = ColumnAlign.Center,//支持表头位置单独设置
-        //        //},
-        //        //new Column("CellProgress", "进度条",ColumnAlign.Center),
-        //        //new Column("CellDivider", "分割线",ColumnAlign.Center),
-        //        //new Column("CellLinks", "链接", ColumnAlign.Center)
-        //        //{
-        //        //    Fixed = true,//冻结列
-        //        //},
-        //    };
-        //}
-        private void InitData()
-        {
-            antList = new AntList<CameraBase>();
-
-            for (int i = 0; i < 10; i++)
-            {
-                antList.Add(new CameraBase
-                {
-                    CameraName = "相机1",
-                    CameraIP = "",
-                    Gain = 6,
-                    IsHardwareTrigger = true,
-                    RotateImage = 50,
-                    Exposure = 100,
-                   
-                 
-                    //CellLinks = new CellLink[] {new CellLink("https://gitee.com/antdui/AntdUI", "AntdUI"),
-                    //new CellButton(Guid.NewGuid().ToString(),"编辑",TTypeMini.Primary),
-                    //new CellButton(Guid.NewGuid().ToString(), "徽标", TTypeMini.Success)
-                    //{
-                    //    //支持所有单元格控件
-                    //    DropDownItems = new ISelectItem[]
-                    //    {
-                    //         new AntdUI.SelectItem(TState.Default),
-                    //         new AntdUI.SelectItem(TState.Primary),
-                    //         new AntdUI.SelectItem(TState.Success),
-                    //         new AntdUI.SelectItem(TState.Error),
-                    //         new AntdUI.SelectItem(TState.Warn),
-                    //         new AntdUI.SelectItem(TState.Processing),
-
-                    //    },
-                    //    DropDownValueChanged = (value) =>
-                    //    {
-                    //        string badge = value.ToString();
-                    //        //switch(badge) {
-                    //        //case "Default":
-                    //        //        curUser.CellBadge = new CellBadge(TState.Default, badge); break;
-                    //        //case "Primary":
-                    //        //        curUser.CellBadge = new CellBadge(TState.Primary, badge); break;
-                    //        //case "Success":
-                    //        //        curUser.CellBadge = new CellBadge(TState.Success, badge); break;
-                    //        //case "Error":
-                    //        //        curUser.CellBadge = new CellBadge(TState.Error, badge); break;
-                    //        //case "Warn":
-                    //        //        curUser.CellBadge = new CellBadge(TState.Warn, badge); break;
-                    //        //case "Processing":
-                    //        //        curUser.CellBadge = new CellBadge(TState.Processing, badge); break;
-                    //        //}
-                    //    }
-                    //},
-                    //new CellButton(Guid.NewGuid().ToString(),"删除",TTypeMini.Error),
-                    //new CellButton(Guid.NewGuid().ToString(),"查看图片",TTypeMini.Primary)},
-                    //value:0-1
-                   // CellProgress = new CellProgress(0.5f),
-                   // CellDivider = new CellDivider(),
-                });
-            }
-
-          
-
-            //设置树数据，可为任意行设置
-
-           // antList[1].Users = subUsers.ToArray();
-           // table_base.Binding(antList);
-
-            //设置行禁用
-           // table_base.SetRowEnable(0, false, true);
-        }
-    }
-}

DHSoftware/Views/CameraConfigControl.resx

@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!--
-    Microsoft ResX Schema 
-
-    Version 2.0
-
-    The primary goals of this format is to allow a simple XML format
-    that is mostly human readable. The generation and parsing of the
-    various data types are done through the TypeConverter classes
-    associated with the data types.
-
-    Example:
-
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-
-    There are any number of "resheader" rows that contain simple
-    name/value pairs.
-
-    Each data row contains a name, and value. The row also contains a
-    type or mimetype. Type corresponds to a .NET class that support
-    text/value conversion through the TypeConverter architecture.
-    Classes that don't support this are serialized and stored with the
-    mimetype set.
-
-    The mimetype is used for serialized objects, and tells the
-    ResXResourceReader how to depersist the object. This is currently not
-    extensible. For a given mimetype the value must be set accordingly:
-
-    Note - application/x-microsoft.net.object.binary.base64 is the format
-    that the ResXResourceWriter will generate, however the reader can
-    read any of the formats listed below.
-
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-</root>

DHSoftware/Views/DetectConfigControl.Designer.cs

@@ -1,297 +0,0 @@
-namespace DHSoftware.Views
-{
-    partial class DetectConfigControl
-    {
-        /// <summary> 
-        /// 必需的设计器变量。
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary> 
-        /// 清理所有正在使用的资源。
-        /// </summary>
-        /// <param name="disposing">如果应释放托管资源，为 true；否则为 false。</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region 组件设计器生成的代码
-
-        /// <summary> 
-        /// 设计器支持所需的方法 - 不要修改
-        /// 使用代码编辑器修改此方法的内容。
-        /// </summary>
-        private void InitializeComponent()
-        {
-            panel1 = new Panel();
-            panel3 = new Panel();
-            label6 = new AntdUI.Label();
-            cbxDetectType = new AntdUI.Select();
-            label1 = new AntdUI.Label();
-            tbDetectName = new AntdUI.Input();
-            btnPreOpen = new AntdUI.Button();
-            tbModelpath = new AntdUI.Input();
-            button3 = new AntdUI.Button();
-            switchEnable = new AntdUI.Switch();
-            label8 = new AntdUI.Label();
-            label10 = new AntdUI.Label();
-            sthPic = new AntdUI.Switch();
-            sthSaveNGPic = new AntdUI.Switch();
-            label7 = new AntdUI.Label();
-            label9 = new AntdUI.Label();
-            swSaveOKPic = new AntdUI.Switch();
-            panel2 = new Panel();
-            label2 = new AntdUI.Label();
-            buttonDEL = new AntdUI.Button();
-            table_base = new AntdUI.Table();
-            buttonADD = new AntdUI.Button();
-            panel1.SuspendLayout();
-            panel3.SuspendLayout();
-            panel2.SuspendLayout();
-            SuspendLayout();
-            // 
-            // panel1
-            // 
-            panel1.BorderStyle = BorderStyle.FixedSingle;
-            panel1.Controls.Add(panel3);
-            panel1.Controls.Add(panel2);
-            panel1.Dock = DockStyle.Fill;
-            panel1.Location = new Point(0, 0);
-            panel1.Name = "panel1";
-            panel1.Size = new Size(600, 445);
-            panel1.TabIndex = 0;
-            // 
-            // panel3
-            // 
-            panel3.Controls.Add(label6);
-            panel3.Controls.Add(cbxDetectType);
-            panel3.Controls.Add(label1);
-            panel3.Controls.Add(tbDetectName);
-            panel3.Controls.Add(btnPreOpen);
-            panel3.Controls.Add(tbModelpath);
-            panel3.Controls.Add(button3);
-            panel3.Controls.Add(switchEnable);
-            panel3.Controls.Add(label8);
-            panel3.Controls.Add(label10);
-            panel3.Controls.Add(sthPic);
-            panel3.Controls.Add(sthSaveNGPic);
-            panel3.Controls.Add(label7);
-            panel3.Controls.Add(label9);
-            panel3.Controls.Add(swSaveOKPic);
-            panel3.Dock = DockStyle.Fill;
-            panel3.Location = new Point(0, 0);
-            panel3.Name = "panel3";
-            panel3.Size = new Size(598, 206);
-            panel3.TabIndex = 41;
-            // 
-            // label6
-            // 
-            label6.Location = new Point(3, 15);
-            label6.Name = "label6";
-            label6.Size = new Size(58, 23);
-            label6.TabIndex = 25;
-            label6.Text = "检测名称";
-            // 
-            // cbxDetectType
-            // 
-            cbxDetectType.Anchor = AnchorStyles.Top | AnchorStyles.Right;
-            cbxDetectType.Location = new Point(341, 7);
-            cbxDetectType.Name = "cbxDetectType";
-            cbxDetectType.Size = new Size(226, 31);
-            cbxDetectType.TabIndex = 40;
-            // 
-            // label1
-            // 
-            label1.Location = new Point(3, 44);
-            label1.Name = "label1";
-            label1.Size = new Size(73, 23);
-            label1.TabIndex = 9;
-            label1.Text = "模型路径";
-            // 
-            // tbDetectName
-            // 
-            tbDetectName.Location = new Point(82, 7);
-            tbDetectName.Name = "tbDetectName";
-            tbDetectName.Size = new Size(249, 31);
-            tbDetectName.TabIndex = 39;
-            // 
-            // btnPreOpen
-            // 
-            btnPreOpen.Anchor = AnchorStyles.Top | AnchorStyles.Right;
-            btnPreOpen.Location = new Point(507, 36);
-            btnPreOpen.MinimumSize = new Size(20, 0);
-            btnPreOpen.Name = "btnPreOpen";
-            btnPreOpen.Size = new Size(60, 31);
-            btnPreOpen.TabIndex = 22;
-            btnPreOpen.Text = "...";
-            // 
-            // tbModelpath
-            // 
-            tbModelpath.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
-            tbModelpath.Location = new Point(82, 36);
-            tbModelpath.Name = "tbModelpath";
-            tbModelpath.Size = new Size(415, 31);
-            tbModelpath.TabIndex = 38;
-            // 
-            // button3
-            // 
-            button3.Anchor = AnchorStyles.Top | AnchorStyles.Right;
-            button3.Location = new Point(385, 73);
-            button3.Name = "button3";
-            button3.Size = new Size(182, 34);
-            button3.TabIndex = 37;
-            button3.Text = "查看文件夹";
-            // 
-            // switchEnable
-            // 
-            switchEnable.Location = new Point(82, 84);
-            switchEnable.Name = "switchEnable";
-            switchEnable.Size = new Size(60, 23);
-            switchEnable.TabIndex = 27;
-            switchEnable.Text = "switch1";
-            // 
-            // label8
-            // 
-            label8.Location = new Point(3, 84);
-            label8.Name = "label8";
-            label8.Size = new Size(58, 23);
-            label8.TabIndex = 28;
-            label8.Text = "模型启用";
-            // 
-            // label10
-            // 
-            label10.Location = new Point(176, 113);
-            label10.Name = "label10";
-            label10.Size = new Size(73, 23);
-            label10.TabIndex = 34;
-            label10.Text = "保存NG原图";
-            // 
-            // sthPic
-            // 
-            sthPic.Location = new Point(263, 84);
-            sthPic.Name = "sthPic";
-            sthPic.Size = new Size(60, 23);
-            sthPic.TabIndex = 29;
-            sthPic.Text = "switch2";
-            // 
-            // sthSaveNGPic
-            // 
-            sthSaveNGPic.Location = new Point(263, 113);
-            sthSaveNGPic.Name = "sthSaveNGPic";
-            sthSaveNGPic.Size = new Size(60, 23);
-            sthSaveNGPic.TabIndex = 33;
-            sthSaveNGPic.Text = "switch4";
-            // 
-            // label7
-            // 
-            label7.Location = new Point(184, 84);
-            label7.Name = "label7";
-            label7.Size = new Size(58, 23);
-            label7.TabIndex = 30;
-            label7.Text = "数据保存";
-            // 
-            // label9
-            // 
-            label9.Location = new Point(3, 113);
-            label9.Name = "label9";
-            label9.Size = new Size(73, 23);
-            label9.TabIndex = 32;
-            label9.Text = "保存OK原图";
-            // 
-            // swSaveOKPic
-            // 
-            swSaveOKPic.Location = new Point(82, 113);
-            swSaveOKPic.Name = "swSaveOKPic";
-            swSaveOKPic.Size = new Size(60, 23);
-            swSaveOKPic.TabIndex = 31;
-            swSaveOKPic.Text = "switch3";
-            // 
-            // panel2
-            // 
-            panel2.Controls.Add(label2);
-            panel2.Controls.Add(buttonDEL);
-            panel2.Controls.Add(table_base);
-            panel2.Controls.Add(buttonADD);
-            panel2.Dock = DockStyle.Bottom;
-            panel2.Location = new Point(0, 206);
-            panel2.Name = "panel2";
-            panel2.Size = new Size(598, 237);
-            panel2.TabIndex = 35;
-            // 
-            // label2
-            // 
-            label2.Location = new Point(3, 3);
-            label2.Name = "label2";
-            label2.Size = new Size(58, 23);
-            label2.TabIndex = 29;
-            label2.Text = "模型参数";
-            // 
-            // buttonDEL
-            // 
-            buttonDEL.Location = new Point(93, 28);
-            buttonDEL.Name = "buttonDEL";
-            buttonDEL.Size = new Size(84, 34);
-            buttonDEL.TabIndex = 24;
-            buttonDEL.Text = "删除";
-            // 
-            // table_base
-            // 
-            table_base.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
-            table_base.Location = new Point(0, 68);
-            table_base.Name = "table_base";
-            table_base.Size = new Size(598, 169);
-            table_base.TabIndex = 22;
-            table_base.Text = "table1";
-            // 
-            // buttonADD
-            // 
-            buttonADD.Location = new Point(3, 28);
-            buttonADD.Name = "buttonADD";
-            buttonADD.Size = new Size(84, 34);
-            buttonADD.TabIndex = 23;
-            buttonADD.Text = "新增";
-            // 
-            // DetectConfigControl
-            // 
-            AutoScaleDimensions = new SizeF(7F, 17F);
-            AutoScaleMode = AutoScaleMode.Font;
-            Controls.Add(panel1);
-            Name = "DetectConfigControl";
-            Size = new Size(600, 445);
-            panel1.ResumeLayout(false);
-            panel3.ResumeLayout(false);
-            panel2.ResumeLayout(false);
-            ResumeLayout(false);
-        }
-
-        #endregion
-
-        private Panel panel1;
-        private AntdUI.Label label1;
-        private AntdUI.Label label6;
-        private AntdUI.Button btnPreOpen;
-        private AntdUI.Label label7;
-        private AntdUI.Switch sthPic;
-        private AntdUI.Label label8;
-        private AntdUI.Switch switchEnable;
-        private AntdUI.Label label10;
-        private AntdUI.Switch sthSaveNGPic;
-        private AntdUI.Label label9;
-        private AntdUI.Switch swSaveOKPic;
-        private Panel panel2;
-        private AntdUI.Button buttonDEL;
-        private AntdUI.Table table_base;
-        private AntdUI.Button buttonADD;
-        private AntdUI.Button button3;
-        private AntdUI.Input tbDetectName;
-        private AntdUI.Input tbModelpath;
-        private AntdUI.Label label2;
-        private AntdUI.Select cbxDetectType;
-        private Panel panel3;
-    }
-}

DHSoftware/Views/DetectConfigControl.cs

@@ -1,403 +0,0 @@
-using AntdUI;
-using AntdUIDemo.Views.Table;
-using DH.Commons.Enums;
-using DH.Devices.Vision;
-using DHSoftware.Models;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Data.Common;
-using System.Drawing;
-using System.Linq;
-using System.Reflection;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-using DH.Devices.Vision;
-using DH.Commons.Base;
-
-namespace DHSoftware.Views
-{
-    public partial class DetectConfigControl : UserControl
-    {
-
-        private DetectionConfig _currentConfig = new DetectionConfig();
-        private readonly string _configName;
-        List<KeyValuePair<string, int>> MLModelTypes = GetFilteredEnumDescriptionsAndValues<ModelType>();
-
-        public static List<KeyValuePair<string, int>> GetFilteredEnumDescriptionsAndValues<T>() where T : Enum
-        {
-            return Enum.GetValues(typeof(T))
-                .Cast<T>()
-                .Select(e =>
-                {
-                    // 获取枚举的 Description 属性，如果没有，则使用枚举的名称
-                    var description = e.GetType()
-                        .GetField(e.ToString())
-                        ?.GetCustomAttribute<DescriptionAttribute>()
-                        ?.Description ?? e.ToString();
-
-                    // 返回枚举的描述和对应的整数值
-                    return new KeyValuePair<string, int>(description, Convert.ToInt32(e));
-                })
-                .ToList();
-        }
-
-        List<KeyValuePair<string, int>> resultStates = GetFilteredEnumDescriptionsAndValues<ResultState>();
-        // 获取枚举的描述和对应的值，只筛选出 OK 和 NG
-        public static List<KeyValuePair<string, int>> GetFilteredEnumDescriptionsAndValuesres<T>() where T : Enum
-        {
-            return Enum.GetValues(typeof(T))
-                .Cast<T>()
-                .Where(e => e.Equals(ResultState.OK) || e.Equals(ResultState.DetectNG)) // 只保留 OK 和 NG
-                .Select(e =>
-                {
-                    // 通过反射获取 DescriptionAttribute 描述，如果没有描述，则使用枚举项名称
-                    var description = e.GetType()
-                        .GetField(e.ToString())
-                        ?.GetCustomAttribute<DescriptionAttribute>()
-                        ?.Description ?? e.ToString(); // 如果没有 DescriptionAttribute，则使用枚举名称
-
-                    // 返回描述和值的键值对
-                    return new KeyValuePair<string, int>(description, Convert.ToInt32(e));
-                })
-                .ToList();
-        }
-
-
-        DetectionConfig Detection = new DetectionConfig();
-        AntList<DefectRow> antList;
-        public AntdUI.Window _window;
-        DefectRow curUser;
-        public DetectConfigControl()
-        {
-            InitializeComponent();
-            InitTableColumns();
-            //InitData();
-            BindEventHandler();
-            foreach (var item in MLModelTypes)
-            {
-                cbxDetectType.Items.Add(item.Key);
-            }
-            cbxDetectType.SelectedIndex = (int)Detection.ModelType - 1;
-            tbDetectName.Text = Detection.Name;
-          
-        }
-
-        private void InitTableColumns()
-        {
-            table_base.Columns = new ColumnCollection() {
-                new ColumnCheck("Selected"){Fixed = true},
-                new Column("LabelDescription", "标签名", ColumnAlign.Center)
-                {
-                    Width="120",
-                    //设置树节点，名称需和User里的User[]名称保持一致
-                    KeyTree = "Users"
-                },
-                  new ColumnSwitch("IsEnable", "是否启用", ColumnAlign.Center){
-                    //支持点击回调
-                    //Call= (value,record, i_row, i_col) =>{
-                    //    //执行耗时操作
-                    //    Thread.Sleep(10);
-                    //   // AntdUI.Message.info(window, value.ToString(),autoClose:1);
-                    //    return value;
-                    //}
-                },
-                new Column("ScoreMinValue", "最小得分",ColumnAlign.Center),
-                new Column("ScoreMaxValue", "最大得分",ColumnAlign.Center),
-
-                new Column("AreaMinValue", "最小面积",ColumnAlign.Center),
-                new Column("AreaMaxValue", "最大面积",ColumnAlign.Center),
-                //new Column("CellBadge", "徽标",ColumnAlign.Center),
-                //new Column("CellText", "富文本")
-                //{
-                //    ColAlign = ColumnAlign.Center,//支持表头位置单独设置
-                //},
-                //new Column("CellProgress", "进度条",ColumnAlign.Center),
-                //new Column("CellDivider", "分割线",ColumnAlign.Center),
-                //new Column("CellLinks", "链接", ColumnAlign.Center)
-                //{
-                //    Fixed = true,//冻结列
-                //},
-            };
-        }
-
-        private void InitData()
-        {
-            antList = new AntList<DefectRow>();
-
-            for (int i = 0; i < 10; i++)
-            {
-                antList.Add(new DefectRow
-                {
-                    LabelDescription = "张三",
-
-                });
-            }
-
-           
-            table_base.Binding(antList);
-
-            //设置行禁用
-          //  table_base.SetRowEnable(0, false, true);
-        }
-
-
-        private void BindEventHandler()
-        {
-            buttonADD.Click += ButtonADD_Click;
-            buttonDEL.Click += ButtonDEL_Click;
-
-           
-            table_base.CellClick += Table_base_CellClick;
-            table_base.CellButtonClick += Table_base_CellButtonClick;
-        }
-
-      
-        private AntdUI.Table.CellStyleInfo Table_base_SetRowStyle(object sender, TableSetRowStyleEventArgs e)
-        {
-            if (e.RowIndex % 2 == 0)
-            {
-                return new AntdUI.Table.CellStyleInfo
-                {
-                    BackColor = AntdUI.Style.Db.ErrorBg,
-                };
-            }
-            return null;
-        }
-
-        private void ButtonADD_Click(object sender, EventArgs e)
-        {
-            DefectRow useradd = new DefectRow()
-            {
-                LabelDescription="xinquexian",
-                IsEnable=true,
-                ScoreMinValue=0.3,
-                ScoreMaxValue=1,
-                AreaMinValue=1,
-                AreaMaxValue=999999999,
-               
-            };
-            var form = new DefectRowEdit(_window, useradd) { Size = new Size(700, 500) };
-            AntdUI.Modal.open(new AntdUI.Modal.Config(_window, "", form, TType.None)
-            {
-                BtnHeight = 0,
-            });
-            if (form.submit)
-            {
-                antList.Add(useradd);
-            }
-
-        }
-
-        private void Table_base_CellClick(object sender, TableClickEventArgs e)
-        {
-            var record = e.Record;
-            if (record is DefectRow user)
-            {
-                curUser = user;
-                //判断是否右键
-                if (e.Button == MouseButtons.Right)
-                {
-                    if (antList.Count == 0) return;
-                    AntdUI.ContextMenuStrip.open(new AntdUI.ContextMenuStrip.Config(table_base,
-                    (item) =>
-                    {
-                        if (item.Text == "开启")
-                        {
-                            user.IsEnable = true;
-                        }
-                        else if (item.Text == "关闭")
-                        {
-                            user.IsEnable = false;
-                        }
-                        else if (item.Text == "编辑")
-                        {
-                            var form = new DefectRowEdit(_window, user) { Size = new Size(500, 300) };
-                            AntdUI.Drawer.open(new AntdUI.Drawer.Config(_window, form)
-                            {
-                                OnLoad = () =>
-                                {
-                                    AntdUI.Message.info(_window, "进入编辑", autoClose: 1);
-                                },
-                                OnClose = () =>
-                                {
-                                    AntdUI.Message.info(_window, "结束编辑", autoClose: 1);
-                                }
-                            });
-                        }
-                        else if (item.Text == "删除")
-                        {
-                            var result = Modal.open(_window, "删除警告！", "确认要删除选择的数据吗？", TType.Warn);
-                            if (result == DialogResult.OK)
-                            {
-                                //父元素没有勾选或者子元素也没有勾选，则删除当前行
-                                bool delCurrent = !antList.Any(x => x.Selected /*|| (x.?.Any(u => u.Selected) ?? false)*/);
-
-                                if (delCurrent)
-                                {
-                                    //删除当前行，先判断是否父元素，再判断是否子元素,只支持一层子元素，需实现嵌套查询
-                                    for (int i = 0; i < antList.Count; i++)
-                                    {
-                                        if (antList[i] == user)
-                                        {
-                                            antList.RemoveAt(i);
-                                        }
-                                        //else
-                                        //{
-                                        //    antList[i].Users = antList[i].Users?.Where(x => x != user).ToArray();
-                                        //}
-                                    }
-                                }
-                                else
-                                {
-                                    // 使用反转for循环删除主列表中选中的项
-                                    for (int i = antList.Count - 1; i >= 0; i--)
-                                    {
-                                        // 1.删除选中的主列表项
-                                        if (antList[i].Selected)
-                                        {
-                                            antList.RemoveAt(i);
-                                        }
-                                        //else
-                                        //{
-                                        //    // 删除子列表中选中的项
-                                        //    antList[i].Users = antList[i].Users?.Where(childUser => !childUser.Selected).ToArray();
-                                        //}
-                                    }
-                                }
-
-                            }
-                        }
-                        else if (item.Text == "查看图片")
-                        {
-                            //查看其他来源的高清图片
-                            Preview.open(new Preview.Config(_window, Properties.Resources.head2));
-                        }
-                        else
-                            AntdUI.Message.info(_window, item.Text, autoClose: 1);
-                    },
-                        new IContextMenuStripItem[] {
-                            //根据行数据动态修改右键菜单
-                            user.IsEnable?  new ContextMenuStripItem("关闭")
-                            {
-                                IconSvg = "CloseOutlined"
-                            }:new ContextMenuStripItem("开启")
-                            {
-                                IconSvg = "CheckOutlined"
-                            },
-                            new AntdUI.ContextMenuStripItem("编辑"){
-                                IconSvg = "EditOutlined",
-                            },
-                            new AntdUI.ContextMenuStripItem("删除"){
-                                IconSvg = "DeleteOutlined"
-                            },
-                            new ContextMenuStripItem("查看图片")
-                            {
-                                IconSvg = "FundViewOutlined"
-                            },
-                            new ContextMenuStripItemDivider(),
-                            new AntdUI.ContextMenuStripItem("详情"){
-                                Sub = new IContextMenuStripItem[]{ new AntdUI.ContextMenuStripItem("打印", "Ctrl + P") { },
-                                        new AntdUI.ContextMenuStripItem("另存为", "Ctrl + S") { } },
-                                IconSvg = "<svg t=\"1725101601993\" class=\"icon\" viewBox=\"0 0 1024 1024\" version=\"1.1\" xmlns=\"http://www.w3.org/2000/svg\" p-id=\"1414\" width=\"200\" height=\"200\"><path d=\"M450.23 831.7c-164.87 0-316.85-108.51-366.94-269.68-30.4-97.82-20.9-201.62 26.76-292.29s127.79-157.35 225.6-187.75c97.83-30.42 201.61-20.9 292.29 26.76 90.67 47.67 157.35 127.79 187.75 225.61 35.78 115.12 16.24 237.58-53.6 335.99a383.494 383.494 0 0 1-43 50.66c-15.04 14.89-39.34 14.78-54.23-0.29-14.9-15.05-14.77-39.34 0.29-54.23a307.844 307.844 0 0 0 34.39-40.52c55.9-78.76 71.54-176.75 42.92-268.84-50.21-161.54-222.49-252.1-384.03-201.9-78.26 24.32-142.35 77.67-180.48 150.2-38.14 72.53-45.74 155.57-21.42 233.83 44.58 143.44 190.03 234.7 338.26 212.42 20.98-3.14 40.48 11.26 43.64 32.2 3.16 20.95-11.26 40.48-32.2 43.64a377.753 377.753 0 0 1-56 4.19z\" p-id=\"1415\"></path><path d=\"M919.84 959.5c-9.81 0-19.63-3.74-27.11-11.24L666.75 722.29c-14.98-14.97-14.98-39.25 0-54.23 14.97-14.98 39.26-14.98 54.23 0l225.97 225.97c14.98 14.97 14.98 39.25 0 54.23-7.48 7.5-17.3 11.24-27.11 11.24z\" p-id=\"1416\"></path></svg>",
-                            }
-                        }));
-                }
-                else
-                {
-
-                }
-            }
-        }
-
-        //表格内部按钮事件
-        private void Table_base_CellButtonClick(object sender, TableButtonEventArgs e)
-        {
-            var buttontext = e.Btn.Text;
-
-            if (e.Record is DefectRow user)
-            {
-                curUser = user;
-                switch (buttontext)
-                {
-                    //暂不支持进入整行编辑，只支持指定单元格编辑，推荐使用弹窗或抽屉编辑整行数据
-                    case "编辑":
-                        var form = new DefectRowEdit(_window, user) { Size = new Size(500, 300) };
-                        AntdUI.Drawer.open(new AntdUI.Drawer.Config(_window, form)
-                        {
-                            OnLoad = () =>
-                            {
-                                AntdUI.Message.info(_window, "进入编辑", autoClose: 1);
-                            },
-                            OnClose = () =>
-                            {
-                                AntdUI.Message.info(_window, "结束编辑", autoClose: 1);
-                            }
-                        });
-                        break;
-                    case "删除":
-                        var result = Modal.open(_window, "删除警告！", "确认要删除选择的数据吗？", TType.Warn);
-                        if (result == DialogResult.OK)
-                            antList.Remove(user);
-                        break;
-                    case "AntdUI":
-                        //超链接内容
-                       // AntdUI.Message.info(_window, user.CellLinks.FirstOrDefault().Id, autoClose: 1);
-                        break;
-                    case "查看图片":
-                        //使用clone可以防止table中的image被修改
-                       // Preview.open(new Preview.Config(window, (Image)curUser.CellImages[0].Image.Clone()));
-                        break;
-                }
-            }
-        }
-
-        private void ButtonDEL_Click(object sender, EventArgs e)
-        {
-            if (antList.Count == 0 || !antList.Any(x => x.Selected))
-            {
-                bool isSubSelected = false;
-                //// 判断子元素是否勾选
-                //for (int i = 0; i < antList.Count; i++)
-                //{
-                //    if (antList[i].Users != null && antList[i].Users.Any(x => x.Selected))
-                //    {
-                //        isSubSelected = true;
-                //        break;
-                //    }
-                //}
-                if (!isSubSelected)
-                {
-                    AntdUI.Message.warn(_window, "请选择要删除的行！", autoClose: 3);
-                    return;
-                }
-            }
-
-            var result = Modal.open(_window, "删除警告！", "确认要删除选择的数据吗？", TType.Warn);
-            if (result == DialogResult.OK)
-            {
-                // 使用反转for循环删除主列表中选中的项
-                for (int i = antList.Count - 1; i >= 0; i--)
-                {
-                    // 删除选中的主列表项
-                    if (antList[i].Selected)
-                    {
-                        antList.RemoveAt(i);
-                    }
-                    else
-                    {
-                        // 删除子列表中选中的项
-                       // antList[i].Users = antList[i].Users?.Where(user => !user.Selected).ToArray();
-                    }
-                }
-                // 提示删除完成
-                // AntdUI.Message.success(this.w, "删除成功！", autoClose: 3);
-                MessageBox.Show("删除成功！");
-            }
-        }
-
-
-    }
-}

DHSoftware/Views/LoginWindow.cs

@@ -9,10 +9,32 @@ namespace DHSoftware
         public LoginWindow()
         {
             InitializeComponent();
+            // 关键设置：允许窗体优先接收按键事件
+            this.KeyPreview = true;
+
+            // 绑定按键事件
+            this.KeyDown += Login_KeyDown;
             button_ok.Click += Button_ok_Click;
             button_cancel.Click += Button_cancel_Click;
         }
 
+        private void Login_KeyDown(object? sender, KeyEventArgs e)
+        {
+            // 监听回车键
+            if (e.KeyCode == Keys.Enter)
+            {
+                button_ok.PerformClick(); // 触发确定按钮的点击事件
+                e.Handled = true;      // 阻止其他控件处理该按键
+            }
+
+            // 监听 ESC 键
+            if (e.KeyCode == Keys.Escape)
+            {
+                button_cancel.PerformClick(); // 触发取消按钮的点击事件
+                e.Handled = true;
+            }
+        }
+
         /// <summary>
         /// 窗体对象实例
         /// </summary>

DHSoftware/Views/MainWindow.Designer.cs

@@ -28,8 +28,8 @@
         /// </summary>
         private void InitializeComponent()
         {
-            AntdUI.Tabs.StyleCard styleCard3 = new AntdUI.Tabs.StyleCard();
-            AntdUI.Tabs.StyleCard styleCard4 = new AntdUI.Tabs.StyleCard();
+            AntdUI.Tabs.StyleLine styleLine2 = new AntdUI.Tabs.StyleLine();
+            AntdUI.Tabs.StyleCard styleCard2 = new AntdUI.Tabs.StyleCard();
             AntdUI.SegmentedItem segmentedItem6 = new AntdUI.SegmentedItem();
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MainWindow));
             AntdUI.SegmentedItem segmentedItem7 = new AntdUI.SegmentedItem();
@@ -38,19 +38,37 @@
             AntdUI.SegmentedItem segmentedItem10 = new AntdUI.SegmentedItem();
             titlebar = new AntdUI.PageHeader();
             lbName = new AntdUI.Label();
+            tabsStas = new AntdUI.Tabs();
+            tabPage3 = new AntdUI.TabPage();
+            panel7 = new Panel();
+            panel5 = new Panel();
+            lblNowtime = new Label();
+            label8 = new Label();
+            lblstarttime = new Label();
+            label6 = new Label();
+            lblUPH = new Label();
+            label4 = new Label();
+            lblNum = new Label();
+            label2 = new Label();
             pageHeader1 = new AntdUI.PageHeader();
+            lbInBackend = new AntdUI.Label();
             labuph = new Label();
             divider2 = new AntdUI.Divider();
+            tabMain = new AntdUI.TabPage();
             panelmain = new AntdUI.Panel();
             panel2 = new AntdUI.Panel();
-            panel4 = new AntdUI.Panel();
-            panel6 = new AntdUI.Panel();
-            splitContainer1 = new SplitContainer();
-            splitContainer2 = new SplitContainer();
             tabImgDisplay = new AntdUI.Tabs();
+            panel4 = new AntdUI.Panel();
             richTextBox1 = new RichTextBox();
-            tabsConfig = new AntdUI.Tabs();
-            tabPage2 = new AntdUI.TabPage();
+            panel6 = new AntdUI.Panel();
+            lblNum2 = new Label();
+            label12 = new Label();
+            lblNowtime2 = new Label();
+            label10 = new Label();
+            lblstarttime2 = new Label();
+            label7 = new Label();
+            lblUPH2 = new Label();
+            label1 = new Label();
             panel1 = new AntdUI.Panel();
             panel3 = new AntdUI.Panel();
             btnDeleteProject = new AntdUI.Button();
@@ -59,20 +77,14 @@
             sltProjects = new AntdUI.Select();
             segmented1 = new AntdUI.Segmented();
             titlebar.SuspendLayout();
+            tabsStas.SuspendLayout();
+            tabPage3.SuspendLayout();
+            panel5.SuspendLayout();
             pageHeader1.SuspendLayout();
             panelmain.SuspendLayout();
             panel2.SuspendLayout();
             panel4.SuspendLayout();
             panel6.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)splitContainer1).BeginInit();
-            splitContainer1.Panel1.SuspendLayout();
-            splitContainer1.Panel2.SuspendLayout();
-            splitContainer1.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)splitContainer2).BeginInit();
-            splitContainer2.Panel1.SuspendLayout();
-            splitContainer2.Panel2.SuspendLayout();
-            splitContainer2.SuspendLayout();
-            tabsConfig.SuspendLayout();
             panel1.SuspendLayout();
             panel3.SuspendLayout();
             SuspendLayout();
@@ -107,8 +119,126 @@
             lbName.Text = "";
             lbName.TextAlign = ContentAlignment.MiddleRight;
             // 
+            // tabsStas
+            // 
+            tabsStas.Dock = DockStyle.Fill;
+            tabsStas.Location = new Point(0, 0);
+            tabsStas.Name = "tabsStas";
+            tabsStas.Pages.Add(tabPage3);
+            tabsStas.Size = new Size(580, 176);
+            tabsStas.Style = styleLine2;
+            tabsStas.TabIndex = 3;
+            tabsStas.Text = "tabs3";
+            // 
+            // tabPage3
+            // 
+            tabPage3.Controls.Add(panel7);
+            tabPage3.Controls.Add(panel5);
+            tabPage3.Location = new Point(3, 3);
+            tabPage3.Name = "tabPage3";
+            tabPage3.Size = new Size(574, 170);
+            tabPage3.TabIndex = 0;
+            tabPage3.Text = "日志";
+            // 
+            // panel7
+            // 
+            panel7.Dock = DockStyle.Fill;
+            panel7.Location = new Point(0, 0);
+            panel7.Name = "panel7";
+            panel7.Size = new Size(374, 170);
+            panel7.TabIndex = 2;
+            // 
+            // panel5
+            // 
+            panel5.Controls.Add(lblNowtime);
+            panel5.Controls.Add(label8);
+            panel5.Controls.Add(lblstarttime);
+            panel5.Controls.Add(label6);
+            panel5.Controls.Add(lblUPH);
+            panel5.Controls.Add(label4);
+            panel5.Controls.Add(lblNum);
+            panel5.Controls.Add(label2);
+            panel5.Dock = DockStyle.Right;
+            panel5.Location = new Point(374, 0);
+            panel5.Name = "panel5";
+            panel5.Size = new Size(200, 170);
+            panel5.TabIndex = 1;
+            // 
+            // lblNowtime
+            // 
+            lblNowtime.AutoSize = true;
+            lblNowtime.Location = new Point(69, 41);
+            lblNowtime.Name = "lblNowtime";
+            lblNowtime.Size = new Size(15, 17);
+            lblNowtime.TabIndex = 7;
+            lblNowtime.Text = "0";
+            // 
+            // label8
+            // 
+            label8.AutoSize = true;
+            label8.Location = new Point(7, 41);
+            label8.Name = "label8";
+            label8.Size = new Size(56, 17);
+            label8.TabIndex = 6;
+            label8.Text = "此刻时间";
+            // 
+            // lblstarttime
+            // 
+            lblstarttime.AutoSize = true;
+            lblstarttime.Location = new Point(69, 15);
+            lblstarttime.Name = "lblstarttime";
+            lblstarttime.Size = new Size(15, 17);
+            lblstarttime.TabIndex = 5;
+            lblstarttime.Text = "0";
+            // 
+            // label6
+            // 
+            label6.AutoSize = true;
+            label6.Location = new Point(7, 15);
+            label6.Name = "label6";
+            label6.Size = new Size(56, 17);
+            label6.TabIndex = 4;
+            label6.Text = "开始时间";
+            // 
+            // lblUPH
+            // 
+            lblUPH.AutoSize = true;
+            lblUPH.Location = new Point(70, 105);
+            lblUPH.Name = "lblUPH";
+            lblUPH.Size = new Size(15, 17);
+            lblUPH.TabIndex = 3;
+            lblUPH.Text = "0";
+            // 
+            // label4
+            // 
+            label4.AutoSize = true;
+            label4.Location = new Point(7, 105);
+            label4.Name = "label4";
+            label4.Size = new Size(33, 17);
+            label4.TabIndex = 2;
+            label4.Text = "UPH";
+            // 
+            // lblNum
+            // 
+            lblNum.AutoSize = true;
+            lblNum.Location = new Point(70, 75);
+            lblNum.Name = "lblNum";
+            lblNum.Size = new Size(15, 17);
+            lblNum.TabIndex = 1;
+            lblNum.Text = "0";
+            // 
+            // label2
+            // 
+            label2.AutoSize = true;
+            label2.Location = new Point(7, 75);
+            label2.Name = "label2";
+            label2.Size = new Size(32, 17);
+            label2.TabIndex = 0;
+            label2.Text = "总数";
+            // 
             // pageHeader1
             // 
+            pageHeader1.Controls.Add(lbInBackend);
             pageHeader1.Controls.Add(labuph);
             pageHeader1.Controls.Add(divider2);
             pageHeader1.DividerShow = true;
@@ -120,6 +250,17 @@
             pageHeader1.TabIndex = 7;
             pageHeader1.Text = "UPH";
             // 
+            // lbInBackend
+            // 
+            lbInBackend.BackColor = Color.Transparent;
+            lbInBackend.Dock = DockStyle.Right;
+            lbInBackend.ForeColor = Color.FromArgb(46, 108, 227);
+            lbInBackend.Location = new Point(949, 10);
+            lbInBackend.Name = "lbInBackend";
+            lbInBackend.Size = new Size(75, 30);
+            lbInBackend.TabIndex = 2;
+            lbInBackend.Text = "系统后台";
+            // 
             // labuph
             // 
             labuph.AutoSize = true;
@@ -139,9 +280,18 @@
             divider2.TabIndex = 0;
             divider2.Text = "";
             // 
+            // tabMain
+            // 
+            tabMain.Location = new Point(3, 28);
+            tabMain.Name = "tabMain";
+            tabMain.Size = new Size(574, 289);
+            tabMain.TabIndex = 0;
+            tabMain.Text = "检测";
+            // 
             // panelmain
             // 
             panelmain.Controls.Add(panel2);
+            panelmain.Controls.Add(panel4);
             panelmain.Controls.Add(panel1);
             panelmain.Dock = DockStyle.Fill;
             panelmain.Location = new Point(0, 40);
@@ -152,110 +302,132 @@
             // 
             // panel2
             // 
-            panel2.Controls.Add(panel4);
+            panel2.Controls.Add(tabImgDisplay);
             panel2.Dock = DockStyle.Fill;
             panel2.Location = new Point(0, 68);
             panel2.Name = "panel2";
-            panel2.Size = new Size(1024, 500);
-            panel2.TabIndex = 1;
+            panel2.Size = new Size(1024, 388);
+            panel2.TabIndex = 3;
             panel2.Text = "panel2";
             // 
-            // panel4
-            // 
-            panel4.Controls.Add(panel6);
-            panel4.Dock = DockStyle.Fill;
-            panel4.Location = new Point(0, 0);
-            panel4.Name = "panel4";
-            panel4.Size = new Size(1024, 500);
-            panel4.TabIndex = 1;
-            panel4.Text = "panel4";
-            // 
-            // panel6
-            // 
-            panel6.Controls.Add(splitContainer1);
-            panel6.Dock = DockStyle.Fill;
-            panel6.Location = new Point(0, 0);
-            panel6.Name = "panel6";
-            panel6.Size = new Size(1024, 500);
-            panel6.TabIndex = 1;
-            panel6.Text = "panel6";
-            // 
-            // splitContainer1
-            // 
-            splitContainer1.BackColor = SystemColors.Control;
-            splitContainer1.Dock = DockStyle.Fill;
-            splitContainer1.Location = new Point(0, 0);
-            splitContainer1.Name = "splitContainer1";
-            // 
-            // splitContainer1.Panel1
-            // 
-            splitContainer1.Panel1.Controls.Add(splitContainer2);
-            // 
-            // splitContainer1.Panel2
-            // 
-            splitContainer1.Panel2.BackColor = SystemColors.ButtonFace;
-            splitContainer1.Panel2.Controls.Add(tabsConfig);
-            splitContainer1.Size = new Size(1024, 500);
-            splitContainer1.SplitterDistance = 606;
-            splitContainer1.SplitterIncrement = 2;
-            splitContainer1.SplitterWidth = 10;
-            splitContainer1.TabIndex = 0;
-            // 
-            // splitContainer2
-            // 
-            splitContainer2.Dock = DockStyle.Fill;
-            splitContainer2.Location = new Point(0, 0);
-            splitContainer2.Name = "splitContainer2";
-            splitContainer2.Orientation = Orientation.Horizontal;
-            // 
-            // splitContainer2.Panel1
-            // 
-            splitContainer2.Panel1.Controls.Add(tabImgDisplay);
-            // 
-            // splitContainer2.Panel2
-            // 
-            splitContainer2.Panel2.Controls.Add(richTextBox1);
-            splitContainer2.Size = new Size(606, 500);
-            splitContainer2.SplitterDistance = 320;
-            splitContainer2.TabIndex = 0;
-            // 
             // tabImgDisplay
             // 
             tabImgDisplay.Dock = DockStyle.Fill;
             tabImgDisplay.Location = new Point(0, 0);
             tabImgDisplay.Name = "tabImgDisplay";
-            tabImgDisplay.Size = new Size(606, 320);
-            tabImgDisplay.Style = styleCard3;
-            tabImgDisplay.TabIndex = 1;
+            tabImgDisplay.Size = new Size(1024, 388);
+            tabImgDisplay.Style = styleCard2;
+            tabImgDisplay.TabIndex = 3;
             tabImgDisplay.Text = "tabs1";
             // 
+            // panel4
+            // 
+            panel4.Controls.Add(richTextBox1);
+            panel4.Controls.Add(panel6);
+            panel4.Dock = DockStyle.Bottom;
+            panel4.Location = new Point(0, 456);
+            panel4.Name = "panel4";
+            panel4.Size = new Size(1024, 112);
+            panel4.TabIndex = 2;
+            panel4.Text = "panel4";
+            // 
             // richTextBox1
             // 
             richTextBox1.Dock = DockStyle.Fill;
             richTextBox1.Location = new Point(0, 0);
             richTextBox1.Name = "richTextBox1";
-            richTextBox1.Size = new Size(606, 176);
-            richTextBox1.TabIndex = 0;
+            richTextBox1.Size = new Size(719, 112);
+            richTextBox1.TabIndex = 1;
             richTextBox1.Text = "";
             // 
-            // tabsConfig
+            // panel6
             // 
-            tabsConfig.Dock = DockStyle.Fill;
-            tabsConfig.Location = new Point(0, 0);
-            tabsConfig.Name = "tabsConfig";
-            tabsConfig.Pages.Add(tabPage2);
-            tabsConfig.Size = new Size(408, 500);
-            tabsConfig.Style = styleCard4;
-            tabsConfig.TabIndex = 2;
-            tabsConfig.Text = "tabs2";
+            panel6.Controls.Add(lblNum2);
+            panel6.Controls.Add(label12);
+            panel6.Controls.Add(lblNowtime2);
+            panel6.Controls.Add(label10);
+            panel6.Controls.Add(lblstarttime2);
+            panel6.Controls.Add(label7);
+            panel6.Controls.Add(lblUPH2);
+            panel6.Controls.Add(label1);
+            panel6.Dock = DockStyle.Right;
+            panel6.Location = new Point(719, 0);
+            panel6.Name = "panel6";
+            panel6.Size = new Size(305, 112);
+            panel6.TabIndex = 0;
+            panel6.Text = "panel6";
             // 
-            // tabPage2
+            // lblNum2
             // 
-            tabPage2.Location = new Point(3, 28);
-            tabPage2.Name = "tabPage2";
-            tabPage2.Size = new Size(402, 469);
-            tabPage2.TabIndex = 0;
-            tabPage2.Text = "配置";
+            lblNum2.AutoSize = true;
+            lblNum2.Location = new Point(68, 92);
+            lblNum2.Name = "lblNum2";
+            lblNum2.Size = new Size(15, 17);
+            lblNum2.TabIndex = 7;
+            lblNum2.Text = "0";
+            // 
+            // label12
+            // 
+            label12.AutoSize = true;
+            label12.Location = new Point(6, 92);
+            label12.Name = "label12";
+            label12.Size = new Size(44, 17);
+            label12.TabIndex = 6;
+            label12.Text = "总计数";
+            // 
+            // lblNowtime2
+            // 
+            lblNowtime2.AutoSize = true;
+            lblNowtime2.Location = new Point(68, 68);
+            lblNowtime2.Name = "lblNowtime2";
+            lblNowtime2.Size = new Size(15, 17);
+            lblNowtime2.TabIndex = 5;
+            lblNowtime2.Text = "0";
+            // 
+            // label10
+            // 
+            label10.AutoSize = true;
+            label10.Location = new Point(6, 68);
+            label10.Name = "label10";
+            label10.Size = new Size(56, 17);
+            label10.TabIndex = 4;
+            label10.Text = "运行时间";
+            // 
+            // lblstarttime2
+            // 
+            lblstarttime2.AutoSize = true;
+            lblstarttime2.Location = new Point(68, 37);
+            lblstarttime2.Name = "lblstarttime2";
+            lblstarttime2.Size = new Size(15, 17);
+            lblstarttime2.TabIndex = 3;
+            lblstarttime2.Text = "0";
+            // 
+            // label7
+            // 
+            label7.AutoSize = true;
+            label7.Location = new Point(6, 37);
+            label7.Name = "label7";
+            label7.Size = new Size(56, 17);
+            label7.TabIndex = 2;
+            label7.Text = "开始时间";
+            // 
+            // lblUPH2
+            // 
+            lblUPH2.AutoSize = true;
+            lblUPH2.Location = new Point(68, 11);
+            lblUPH2.Name = "lblUPH2";
+            lblUPH2.Size = new Size(15, 17);
+            lblUPH2.TabIndex = 1;
+            lblUPH2.Text = "0";
+            // 
+            // label1
+            // 
+            label1.AutoSize = true;
+            label1.Location = new Point(6, 11);
+            label1.Name = "label1";
+            label1.Size = new Size(33, 17);
+            label1.TabIndex = 0;
+            label1.Text = "UPH";
             // 
             // panel1
             // 
@@ -417,21 +589,17 @@
             FormClosing += MainWindow_FormClosing;
             Load += MainWindow_Load;
             titlebar.ResumeLayout(false);
+            tabsStas.ResumeLayout(false);
+            tabPage3.ResumeLayout(false);
+            panel5.ResumeLayout(false);
+            panel5.PerformLayout();
             pageHeader1.ResumeLayout(false);
             pageHeader1.PerformLayout();
             panelmain.ResumeLayout(false);
             panel2.ResumeLayout(false);
             panel4.ResumeLayout(false);
             panel6.ResumeLayout(false);
-            splitContainer1.Panel1.ResumeLayout(false);
-            splitContainer1.Panel2.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)splitContainer1).EndInit();
-            splitContainer1.ResumeLayout(false);
-            splitContainer2.Panel1.ResumeLayout(false);
-            splitContainer2.Panel2.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)splitContainer2).EndInit();
-            splitContainer2.ResumeLayout(false);
-            tabsConfig.ResumeLayout(false);
+            panel6.PerformLayout();
             panel1.ResumeLayout(false);
             panel3.ResumeLayout(false);
             ResumeLayout(false);
@@ -445,22 +613,41 @@
         private AntdUI.Panel panelmain;
         private AntdUI.Panel panel1;
         private AntdUI.Segmented segmented1;
-        private AntdUI.Panel panel2;
-        private AntdUI.Panel panel4;
-        private AntdUI.Panel panel6;
         private Label labuph;
         private AntdUI.Splitter splitter1;
-        private SplitContainer splitContainer1;
-        private SplitContainer splitContainer2;
-        private AntdUI.Tabs tabImgDisplay;
-        private AntdUI.Tabs tabsConfig;
-        private AntdUI.TabPage tabPage2;
+
         private AntdUI.Label lbName;
         private AntdUI.Panel panel3;
         private AntdUI.Button btnDeleteProject;
         private AntdUI.Button btnAddProject;
         private AntdUI.Button btnLoadProject;
         public AntdUI.Select sltProjects;
+        private Panel panel7;
+        private Panel panel5;
+        private Label lblNum;
+        private Label label2;
+        private Label lblNowtime;
+        private Label label8;
+        private Label lblstarttime;
+        private Label label6;
+        private Label lblUPH;
+        private Label label4;
+        private AntdUI.TabPage tabPage3;
+        private AntdUI.TabPage tabMain;
+        private AntdUI.Tabs tabsStas;
+        private Label label1;
+        private AntdUI.Panel panel2;
+        private AntdUI.Panel panel4;
+        private AntdUI.Tabs tabImgDisplay;
         private RichTextBox richTextBox1;
+        private AntdUI.Panel panel6;
+        private Label lblUPH2;
+        private Label lblNum2;
+        private Label label12;
+        private Label lblNowtime2;
+        private Label label10;
+        private Label lblstarttime2;
+        private Label label7;
+        private AntdUI.Label lbInBackend;
     }
 }

DHSoftware/Views/MainWindow.cs

@@ -16,6 +16,7 @@ using DVPCameraType;
 using HalconDotNet;
 using Microsoft.Win32;
 using OpenCvSharp;
+using SqlSugar;
 using System;
 using System.CodeDom;
 using System.Collections.Concurrent;
@@ -291,7 +292,7 @@ namespace DHSoftware
                 for (int i = 0; i < ConfigModel.PLCBaseList.Count; i++)
                 {
                     var plcBase = ConfigModel.PLCBaseList[i];
-                    if (plcBase.PLCType == EnumPLCType.信捷XC网口)
+                    if (plcBase.PLCType == EnumPLCType.信捷XC网口 || plcBase.PLCType == EnumPLCType.信捷XD网口)
                     {
                         PLC.IP = plcBase.IP;
                         PLC.PLCType = plcBase.PLCType;
@@ -322,10 +323,10 @@ namespace DHSoftware
                     detectionConfig.ModelHeight = detection.ModelHeight;
                     detectionConfig.In_lable_path = detection.In_lable_path;
                     detectionConfig.IsEnabled = detection.IsEnabled;
-                    detectionConfig.ShowLocation.X = (i + 1) % 5+ (i + 1) / 5;
-                  //  detectionConfig.ShowLocation.X = detection.ShowLocation.X;
-                    detectionConfig.ShowLocation.Y = (i + 1) / 5+1;
-                   // detectionConfig.ShowLocation.Y = detection.ShowLocation.Y;
+                    detectionConfig.ShowLocation.X = (i + 1) % 5 + (i + 1) / 5;
+                    //  detectionConfig.ShowLocation.X = detection.ShowLocation.X;
+                    detectionConfig.ShowLocation.Y = (i + 1) / 5 + 1;
+                    // detectionConfig.ShowLocation.Y = detection.ShowLocation.Y;
                     DetectionConfigs.Add(detectionConfig);
                 }
             }
@@ -366,6 +367,12 @@ namespace DHSoftware
             btnAddProject.Click += BtnAddProject_Click;
             btnDeleteProject.Click += BtnDeleteProject_Click;
             btnLoadProject.Click += BtnLoadProject_Click;
+            lbInBackend.Click += LbInBackend_Click;
+        }
+
+        private void LbInBackend_Click(object? sender, EventArgs e)
+        {
+            RBACWindow.Instance.Show();
         }
 
         private void BtnDeleteProject_Click(object? sender, EventArgs e)
@@ -512,7 +519,11 @@ namespace DHSoftware
                 {
                     camera.CameraDisConnect();
                 }
-                PLC.PLCDisConnect();
+                if (PLC != null)
+                {
+                    PLC.CloseProcess();
+                }
+                _visionEngine.Stop();//释放模型
                 CloseWindow.Instance.Close();// 关闭提示窗口
                                              //Application.Exit();
                 System.Environment.Exit(0);
@@ -570,26 +581,25 @@ namespace DHSoftware
         private List<SimboStationMLEngineSet> SimboStationMLEngineList = new List<SimboStationMLEngineSet>();
         private Dictionary<string, HDevEngineTool> HalconToolDict = new Dictionary<string, HDevEngineTool>();
         public List<RecongnitionLabel> RecongnitionLabelList { get; set; } = new List<RecongnitionLabel>();
-        public DateTime startTime;
+        public DateTime ProcessstartTime;
 
         private void HandleStartButton()
         {
             StartProcess();
         }
 
-        private static int currentRegister = 411;  // 初始为 D411
+
 
         private void StartProcess()
         {
-            startTime= DateTime.Now;
+            ProcessstartTime = DateTime.Now;
+            lblstarttime2.Text = ProcessstartTime.ToString("yyyy-MM-dd HH:mm:ss");
             //计数清零
             PieceCount = 0;
-            //吹气点位归置
-            currentRegister = 411;
-            
+
+            Thread.Sleep(100);
             if (PLC?.Enable == true)
             {
-                PLC.CountToZero();
                 PLC.OnNewPieces -= MainMotion_NewPieces;
                 PLC.OnNewPieces += MainMotion_NewPieces;
             }
@@ -601,7 +611,18 @@ namespace DHSoftware
                     cam.SnapshotCount = 0;
                 }
             });
-
+            Cameras.ForEach(d => {
+                if (d is CameraBase cam)
+                {
+                    cam.SnapshotCount = 0;
+                }
+            });
+            HKCameras.ForEach(d => {
+                if (d is CameraBase cam)
+                {
+                    cam.SnapshotCount = 0;
+                }
+            });
             //PrepareBatchNO();
             // isInPositionChecking = false;
             //isFullTrayChecking = false;
@@ -685,404 +706,20 @@ namespace DHSoftware
 
             //   ProductBaseCount = _MGSCameraList.Count;
 
-            for (int i = 0; i < ProductBaseCount * ProductListMulti; i++)
-            {
-                ConcurrentDictionary<uint, ProductData> products = new ConcurrentDictionary<uint, ProductData>();
-                _productLists.Add(products);
-            }
+         
 
-            // 转盘操作
-            // if (_PLC?.IIConfig?.IsEnabled == true)
+            //流程执行时PLC
+            PLC.StartProcess();
 
-            //   _PLC.TurntableOpen(XKRSPLCConfig.TurnSpeed, XKRSPLCConfig.TurnDirection);
-            PLCItem itemSpeed = PLC.PLCItemList.FirstOrDefault(u => u.Name == "转盘速度");
-            if (itemSpeed != null)
-            {
-                PLC.TurntableOpen();
-            }
 
-            Thread.Sleep(500);
 
-            //振动盘
-            //if (XKRSPLCConfig.IsEnableVibratory)
-            //{
-            //    if (_PLC.IIConfig.IsEnabled)
-            //        _PLC.Vibratory(true);
-            //}
 
-            //InitialOEEStatistic();
-
-            // MachineState = MachineState.Running;
         }
 
-        private void PrepareMLEngine()
-        {
-            //if (_visionEngine == null)
-            //{
-            //    _visionEngine = DeviceCollection.FirstOrDefault(u => u is VisionEngineBase) as VisionEngineBase;
-            //}
-
-            //if (_visionEngine == null)
-            //{
-            //    throw new ProcessException($"未能获取检测设备");
-            //}
-
-            //相机模组
-            //_cameraRelatedDetectionDict = new();
-
-            //detectionList.ForEach(detection =>
-            //{
-            //    detection.CameraCollects.ForEach(cam =>
-            //    {
-            //        List<string> Dets = new List<string>
-            //        {
-            //            detection.Id
-            //        };
-            //        if (!_cameraRelatedDetectionDict.ContainsKey(cam.CameraSourceId))
-            //        {
-            //            _cameraRelatedDetectionDict.Add(cam.CameraSourceId, Dets);
-            //        }
-            //        else
-            //        {
-            //            _cameraRelatedDetectionDict[cam.CameraSourceId].Add(detection.Id);
-            //        }
-
-            //    });
-            //});
-
-            //_visionEngine.OnDetectionWarningStop += VisionEngine_OnDetectionWarningStopAsync;
-        }
-
-#if false
-        private void HandleStartButton2()
-        {
-            CurrentMachine = true;
-
-            //_visionEngine.Start();
-            //[Category("深度学习检测配置")]
-            //[DisplayName("检测标签定义集合")]
-            //[Description("定义检测标签的集合，例如：Seg/Detection模式：断裂、油污、划伤...；Class模式：ok、ng、上面、下面、套环、正常...")]
-            //[TypeConverter(typeof(CollectionCountConvert))]
-            //[Editor(typeof(ComplexCollectionEditor<RecongnitionLabel>), typeof(UITypeEditor))]
-            RecongnitionLabel recongnition = new RecongnitionLabel
-            {
-                LabelName = "youwu",
-                LabelDescription = "油污",
-                LabelCategory = "A_NG"
-            };
-            RecongnitionLabel recongnition2 = new RecongnitionLabel
-            {
-                LabelName = "youwu",
-                LabelDescription = "油污",
-                LabelCategory = "A_NG"
-            };
-            RecongnitionLabel recongnition3 = new RecongnitionLabel
-            {
-                LabelName = "youwu",
-                LabelDescription = "油污",
-                LabelCategory = "A_NG"
-            };
-            RecongnitionLabelList.Add(recongnition);
-            RecongnitionLabelList.Add(recongnition2);
-            RecongnitionLabelList.Add(recongnition3);
-
-            var det1 = new DetectionConfig("相机1", ModelType.目标检测, @"D:\PROJECTS\X015\Vision\Cam1.onnx", false, "Cam1");
-            var det2 = new DetectionConfig("相机2", ModelType.目标检测, @"D:\PROJECTS\X015\Vision\Cam2.onnx", false, "Cam2");
-            var det3 = new DetectionConfig("相机3", ModelType.目标检测, @"D:\PROJECTS\X015\Vision\Cam3.onnx", false, "Cam3");
-            var det4 = new DetectionConfig("相机4", ModelType.目标检测, @"D:\PROJECTS\X015\Vision\Cam4.onnx", false, "Cam4");
-            var det5 = new DetectionConfig("相机5", ModelType.目标检测, @"D:\PROJECTS\X015\Vision\Cam5.onnx", false, "Cam5");
-            var det6 = new DetectionConfig("相机6", ModelType.目标检测, @"D:\PROJECTS\X015\Vision\Cam6.onnx", false, "Cam6");
-            var det7 = new DetectionConfig("相机7", ModelType.目标检测, @"D:\PROJECTS\X015\Vision\Cam7.onnx", false, "Cam7");
-            var det8 = new DetectionConfig("相机8", ModelType.目标检测, @"D:\PROJECTS\X015\Vision\Cam8.onnx", false, "Cam8");
-            List<RelatedCamera> CameraCollects = new List<RelatedCamera>();
-            CameraCollects.Add(new RelatedCamera("Cam1"));
-            List<RelatedCamera> CameraCollects2 = new List<RelatedCamera>();
-            CameraCollects2.Add(new RelatedCamera("Cam2"));
-            List<RelatedCamera> CameraCollects3 = new List<RelatedCamera>();
-            CameraCollects3.Add(new RelatedCamera("Cam3"));
-            List<RelatedCamera> CameraCollects4 = new List<RelatedCamera>();
-            CameraCollects4.Add(new RelatedCamera("Cam4"));
-            List<RelatedCamera> CameraCollects5 = new List<RelatedCamera>();
-            CameraCollects5.Add(new RelatedCamera("Cam5"));
-            List<RelatedCamera> CameraCollects6 = new List<RelatedCamera>();
-            CameraCollects6.Add(new RelatedCamera("Cam6"));
-            List<RelatedCamera> CameraCollects7 = new List<RelatedCamera>();
-            CameraCollects7.Add(new RelatedCamera("Cam7"));
-            List<RelatedCamera> CameraCollects8 = new List<RelatedCamera>();
-            CameraCollects8.Add(new RelatedCamera("Cam8"));
-
-            float Conf = 0.5f;
-
-            det1.CameraCollects = CameraCollects;
-            det1.ModelconfThreshold = Conf;
-            det1.ModelWidth = 640;
-            det1.ModelHeight = 640;
-            det1.In_lable_path = "D:\\PROJECTS\\X015\\Vision\\Cam1.txt";
-            det1.IsEnabled = true;
-            det1.ShowLocation.X = 1;
-            det1.ShowLocation.Y = 1;
-
-            det2.CameraCollects = CameraCollects2;
-            det2.ModelconfThreshold = Conf;
-            det2.ModelWidth = 640;
-            det2.ModelHeight = 640;
-            det2.In_lable_path = "D:\\PROJECTS\\X015\\Vision\\Cam2.txt";
-            det2.IsEnabled = true;
-            det2.ShowLocation.X = 2;
-            det2.ShowLocation.Y = 1;
-
-            det3.CameraCollects = CameraCollects3;
-            det3.ModelconfThreshold = Conf;
-            det3.ModelWidth = 640;
-            det3.ModelHeight = 640;
-            det3.In_lable_path = "D:\\PROJECTS\\X015\\Vision\\Cam3.txt";
-            det3.IsEnabled = true;
-            det3.ShowLocation.X = 3;
-            det3.ShowLocation.Y = 1;
-
-            det4.CameraCollects = CameraCollects4;
-            det4.ModelconfThreshold = Conf;
-            det4.ModelWidth = 640;
-            det4.ModelHeight = 640;
-            det4.In_lable_path = "D:\\PROJECTS\\X015\\Vision\\Cam4.txt";
-            det4.IsEnabled = true;
-            det4.ShowLocation.X = 4;
-            det4.ShowLocation.Y = 1;
-
-            det5.CameraCollects = CameraCollects5;
-            det5.ModelconfThreshold = Conf;
-            det5.ModelWidth = 640;
-            det5.ModelHeight = 640;
-            det5.In_lable_path = "D:\\PROJECTS\\X015\\Vision\\Cam5.txt";
-            det5.IsEnabled = true;
-            det5.ShowLocation.X = 1;
-            det5.ShowLocation.Y = 2;
-
-            det6.CameraCollects = CameraCollects6;
-            det6.ModelconfThreshold = Conf;
-            det6.ModelWidth = 640;
-            det6.ModelHeight = 640;
-            det6.In_lable_path = "D:\\PROJECTS\\X015\\Vision\\Cam6.txt";
-            det6.IsEnabled = true;
-            det6.ShowLocation.X = 2;
-            det6.ShowLocation.Y = 2;
-
-            det7.CameraCollects = CameraCollects7;
-            det7.ModelconfThreshold = Conf;
-            det7.ModelWidth = 640;
-            det7.ModelHeight = 640;
-            det7.In_lable_path = "D:\\PROJECTS\\X015\\Vision\\Cam7.txt";
-            det7.IsEnabled = true;
-            det7.ShowLocation.X = 3;
-            det7.ShowLocation.Y = 2;
-
-            det8.CameraCollects = CameraCollects8;
-            det8.ModelconfThreshold = Conf;
-            det8.ModelWidth = 640;
-            det8.ModelHeight = 640;
-            det8.In_lable_path = "D:\\PROJECTS\\X015\\Vision\\Cam8.txt";
-            det8.IsEnabled = true;
-            det8.ShowLocation.X = 4;
-            det8.ShowLocation.Y = 2;
-
-            DetectionConfigs.Add(det1);
-            DetectionConfigs.Add(det2);
-            DetectionConfigs.Add(det3);
-            DetectionConfigs.Add(det4);
-            DetectionConfigs.Add(det5);
-            DetectionConfigs.Add(det6);
-            DetectionConfigs.Add(det7);
-            DetectionConfigs.Add(det8);
-
-            Cameras.Clear();
-            HKCameras.Clear();
-            Dectection.Clear();
-            _cameraRelatedDetectionDict = new();
-
-#if false
-            for (int i = 1; i <= 8; i++)
-            {
-                HikVisionCamera camera = new HikVisionCamera();
-                camera.CameraName = $"Cam{i}";
-                camera.CameraIP = $"192.168.{i}.1";
-                camera.ComputerIP = $"192.168.{i}.1";
-                camera.CameraConnect();
-                camera.OnHImageOutput += OnCameraHImageOutput;
-                HKCameras.Add(camera);
-            }
-#else
-            //Do3ThinkCamera do3ThinkCamera1 = new Do3ThinkCamera();
-
-            //do3ThinkCamera1.dvpStreamFormat = dvpStreamFormat.S_RAW8;
-            //do3ThinkCamera1.CameraName = "Cam1";
-            //do3ThinkCamera1.CameraConnect();
-            //do3ThinkCamera1.OnHImageOutput += OnCameraHImageOutput;
-            // Cameras.Add(do3ThinkCamera1);
-            for (int i = 1; i <= 8; i++)
-            {
-                Do3ThinkCamera cam = new Do3ThinkCamera();
-                if (i == 1)
-                {
-                    cam.dvpStreamFormat = dvpStreamFormat.S_RAW8;
-                }
-                else
-                {
-                    cam.dvpStreamFormat = dvpStreamFormat.S_RGB24;
-                }
-
-                cam.CameraName = $"Cam{i}";
-                Cameras.Add(cam);
-                cam.CameraConnect();
-                cam.OnHImageOutput += OnCameraHImageOutput;
-            }
-
-#endif
-
-            DetectionConfigs.ForEach(detection =>
-            {
-                detection.CameraCollects.ForEach(cam =>
-                {
-                    List<string> Dets = new List<string>
-                   {
-                        detection.Id
-                   };
-                    if (!_cameraRelatedDetectionDict.ContainsKey(cam.CameraSourceId))
-                    {
-                        _cameraRelatedDetectionDict.Add(cam.CameraSourceId, Dets);
-                    }
-                    else
-                    {
-                        _cameraRelatedDetectionDict[cam.CameraSourceId].Add(detection.Id);
-                    }
-                }
-               );
-            });
-            string inferenceDevice = "CPU";
-
-            _visionEngine = new SimboVisionDriver();
-            _visionEngine.DetectionConfigs = DetectionConfigs;
-
-            _visionEngine.Init();
-            CtrlVisionRunBase ctrlVisionRun = new CtrlVisionRunBase(_visionEngine);
-            tabImgDisplay.Controls.Add(ctrlVisionRun);
-
-            //Add the code for the "启动" button click here
-
-            ////初始化Halcon工具
-            //InitialHalconTools();
-
-            ////深度学习模型加载
-            //bool resultOK = InitialSimboMLEnginesAsync();
-            //if (resultOK)
-            //{
-            //    //初始化失败
-            //    // return;
-            //}
-            //位置比较卡
-
-            sLDMotion.AxisSettings = new List<AxisSetting>();
-            AxisSetting axis1 = new AxisSetting();
-            axis1.AxisIndex = 0;
-            axis1.AxisName = "转盘1";
-            axis1.IsAxisEnabled = true;
-            //axis1.AlarmLogic = AxisDirection.Positive;
-            sLDMotion.IODefinitionCollection = new List<IODefinition>();
-            Motion(sLDMotion.IODefinitionCollection);
-
-            sLDMotion.SnapshotSettings = new List<SnapshotSetting>();
-            int[] cameraPositions = { 24161, 33608, 39702, 45701 };
-
-            sLDMotion.SnapshotSettings.Add(new SnapshotSetting
-            {
-                IsEnabled = true,
-                CameraIO = sLDMotion.IODefinitionCollection.FirstOrDefault(t => t.IOType == IOType.OUTPUT && t.IOIndex == 13),
-                CameraPosition = 7613,
-                StationNumber = 0
-            });
-            for (int i = 0; i < 4; i++)
-            {
-                sLDMotion.SnapshotSettings.Add(new SnapshotSetting
-                {
-                    IsEnabled = true,
-                    CameraIO = sLDMotion.IODefinitionCollection.FirstOrDefault(t => t.IOType == IOType.OUTPUT && t.IOIndex == i),
-                    CameraPosition = cameraPositions[i],
-                    StationNumber = 0
-                });
-            }
-
-            sLDMotion.BlowSettings = new List<BlowSetting>();
-            int[] BlowPositions = { 61353, 68566 };
-            sLDMotion.BlowSettings.Add(new BlowSetting
-            {
-                IsEnabled = true,
-                BlowIO = sLDMotion.IODefinitionCollection.FirstOrDefault(t => t.IOType == IOType.OUTPUT && t.IOIndex == 5),
-                BlowPosition = BlowPositions[0],
-                StationNumber = 0
-            });
-            sLDMotion.BlowSettings.Add(new BlowSetting
-            {
-                IsEnabled = true,
-                BlowIO = sLDMotion.IODefinitionCollection.FirstOrDefault(t => t.IOType == IOType.OUTPUT && t.IOIndex == 6),
-                BlowPosition = BlowPositions[1],
-                StationNumber = 0
-            });
-
-            //SnapshotSetting sna1 = new SnapshotSetting();
-            //sna1.IsEnabled = true;
-            //sna1.CameraIO= sLDMotion.IODefinitionCollection.FirstOrDefault(t => t.IOType == IOType.OUTPUT && t.IOIndex == 0);
-            //sna1.CameraPosition = 17000;
-            //sna1.StationNumber = 0;
-
-            // sLDMotion.SnapshotSettings.Add(sna1);
-            sLDMotion.AxisSettings.Add(axis1);
-            sLDMotion.Init();
-            sLDMotion.OnNewPieces -= MainMotion_NewPieces;
-            sLDMotion.OnNewPieces += MainMotion_NewPieces;
-            // sLDMotion.Start();
-
-            //PLC.IP = "192.168.6.6";
-            //PLC.Port = 502;
-            //PLC.PLCConnect();
-            //PLC.OnNewPieces -= MainMotion_NewPieces;
-            //PLC.OnNewPieces += MainMotion_NewPieces;
-            ProductBaseCount = 8;
-            for (int i = 0; i < ProductBaseCount * ProductListMulti; i++)
-            {
-                ConcurrentDictionary<uint, ProductData> products = new ConcurrentDictionary<uint, ProductData>();
-                _productLists.Add(products);
-            }
-            sLDMotion.AxisStop();
-            bool e = sLDMotion.CArdReset();
-            //转盘速度
-            sLDMotion.JOGRun(14000, 100000);
-            startTime = DateTime.Now;
-        }
-        public void Motion(List<IODefinition> iODefinitions)
-        {
-            for (int i = 0; i < 16; i++)
-            {
-                iODefinitions.Add(new IODefinition
-                {
-                    IOType = IOType.INPUT,
-                    IOIndex = i,
-                    IODesc = $"入料传感器{i + 1}"
-                });
-            }
-            for (int i = 0; i < 16; i++)
-            {
-                iODefinitions.Add(new IODefinition
-                {
-                    IOType = IOType.OUTPUT,
-                    IOIndex = i,
-                    IODesc = $"入料传感器{i + 1}"
-                });
-            }
-        }
-#endif
 
         private uint PieceCount = 0;
         private List<ConcurrentDictionary<uint, ProductData>> _productLists = new List<ConcurrentDictionary<uint, ProductData>>();
-        private int ProductListMulti = 2;
+        private int ProductListMulti = 1;
         private int ProductBaseCount = 0;
 
         private int PieceNumberToIndex(uint pn)
@@ -1174,8 +811,8 @@ namespace DHSoftware
                             }
                             else
                             {
-                                // Thread.Sleep(20);
-                                await Task.Delay(20);
+                                 Thread.Sleep(20);
+                                //await Task.Delay(20);
                             }
                             retryTimes--;
                         }
@@ -1228,10 +865,7 @@ namespace DHSoftware
                             }));
                             //重新生成实例 销毁之前的实例
 
-                            using (StreamWriter sw = new StreamWriter("D://123log.txt", true, Encoding.UTF8))
-                            {
-                                sw.WriteLine(productNumber + "提前推出" + camera.CameraName);
-                            }
+                          
                             //  LogAsync(DateTime.Now, LogLevel.Warning, $"{camera.Name} 找到产品{productNumber}，但是没有推理1");
 
                             return;
@@ -1240,7 +874,8 @@ namespace DHSoftware
                         double totalTime = 0.0;
                         List<ResultState> resultStates = new List<ResultState>();
                         List<string>? detectionDict = _cameraRelatedDetectionDict[camera.CameraName];
-
+                        Stopwatch stopwatch = new Stopwatch();
+                        stopwatch.Start();
                         for (int i = 0; i < detectionDict.Count; i++)
                         {
                             string detectionId = detectionDict[i];
@@ -1255,7 +890,8 @@ namespace DHSoftware
                                 product.ResultCollection.Add(temp1);
                             }
                         }
-
+                        stopwatch.Stop();
+                    
                         product.InferenceOne();
 
                         // LogAsync(DateTime.Now, LogLevel.Information, $"{camera.Name} 推理完成，产品{productNumber}");
@@ -1264,8 +900,9 @@ namespace DHSoftware
                         {
                             return;
                         }
-                        ProductNum_Total++;
-                        CalculateOEE();
+                        UpdateResult(DateTime.Now, null, product.ProductResult.GetEnumDescription());
+                       // ProductNum_Total++;
+                       //  CalculateOEE();
                         this.BeginInvoke(new MethodInvoker(delegate ()
                         {
                             int currentScrollPosition = richTextBox1.GetPositionFromCharIndex(richTextBox1.TextLength).Y;
@@ -1282,6 +919,14 @@ namespace DHSoftware
                         product.ProductResult = product.ResultCollection.Any(u => u.ResultState != ResultState.OK)
                             ? ResultState.B_NG
                             : ResultState.OK;
+                        //if (product.ProductResult == ResultState.OK)
+                        //{
+                        //    PLC.Blowing(productNumber, 1);
+                        //}
+                        //else
+                        //{
+                        //    PLC.Blowing(productNumber, 2);
+                        //}
                         product.ProductLabelCategory = product.ProductResult.GetEnumDescription();
                         product.ProductLabel = product.ProductResult.GetEnumDescription();
 
@@ -1361,42 +1006,43 @@ namespace DHSoftware
             });
         }
 
-        public void SetResult()
+        public async Task UpdateResult(DateTime dt, object objData, string resultStr)
         {
-            ////  detectResult.IsPreTreatDone = detectResult.VisionImageSet.PreTreatedFlag
-            ////2024-02-29 目标检测不能全是NG
-            //if (IsPreTreatNG || IsObjectDetectNG)
-            //{
-            //    return;
-            //}
+          //  CurrentState = RunState.Running;
 
-            //if (IsPreTreatDone && IsMLDetectDone && IsAfterTreatDone)
-            //{
-            //    ResultState = ResultState.OK;
-            //    ResultLabel = ResultState.OK.GetEnumDescription();
-            //}
+            ProductNum_Total++;
+            //AddOKProduct(resultStr);
+
+          
+
+            CalculateOEE();
+
+           
         }
 
         private void HandleStopButton()
         {
-            Cameras.Clear();
-            Dectection.Clear();
+           // Cameras.Clear();
+           // Dectection.Clear();
             // Add the code for the "停止" button click here
-            PLC.TurntableStop();
+            PLC.TurnStart(false);
             CurrentMachine = true;
-            sLDMotion.Stop();
+            //sLDMotion.Stop();
         }
 
         public int UPH = 0;
 
         public void CalculateOEE()
         {
-            TimeSpan timeSpan = DateTime.Now - startTime;
+            TimeSpan timeSpan = DateTime.Now - ProcessstartTime;
 
             UPH = (int)(ProductNum_Total / timeSpan.TotalHours) + 100;
             //UPM = (int)UPH / 60;
             this.BeginInvoke(new MethodInvoker(delegate ()
             {
+                lblNowtime2.Text = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
+                lblUPH2.Text = UPH.ToString();
+                lblNum2.Text = ProductNum_Total.ToString();
                 labuph.Text = UPH.ToString();
             }));
         }
@@ -1424,5 +1070,15 @@ namespace DHSoftware
         private void splitter1_SplitterMoved(object sender, SplitterEventArgs e)
         {
         }
+
+        private void richTextBox1_TextChanged(object sender, EventArgs e)
+        {
+
+        }
+
+        private void splitContainer2_Panel1_Paint(object sender, PaintEventArgs e)
+        {
+
+        }
     }
 }

DHSoftware/Views/MotionEdit.cs

@@ -1,125 +0,0 @@
-using AntdUI;
-using DH.Commons.Base;
-using DH.Commons.Enums;
-using DH.Devices.PLC;
-
-namespace DHSoftware.Views
-{
-    public partial class MotionEdit : UserControl
-    {
-        private AntdUI.Window window;
-        private PLCItem plcItem;
-        public bool submit;
-        public MotionEdit(AntdUI.Window _window, PLCItem _plcItem)
-        {
-            InitializeComponent();
-            plcItem = _plcItem;
-            // 绑定事件
-            BindEventHandler();
-            //设置默认值
-            InitData();
-
-        }
-        private void BindEventHandler()
-        {
-            button_ok.Click += Button_ok_Click;
-            button_cancel.Click += Button_cancel_Click;
-
-
-            sltDataType.SelectedIndexChanged += SltDataType_SelectedIndexChanged;
-            sltStart.SelectedIndexChanged += SltStart_SelectedIndexChanged;
-            sltEnd.SelectedIndexChanged += SltEnd_SelectedIndexChanged;
-        }
-
-        private void SltEnd_SelectedIndexChanged(object sender, IntEventArgs e)
-        {
-            iptEndIndex.Visible = e.Value == 0;
-        }
-
-        private void SltDataType_SelectedIndexChanged(object sender, IntEventArgs e)
-        {
-            var isMType = e.Value == 2;
-            stpNum.Visible = !isMType;
-            sltBoolValue.Visible = isMType;
-        }
-
-        private void SltStart_SelectedIndexChanged(object sender, IntEventArgs e)
-        {
-            iptStartIndex.Visible = e.Value == 0;
-        }
-
-
-
-        private void Button_cancel_Click(object sender, EventArgs e)
-        {
-            submit = false;
-            this.Dispose();
-        }
-
-        private void Button_ok_Click(object sender, EventArgs e)
-        {
-            sltName.Status = AntdUI.TType.None;
-            //检查输入内容
-            if (String.IsNullOrEmpty(sltName.Text))
-            {
-                sltName.Status = AntdUI.TType.Error;
-                AntdUI.Message.warn(window, "参数名称不能为空！", autoClose: 3);
-                return;
-            }
-
-            plcItem.Name = sltName.Text;
-            plcItem.Address = iptAddress.Text;
-            plcItem.Type = sltDataType.Text;
-            plcItem.Value = sltDataType.SelectedIndex == 2 ? sltBoolValue.Text : iptValue.Text;
-            plcItem.NumTpye = sltDataType.SelectedIndex == 2 ? string.Empty : sltIntType.Text;
-            plcItem.StartExecute = sltStart.Text == "执行" ? true : false;
-            plcItem.StartIndex = sltStart.Text == "执行" ? Convert.ToInt32(iptStartIndex.Value) : -1;
-            plcItem.EndExecute = sltEnd.Text == "执行" ? true : false;
-            plcItem.EndIndex = sltEnd.Text == "执行" ? Convert.ToInt32(iptEndIndex.Value) : -1;
-
-            submit = true;
-            this.Dispose();
-        }
-
-        private void InitData()
-        {
-            var PLCItemNames = Enum.GetNames(typeof(EnumPLCOutputIO));
-            foreach (var name in PLCItemNames)
-            {
-                sltName.Items.Add(name);
-            }
-            var PLCDataTypes = Enum.GetNames(typeof(EnumPLCDataType));
-            foreach (var name in PLCDataTypes)
-            {
-                sltDataType.Items.Add(name);
-            }
-            sltDataType.SelectedIndex = 0;
-            var PLCINTTypes = Enum.GetNames(typeof(EnumPLCINTType));
-            foreach (var name in PLCINTTypes)
-            {
-                sltIntType.Items.Add(name);
-            }
-
-            sltStart.SelectedIndex = 1;
-            sltEnd.SelectedIndex = 1;
-
-            if (!string.IsNullOrEmpty(plcItem.Name))
-            {
-                sltName.Text = plcItem.Name;
-                iptAddress.Text = plcItem.Address;
-                sltDataType.SelectedValue = plcItem.Type;
-                iptValue.Text = sltDataType.SelectedIndex != 2 ? plcItem.Value : string.Empty;
-                sltBoolValue.SelectedValue = sltDataType.SelectedIndex == 2 ? plcItem.Value : string.Empty;
-                sltIntType.SelectedValue = sltDataType.SelectedIndex == 2 ? string.Empty : plcItem.NumTpye;
-                sltStart.SelectedValue = plcItem.StartExecute == true ? "执行" : "取消";
-                sltEnd.SelectedValue = plcItem.EndExecute == true ? "执行" : "取消";
-                iptStartIndex.Value = plcItem.StartExecute == true ? plcItem.StartIndex : -1;
-                iptEndIndex.Value = plcItem.EndExecute == true ? plcItem.EndIndex : -1;
-
-
-            }
-        }
-
-
-    }
-}

DHSoftware/Views/PreTreatUserControl.Designer.cs

@@ -1,213 +0,0 @@
-namespace DHSoftware.Views
-{
-    partial class PreTreatUserControl
-    {
-        /// <summary> 
-        /// 必需的设计器变量。
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary> 
-        /// 清理所有正在使用的资源。
-        /// </summary>
-        /// <param name="disposing">如果应释放托管资源，为 true；否则为 false。</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region 组件设计器生成的代码
-
-        /// <summary> 
-        /// 设计器支持所需的方法 - 不要修改
-        /// 使用代码编辑器修改此方法的内容。
-        /// </summary>
-        private void InitializeComponent()
-        {
-            btnPreOpen = new AntdUI.Button();
-            tbxPrePath = new TextBox();
-            label1 = new AntdUI.Label();
-            panel1 = new Panel();
-            btnOParmDel = new Panel();
-            label3 = new Label();
-            btnDelOParm = new AntdUI.Button();
-            tbOutputParm = new AntdUI.Table();
-            btnAddOParm = new AntdUI.Button();
-            panel2 = new Panel();
-            label2 = new Label();
-            btnDelIParm = new AntdUI.Button();
-            tbInputParm = new AntdUI.Table();
-            btnAddIParm = new AntdUI.Button();
-            panel1.SuspendLayout();
-            btnOParmDel.SuspendLayout();
-            panel2.SuspendLayout();
-            SuspendLayout();
-            // 
-            // btnPreOpen
-            // 
-            btnPreOpen.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
-            btnPreOpen.Location = new Point(570, 17);
-            btnPreOpen.Name = "btnPreOpen";
-            btnPreOpen.Size = new Size(28, 23);
-            btnPreOpen.TabIndex = 21;
-            btnPreOpen.Text = "...";
-            btnPreOpen.Click += btnPreOpen_Click;
-            // 
-            // tbxPrePath
-            // 
-            tbxPrePath.Location = new Point(91, 17);
-            tbxPrePath.Name = "tbxPrePath";
-            tbxPrePath.Size = new Size(473, 23);
-            tbxPrePath.TabIndex = 20;
-            // 
-            // label1
-            // 
-            label1.Location = new Point(12, 17);
-            label1.Name = "label1";
-            label1.Size = new Size(73, 23);
-            label1.TabIndex = 19;
-            label1.Text = "预处理路径";
-            // 
-            // panel1
-            // 
-            panel1.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
-            panel1.BorderStyle = BorderStyle.FixedSingle;
-            panel1.Controls.Add(btnOParmDel);
-            panel1.Controls.Add(panel2);
-            panel1.Controls.Add(label1);
-            panel1.Controls.Add(btnPreOpen);
-            panel1.Controls.Add(tbxPrePath);
-            panel1.Location = new Point(0, 0);
-            panel1.Name = "panel1";
-            panel1.Size = new Size(633, 243);
-            panel1.TabIndex = 22;
-            // 
-            // btnOParmDel
-            // 
-            btnOParmDel.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
-            btnOParmDel.Controls.Add(label3);
-            btnOParmDel.Controls.Add(btnDelOParm);
-            btnOParmDel.Controls.Add(tbOutputParm);
-            btnOParmDel.Controls.Add(btnAddOParm);
-            btnOParmDel.Location = new Point(352, 44);
-            btnOParmDel.Name = "btnOParmDel";
-            btnOParmDel.Size = new Size(246, 194);
-            btnOParmDel.TabIndex = 26;
-            // 
-            // label3
-            // 
-            label3.AutoSize = true;
-            label3.Location = new Point(3, 2);
-            label3.Name = "label3";
-            label3.Size = new Size(56, 17);
-            label3.TabIndex = 25;
-            label3.Text = "输出参数";
-            // 
-            // btnDelOParm
-            // 
-            btnDelOParm.Location = new Point(93, 25);
-            btnDelOParm.Name = "btnDelOParm";
-            btnDelOParm.Size = new Size(84, 34);
-            btnDelOParm.TabIndex = 24;
-            btnDelOParm.Text = "删除";
-            // 
-            // tbOutputParm
-            // 
-            tbOutputParm.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
-            tbOutputParm.Location = new Point(3, 65);
-            tbOutputParm.Name = "tbOutputParm";
-            tbOutputParm.Size = new Size(240, 126);
-            tbOutputParm.TabIndex = 22;
-            tbOutputParm.Text = "table2";
-            // 
-            // btnAddOParm
-            // 
-            btnAddOParm.Location = new Point(3, 25);
-            btnAddOParm.Name = "btnAddOParm";
-            btnAddOParm.Size = new Size(84, 34);
-            btnAddOParm.TabIndex = 23;
-            btnAddOParm.Text = "新增";
-            // 
-            // panel2
-            // 
-            panel2.Controls.Add(label2);
-            panel2.Controls.Add(btnDelIParm);
-            panel2.Controls.Add(tbInputParm);
-            panel2.Controls.Add(btnAddIParm);
-            panel2.Location = new Point(12, 45);
-            panel2.Name = "panel2";
-            panel2.Size = new Size(264, 194);
-            panel2.TabIndex = 25;
-            // 
-            // label2
-            // 
-            label2.AutoSize = true;
-            label2.Location = new Point(3, 5);
-            label2.Name = "label2";
-            label2.Size = new Size(56, 17);
-            label2.TabIndex = 25;
-            label2.Text = "输入参数";
-            // 
-            // btnDelIParm
-            // 
-            btnDelIParm.Location = new Point(93, 25);
-            btnDelIParm.Name = "btnDelIParm";
-            btnDelIParm.Size = new Size(84, 34);
-            btnDelIParm.TabIndex = 24;
-            btnDelIParm.Text = "删除";
-            // 
-            // tbInputParm
-            // 
-            tbInputParm.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
-            tbInputParm.Location = new Point(3, 65);
-            tbInputParm.Name = "tbInputParm";
-            tbInputParm.Size = new Size(258, 126);
-            tbInputParm.TabIndex = 22;
-            tbInputParm.Text = "table1";
-            // 
-            // btnAddIParm
-            // 
-            btnAddIParm.Location = new Point(3, 25);
-            btnAddIParm.Name = "btnAddIParm";
-            btnAddIParm.Size = new Size(84, 34);
-            btnAddIParm.TabIndex = 23;
-            btnAddIParm.Text = "新增";
-            // 
-            // PreTreatUserControl
-            // 
-            AutoScaleDimensions = new SizeF(7F, 17F);
-            AutoScaleMode = AutoScaleMode.Font;
-            Controls.Add(panel1);
-            Name = "PreTreatUserControl";
-            Size = new Size(635, 243);
-            panel1.ResumeLayout(false);
-            panel1.PerformLayout();
-            btnOParmDel.ResumeLayout(false);
-            btnOParmDel.PerformLayout();
-            panel2.ResumeLayout(false);
-            panel2.PerformLayout();
-            ResumeLayout(false);
-        }
-
-        #endregion
-
-        private AntdUI.Button btnPreOpen;
-        private TextBox tbxPrePath;
-        private AntdUI.Label label1;
-        private Panel panel1;
-        private AntdUI.Button btnDelIParm;
-        private AntdUI.Button btnAddIParm;
-        private AntdUI.Table tbInputParm;
-        private Panel panel2;
-        private Panel btnOParmDel;
-        private Label label3;
-        private AntdUI.Button btnDelOParm;
-        private AntdUI.Table tbOutputParm;
-        private AntdUI.Button btnAddOParm;
-        private Label label2;
-    }
-}

DHSoftware/Views/PreTreatUserControl.cs

@@ -1,25 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-
-namespace DHSoftware.Views
-{
-    public partial class PreTreatUserControl : UserControl
-    {
-        public PreTreatUserControl()
-        {
-            InitializeComponent();
-        }
-
-        private void btnPreOpen_Click(object sender, EventArgs e)
-        {
-
-        }
-    }
-}

DHSoftware/Views/RBACWindow.Designer.cs

@@ -0,0 +1,159 @@
+namespace DHSoftware
+{
+    partial class RBACWindow
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            AntdUI.Tabs.StyleLine styleLine1 = new AntdUI.Tabs.StyleLine();
+            AntdUI.MenuItem menuItem1 = new AntdUI.MenuItem();
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(RBACWindow));
+            AntdUI.MenuItem menuItem2 = new AntdUI.MenuItem();
+            AntdUI.MenuItem menuItem3 = new AntdUI.MenuItem();
+            AntdUI.MenuItem menuItem4 = new AntdUI.MenuItem();
+            titlebar = new AntdUI.PageHeader();
+            lbName = new AntdUI.Label();
+            panel1 = new AntdUI.Panel();
+            tabs1 = new AntdUI.Tabs();
+            divider1 = new AntdUI.Divider();
+            menu1 = new AntdUI.Menu();
+            titlebar.SuspendLayout();
+            panel1.SuspendLayout();
+            SuspendLayout();
+            // 
+            // titlebar
+            // 
+            titlebar.BackColor = Color.FromArgb(46, 108, 227);
+            titlebar.Controls.Add(lbName);
+            titlebar.DividerShow = true;
+            titlebar.DividerThickness = 0F;
+            titlebar.Dock = DockStyle.Top;
+            titlebar.Font = new Font("Microsoft YaHei UI", 12F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            titlebar.ForeColor = Color.White;
+            titlebar.Location = new Point(0, 0);
+            titlebar.Mode = AntdUI.TAMode.Dark;
+            titlebar.Name = "titlebar";
+            titlebar.ShowButton = true;
+            titlebar.ShowIcon = true;
+            titlebar.Size = new Size(904, 40);
+            titlebar.SubText = "CCD光学筛选系统后台";
+            titlebar.TabIndex = 1;
+            titlebar.Text = "山东迭慧智能科技有限公司";
+            // 
+            // lbName
+            // 
+            lbName.Dock = DockStyle.Right;
+            lbName.ForeColor = SystemColors.Window;
+            lbName.Location = new Point(626, 0);
+            lbName.Name = "lbName";
+            lbName.Size = new Size(134, 40);
+            lbName.TabIndex = 0;
+            lbName.Text = "";
+            lbName.TextAlign = ContentAlignment.MiddleRight;
+            // 
+            // panel1
+            // 
+            panel1.Controls.Add(tabs1);
+            panel1.Controls.Add(divider1);
+            panel1.Controls.Add(menu1);
+            panel1.Dock = DockStyle.Fill;
+            panel1.Location = new Point(0, 40);
+            panel1.Name = "panel1";
+            panel1.Size = new Size(904, 476);
+            panel1.TabIndex = 2;
+            panel1.Text = "panel1";
+            // 
+            // tabs1
+            // 
+            tabs1.BackColor = SystemColors.Window;
+            tabs1.Dock = DockStyle.Fill;
+            tabs1.Location = new Point(200, 0);
+            tabs1.Name = "tabs1";
+            tabs1.Size = new Size(704, 476);
+            tabs1.Style = styleLine1;
+            tabs1.TabIndex = 7;
+            tabs1.Text = "tabs1";
+            // 
+            // divider1
+            // 
+            divider1.BackColor = SystemColors.Window;
+            divider1.Dock = DockStyle.Left;
+            divider1.Location = new Point(190, 0);
+            divider1.Name = "divider1";
+            divider1.OrientationMargin = 0F;
+            divider1.Size = new Size(10, 476);
+            divider1.TabIndex = 6;
+            divider1.Text = "";
+            divider1.Vertical = true;
+            // 
+            // menu1
+            // 
+            menu1.BackColor = SystemColors.Window;
+            menu1.Dock = DockStyle.Left;
+            menuItem1.IconSvg = resources.GetString("menuItem1.IconSvg");
+            menuItem2.IconSvg = resources.GetString("menuItem2.IconSvg");
+            menuItem2.Text = "用户管理";
+            menuItem3.IconSvg = resources.GetString("menuItem3.IconSvg");
+            menuItem3.Text = "角色管理";
+            menuItem4.IconSvg = resources.GetString("menuItem4.IconSvg");
+            menuItem4.Text = "权限管理";
+            menuItem1.Sub.Add(menuItem2);
+            menuItem1.Sub.Add(menuItem3);
+            menuItem1.Sub.Add(menuItem4);
+            menuItem1.Text = "系统后台";
+            menu1.Items.Add(menuItem1);
+            menu1.Location = new Point(0, 0);
+            menu1.Name = "menu1";
+            menu1.Size = new Size(190, 476);
+            menu1.TabIndex = 0;
+            menu1.Text = "menu1";
+            // 
+            // RBACWindow
+            // 
+            AutoScaleDimensions = new SizeF(7F, 17F);
+            AutoScaleMode = AutoScaleMode.Font;
+            ClientSize = new Size(904, 516);
+            Controls.Add(panel1);
+            Controls.Add(titlebar);
+            Name = "RBACWindow";
+            StartPosition = FormStartPosition.CenterScreen;
+            Text = "RBACWindows";
+            WindowState = FormWindowState.Maximized;
+            titlebar.ResumeLayout(false);
+            panel1.ResumeLayout(false);
+            ResumeLayout(false);
+        }
+
+        #endregion
+
+        private AntdUI.PageHeader titlebar;
+        private AntdUI.Label lbName;
+        private AntdUI.Panel panel1;
+        private AntdUI.Tabs tabs1;
+        private AntdUI.Divider divider1;
+        private AntdUI.Menu menu1;
+    }
+}

DHSoftware/Views/RBACWindow.cs

@@ -0,0 +1,200 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+using AntdUI;
+using DH.Commons.Base;
+using DH.Commons.Models;
+using DHSoftware.Views;
+
+namespace DHSoftware
+{
+    public partial class RBACWindow : Window
+    {
+        public RBACWindow()
+        {
+            InitializeComponent();
+            menu1.SelectChanged += Menu1_SelectChanged;
+        }
+
+        /// <summary>
+        /// 窗体对象实例
+        /// </summary>
+        private static RBACWindow _instance;
+
+        internal static RBACWindow Instance
+        {
+            get
+            {
+                if (_instance == null || _instance.IsDisposed)
+                    _instance = new RBACWindow();
+                return _instance;
+            }
+        }
+        private void Menu1_SelectChanged(object sender, MenuSelectEventArgs e)
+        {
+            MenuItem clickedItem = e.Value;
+
+            if (clickedItem != null)
+            {
+                if (clickedItem.PARENTITEM == null)
+                {
+                    return;
+                }
+
+                switch (clickedItem.PARENTITEM.Text)
+                {
+                    case "用户管理":
+                        foreach (var tab in tabs1.Pages)
+                        {
+                            if (tab is AntdUI.TabPage existingTab && existingTab.Text == $"{clickedItem.PARENTITEM.Text}-{clickedItem.Text}")
+                            {
+                                tabs1.SelectedTab = existingTab; 
+                                return;
+                            }
+                        }
+
+                        CameraBase? CameraBase = ConfigModel.CameraBaseList.Where(c => c.CameraName == clickedItem.Text).FirstOrDefault();
+                        if (CameraBase == null)
+                        {
+                            CameraBase = new CameraBase();
+                        }
+                        UserControl control = null;
+                        control = new CameraControl(this, CameraBase);
+                        if (control != null)
+                        {
+                            //容器添加控件，需要调整dpi
+                            control.Dock = DockStyle.Fill;
+                            AutoDpi(control);
+                            AntdUI.TabPage tabPage = new AntdUI.TabPage()
+                            {
+                                Text = $"{clickedItem.PARENTITEM.Text}-{clickedItem.Text}",
+                                ReadOnly = false,
+                            };
+                            tabPage.Controls.Add(control);
+                            tabs1.Pages.Add(tabPage);
+
+                            tabs1.SelectedTab = tabPage;
+               
+                        }
+                        break;
+
+                    case "角色管理":
+                        // 检查是否已存在同名 TabPage
+                        foreach (var tab in tabs1.Pages)
+                        {
+                            if (tab is AntdUI.TabPage existingTab && existingTab.Text == $"{clickedItem.PARENTITEM.Text}-{clickedItem.Text}")
+                            {
+                              
+                                tabs1.SelectedTab = existingTab; 
+                                return;
+                            }
+                        }
+                        DetectionConfig? detectionConfig = ConfigModel.DetectionList.Where(c => c.Name == clickedItem.Text).FirstOrDefault();
+                        if (detectionConfig == null)
+                        {
+                            detectionConfig = new DetectionConfig();
+                        }
+                        UserControl control1 = null;
+                        control1 = new DetectControl(this, detectionConfig);
+                        if (control1 != null)
+                        {
+                            //容器添加控件，需要调整dpi
+                            control1.Dock = DockStyle.Fill;
+                            AutoDpi(control1);
+                            AntdUI.TabPage tabPage = new AntdUI.TabPage()
+                            {
+                                Text = $"{clickedItem.PARENTITEM.Text}-{clickedItem.Text}",
+                                ReadOnly = false,
+                            };
+                            tabPage.Controls.Add(control1);
+                            tabs1.Pages.Add(tabPage);
+                            tabs1.SelectedTab = tabPage;
+ 
+                        }
+                        break;
+
+                    case "权限管理":
+                        foreach (var tab in tabs1.Pages)
+                        {
+                            if (tab is AntdUI.TabPage existingTab && existingTab.Text == $"{clickedItem.PARENTITEM.Text}-{clickedItem.Text}")
+                            {
+                                tabs1.SelectedTab = existingTab; // 直接跳转到已存在的 TabPage
+                               
+                                return;
+                            }
+                        }
+                        //先获取是否存在该名称的配置
+                        //如果没有新建项
+                        PLCBase? pLCBase = ConfigModel.PLCBaseList.Where(c => c.PLCName == clickedItem.Text).FirstOrDefault();
+                        if (pLCBase == null)
+                        {
+                            pLCBase = new PLCBase();
+                        }
+                        UserControl control2 = null;
+                        control = new MotionControl(this, pLCBase);
+                        if (control != null)
+                        {
+                            //容器添加控件，需要调整dpi
+                            control.Dock = DockStyle.Fill;
+                            AutoDpi(control);
+                            AntdUI.TabPage tabPage = new AntdUI.TabPage()
+                            {
+                                Text = $"{clickedItem.PARENTITEM.Text}-{clickedItem.Text}",
+                                ReadOnly = false,
+                            };
+                            tabPage.Controls.Add(control);
+                            tabs1.Pages.Add(tabPage);
+                            tabs1.SelectedTab = tabPage;
+                        }
+                        break;
+                    case "其他设置":
+                        foreach (var tab in tabs1.Pages)
+                        {
+                            if (tab is AntdUI.TabPage existingTab && existingTab.Text == $"{clickedItem.PARENTITEM.Text}-{clickedItem.Text}")
+                            {
+                                tabs1.SelectedTab = existingTab; // 直接跳转到已存在的 TabPage
+                                return;
+                            }
+                        }
+
+                        if (clickedItem.Text == "全局设置")
+                        {
+                            //先获取是否存在该名称的配置
+                            //如果没有新建项
+                            GlobalConfig? global = ConfigModel
+                            .GlobalList.FirstOrDefault();
+                            if (global == null)
+                            {
+                                global = new GlobalConfig();
+                            }
+
+                            UserControl control3 = null;
+                            control = new GlobalControl(this, global);
+                            if (control != null)
+                            {
+                                //容器添加控件，需要调整dpi
+                                control.Dock = DockStyle.Fill;
+                                AutoDpi(control);
+                                AntdUI.TabPage tabPage = new AntdUI.TabPage()
+                                {
+                                    Text = $"{clickedItem.PARENTITEM.Text}-{clickedItem.Text}",
+                                    ReadOnly = false,
+                                };
+                                tabPage.Controls.Add(control);
+                                tabs1.Pages.Add(tabPage);
+                                tabs1.SelectedTab = tabPage;
+
+                            }
+                        }
+                        break;
+                }
+            }
+        }
+    }
+}

DHSoftware/Views/RBACWindow.resx

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <root>
   <!--
-    Microsoft ResX Schema 
+    Microsoft ResX Schema
 
     Version 2.0
 
@@ -48,7 +48,7 @@
     value   : The object must be serialized with
             : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
             : and then encoded with base64 encoding.
-    
+
     mimetype: application/x-microsoft.net.object.soap.base64
     value   : The object must be serialized with
             : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
@@ -117,4 +117,16 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <data name="menuItem1.IconSvg" xml:space="preserve">
+    <value>&lt;svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1024 1024"&gt;&lt;path d="M490.4 491.7h-195.8c-108 0-195.8-87.8-195.8-195.8 0-108 87.8-195.8 195.8-195.8s195.8 87.8 195.8 195.8v195.8zm-195.8-337.1c-77.9 0-141.3 63.4-141.3 141.3s63.4 141.3 141.3 141.3h141.3v-141.3c0-77.9-63.4-141.3-141.3-141.3zm434.6 337.1h-195.8v-195.8c0-108 87.8-195.8 195.8-195.8s195.8 87.8 195.8 195.8c0 108-87.8 195.8-195.8 195.8zm-141.3-54.5h141.3c77.9 0 141.3-63.4 141.3-141.3S807.3 200 729.4 200 588.1 263.4 588.1 341.3v141.3zM294.6 923.9c-108 0-195.8-87.8-195.8-195.8s87.8-195.8 195.8-195.8h195.8v195.8c0 108-87.8 195.8-195.8 195.8zm0-337.1c-77.9 0-141.3 63.4-141.3 141.3s63.4 141.3 141.3 141.3S435.9 806 435.9 728.1V586.8H294.6zm434.8 337.1c-108 0-195.8-87.8-195.8-195.8V532.3h195.8c108 0 195.8 87.8 195.8 195.8s-87.8 195.8-195.8 195.8zM588.1 586.8v141.3c0 77.9 63.4 141.3 141.3 141.3S870.7 806 870.7 728.1 807.3 586.8 729.4 586.8H588.1z"/&gt;&lt;/svg&gt;</value>
+  </data>
+  <data name="menuItem2.IconSvg" xml:space="preserve">
+    <value>&lt;svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1024 1024" fill="#333333"&gt;&lt;path d="M665.4 532.8c-20.9-10.8-42.9-19.6-65.8-26.4 85.1-44.7 139.5-140 122.7-246C706.1 158 620.8 77 517.8 65.5 376.1 49.6 256 160 256 298.7c0 90.3 51.1 168.6 126 207.9-159.1 46.9-275.3 193.9-275.3 368.1 0 23.3 2.3 46 6.3 68.2 1.8 10 10.8 17.1 21 17.1h0.1c13.3 0 23.3-12 20.9-25.1-10.8-58-7.4-120.9 21.1-187.2 50.3-117 158.4-202.2 285.3-213.1 70.5-6.1 136.6 10.1 193.3 41.4 23.7 0 31.9-32.3 10.7-43.2zM458.1 488c-79.5-13-143.6-77-156.7-156.7C279.7 200 392 87.7 523.2 109.4c79.5 13 143.6 77 156.7 156.7 21.8 131-90.6 243-221.8 221.9zM640 704h256c11.8 0 21.3-9.6 21.3-21.3 0-11.8-9.6-21.3-21.3-21.3H640c-11.8 0-21.3 9.6-21.3 21.3 0 11.7 9.5 21.3 21.3 21.3zm0 106.7h256c11.8 0 21.3-9.6 21.3-21.3 0-11.8-9.6-21.3-21.3-21.3H640c-11.8 0-21.3 9.6-21.3 21.3 0 11.7 9.5 21.3 21.3 21.3zm0 106.6h256c11.8 0 21.3-9.6 21.3-21.3 0-11.8-9.6-21.3-21.3-21.3H640c-11.8 0-21.3 9.6-21.3 21.3 0 11.8 9.5 21.3 21.3 21.3z"/&gt;&lt;/svg&gt;</value>
+  </data>
+  <data name="menuItem3.IconSvg" xml:space="preserve">
+    <value>&lt;svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1024 1024" fill="#000"&gt;&lt;path d="M844.5 682.7H554.7c-11.7 0-21.3 9.6-21.3 21.3 0 11.7 9.6 21.3 21.3 21.3H896c2.8 0 5.6-0.6 8.2-1.7 0.5-0.2 0.9-0.7 1.4-0.9 1.9-1 3.8-2 5.4-3.6 1.6-1.6 2.6-3.5 3.6-5.4 0.3-0.5 0.7-0.9 0.9-1.4 1.1-2.6 1.7-5.4 1.7-8.2 0-0.2-0.1-0.3-0.1-0.5-0.1-2.6-0.5-5.2-1.6-7.7-0.6-1.5-1.7-2.7-2.7-4-0.7-0.9-1.1-2-1.9-2.9L805.5 583.3c-8.3-8.3-21.9-8.3-30.2 0s-8.3 21.9 0 30.2l69.2 69.2zm-99.3-410.8C733.3 164.6 646.1 77.3 538.7 65.5 397.1 49.9 277.3 160.3 277.3 298.7c0 90 50.7 168 125 207.4C231.9 553.9 106.7 710.2 106.7 896c0 15.5 1.1 30.7 2.9 45.7 1.3 10.5 10.5 18.3 21.1 18.3 12.5 0 22.6-10.8 21.1-23.3-1.6-13.4-2.5-26.9-2.5-40.7 0-200.3 162.4-362.7 362.7-362.7 138.4 0 248.8-119.8 233.2-261.4zM479.5 488c-79.6-13.1-143.8-77.2-156.8-156.8-21.6-131.4 90.4-243.4 221.8-221.8 79.6 13.1 143.8 77.2 156.8 156.8 21.6 131.3-90.4 243.4-221.8 221.8zm416.5 323.8H554.7c-2.8 0-5.6 0.6-8.2 1.7-0.5 0.2-0.9 0.7-1.4 0.9-1.9 1-3.8 2-5.4 3.6-1.6 1.6-2.6 3.5-3.6 5.5-0.3 0.5-0.7 0.9-0.9 1.4-1.1 2.6-1.7 5.4-1.7 8.2 0 0.2 0.1 0.3 0.1 0.5 0.1 2.6 0.5 5.2 1.6 7.6 0.6 1.5 1.7 2.7 2.7 4 0.7 0.9 1.1 2 1.9 2.9l105.6 105.6c8.3 8.3 21.9 8.3 30.2 0s8.3-21.9 0-30.2l-69.2-69.1H896c11.7 0 21.3-9.6 21.3-21.3s-9.6-21.3-21.3-21.3z"/&gt;&lt;/svg&gt;</value>
+  </data>
+  <data name="menuItem4.IconSvg" xml:space="preserve">
+    <value>&lt;svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1024 1024" fill="#333333"&gt;&lt;path d="M665.4 532.8c-20.9-10.8-42.9-19.6-65.8-26.4 85.1-44.7 139.5-140 122.7-246C706.1 158 620.8 77 517.8 65.5 376.1 49.6 256 160 256 298.7c0 90.3 51.1 168.6 126 207.9-159.1 46.9-275.3 193.9-275.3 368.1 0 23.3 2.3 46 6.3 68.2 1.8 10 10.8 17.1 21 17.1h0.1c13.3 0 23.3-12 20.9-25.1-10.8-58-7.4-120.9 21.1-187.2 50.3-117 158.4-202.2 285.3-213.1 70.5-6.1 136.6 10.1 193.3 41.4 23.7 0 31.9-32.3 10.7-43.2zM458.1 488c-79.5-13-143.6-77-156.7-156.7C279.7 200 392 87.7 523.2 109.4c79.5 13 143.6 77 156.7 156.7 21.8 131-90.6 243-221.8 221.9zM896 768h-42.7v-42.7c0-58.9-47.8-106.7-106.7-106.7S640 666.4 640 725.3V768h-42.7c-11.8 0-21.3 9.6-21.3 21.3v149.3c0 11.8 9.6 21.3 21.3 21.3H896c11.8 0 21.3-9.6 21.3-21.3V789.3c0-11.7-9.5-21.3-21.3-21.3zm-213.3-42.7c0-35.3 28.7-64 64-64s64 28.7 64 64V768h-128v-42.7zm192 192h-256V810.7h256v106.6z"/&gt;&lt;/svg&gt;</value>
+  </data>
 </root>

DHSoftware/Views/Setting/DefectRowEdit.cs

@@ -8,7 +8,7 @@ namespace AntdUIDemo.Views.Table
 {
     public partial class DefectRowEdit : UserControl
     {
-        DetectConfigControl detectConfigControl;
+    
         private AntdUI.Window window;
         private DefectRow user;
         public bool submit;

DHSoftware/Views/Setting/GlobalControl.Designer.cs

@@ -0,0 +1,425 @@
+namespace DHSoftware.Views
+{
+    partial class GlobalControl
+    {
+        /// <summary> 
+        /// 必需的设计器变量。
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary> 
+        /// 清理所有正在使用的资源。
+        /// </summary>
+        /// <param name="disposing">如果应释放托管资源，为 true；否则为 false。</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region 组件设计器生成的代码
+
+        /// <summary> 
+        /// 设计器支持所需的方法 - 不要修改
+        /// 使用代码编辑器修改此方法的内容。
+        /// </summary>
+        private void InitializeComponent()
+        {
+            AntdUI.Tabs.StyleLine styleLine1 = new AntdUI.Tabs.StyleLine();
+            tabs1 = new AntdUI.Tabs();
+            tabPage6 = new AntdUI.TabPage();
+            tabPage1 = new AntdUI.TabPage();
+            TableInitProcess = new AntdUI.Table();
+            panel1 = new AntdUI.Panel();
+            btnAdd = new AntdUI.Button();
+            btnDelete = new AntdUI.Button();
+            tabPage2 = new AntdUI.TabPage();
+            TableSartProcess = new AntdUI.Table();
+            panel2 = new AntdUI.Panel();
+            btnSartProcessDelete = new AntdUI.Button();
+            btnSartProcessAdd = new AntdUI.Button();
+            tabPage3 = new AntdUI.TabPage();
+            TableStopProcess = new AntdUI.Table();
+            panel3 = new AntdUI.Panel();
+            btnStopProcessDelete = new AntdUI.Button();
+            btnStopProcessAdd = new AntdUI.Button();
+            tabPage4 = new AntdUI.TabPage();
+            TableStartReset = new AntdUI.Table();
+            panel4 = new AntdUI.Panel();
+            btnStartResetDelete = new AntdUI.Button();
+            btnStartResetAdd = new AntdUI.Button();
+            tabPage5 = new AntdUI.TabPage();
+            TableStopReset = new AntdUI.Table();
+            panel5 = new AntdUI.Panel();
+            btnStopResetDelete = new AntdUI.Button();
+            btnStopResetAdd = new AntdUI.Button();
+            tabs1.SuspendLayout();
+            tabPage1.SuspendLayout();
+            panel1.SuspendLayout();
+            tabPage2.SuspendLayout();
+            panel2.SuspendLayout();
+            tabPage3.SuspendLayout();
+            panel3.SuspendLayout();
+            tabPage4.SuspendLayout();
+            panel4.SuspendLayout();
+            tabPage5.SuspendLayout();
+            panel5.SuspendLayout();
+            SuspendLayout();
+            // 
+            // tabs1
+            // 
+            tabs1.Dock = DockStyle.Fill;
+            tabs1.Location = new Point(0, 0);
+            tabs1.Name = "tabs1";
+            tabs1.Pages.Add(tabPage6);
+            tabs1.Pages.Add(tabPage1);
+            tabs1.Pages.Add(tabPage2);
+            tabs1.Pages.Add(tabPage3);
+            tabs1.Pages.Add(tabPage4);
+            tabs1.Pages.Add(tabPage5);
+            tabs1.Size = new Size(898, 530);
+            tabs1.Style = styleLine1;
+            tabs1.TabIndex = 26;
+            tabs1.Text = "tabs1";
+            tabs1.SelectedIndex = 1;
+            // 
+            // tabPage6
+            // 
+            tabPage6.Location = new Point(3, 28);
+            tabPage6.Name = "tabPage6";
+            tabPage6.Size = new Size(892, 499);
+            tabPage6.TabIndex = 5;
+            tabPage6.Text = "全局配置";
+            // 
+            // tabPage1
+            // 
+            tabPage1.Controls.Add(TableInitProcess);
+            tabPage1.Controls.Add(panel1);
+            tabPage1.Location = new Point(-892, -499);
+            tabPage1.Name = "tabPage1";
+            tabPage1.Size = new Size(892, 499);
+            tabPage1.TabIndex = 0;
+            tabPage1.Text = "流程加载操作";
+            // 
+            // TableInitProcess
+            // 
+            TableInitProcess.Dock = DockStyle.Fill;
+            TableInitProcess.EmptyHeader = true;
+            TableInitProcess.Location = new Point(0, 45);
+            TableInitProcess.Name = "TableInitProcess";
+            TableInitProcess.Padding = new Padding(5);
+            TableInitProcess.Size = new Size(892, 454);
+            TableInitProcess.TabIndex = 36;
+            // 
+            // panel1
+            // 
+            panel1.Back = Color.Transparent;
+            panel1.BackColor = SystemColors.Window;
+            panel1.Controls.Add(btnAdd);
+            panel1.Controls.Add(btnDelete);
+            panel1.Dock = DockStyle.Top;
+            panel1.Location = new Point(0, 0);
+            panel1.Name = "panel1";
+            panel1.Size = new Size(892, 45);
+            panel1.TabIndex = 35;
+            // 
+            // btnAdd
+            // 
+            btnAdd.Font = new Font("Microsoft YaHei UI", 9F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            btnAdd.Location = new Point(13, 10);
+            btnAdd.Name = "btnAdd";
+            btnAdd.Size = new Size(82, 32);
+            btnAdd.TabIndex = 35;
+            btnAdd.Text = "新增";
+            btnAdd.Type = AntdUI.TTypeMini.Primary;
+            btnAdd.WaveSize = 0;
+            // 
+            // btnDelete
+            // 
+            btnDelete.Font = new Font("Microsoft YaHei UI", 9F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            btnDelete.Location = new Point(110, 10);
+            btnDelete.Name = "btnDelete";
+            btnDelete.Size = new Size(74, 32);
+            btnDelete.TabIndex = 36;
+            btnDelete.Text = "删除";
+            btnDelete.Type = AntdUI.TTypeMini.Error;
+            btnDelete.WaveSize = 0;
+            // 
+            // tabPage2
+            // 
+            tabPage2.Controls.Add(TableSartProcess);
+            tabPage2.Controls.Add(panel2);
+            tabPage2.Location = new Point(-669, -499);
+            tabPage2.Name = "tabPage2";
+            tabPage2.Size = new Size(669, 499);
+            tabPage2.TabIndex = 1;
+            tabPage2.Text = "流程启动操作";
+            // 
+            // TableSartProcess
+            // 
+            TableSartProcess.Dock = DockStyle.Fill;
+            TableSartProcess.EmptyHeader = true;
+            TableSartProcess.Location = new Point(0, 45);
+            TableSartProcess.Name = "TableSartProcess";
+            TableSartProcess.Padding = new Padding(5);
+            TableSartProcess.Size = new Size(669, 454);
+            TableSartProcess.TabIndex = 38;
+            TableSartProcess.Text = "table1";
+            // 
+            // panel2
+            // 
+            panel2.Back = Color.Transparent;
+            panel2.BackColor = SystemColors.Window;
+            panel2.Controls.Add(btnSartProcessDelete);
+            panel2.Controls.Add(btnSartProcessAdd);
+            panel2.Dock = DockStyle.Top;
+            panel2.Location = new Point(0, 0);
+            panel2.Name = "panel2";
+            panel2.Size = new Size(669, 45);
+            panel2.TabIndex = 37;
+            panel2.Text = "panel2";
+            // 
+            // btnSartProcessDelete
+            // 
+            btnSartProcessDelete.Font = new Font("Microsoft YaHei UI", 9F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            btnSartProcessDelete.Location = new Point(110, 10);
+            btnSartProcessDelete.Name = "btnSartProcessDelete";
+            btnSartProcessDelete.Size = new Size(74, 32);
+            btnSartProcessDelete.TabIndex = 36;
+            btnSartProcessDelete.Text = "删除";
+            btnSartProcessDelete.Type = AntdUI.TTypeMini.Error;
+            btnSartProcessDelete.WaveSize = 0;
+            // 
+            // btnSartProcessAdd
+            // 
+            btnSartProcessAdd.Font = new Font("Microsoft YaHei UI", 9F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            btnSartProcessAdd.Location = new Point(13, 10);
+            btnSartProcessAdd.Name = "btnSartProcessAdd";
+            btnSartProcessAdd.Size = new Size(82, 32);
+            btnSartProcessAdd.TabIndex = 35;
+            btnSartProcessAdd.Text = "新增";
+            btnSartProcessAdd.Type = AntdUI.TTypeMini.Primary;
+            btnSartProcessAdd.WaveSize = 0;
+            // 
+            // tabPage3
+            // 
+            tabPage3.Controls.Add(TableStopProcess);
+            tabPage3.Controls.Add(panel3);
+            tabPage3.Location = new Point(-669, -499);
+            tabPage3.Name = "tabPage3";
+            tabPage3.Size = new Size(669, 499);
+            tabPage3.TabIndex = 2;
+            tabPage3.Text = "流程结束操作";
+            // 
+            // TableStopProcess
+            // 
+            TableStopProcess.Dock = DockStyle.Fill;
+            TableStopProcess.EmptyHeader = true;
+            TableStopProcess.Location = new Point(0, 45);
+            TableStopProcess.Name = "TableStopProcess";
+            TableStopProcess.Padding = new Padding(5);
+            TableStopProcess.Size = new Size(669, 454);
+            TableStopProcess.TabIndex = 38;
+            TableStopProcess.Text = "table1";
+            // 
+            // panel3
+            // 
+            panel3.Back = Color.Transparent;
+            panel3.BackColor = SystemColors.Window;
+            panel3.Controls.Add(btnStopProcessDelete);
+            panel3.Controls.Add(btnStopProcessAdd);
+            panel3.Dock = DockStyle.Top;
+            panel3.Location = new Point(0, 0);
+            panel3.Name = "panel3";
+            panel3.Size = new Size(669, 45);
+            panel3.TabIndex = 37;
+            panel3.Text = "panel3";
+            // 
+            // btnStopProcessDelete
+            // 
+            btnStopProcessDelete.Font = new Font("Microsoft YaHei UI", 9F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            btnStopProcessDelete.Location = new Point(110, 10);
+            btnStopProcessDelete.Name = "btnStopProcessDelete";
+            btnStopProcessDelete.Size = new Size(74, 32);
+            btnStopProcessDelete.TabIndex = 36;
+            btnStopProcessDelete.Text = "删除";
+            btnStopProcessDelete.Type = AntdUI.TTypeMini.Error;
+            btnStopProcessDelete.WaveSize = 0;
+            // 
+            // btnStopProcessAdd
+            // 
+            btnStopProcessAdd.Font = new Font("Microsoft YaHei UI", 9F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            btnStopProcessAdd.Location = new Point(13, 10);
+            btnStopProcessAdd.Name = "btnStopProcessAdd";
+            btnStopProcessAdd.Size = new Size(82, 32);
+            btnStopProcessAdd.TabIndex = 35;
+            btnStopProcessAdd.Text = "新增";
+            btnStopProcessAdd.Type = AntdUI.TTypeMini.Primary;
+            btnStopProcessAdd.WaveSize = 0;
+            // 
+            // tabPage4
+            // 
+            tabPage4.Controls.Add(TableStartReset);
+            tabPage4.Controls.Add(panel4);
+            tabPage4.Location = new Point(-669, -499);
+            tabPage4.Name = "tabPage4";
+            tabPage4.Size = new Size(669, 499);
+            tabPage4.TabIndex = 3;
+            tabPage4.Text = "复位开始操作";
+            // 
+            // TableStartReset
+            // 
+            TableStartReset.Dock = DockStyle.Fill;
+            TableStartReset.EmptyHeader = true;
+            TableStartReset.Location = new Point(0, 45);
+            TableStartReset.Name = "TableStartReset";
+            TableStartReset.Padding = new Padding(5);
+            TableStartReset.Size = new Size(669, 454);
+            TableStartReset.TabIndex = 38;
+            TableStartReset.Text = "table1";
+            // 
+            // panel4
+            // 
+            panel4.Back = Color.Transparent;
+            panel4.BackColor = SystemColors.Window;
+            panel4.Controls.Add(btnStartResetDelete);
+            panel4.Controls.Add(btnStartResetAdd);
+            panel4.Dock = DockStyle.Top;
+            panel4.Location = new Point(0, 0);
+            panel4.Name = "panel4";
+            panel4.Size = new Size(669, 45);
+            panel4.TabIndex = 37;
+            panel4.Text = "panel4";
+            // 
+            // btnStartResetDelete
+            // 
+            btnStartResetDelete.Font = new Font("Microsoft YaHei UI", 9F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            btnStartResetDelete.Location = new Point(110, 10);
+            btnStartResetDelete.Name = "btnStartResetDelete";
+            btnStartResetDelete.Size = new Size(74, 32);
+            btnStartResetDelete.TabIndex = 36;
+            btnStartResetDelete.Text = "删除";
+            btnStartResetDelete.Type = AntdUI.TTypeMini.Error;
+            btnStartResetDelete.WaveSize = 0;
+            // 
+            // btnStartResetAdd
+            // 
+            btnStartResetAdd.Font = new Font("Microsoft YaHei UI", 9F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            btnStartResetAdd.Location = new Point(13, 10);
+            btnStartResetAdd.Name = "btnStartResetAdd";
+            btnStartResetAdd.Size = new Size(82, 32);
+            btnStartResetAdd.TabIndex = 35;
+            btnStartResetAdd.Text = "新增";
+            btnStartResetAdd.Type = AntdUI.TTypeMini.Primary;
+            btnStartResetAdd.WaveSize = 0;
+            // 
+            // tabPage5
+            // 
+            tabPage5.Controls.Add(TableStopReset);
+            tabPage5.Controls.Add(panel5);
+            tabPage5.Location = new Point(-669, -499);
+            tabPage5.Name = "tabPage5";
+            tabPage5.Size = new Size(669, 499);
+            tabPage5.TabIndex = 4;
+            tabPage5.Text = "复位结束操作";
+            // 
+            // TableStopReset
+            // 
+            TableStopReset.Dock = DockStyle.Fill;
+            TableStopReset.EmptyHeader = true;
+            TableStopReset.Location = new Point(0, 45);
+            TableStopReset.Name = "TableStopReset";
+            TableStopReset.Padding = new Padding(5);
+            TableStopReset.Size = new Size(669, 454);
+            TableStopReset.TabIndex = 38;
+            TableStopReset.Text = "table1";
+            // 
+            // panel5
+            // 
+            panel5.Back = Color.Transparent;
+            panel5.BackColor = SystemColors.Window;
+            panel5.Controls.Add(btnStopResetDelete);
+            panel5.Controls.Add(btnStopResetAdd);
+            panel5.Dock = DockStyle.Top;
+            panel5.Location = new Point(0, 0);
+            panel5.Name = "panel5";
+            panel5.Size = new Size(669, 45);
+            panel5.TabIndex = 37;
+            panel5.Text = "panel5";
+            // 
+            // btnStopResetDelete
+            // 
+            btnStopResetDelete.Font = new Font("Microsoft YaHei UI", 9F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            btnStopResetDelete.Location = new Point(110, 10);
+            btnStopResetDelete.Name = "btnStopResetDelete";
+            btnStopResetDelete.Size = new Size(74, 32);
+            btnStopResetDelete.TabIndex = 36;
+            btnStopResetDelete.Text = "删除";
+            btnStopResetDelete.Type = AntdUI.TTypeMini.Error;
+            btnStopResetDelete.WaveSize = 0;
+            // 
+            // btnStopResetAdd
+            // 
+            btnStopResetAdd.Font = new Font("Microsoft YaHei UI", 9F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            btnStopResetAdd.Location = new Point(13, 10);
+            btnStopResetAdd.Name = "btnStopResetAdd";
+            btnStopResetAdd.Size = new Size(82, 32);
+            btnStopResetAdd.TabIndex = 35;
+            btnStopResetAdd.Text = "新增";
+            btnStopResetAdd.Type = AntdUI.TTypeMini.Primary;
+            btnStopResetAdd.WaveSize = 0;
+            // 
+            // GlobalControl
+            // 
+            AutoScaleDimensions = new SizeF(7F, 17F);
+            AutoScaleMode = AutoScaleMode.Font;
+            Controls.Add(tabs1);
+            Name = "GlobalControl";
+            Size = new Size(898, 530);
+            tabs1.ResumeLayout(false);
+            tabPage1.ResumeLayout(false);
+            panel1.ResumeLayout(false);
+            tabPage2.ResumeLayout(false);
+            panel2.ResumeLayout(false);
+            tabPage3.ResumeLayout(false);
+            panel3.ResumeLayout(false);
+            tabPage4.ResumeLayout(false);
+            panel4.ResumeLayout(false);
+            tabPage5.ResumeLayout(false);
+            panel5.ResumeLayout(false);
+            ResumeLayout(false);
+        }
+
+        #endregion
+        private AntdUI.Tabs tabs1;
+        private AntdUI.TabPage tabPage2;
+        private AntdUI.TabPage tabPage3;
+        private AntdUI.TabPage tabPage4;
+        private AntdUI.TabPage tabPage5;
+        private AntdUI.Table TableSartProcess;
+        private AntdUI.Panel panel2;
+        private AntdUI.Button btnSartProcessDelete;
+        private AntdUI.Button btnSartProcessAdd;
+        private AntdUI.Table TableStopProcess;
+        private AntdUI.Panel panel3;
+        private AntdUI.Button btnStopProcessDelete;
+        private AntdUI.Button btnStopProcessAdd;
+        private AntdUI.Table TableStartReset;
+        private AntdUI.Panel panel4;
+        private AntdUI.Button btnStartResetDelete;
+        private AntdUI.Button btnStartResetAdd;
+        private AntdUI.Table TableStopReset;
+        private AntdUI.Panel panel5;
+        private AntdUI.Button btnStopResetDelete;
+        private AntdUI.Button btnStopResetAdd;
+        private AntdUI.TabPage tabPage1;
+        private AntdUI.Table TableInitProcess;
+        private AntdUI.Panel panel1;
+        private AntdUI.Button btnAdd;
+        private AntdUI.Button btnDelete;
+        private AntdUI.TabPage tabPage6;
+    }
+}

DHSoftware/Views/Setting/GlobalControl.cs

@@ -0,0 +1,819 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Diagnostics;
+using System.Drawing;
+using System.IO.Ports;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+using AntdUI;
+using DH.Commons.Base;
+using DH.Commons.Enums;
+using DH.Commons.Models;
+using XKRS.CanFly;
+
+namespace DHSoftware.Views
+{
+    public partial class GlobalControl : UserControl
+    {
+        private Window window;
+        private GlobalConfig global;
+        public GlobalControl(Window _window, GlobalConfig _global)
+        {
+            window = _window;
+            global = _global;
+            InitializeComponent();
+            BindEventHandler();
+            InitData();
+    
+        }
+
+        private void BindEventHandler()
+        {
+       
+            btnAdd.Click += BtnAdd_Click;
+            btnDelete.Click += BtnDelete_Click;
+            TableInitProcess.CellButtonClick += ItemsTable_CellButtonClick;
+
+            btnSartProcessAdd.Click += BtnSartProcessAdd_Click;
+            btnSartProcessDelete.Click += BtnSartProcessDelete_Click;
+            TableSartProcess.CellButtonClick += TableSartProcess_CellButtonClick;
+
+            btnStopProcessAdd.Click += BtnStopProcessAdd_Click;
+            btnStopProcessDelete.Click += BtnStopProcessDelete_Click;
+            TableStopProcess.CellButtonClick += TableStopProcess_CellButtonClick;
+
+            btnStartResetAdd.Click += BtnStartResetAdd_Click;
+            btnStartResetDelete.Click += BtnStartResetDelete_Click;
+            TableStartReset.CellButtonClick += TableStartReset_CellButtonClick;
+
+            btnStopResetAdd.Click += BtnStopResetAdd_Click;
+            btnStopResetDelete.Click += BtnStopResetDelete_Click;
+            TableStopReset.CellButtonClick += TableStopReset_CellButtonClick;
+        }
+
+        private void TableStopReset_CellButtonClick(object sender, TableButtonEventArgs e)
+        {
+            var buttontext = e.Btn.Text;
+
+            if (e.Record is PLCItem Item)
+            {
+                switch (buttontext)
+                {
+                    //暂不支持进入整行编辑，只支持指定单元格编辑，推荐使用弹窗或抽屉编辑整行数据
+                    case "编辑":
+                        var form = new MotionProcessEdit(window, "复位结束表操作-编辑", Item, ConfigModel.PLCBaseList?.FirstOrDefault()?.PLCItemList) { Size = new Size(500, 300) };
+                        AntdUI.Drawer.open(new AntdUI.Drawer.Config(window, form)
+                        {
+                            OnLoad = () =>
+                            {
+                                AntdUI.Message.info(window, "进入复位结束表编辑", autoClose: 1);
+                            },
+                            OnClose = () =>
+                            {
+                                AntdUI.Message.info(window, "退出复位结束表编辑", autoClose: 1);
+                            }
+                        });
+                        break;
+
+                    case "删除":
+                        var result = Modal.open(window, "删除警告！", "确认要删除选择的数据吗？", TType.Warn);
+                        if (result == DialogResult.OK)
+                        {
+                            global.StopResetList.Remove(Item);
+                        }
+                        break;
+
+                    case "上移":
+                        if (e.RowIndex <= 1)
+                        {
+                            AntdUI.Message.warn(window, "已是第一条，无法上移！", autoClose: 3);
+                            return;
+                        }
+                        MoveItemUp(global.StopResetList, Item);
+                        break;
+
+                    case "下移":
+                        if (e.RowIndex > global.StopResetList.Count - 1)
+                        {
+                            AntdUI.Message.warn(window, "已是最后一条，无法下移！", autoClose: 3);
+                            return;
+                        }
+                        MoveItemDown(global.StopResetList, Item);
+                        break;
+                }
+            }
+        }
+
+        private void BtnStopResetDelete_Click(object? sender, EventArgs e)
+        {
+            if (global.StopResetList.Count == 0 || !global.StopResetList.Any(x => x.Selected))
+            {
+                AntdUI.Message.warn(window, "请选择要删除的行！", autoClose: 3);
+                return;
+            }
+
+            var result = Modal.open(window, "删除警告！", "确认要删除选择的数据吗？", TType.Warn);
+            if (result == DialogResult.OK)
+            {
+                // 使用反转for循环删除主列表中选中的项
+                for (int i = global.StopResetList.Count - 1; i >= 0; i--)
+                {
+                    // 删除选中的主列表项
+                    if (global.StopResetList[i].Selected)
+                    {
+                        global.StopResetList.RemoveAt(i);
+                    }
+                }
+                // 提示删除完成
+                AntdUI.Message.success(window, "删除成功！", autoClose: 3);
+            }
+        }
+
+        private void BtnStopResetAdd_Click(object? sender, EventArgs e)
+        {
+            if (ConfigModel.PLCBaseList?.FirstOrDefault()?.PLCItemList.Count == 0)
+            {
+                AntdUI.Message.warn(window, "点位表无数据，不允许新增！", autoClose: 3);
+                return;
+            }
+
+            PLCItem Item = new PLCItem()
+            {
+                StartIndex = global.StopResetList.Count + 1,
+                CellLinks = new CellLink[]
+           {
+                    new CellButton(Guid.NewGuid().ToString(), "上移", TTypeMini.Default),
+                    new CellButton(Guid.NewGuid().ToString(), "下移", TTypeMini.Default),
+                    new CellButton(Guid.NewGuid().ToString(), "编辑", TTypeMini.Primary),
+                    new CellButton(Guid.NewGuid().ToString(), "删除", TTypeMini.Error)
+           }
+            };
+
+            var form = new MotionProcessEdit(window, "复位结束表操作-新增", Item, ConfigModel.PLCBaseList?.FirstOrDefault()?.PLCItemList) { Size = new Size(450, 550) };
+
+            AntdUI.Drawer.open(new AntdUI.Drawer.Config(window, form)
+            {
+                OnLoad = () =>
+                {
+                    AntdUI.Message.info(window, "进入复位结束表新增", autoClose: 1);
+                },
+                OnClose = () =>
+                {
+                    if (form.submit)
+                    {
+                        global.StopResetList.Add(Item);
+                    }
+
+                    AntdUI.Message.info(window, "退出复位结束表新增", autoClose: 1);
+                }
+            });
+        }
+
+        private void TableStartReset_CellButtonClick(object sender, TableButtonEventArgs e)
+        {
+            var buttontext = e.Btn.Text;
+
+            if (e.Record is PLCItem Item)
+            {
+                switch (buttontext)
+                {
+                    //暂不支持进入整行编辑，只支持指定单元格编辑，推荐使用弹窗或抽屉编辑整行数据
+                    case "编辑":
+                        var form = new MotionProcessEdit(window, "复位开始表操作-编辑", Item, ConfigModel.PLCBaseList?.FirstOrDefault()?.PLCItemList) { Size = new Size(500, 300) };
+                        AntdUI.Drawer.open(new AntdUI.Drawer.Config(window, form)
+                        {
+                            OnLoad = () =>
+                            {
+                                AntdUI.Message.info(window, "进入复位开始表编辑", autoClose: 1);
+                            },
+                            OnClose = () =>
+                            {
+                                AntdUI.Message.info(window, "退出复位开始表编辑", autoClose: 1);
+                            }
+                        });
+                        break;
+
+                    case "删除":
+                        var result = Modal.open(window, "删除警告！", "确认要删除选择的数据吗？", TType.Warn);
+                        if (result == DialogResult.OK)
+                        {
+                            global.StartResetList.Remove(Item);
+                        }
+                        break;
+
+                    case "上移":
+                        if (e.RowIndex <= 1)
+                        {
+                            AntdUI.Message.warn(window, "已是第一条，无法上移！", autoClose: 3);
+                            return;
+                        }
+                        MoveItemUp(global.StartResetList, Item);
+                        break;
+
+                    case "下移":
+                        if (e.RowIndex > global.StartResetList.Count - 1)
+                        {
+                            AntdUI.Message.warn(window, "已是最后一条，无法下移！", autoClose: 3);
+                            return;
+                        }
+                        MoveItemDown(global.StartResetList, Item);
+                        break;
+                }
+            }
+        }
+
+        private void BtnStartResetDelete_Click(object? sender, EventArgs e)
+        {
+            if (global.StartResetList.Count == 0 || !global.StartResetList.Any(x => x.Selected))
+            {
+                AntdUI.Message.warn(window, "请选择要删除的行！", autoClose: 3);
+                return;
+            }
+
+            var result = Modal.open(window, "删除警告！", "确认要删除选择的数据吗？", TType.Warn);
+            if (result == DialogResult.OK)
+            {
+                // 使用反转for循环删除主列表中选中的项
+                for (int i = global.StartResetList.Count - 1; i >= 0; i--)
+                {
+                    // 删除选中的主列表项
+                    if (global.StartResetList[i].Selected)
+                    {
+                        global.StartResetList.RemoveAt(i);
+                    }
+                }
+                // 提示删除完成
+                AntdUI.Message.success(window, "删除成功！", autoClose: 3);
+            }
+        }
+
+        private void BtnStartResetAdd_Click(object? sender, EventArgs e)
+        {
+            if (ConfigModel.PLCBaseList?.FirstOrDefault()?.PLCItemList.Count == 0)
+            {
+                AntdUI.Message.warn(window, "点位表无数据，不允许新增！", autoClose: 3);
+                return;
+            }
+
+
+            PLCItem Item = new PLCItem()
+            {
+                StartIndex = global.StartResetList.Count + 1,
+                CellLinks = new CellLink[]
+           {
+                    new CellButton(Guid.NewGuid().ToString(), "上移", TTypeMini.Default),
+                    new CellButton(Guid.NewGuid().ToString(), "下移", TTypeMini.Default),
+                    new CellButton(Guid.NewGuid().ToString(), "编辑", TTypeMini.Primary),
+                    new CellButton(Guid.NewGuid().ToString(), "删除", TTypeMini.Error)
+           }
+            };
+
+            var form = new MotionProcessEdit(window, "复位开始表操作-新增", Item, ConfigModel.PLCBaseList?.FirstOrDefault()?.PLCItemList) { Size = new Size(450, 550) };
+
+            AntdUI.Drawer.open(new AntdUI.Drawer.Config(window, form)
+            {
+                OnLoad = () =>
+                {
+                    AntdUI.Message.info(window, "进入复位开始表新增", autoClose: 1);
+                },
+                OnClose = () =>
+                {
+                    if (form.submit)
+                    {
+                        global.StartResetList.Add(Item);
+                    }
+
+                    AntdUI.Message.info(window, "退出复位开始表新增", autoClose: 1);
+                }
+            });
+        }
+
+        private void TableStopProcess_CellButtonClick(object sender, TableButtonEventArgs e)
+        {
+            var buttontext = e.Btn.Text;
+
+            if (e.Record is PLCItem Item)
+            {
+                switch (buttontext)
+                {
+                    //暂不支持进入整行编辑，只支持指定单元格编辑，推荐使用弹窗或抽屉编辑整行数据
+                    case "编辑":
+                        var form = new MotionProcessEdit(window, "流程结束表操作-编辑", Item, ConfigModel.PLCBaseList?.FirstOrDefault()?.PLCItemList) { Size = new Size(500, 300) };
+                        AntdUI.Drawer.open(new AntdUI.Drawer.Config(window, form)
+                        {
+                            OnLoad = () =>
+                            {
+                                AntdUI.Message.info(window, "进入流程结束表编辑", autoClose: 1);
+                            },
+                            OnClose = () =>
+                            {
+                                AntdUI.Message.info(window, "退出流程结束表编辑", autoClose: 1);
+                            }
+                        });
+                        break;
+
+                    case "删除":
+                        var result = Modal.open(window, "删除警告！", "确认要删除选择的数据吗？", TType.Warn);
+                        if (result == DialogResult.OK)
+                        {
+                            global.StopProcessList.Remove(Item);
+                        }
+                        break;
+
+                    case "上移":
+                        if (e.RowIndex <= 1)
+                        {
+                            AntdUI.Message.warn(window, "已是第一条，无法上移！", autoClose: 3);
+                            return;
+                        }
+                        MoveItemUp(global.StopProcessList, Item);
+                        break;
+
+                    case "下移":
+                        if (e.RowIndex > global.StopProcessList.Count - 1)
+                        {
+                            AntdUI.Message.warn(window, "已是最后一条，无法下移！", autoClose: 3);
+                            return;
+                        }
+                        MoveItemDown(global.StopProcessList, Item);
+                        break;
+                }
+            }
+        }
+
+        private void BtnStopProcessDelete_Click(object? sender, EventArgs e)
+        {
+            if (global.StopProcessList.Count == 0 || !global.StopProcessList.Any(x => x.Selected))
+            {
+                AntdUI.Message.warn(window, "请选择要删除的行！", autoClose: 3);
+                return;
+            }
+
+            var result = Modal.open(window, "删除警告！", "确认要删除选择的数据吗？", TType.Warn);
+            if (result == DialogResult.OK)
+            {
+                // 使用反转for循环删除主列表中选中的项
+                for (int i = global.StopProcessList.Count - 1; i >= 0; i--)
+                {
+                    // 删除选中的主列表项
+                    if (global.StopProcessList[i].Selected)
+                    {
+                        global.StopProcessList.RemoveAt(i);
+                    }
+                }
+                // 提示删除完成
+                AntdUI.Message.success(window, "删除成功！", autoClose: 3);
+            }
+        }
+
+        private void BtnStopProcessAdd_Click(object? sender, EventArgs e)
+        {
+            if (ConfigModel.PLCBaseList?.FirstOrDefault()?.PLCItemList.Count == 0)
+            {
+                AntdUI.Message.warn(window, "点位表无数据，不允许新增！", autoClose: 3);
+                return;
+            }
+
+
+            PLCItem Item = new PLCItem()
+            {
+                StartIndex = global.StopProcessList.Count + 1,
+                CellLinks = new CellLink[]
+           {
+                    new CellButton(Guid.NewGuid().ToString(), "上移", TTypeMini.Default),
+                    new CellButton(Guid.NewGuid().ToString(), "下移", TTypeMini.Default),
+                    new CellButton(Guid.NewGuid().ToString(), "编辑", TTypeMini.Primary),
+                    new CellButton(Guid.NewGuid().ToString(), "删除", TTypeMini.Error)
+           }
+            };
+
+            var form = new MotionProcessEdit(window, "流程结束表操作-新增", Item, ConfigModel.PLCBaseList?.FirstOrDefault()?.PLCItemList) { Size = new Size(450, 550) };
+
+            AntdUI.Drawer.open(new AntdUI.Drawer.Config(window, form)
+            {
+                OnLoad = () =>
+                {
+                    AntdUI.Message.info(window, "进入流程结束表新增", autoClose: 1);
+                },
+                OnClose = () =>
+                {
+                    if (form.submit)
+                    {
+                        global.StopProcessList.Add(Item);
+                    }
+
+                    AntdUI.Message.info(window, "退出流程结束表新增", autoClose: 1);
+                }
+            });
+        }
+
+        private void TableSartProcess_CellButtonClick(object sender, TableButtonEventArgs e)
+        {
+            var buttontext = e.Btn.Text;
+
+            if (e.Record is PLCItem Item)
+            {
+                switch (buttontext)
+                {
+                    //暂不支持进入整行编辑，只支持指定单元格编辑，推荐使用弹窗或抽屉编辑整行数据
+                    case "编辑":
+                        var form = new MotionProcessEdit(window, "流程开始表操作-编辑", Item, ConfigModel.PLCBaseList?.FirstOrDefault()?.PLCItemList) { Size = new Size(500, 300) };
+                        AntdUI.Drawer.open(new AntdUI.Drawer.Config(window, form)
+                        {
+                            OnLoad = () =>
+                            {
+                                AntdUI.Message.info(window, "进入流程开始表编辑", autoClose: 1);
+                            },
+                            OnClose = () =>
+                            {
+                                AntdUI.Message.info(window, "退出流程开始表编辑", autoClose: 1);
+                            }
+                        });
+                        break;
+
+                    case "删除":
+                        var result = Modal.open(window, "删除警告！", "确认要删除选择的数据吗？", TType.Warn);
+                        if (result == DialogResult.OK)
+                        {
+                            global.StartProcessList.Remove(Item);
+                        }
+                        break;
+
+                    case "上移":
+                        if (e.RowIndex <= 1)
+                        {
+                            AntdUI.Message.warn(window, "已是第一条，无法上移！", autoClose: 3);
+                            return;
+                        }
+                        MoveItemUp(global.StartProcessList, Item);
+                        break;
+
+                    case "下移":
+                        if (e.RowIndex > global.StartProcessList.Count - 1)
+                        {
+                            AntdUI.Message.warn(window, "已是最后一条，无法下移！", autoClose: 3);
+                            return;
+                        }
+                        MoveItemDown(global.StartProcessList, Item);
+                        break;
+                }
+            }
+        }
+
+        private void BtnSartProcessDelete_Click(object? sender, EventArgs e)
+        {
+            if (global.StartProcessList.Count == 0 || !global.StartProcessList.Any(x => x.Selected))
+            {
+                AntdUI.Message.warn(window, "请选择要删除的行！", autoClose: 3);
+                return;
+            }
+
+            var result = Modal.open(window, "删除警告！", "确认要删除选择的数据吗？", TType.Warn);
+            if (result == DialogResult.OK)
+            {
+                // 使用反转for循环删除主列表中选中的项
+                for (int i = global.StartProcessList.Count - 1; i >= 0; i--)
+                {
+                    // 删除选中的主列表项
+                    if (global.StartProcessList[i].Selected)
+                    {
+                        global.StartProcessList.RemoveAt(i);
+                    }
+                }
+                // 提示删除完成
+                AntdUI.Message.success(window, "删除成功！", autoClose: 3);
+            }
+        }
+
+        private void BtnSartProcessAdd_Click(object? sender, EventArgs e)
+        {
+            if (ConfigModel.PLCBaseList?.FirstOrDefault()?.PLCItemList.Count == 0)
+            {
+                AntdUI.Message.warn(window, "点位表无数据，不允许新增！", autoClose: 3);
+                return;
+            }
+
+
+            PLCItem Item = new PLCItem()
+            {
+                StartIndex = global.StartProcessList.Count + 1,
+                CellLinks = new CellLink[]
+           {
+                    new CellButton(Guid.NewGuid().ToString(), "上移", TTypeMini.Default),
+                    new CellButton(Guid.NewGuid().ToString(), "下移", TTypeMini.Default),
+                    new CellButton(Guid.NewGuid().ToString(), "编辑", TTypeMini.Primary),
+                    new CellButton(Guid.NewGuid().ToString(), "删除", TTypeMini.Error)
+           }
+            };
+
+            var form = new MotionProcessEdit(window, "流程开始表操作-新增", Item, ConfigModel.PLCBaseList?.FirstOrDefault()?.PLCItemList) { Size = new Size(450, 550) };
+
+            AntdUI.Drawer.open(new AntdUI.Drawer.Config(window, form)
+            {
+                OnLoad = () =>
+                {
+                    AntdUI.Message.info(window, "进入流程开始表新增", autoClose: 1);
+                },
+                OnClose = () =>
+                {
+                    if (form.submit)
+                    {
+                        global.StartProcessList.Add(Item);
+                    }
+
+                    AntdUI.Message.info(window, "退出流程开始表新增", autoClose: 1);
+                }
+            });
+        }
+
+        private void ItemsTable_CellButtonClick(object sender, TableButtonEventArgs e)
+        {
+            var buttontext = e.Btn.Text;
+
+            if (e.Record is PLCItem Item)
+            {
+                switch (buttontext)
+                {
+                    //暂不支持进入整行编辑，只支持指定单元格编辑，推荐使用弹窗或抽屉编辑整行数据
+                    case "编辑":
+                        var form = new MotionProcessEdit(window, "流程加载表操作-编辑", Item, ConfigModel.PLCBaseList?.FirstOrDefault()?.PLCItemList) { Size = new Size(500, 300) };
+                        AntdUI.Drawer.open(new AntdUI.Drawer.Config(window, form)
+                        {
+                            OnLoad = () =>
+                            {
+                                AntdUI.Message.info(window, "进入流程加载表编辑", autoClose: 1);
+                            },
+                            OnClose = () =>
+                            {
+                                AntdUI.Message.info(window, "退出流程加载表编辑", autoClose: 1);
+                            }
+                        });
+                        break;
+
+                    case "删除":
+                        var result = Modal.open(window, "删除警告！", "确认要删除选择的数据吗？", TType.Warn);
+                        if (result == DialogResult.OK)
+                        {
+                            global.InitProcessList.Remove(Item);
+                        }
+                        break;
+
+                    case "上移":
+                        if (e.RowIndex <= 1)
+                        {
+                            AntdUI.Message.warn(window, "已是第一条，无法上移！", autoClose: 3);
+                            return;
+                        }
+                        MoveItemUp(global.InitProcessList, Item);
+                        break;
+
+                    case "下移":
+                        if (e.RowIndex > global.InitProcessList.Count - 1)
+                        {
+                            AntdUI.Message.warn(window, "已是最后一条，无法下移！", autoClose: 3);
+                            return;
+                        }
+                        MoveItemDown(global.InitProcessList, Item);
+                        break;
+                }
+            }
+        }
+
+        // 上移项
+        public static void MoveItemUp(BindingList<PLCItem> list, PLCItem item)
+        {
+            int index = list.IndexOf(item);
+            if (index > 0)
+            {
+                // 移除并插入到前一位
+                list.RemoveAt(index);
+                list.Insert(index - 1, item);
+                UpdateStartIndexes(list); // 更新序号
+            }
+        }
+
+        // 下移项
+        public static void MoveItemDown(BindingList<PLCItem> list, PLCItem item)
+        {
+            int index = list.IndexOf(item);
+            if (index < list.Count - 1)
+            {
+                // 移除并插入到后一位
+                list.RemoveAt(index);
+                list.Insert(index + 1, item);
+                UpdateStartIndexes(list); // 更新序号
+            }
+        }
+
+        // 更新所有项的序号
+        public static void UpdateStartIndexes(BindingList<PLCItem> list)
+        {
+            for (int i = 0; i < list.Count; i++)
+            {
+                PLCItem item = list[i];
+                if (item.StartIndex != i + 1)
+                {
+                    item.StartIndex = i + 1; // 触发 PropertyChanged 事件
+                }
+            }
+        }
+
+        private void BtnDelete_Click(object? sender, EventArgs e)
+        {
+            if (global.InitProcessList.Count == 0 || !global.InitProcessList.Any(x => x.Selected))
+            {
+                AntdUI.Message.warn(window, "请选择要删除的行！", autoClose: 3);
+                return;
+            }
+
+            var result = Modal.open(window, "删除警告！", "确认要删除选择的数据吗？", TType.Warn);
+            if (result == DialogResult.OK)
+            {
+                // 使用反转for循环删除主列表中选中的项
+                for (int i = global.InitProcessList.Count - 1; i >= 0; i--)
+                {
+                    // 删除选中的主列表项
+                    if (global.InitProcessList[i].Selected)
+                    {
+                        global.InitProcessList.RemoveAt(i);
+                    }
+                }
+                // 提示删除完成
+                AntdUI.Message.success(window, "删除成功！", autoClose: 3);
+            }
+        }
+
+        private void BtnAdd_Click(object? sender, EventArgs e)
+        {
+            if (ConfigModel.PLCBaseList?.FirstOrDefault()?.PLCItemList.Count == 0)
+            {
+                AntdUI.Message.warn(window, "点位表无数据，不允许新增！", autoClose: 3);
+                return;
+            }
+
+
+            PLCItem Item = new PLCItem()
+            {
+                StartIndex = global.InitProcessList.Count + 1,
+                CellLinks = new CellLink[]
+                { new CellButton(Guid.NewGuid().ToString(), "上移", TTypeMini.Default),
+                  new CellButton(Guid.NewGuid().ToString(), "下移", TTypeMini.Default),
+                new CellButton(Guid.NewGuid().ToString(), "编辑", TTypeMini.Primary),
+                new CellButton(Guid.NewGuid().ToString(), "删除", TTypeMini.Error)
+                }
+            };
+
+            var form = new MotionProcessEdit(window, "流程加载表操作-新增", Item, ConfigModel.PLCBaseList?.FirstOrDefault()?.PLCItemList) { Size = new Size(450, 550) };
+
+            AntdUI.Drawer.open(new AntdUI.Drawer.Config(window, form)
+            {
+                OnLoad = () =>
+                {
+                    AntdUI.Message.info(window, "进入流程加载表新增", autoClose: 1);
+                },
+                OnClose = () =>
+                {
+                    if (form.submit)
+                    {
+                        global.InitProcessList.Add(Item);
+                    }
+
+                    AntdUI.Message.info(window, "退出流程加载表新增", autoClose: 1);
+                }
+            });
+        }
+
+
+        private void InitData()
+        {
+            
+            
+
+            TableInitProcess.Columns = new ColumnCollection() {
+              new ColumnCheck("Selected"){Fixed = true},
+                new Column("StartIndex", "序号", ColumnAlign.Center),
+                new ColumnSwitch("StartExecute", "启用", ColumnAlign.Center),
+                new Column("Name", "名称", ColumnAlign.Center),
+                new Column("Type", "类型",ColumnAlign.Center){Visible=false},
+                new Column("Address", "地址",ColumnAlign.Center){Visible=false},
+                new Column("Value", "值",ColumnAlign.Center),
+                new Column("CellLinks", "操作", ColumnAlign.Center)
+            };
+            if (global.InitProcessList.Count > 0)
+            {
+                foreach (var item in global.InitProcessList)
+                {
+                    item.CellLinks = new CellLink[] {
+                             new CellButton(Guid.NewGuid().ToString(), "上移", TTypeMini.Default),
+                        new CellButton(Guid.NewGuid().ToString(), "下移", TTypeMini.Default),
+                        new CellButton(Guid.NewGuid().ToString(), "编辑", TTypeMini.Primary) ,
+                        new CellButton(Guid.NewGuid().ToString(), "删除", TTypeMini.Error)
+                    };
+                }
+            }
+            TableInitProcess.Binding(global.InitProcessList);
+
+            TableSartProcess.Columns = new ColumnCollection() {
+                new ColumnCheck("Selected"){Fixed = true},
+                new Column("StartIndex", "序号", ColumnAlign.Center),
+                new ColumnSwitch("StartExecute", "启用", ColumnAlign.Center),
+                new Column("Name", "名称", ColumnAlign.Center),
+                new Column("Type", "类型",ColumnAlign.Center){Visible=false},
+                new Column("Address", "地址",ColumnAlign.Center){Visible=false},
+                new Column("Value", "值",ColumnAlign.Center),
+                new Column("CellLinks", "操作", ColumnAlign.Center)
+            };
+            if (global.StartProcessList.Count > 0)
+            {
+                foreach (var item in global.StartProcessList)
+                {
+                    item.CellLinks = new CellLink[] {
+                        new CellButton(Guid.NewGuid().ToString(), "上移", TTypeMini.Default),
+                        new CellButton(Guid.NewGuid().ToString(), "下移", TTypeMini.Default),
+                        new CellButton(Guid.NewGuid().ToString(), "编辑", TTypeMini.Primary) ,
+                        new CellButton(Guid.NewGuid().ToString(), "删除", TTypeMini.Error)
+                    };
+                }
+            }
+            //TableSartProcess.Binding(global.StartProcessList);
+            TableSartProcess.Binding(global.StartProcessList);
+            TableStopProcess.Columns = new ColumnCollection() {
+                new ColumnCheck("Selected"){Fixed = true},
+                new Column("StartIndex", "序号", ColumnAlign.Center),
+                new ColumnSwitch("StartExecute", "启用", ColumnAlign.Center),
+                new Column("Name", "名称", ColumnAlign.Center),
+                new Column("Type", "类型",ColumnAlign.Center){Visible=false},
+                new Column("Address", "地址",ColumnAlign.Center){Visible=false},
+                new Column("Value", "值",ColumnAlign.Center),
+                new Column("CellLinks", "操作", ColumnAlign.Center)
+            };
+            if (global.StopProcessList.Count > 0)
+            {
+                foreach (var item in global.StopProcessList)
+                {
+                    item.CellLinks = new CellLink[] {
+                        new CellButton(Guid.NewGuid().ToString(), "上移", TTypeMini.Default),
+                        new CellButton(Guid.NewGuid().ToString(), "下移", TTypeMini.Default),
+                        new CellButton(Guid.NewGuid().ToString(), "编辑", TTypeMini.Primary) ,
+                        new CellButton(Guid.NewGuid().ToString(), "删除", TTypeMini.Error)
+                    };
+                }
+            }
+            TableStopProcess.Binding(global.StopProcessList);
+
+            TableStartReset.Columns = new ColumnCollection() {
+               new ColumnCheck("Selected"){Fixed = true},
+                new Column("StartIndex", "序号", ColumnAlign.Center),
+                new ColumnSwitch("StartExecute", "启用", ColumnAlign.Center),
+                new Column("Name", "名称", ColumnAlign.Center),
+                new Column("Type", "类型",ColumnAlign.Center){Visible=false},
+                new Column("Address", "地址",ColumnAlign.Center){Visible=false},
+                new Column("Value", "值",ColumnAlign.Center),
+                new Column("CellLinks", "操作", ColumnAlign.Center)
+            };
+            if (global.StartResetList.Count > 0)
+            {
+                foreach (var item in global.StartResetList)
+                {
+                    item.CellLinks = new CellLink[] {
+                        new CellButton(Guid.NewGuid().ToString(), "上移", TTypeMini.Default),
+                        new CellButton(Guid.NewGuid().ToString(), "下移", TTypeMini.Default),
+                        new CellButton(Guid.NewGuid().ToString(), "编辑", TTypeMini.Primary) ,
+                        new CellButton(Guid.NewGuid().ToString(), "删除", TTypeMini.Error)
+                    };
+                }
+            }
+            TableStartReset.Binding(global.StartResetList);
+
+            TableStopReset.Columns = new ColumnCollection() {
+               new ColumnCheck("Selected"){Fixed = true},
+                new Column("StartIndex", "序号", ColumnAlign.Center),
+                new ColumnSwitch("StartExecute", "启用", ColumnAlign.Center),
+                new Column("Name", "名称", ColumnAlign.Center),
+                new Column("Type", "类型",ColumnAlign.Center){Visible=false},
+                new Column("Address", "地址",ColumnAlign.Center){Visible=false},
+                new Column("Value", "值",ColumnAlign.Center),
+                new Column("CellLinks", "操作", ColumnAlign.Center)
+            };
+            if (global.StopResetList.Count > 0)
+            {
+                foreach (var item in global.StopResetList)
+                {
+                    item.CellLinks = new CellLink[] {
+                       new CellButton(Guid.NewGuid().ToString(), "上移", TTypeMini.Default),
+                        new CellButton(Guid.NewGuid().ToString(), "下移", TTypeMini.Default),
+                        new CellButton(Guid.NewGuid().ToString(), "编辑", TTypeMini.Primary) ,
+                        new CellButton(Guid.NewGuid().ToString(), "删除", TTypeMini.Error)
+                    };
+                }
+            }
+            TableStopReset.Binding(global.StopResetList);
+        }
+
+       
+    }
+}

DHSoftware/Views/Setting/MotionControl.Designer.cs

@@ -28,6 +28,7 @@
         /// </summary>
         private void InitializeComponent()
         {
+            AntdUI.Tabs.StyleLine styleLine1 = new AntdUI.Tabs.StyleLine();
             stackPanel2 = new AntdUI.StackPanel();
             swhEnable = new AntdUI.Switch();
             label4 = new AntdUI.Label();
@@ -56,7 +57,10 @@
             stpBaud = new AntdUI.StackPanel();
             cmbBaudRate = new AntdUI.Select();
             label3 = new AntdUI.Label();
+            tabs1 = new AntdUI.Tabs();
+            tabPage1 = new AntdUI.TabPage();
             PLCItemsTable = new AntdUI.Table();
+            panel1 = new AntdUI.Panel();
             btnDelete = new AntdUI.Button();
             btnAdd = new AntdUI.Button();
             stackPanel2.SuspendLayout();
@@ -69,6 +73,9 @@
             stpStop.SuspendLayout();
             stpData.SuspendLayout();
             stpBaud.SuspendLayout();
+            tabs1.SuspendLayout();
+            tabPage1.SuspendLayout();
+            panel1.SuspendLayout();
             SuspendLayout();
             // 
             // stackPanel2
@@ -164,9 +171,10 @@
             stackPanel1.Controls.Add(stpCom);
             stackPanel1.Controls.Add(stackPanel3);
             stackPanel1.Controls.Add(stackPanel2);
-            stackPanel1.Location = new Point(19, 16);
+            stackPanel1.Dock = DockStyle.Left;
+            stackPanel1.Location = new Point(0, 0);
             stackPanel1.Name = "stackPanel1";
-            stackPanel1.Size = new Size(223, 478);
+            stackPanel1.Size = new Size(223, 530);
             stackPanel1.TabIndex = 25;
             stackPanel1.Text = "stackPanel1";
             stackPanel1.Vertical = true;
@@ -331,22 +339,58 @@
             label3.TabIndex = 24;
             label3.Text = "波  特  率";
             // 
+            // tabs1
+            // 
+            tabs1.Dock = DockStyle.Fill;
+            tabs1.Location = new Point(223, 0);
+            tabs1.Name = "tabs1";
+            tabs1.Pages.Add(tabPage1);
+            tabs1.Size = new Size(675, 530);
+            tabs1.Style = styleLine1;
+            tabs1.TabIndex = 26;
+            tabs1.Text = "tabs1";
+            // 
+            // tabPage1
+            // 
+            tabPage1.Controls.Add(PLCItemsTable);
+            tabPage1.Controls.Add(panel1);
+            tabPage1.Location = new Point(3, 28);
+            tabPage1.Name = "tabPage1";
+            tabPage1.Size = new Size(669, 499);
+            tabPage1.TabIndex = 0;
+            tabPage1.Text = "点位表";
+            // 
             // PLCItemsTable
             // 
+            PLCItemsTable.Dock = DockStyle.Fill;
             PLCItemsTable.EmptyHeader = true;
-            PLCItemsTable.Location = new Point(238, 71);
+            PLCItemsTable.Location = new Point(0, 45);
             PLCItemsTable.Name = "PLCItemsTable";
-            PLCItemsTable.Size = new Size(634, 392);
-            PLCItemsTable.TabIndex = 26;
+            PLCItemsTable.Padding = new Padding(5);
+            PLCItemsTable.Size = new Size(669, 454);
+            PLCItemsTable.TabIndex = 36;
             PLCItemsTable.Text = "table1";
             // 
+            // panel1
+            // 
+            panel1.Back = Color.Transparent;
+            panel1.BackColor = SystemColors.Window;
+            panel1.Controls.Add(btnDelete);
+            panel1.Controls.Add(btnAdd);
+            panel1.Dock = DockStyle.Top;
+            panel1.Location = new Point(0, 0);
+            panel1.Name = "panel1";
+            panel1.Size = new Size(669, 45);
+            panel1.TabIndex = 35;
+            panel1.Text = "panel1";
+            // 
             // btnDelete
             // 
             btnDelete.Font = new Font("Microsoft YaHei UI", 9F, FontStyle.Regular, GraphicsUnit.Point, 134);
-            btnDelete.Location = new Point(331, 27);
+            btnDelete.Location = new Point(110, 10);
             btnDelete.Name = "btnDelete";
-            btnDelete.Size = new Size(80, 32);
-            btnDelete.TabIndex = 28;
+            btnDelete.Size = new Size(74, 32);
+            btnDelete.TabIndex = 36;
             btnDelete.Text = "删除";
             btnDelete.Type = AntdUI.TTypeMini.Error;
             btnDelete.WaveSize = 0;
@@ -354,10 +398,10 @@
             // btnAdd
             // 
             btnAdd.Font = new Font("Microsoft YaHei UI", 9F, FontStyle.Regular, GraphicsUnit.Point, 134);
-            btnAdd.Location = new Point(245, 27);
+            btnAdd.Location = new Point(13, 10);
             btnAdd.Name = "btnAdd";
-            btnAdd.Size = new Size(80, 32);
-            btnAdd.TabIndex = 27;
+            btnAdd.Size = new Size(82, 32);
+            btnAdd.TabIndex = 35;
             btnAdd.Text = "新增";
             btnAdd.Type = AntdUI.TTypeMini.Primary;
             btnAdd.WaveSize = 0;
@@ -366,9 +410,7 @@
             // 
             AutoScaleDimensions = new SizeF(7F, 17F);
             AutoScaleMode = AutoScaleMode.Font;
-            Controls.Add(btnDelete);
-            Controls.Add(btnAdd);
-            Controls.Add(PLCItemsTable);
+            Controls.Add(tabs1);
             Controls.Add(stackPanel1);
             Name = "MotionControl";
             Size = new Size(898, 530);
@@ -382,6 +424,9 @@
             stpStop.ResumeLayout(false);
             stpData.ResumeLayout(false);
             stpBaud.ResumeLayout(false);
+            tabs1.ResumeLayout(false);
+            tabPage1.ResumeLayout(false);
+            panel1.ResumeLayout(false);
             ResumeLayout(false);
         }
 
@@ -415,7 +460,10 @@
         private AntdUI.StackPanel stpBaud;
         private AntdUI.Select cmbBaudRate;
         private AntdUI.Label label3;
+        private AntdUI.Tabs tabs1;
+        private AntdUI.TabPage tabPage1;
         private AntdUI.Table PLCItemsTable;
+        private AntdUI.Panel panel1;
         private AntdUI.Button btnDelete;
         private AntdUI.Button btnAdd;
     }

DHSoftware/Views/Setting/MotionControl.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Data;
+using System.Diagnostics;
 using System.Drawing;
 using System.IO.Ports;
 using System.Linq;
@@ -18,28 +19,29 @@ namespace DHSoftware.Views
 {
     public partial class MotionControl : UserControl
     {
-        Window window;
-        PLCBase pLCBase;
-        public MotionControl(Window _window,PLCBase _pLCBase)
+        private Window window;
+        private PLCBase pLCBase;
+
+        public MotionControl(Window _window, PLCBase _pLCBase)
         {
-             window= _window;
-            pLCBase= _pLCBase;
+            window = _window;
+            pLCBase = _pLCBase;
             InitializeComponent();
             BindEventHandler();
             InitData();
             SetupDataBindings();
         }
 
-    
-
         private void BindEventHandler()
         {
             sltTpye.TextChanged += SltTpye_TextChanged;
             btnAdd.Click += BtnAdd_Click;
             btnDelete.Click += BtnDelete_Click;
-            PLCItemsTable.CellButtonClick += PLCItemsTable_CellButtonClick; ;
+            PLCItemsTable.CellButtonClick += PLCItemsTable_CellButtonClick;
+          
         }
 
+
         private void PLCItemsTable_CellButtonClick(object sender, TableButtonEventArgs e)
         {
             var buttontext = e.Btn.Text;
@@ -50,7 +52,7 @@ namespace DHSoftware.Views
                 {
                     //暂不支持进入整行编辑，只支持指定单元格编辑，推荐使用弹窗或抽屉编辑整行数据
                     case "编辑":
-                        var form = new MotionEdit(window, pLCItem) { Size = new Size(500, 300) };
+                        var form = new MotionEdit(window, "点位表操作-编辑", pLCItem) { Size = new Size(500, 300) };
                         AntdUI.Drawer.open(new AntdUI.Drawer.Config(window, form)
                         {
                             OnLoad = () =>
@@ -59,26 +61,11 @@ namespace DHSoftware.Views
                             },
                             OnClose = () =>
                             {
-                                pLCItem.CellTags = new CellTag[] { };
-                                var tempList = pLCItem.CellTags.ToList();
-
-                                if (pLCItem.StartExecute)
-                                {
-                                    var newTag = new CellTag($"ON_{pLCItem.StartIndex}", TTypeMini.Primary);
-                                    tempList.Add(newTag);
-                                }
-                                if (pLCItem.EndExecute)
-                                {
-                                    var newTag = new CellTag($"OFF_{pLCItem.EndIndex}", TTypeMini.Warn);
-                                    tempList.Add(newTag);
-                                }
-
-                                // 重新赋值回数组
-                                pLCItem.CellTags = tempList.ToArray();
                                 AntdUI.Message.info(window, "结束编辑", autoClose: 1);
                             }
                         });
                         break;
+
                     case "删除":
                         var result = Modal.open(window, "删除警告！", "确认要删除选择的数据吗？", TType.Warn);
                         if (result == DialogResult.OK)
@@ -87,6 +74,62 @@ namespace DHSoftware.Views
                         }
                         break;
 
+                    case "上移":
+                        if (e.RowIndex <= 1)
+                        {
+                            AntdUI.Message.warn(window, "已是第一条，无法上移！", autoClose: 3);
+                            return;
+                        }
+                        MoveItemUp(pLCBase.PLCItemList, pLCItem);
+                        break;
+
+                    case "下移":
+                        if (e.RowIndex > pLCBase.PLCItemList.Count - 1)
+                        {
+                            AntdUI.Message.warn(window, "已是最后一条，无法下移！", autoClose: 3);
+                            return;
+                        }
+                        MoveItemDown(pLCBase.PLCItemList, pLCItem);
+                        break;
+                }
+            }
+        }
+
+        // 上移项
+        public static void MoveItemUp(BindingList<PLCItem> list, PLCItem item)
+        {
+            int index = list.IndexOf(item);
+            if (index > 0)
+            {
+                // 移除并插入到前一位
+                list.RemoveAt(index);
+                list.Insert(index - 1, item);
+                UpdateStartIndexes(list); // 更新序号
+            }
+        }
+
+        // 下移项
+        public static void MoveItemDown(BindingList<PLCItem> list, PLCItem item)
+        {
+            int index = list.IndexOf(item);
+            if (index < list.Count - 1)
+            {
+                // 移除并插入到后一位
+                list.RemoveAt(index);
+                list.Insert(index + 1, item);
+                UpdateStartIndexes(list); // 更新序号
+            }
+        }
+
+        // 更新所有项的序号
+        public static void UpdateStartIndexes(BindingList<PLCItem> list)
+        {
+            for (int i = 0; i < list.Count; i++)
+            {
+                PLCItem item = list[i];
+                if (item.StartIndex != i + 1)
+                {
+                    item.StartIndex = i + 1; // 触发 PropertyChanged 事件
                 }
             }
         }
@@ -120,40 +163,43 @@ namespace DHSoftware.Views
         {
             PLCItem pLCItem = new PLCItem()
             {
+                StartIndex = pLCBase.PLCItemList.Count + 1,
                 CellLinks = new CellLink[]
-                {
-            new CellButton(Guid.NewGuid().ToString(), "编辑", TTypeMini.Primary),
-            new CellButton(Guid.NewGuid().ToString(), "删除", TTypeMini.Error)
+                { new CellButton(Guid.NewGuid().ToString(), "上移", TTypeMini.Default),
+                  new CellButton(Guid.NewGuid().ToString(), "下移", TTypeMini.Default),
+                new CellButton(Guid.NewGuid().ToString(), "编辑", TTypeMini.Primary),
+                new CellButton(Guid.NewGuid().ToString(), "删除", TTypeMini.Error)
                 }
             };
 
-            var form = new MotionEdit(window, pLCItem) { Size = new Size(450, 550) };
-            AntdUI.Modal.open(new AntdUI.Modal.Config(window, "", form, TType.None)
+            var form = new MotionEdit(window, "点位表操作-新增", pLCItem) { Size = new Size(450, 550) };
+
+            AntdUI.Drawer.open(new AntdUI.Drawer.Config(window, form)
             {
-                BtnHeight = 0,
+                OnLoad = () =>
+                {
+                    AntdUI.Message.info(window, "进入新增", autoClose: 1);
+                },
+                OnClose = () =>
+                {
+                    if (form.submit)
+                    {
+                        pLCBase.PLCItemList.Add(pLCItem);
+                    }
+
+                    AntdUI.Message.info(window, "结束新增", autoClose: 1);
+                }
             });
 
-            if (form.submit)
-            {
-                pLCItem.CellTags = new CellTag[] { };
-                var tempList = pLCItem.CellTags.ToList();
+            //AntdUI.Modal.open(new AntdUI.Modal.Config(window, "", form, TType.None)
+            //{
+            //    BtnHeight = 0,
+            //});
 
-                if (pLCItem.StartExecute)
-                {
-                    var newTag = new CellTag($"ON_{pLCItem.StartIndex}", TTypeMini.Primary);
-                    tempList.Add(newTag);
-                }
-                if (pLCItem.EndExecute)
-                {
-                    var newTag = new CellTag($"OFF_{pLCItem.EndIndex}", TTypeMini.Warn);
-                    tempList.Add(newTag);
-                }
-
-                // 重新赋值回数组
-                pLCItem.CellTags = tempList.ToArray();
-
-                pLCBase.PLCItemList.Add(pLCItem);
-            }
+            //if (form.submit)
+            //{
+            //    pLCBase.PLCItemList.Add(pLCItem);
+            //}
         }
 
         private void SltTpye_TextChanged(object? sender, EventArgs e)
@@ -193,24 +239,17 @@ namespace DHSoftware.Views
                 }
                 else
                 {
-
                 }
             }
         }
 
-
-
-
-    
-
-
         private void InitData()
         {
             // 获取枚举字段名列表（原描述改为字段名）
             sltTpye.Items.Clear();
             foreach (EnumPLCType value in Enum.GetValues(typeof(EnumPLCType)))
             {
-                sltTpye.Items.Add(value.ToString()); 
+                sltTpye.Items.Add(value.ToString());
             }
 
             // 波特率选项（保持不变）
@@ -242,46 +281,28 @@ namespace DHSoftware.Views
 
             PLCItemsTable.Columns = new ColumnCollection() {
                 new ColumnCheck("Selected"){Fixed = true},
+                new Column("StartIndex", "序号", ColumnAlign.Center),
                 new Column("Name", "名称", ColumnAlign.Center),
                 new Column("Type", "类型",ColumnAlign.Center),
                 new Column("Address", "地址",ColumnAlign.Center),
-                new Column("Value", "值",ColumnAlign.Center),
-                new Column("CellTags", "标签",ColumnAlign.Center),
                 new Column("CellLinks", "操作", ColumnAlign.Center)
             };
-            if (pLCBase.PLCItemList.Count > 0) 
+            if (pLCBase.PLCItemList.Count > 0)
             {
-                foreach( var item in pLCBase.PLCItemList)
+                foreach (var item in pLCBase.PLCItemList)
                 {
-                    item.CellTags = new CellTag[] { };
-                    var tempList = item.CellTags.ToList();
-        
-                    if (item.StartExecute)
-                    {
-                        var newTag = new CellTag($"ON_{item.StartIndex}", TTypeMini.Primary);
-                        tempList.Add(newTag);
-                    }
-                    if (item.EndExecute)
-                    {
-                        var newTag = new CellTag($"OFF_{item.EndIndex}", TTypeMini.Warn);
-                        tempList.Add(newTag);
-                    }
-
-                    // 重新赋值回数组
-                    item.CellTags = tempList.ToArray();
-
-
-
-                    item.CellLinks = new CellLink[] { 
+                    item.CellLinks = new CellLink[] {
+                             new CellButton(Guid.NewGuid().ToString(), "上移", TTypeMini.Default),
+                        new CellButton(Guid.NewGuid().ToString(), "下移", TTypeMini.Default),
                         new CellButton(Guid.NewGuid().ToString(), "编辑", TTypeMini.Primary) ,
                         new CellButton(Guid.NewGuid().ToString(), "删除", TTypeMini.Error)
                     };
                 }
             }
             PLCItemsTable.Binding(pLCBase.PLCItemList);
-        }
 
-  
+           
+        }
 
         private void SetupDataBindings()
         {
@@ -296,9 +317,7 @@ namespace DHSoftware.Views
             iptIP.DataBindings.Add(nameof(iptIP.Text), pLCBase, nameof(pLCBase.IP));
             iptPort.DataBindings.Add(nameof(iptPort.Text), pLCBase, nameof(pLCBase.Port));
 
-            swhEnable.DataBindings.Add(nameof(swhEnable.Checked),pLCBase, nameof(pLCBase.Enable));
+            swhEnable.DataBindings.Add(nameof(swhEnable.Checked), pLCBase, nameof(pLCBase.Enable));
         }
-
-       
     }
-}
+}

DHSoftware/Views/Setting/MotionEdit.Designer.cs

@@ -0,0 +1,215 @@
+namespace DHSoftware.Views
+{
+    partial class MotionEdit
+    {
+        /// <summary> 
+        /// 必需的设计器变量。
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary> 
+        /// 清理所有正在使用的资源。
+        /// </summary>
+        /// <param name="disposing">如果应释放托管资源，为 true；否则为 false。</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region 组件设计器生成的代码
+
+        /// <summary> 
+        /// 设计器支持所需的方法 - 不要修改
+        /// 使用代码编辑器修改此方法的内容。
+        /// </summary>
+        private void InitializeComponent()
+        {
+            button_cancel = new AntdUI.Button();
+            sltName = new AntdUI.Select();
+            label2 = new AntdUI.Label();
+            divider2 = new AntdUI.Divider();
+            stackPanel1 = new AntdUI.StackPanel();
+            button_ok = new AntdUI.Button();
+            divider1 = new AntdUI.Divider();
+            lbTitleName = new AntdUI.Label();
+            panel1 = new AntdUI.Panel();
+            iptAddress = new AntdUI.Input();
+            label7 = new AntdUI.Label();
+            sltDataType = new AntdUI.Select();
+            label3 = new AntdUI.Label();
+            stackPanel1.SuspendLayout();
+            panel1.SuspendLayout();
+            SuspendLayout();
+            // 
+            // button_cancel
+            // 
+            button_cancel.BorderWidth = 1F;
+            button_cancel.Font = new Font("Microsoft YaHei UI", 9F);
+            button_cancel.Ghost = true;
+            button_cancel.Location = new Point(84, 3);
+            button_cancel.Name = "button_cancel";
+            button_cancel.Size = new Size(75, 38);
+            button_cancel.TabIndex = 1;
+            button_cancel.Text = "取消";
+            // 
+            // sltName
+            // 
+            sltName.Dock = DockStyle.Top;
+            sltName.Font = new Font("Microsoft YaHei UI", 9F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            sltName.Location = new Point(18, 134);
+            sltName.MaxCount = 10;
+            sltName.Name = "sltName";
+            sltName.Radius = 3;
+            sltName.Size = new Size(409, 38);
+            sltName.TabIndex = 23;
+            // 
+            // label2
+            // 
+            label2.Dock = DockStyle.Top;
+            label2.Font = new Font("Microsoft YaHei UI", 12F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            label2.Location = new Point(18, 110);
+            label2.Name = "label2";
+            label2.Size = new Size(409, 24);
+            label2.TabIndex = 22;
+            label2.Text = "名称";
+            // 
+            // divider2
+            // 
+            divider2.Dock = DockStyle.Top;
+            divider2.Location = new Point(18, 98);
+            divider2.Name = "divider2";
+            divider2.Size = new Size(409, 12);
+            divider2.TabIndex = 21;
+            // 
+            // stackPanel1
+            // 
+            stackPanel1.Controls.Add(button_cancel);
+            stackPanel1.Controls.Add(button_ok);
+            stackPanel1.Dock = DockStyle.Top;
+            stackPanel1.Location = new Point(18, 54);
+            stackPanel1.Name = "stackPanel1";
+            stackPanel1.RightToLeft = RightToLeft.No;
+            stackPanel1.Size = new Size(409, 44);
+            stackPanel1.TabIndex = 20;
+            stackPanel1.Text = "stackPanel1";
+            // 
+            // button_ok
+            // 
+            button_ok.Font = new Font("Microsoft YaHei UI", 9F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            button_ok.Location = new Point(3, 3);
+            button_ok.Name = "button_ok";
+            button_ok.Size = new Size(75, 38);
+            button_ok.TabIndex = 0;
+            button_ok.Text = "确定";
+            button_ok.Type = AntdUI.TTypeMini.Primary;
+            // 
+            // divider1
+            // 
+            divider1.Dock = DockStyle.Top;
+            divider1.Location = new Point(18, 42);
+            divider1.Name = "divider1";
+            divider1.Size = new Size(409, 12);
+            divider1.TabIndex = 19;
+            // 
+            // lbTitleName
+            // 
+            lbTitleName.Dock = DockStyle.Top;
+            lbTitleName.Font = new Font("Microsoft YaHei UI", 12F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            lbTitleName.Location = new Point(18, 18);
+            lbTitleName.Name = "lbTitleName";
+            lbTitleName.Size = new Size(409, 24);
+            lbTitleName.TabIndex = 17;
+            lbTitleName.Text = "PLC点位操作";
+            // 
+            // panel1
+            // 
+            panel1.Controls.Add(iptAddress);
+            panel1.Controls.Add(label7);
+            panel1.Controls.Add(sltDataType);
+            panel1.Controls.Add(label3);
+            panel1.Controls.Add(sltName);
+            panel1.Controls.Add(label2);
+            panel1.Controls.Add(divider2);
+            panel1.Controls.Add(stackPanel1);
+            panel1.Controls.Add(divider1);
+            panel1.Controls.Add(lbTitleName);
+            panel1.Dock = DockStyle.Fill;
+            panel1.Location = new Point(0, 0);
+            panel1.Name = "panel1";
+            panel1.Padding = new Padding(12);
+            panel1.Shadow = 6;
+            panel1.Size = new Size(445, 315);
+            panel1.TabIndex = 1;
+            panel1.Text = "panel1";
+            // 
+            // iptAddress
+            // 
+            iptAddress.Dock = DockStyle.Top;
+            iptAddress.Font = new Font("Microsoft YaHei UI", 9F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            iptAddress.Location = new Point(18, 258);
+            iptAddress.Name = "iptAddress";
+            iptAddress.Radius = 3;
+            iptAddress.Size = new Size(409, 38);
+            iptAddress.TabIndex = 54;
+            // 
+            // label7
+            // 
+            label7.Dock = DockStyle.Top;
+            label7.Font = new Font("Microsoft YaHei UI", 12F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            label7.Location = new Point(18, 234);
+            label7.Name = "label7";
+            label7.Size = new Size(409, 24);
+            label7.TabIndex = 53;
+            label7.Text = "地址";
+            // 
+            // sltDataType
+            // 
+            sltDataType.Dock = DockStyle.Top;
+            sltDataType.List = true;
+            sltDataType.Location = new Point(18, 196);
+            sltDataType.Name = "sltDataType";
+            sltDataType.Size = new Size(409, 38);
+            sltDataType.TabIndex = 45;
+            // 
+            // label3
+            // 
+            label3.Dock = DockStyle.Top;
+            label3.Font = new Font("Microsoft YaHei UI", 12F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            label3.Location = new Point(18, 172);
+            label3.Name = "label3";
+            label3.Size = new Size(409, 24);
+            label3.TabIndex = 44;
+            label3.Text = "数据类型";
+            // 
+            // MotionEdit
+            // 
+            AutoScaleDimensions = new SizeF(7F, 17F);
+            AutoScaleMode = AutoScaleMode.Font;
+            Controls.Add(panel1);
+            Name = "MotionEdit";
+            Size = new Size(445, 315);
+            stackPanel1.ResumeLayout(false);
+            panel1.ResumeLayout(false);
+            ResumeLayout(false);
+        }
+
+        #endregion
+        private AntdUI.Button button_cancel;
+        private AntdUI.Select sltName;
+        private AntdUI.Label label2;
+        private AntdUI.Divider divider2;
+        private AntdUI.StackPanel stackPanel1;
+        private AntdUI.Button button_ok;
+        private AntdUI.Divider divider1;
+        private AntdUI.Label lbTitleName;
+        private AntdUI.Panel panel1;
+        private AntdUI.Select sltDataType;
+        private AntdUI.Label label3;
+        private AntdUI.Input iptAddress;
+        private AntdUI.Label label7;
+    }
+}

DHSoftware/Views/Setting/MotionEdit.cs

@@ -0,0 +1,83 @@
+using AntdUI;
+using DH.Commons.Base;
+using DH.Commons.Enums;
+using DH.Devices.PLC;
+
+namespace DHSoftware.Views
+{
+    public partial class MotionEdit : UserControl
+    {
+        private AntdUI.Window window;
+        private PLCItem plcItem;
+        public bool submit;
+        public MotionEdit(AntdUI.Window _window,string TitleName, PLCItem _plcItem)
+        {
+            InitializeComponent();
+            lbTitleName.Text = TitleName;
+            plcItem = _plcItem;
+            // 绑定事件
+            BindEventHandler();
+            //设置默认值
+            InitData();
+
+        }
+        private void BindEventHandler()
+        {
+            button_ok.Click += Button_ok_Click;
+            button_cancel.Click += Button_cancel_Click;
+
+
+          
+        }
+
+
+        private void Button_cancel_Click(object sender, EventArgs e)
+        {
+            submit = false;
+            this.Dispose();
+        }
+
+        private void Button_ok_Click(object sender, EventArgs e)
+        {
+            sltName.Status = AntdUI.TType.None;
+            //检查输入内容
+            if (String.IsNullOrEmpty(sltName.Text))
+            {
+                sltName.Status = AntdUI.TType.Error;
+                AntdUI.Message.warn(window, "参数名称不能为空！", autoClose: 3);
+                return;
+            }
+            plcItem.Name = sltName.Text;
+            plcItem.Address = iptAddress.Text;
+            plcItem.Type = (EnumPLCDataType)sltDataType.SelectedIndex;
+            submit = true;
+            this.Dispose();
+        }
+
+        private void InitData()
+        {
+            var PLCItemNames = Enum.GetNames(typeof(EnumPLCOutputIO));
+            foreach (var name in PLCItemNames)
+            {
+                sltName.Items.Add(name);
+            }
+            var PLCDataTypes = Enum.GetNames(typeof(EnumPLCDataType));
+            foreach (var name in PLCDataTypes)
+            {
+                sltDataType.Items.Add(name);
+            }
+            sltDataType.SelectedIndex = 0;
+         
+
+            if (!string.IsNullOrEmpty(plcItem.Name))
+            {
+                sltName.Text = plcItem.Name;
+                iptAddress.Text = plcItem.Address;
+                sltDataType.SelectedIndex =(int)plcItem.Type;
+            
+            }
+        }
+
+
+    }
+}

DHSoftware/Views/Setting/MotionProcessEdit.Designer.cs

@@ -1,6 +1,6 @@
 namespace DHSoftware.Views
 {
-    partial class MotionEdit
+    partial class MotionProcessEdit
     {
         /// <summary> 
         /// 必需的设计器变量。
@@ -35,30 +35,19 @@
             stackPanel1 = new AntdUI.StackPanel();
             button_ok = new AntdUI.Button();
             divider1 = new AntdUI.Divider();
-            label1 = new AntdUI.Label();
+            lbTitleName = new AntdUI.Label();
             panel1 = new AntdUI.Panel();
-            stackPanel3 = new AntdUI.StackPanel();
-            sltEnd = new AntdUI.Select();
-            label6 = new AntdUI.Label();
-            stackPanel2 = new AntdUI.StackPanel();
-            sltStart = new AntdUI.Select();
-            label5 = new AntdUI.Label();
-            sltBoolValue = new AntdUI.Select();
-            stpNum = new AntdUI.StackPanel();
-            sltIntType = new AntdUI.Select();
+            sltValue = new AntdUI.Select();
             iptValue = new AntdUI.Input();
-            label4 = new AntdUI.Label();
+            label1 = new AntdUI.Label();
             iptAddress = new AntdUI.Input();
             label7 = new AntdUI.Label();
             sltDataType = new AntdUI.Select();
+            label4 = new AntdUI.Label();
+            sltEnable = new AntdUI.Select();
             label3 = new AntdUI.Label();
-            iptStartIndex = new AntdUI.InputNumber();
-            iptEndIndex = new AntdUI.InputNumber();
             stackPanel1.SuspendLayout();
             panel1.SuspendLayout();
-            stackPanel3.SuspendLayout();
-            stackPanel2.SuspendLayout();
-            stpNum.SuspendLayout();
             SuspendLayout();
             // 
             // button_cancel
@@ -131,187 +120,124 @@
             divider1.Size = new Size(409, 12);
             divider1.TabIndex = 19;
             // 
-            // label1
+            // lbTitleName
             // 
-            label1.Dock = DockStyle.Top;
-            label1.Font = new Font("Microsoft YaHei UI", 12F, FontStyle.Regular, GraphicsUnit.Point, 134);
-            label1.Location = new Point(18, 18);
-            label1.Name = "label1";
-            label1.Size = new Size(409, 24);
-            label1.TabIndex = 17;
-            label1.Text = "PLC点位操作";
+            lbTitleName.Dock = DockStyle.Top;
+            lbTitleName.Font = new Font("Microsoft YaHei UI", 12F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            lbTitleName.Location = new Point(18, 18);
+            lbTitleName.Name = "lbTitleName";
+            lbTitleName.Size = new Size(409, 24);
+            lbTitleName.TabIndex = 17;
+            lbTitleName.Text = "PLC点位操作";
             // 
             // panel1
             // 
-            panel1.Controls.Add(stackPanel3);
-            panel1.Controls.Add(label6);
-            panel1.Controls.Add(stackPanel2);
-            panel1.Controls.Add(label5);
-            panel1.Controls.Add(sltBoolValue);
-            panel1.Controls.Add(stpNum);
-            panel1.Controls.Add(label4);
+            panel1.Controls.Add(sltValue);
+            panel1.Controls.Add(iptValue);
+            panel1.Controls.Add(label1);
             panel1.Controls.Add(iptAddress);
             panel1.Controls.Add(label7);
             panel1.Controls.Add(sltDataType);
+            panel1.Controls.Add(label4);
+            panel1.Controls.Add(sltEnable);
             panel1.Controls.Add(label3);
             panel1.Controls.Add(sltName);
             panel1.Controls.Add(label2);
             panel1.Controls.Add(divider2);
             panel1.Controls.Add(stackPanel1);
             panel1.Controls.Add(divider1);
-            panel1.Controls.Add(label1);
+            panel1.Controls.Add(lbTitleName);
             panel1.Dock = DockStyle.Fill;
             panel1.Location = new Point(0, 0);
             panel1.Name = "panel1";
             panel1.Padding = new Padding(12);
             panel1.Shadow = 6;
-            panel1.Size = new Size(445, 572);
+            panel1.Size = new Size(445, 549);
             panel1.TabIndex = 1;
             panel1.Text = "panel1";
+            panel1.Click += panel1_Click;
             // 
-            // stackPanel3
+            // sltValue
             // 
-            stackPanel3.BackColor = SystemColors.Window;
-            stackPanel3.Controls.Add(iptEndIndex);
-            stackPanel3.Controls.Add(sltEnd);
-            stackPanel3.Dock = DockStyle.Top;
-            stackPanel3.Location = new Point(18, 496);
-            stackPanel3.Name = "stackPanel3";
-            stackPanel3.Size = new Size(409, 45);
-            stackPanel3.TabIndex = 61;
-            stackPanel3.Text = "stackPanel3";
-            // 
-            // sltEnd
-            // 
-            sltEnd.Dock = DockStyle.Left;
-            sltEnd.Items.AddRange(new object[] { "执行", "取消" });
-            sltEnd.List = true;
-            sltEnd.Location = new Point(3, 3);
-            sltEnd.Name = "sltEnd";
-            sltEnd.Size = new Size(268, 39);
-            sltEnd.TabIndex = 35;
-            // 
-            // label6
-            // 
-            label6.Dock = DockStyle.Top;
-            label6.Font = new Font("Microsoft YaHei UI", 12F, FontStyle.Regular, GraphicsUnit.Point, 134);
-            label6.Location = new Point(18, 472);
-            label6.Name = "label6";
-            label6.Size = new Size(409, 24);
-            label6.TabIndex = 60;
-            label6.Text = "流程结束执行";
-            // 
-            // stackPanel2
-            // 
-            stackPanel2.BackColor = SystemColors.Window;
-            stackPanel2.Controls.Add(iptStartIndex);
-            stackPanel2.Controls.Add(sltStart);
-            stackPanel2.Dock = DockStyle.Top;
-            stackPanel2.Location = new Point(18, 427);
-            stackPanel2.Name = "stackPanel2";
-            stackPanel2.Size = new Size(409, 45);
-            stackPanel2.TabIndex = 59;
-            stackPanel2.Text = "stackPanel2";
-            // 
-            // sltStart
-            // 
-            sltStart.Dock = DockStyle.Left;
-            sltStart.Items.AddRange(new object[] { "执行", "取消" });
-            sltStart.List = true;
-            sltStart.Location = new Point(3, 3);
-            sltStart.Name = "sltStart";
-            sltStart.Size = new Size(268, 39);
-            sltStart.TabIndex = 35;
-            // 
-            // label5
-            // 
-            label5.Dock = DockStyle.Top;
-            label5.Font = new Font("Microsoft YaHei UI", 12F, FontStyle.Regular, GraphicsUnit.Point, 134);
-            label5.Location = new Point(18, 403);
-            label5.Name = "label5";
-            label5.Size = new Size(409, 24);
-            label5.TabIndex = 58;
-            label5.Text = "流程开始执行";
-            // 
-            // sltBoolValue
-            // 
-            sltBoolValue.Dock = DockStyle.Top;
-            sltBoolValue.Items.AddRange(new object[] { "True", "False" });
-            sltBoolValue.List = true;
-            sltBoolValue.Location = new Point(18, 365);
-            sltBoolValue.Name = "sltBoolValue";
-            sltBoolValue.Size = new Size(409, 38);
-            sltBoolValue.TabIndex = 57;
-            // 
-            // stpNum
-            // 
-            stpNum.BackColor = SystemColors.Window;
-            stpNum.Controls.Add(sltIntType);
-            stpNum.Controls.Add(iptValue);
-            stpNum.Dock = DockStyle.Top;
-            stpNum.Location = new Point(18, 320);
-            stpNum.Name = "stpNum";
-            stpNum.Size = new Size(409, 45);
-            stpNum.TabIndex = 56;
-            stpNum.Text = "stackPanel2";
-            // 
-            // sltIntType
-            // 
-            sltIntType.Dock = DockStyle.Left;
-            sltIntType.List = true;
-            sltIntType.Location = new Point(277, 3);
-            sltIntType.Name = "sltIntType";
-            sltIntType.Size = new Size(132, 39);
-            sltIntType.TabIndex = 35;
+            sltValue.Dock = DockStyle.Top;
+            sltValue.List = true;
+            sltValue.Location = new Point(18, 420);
+            sltValue.Name = "sltValue";
+            sltValue.Size = new Size(409, 38);
+            sltValue.TabIndex = 63;
+            sltValue.Visible = false;
             // 
             // iptValue
             // 
-            iptValue.Dock = DockStyle.Left;
+            iptValue.Dock = DockStyle.Top;
             iptValue.Font = new Font("Microsoft YaHei UI", 9F, FontStyle.Regular, GraphicsUnit.Point, 134);
-            iptValue.Location = new Point(3, 3);
+            iptValue.Location = new Point(18, 382);
             iptValue.Name = "iptValue";
+            iptValue.PlaceholderText = "";
             iptValue.Radius = 3;
-            iptValue.Size = new Size(268, 39);
-            iptValue.TabIndex = 24;
+            iptValue.Size = new Size(409, 38);
+            iptValue.TabIndex = 62;
+            iptValue.Visible = false;
             // 
-            // label4
+            // label1
             // 
-            label4.Dock = DockStyle.Top;
-            label4.Font = new Font("Microsoft YaHei UI", 12F, FontStyle.Regular, GraphicsUnit.Point, 134);
-            label4.Location = new Point(18, 296);
-            label4.Name = "label4";
-            label4.Size = new Size(409, 24);
-            label4.TabIndex = 55;
-            label4.Text = "值";
+            label1.Dock = DockStyle.Top;
+            label1.Font = new Font("Microsoft YaHei UI", 12F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            label1.Location = new Point(18, 358);
+            label1.Name = "label1";
+            label1.Size = new Size(409, 24);
+            label1.TabIndex = 61;
+            label1.Text = "值";
             // 
             // iptAddress
             // 
             iptAddress.Dock = DockStyle.Top;
             iptAddress.Font = new Font("Microsoft YaHei UI", 9F, FontStyle.Regular, GraphicsUnit.Point, 134);
-            iptAddress.Location = new Point(18, 258);
+            iptAddress.Location = new Point(18, 320);
             iptAddress.Name = "iptAddress";
             iptAddress.Radius = 3;
+            iptAddress.ReadOnly = true;
             iptAddress.Size = new Size(409, 38);
-            iptAddress.TabIndex = 54;
+            iptAddress.TabIndex = 60;
             // 
             // label7
             // 
             label7.Dock = DockStyle.Top;
             label7.Font = new Font("Microsoft YaHei UI", 12F, FontStyle.Regular, GraphicsUnit.Point, 134);
-            label7.Location = new Point(18, 234);
+            label7.Location = new Point(18, 296);
             label7.Name = "label7";
             label7.Size = new Size(409, 24);
-            label7.TabIndex = 53;
+            label7.TabIndex = 59;
             label7.Text = "地址";
             // 
             // sltDataType
             // 
             sltDataType.Dock = DockStyle.Top;
             sltDataType.List = true;
-            sltDataType.Location = new Point(18, 196);
+            sltDataType.Location = new Point(18, 258);
             sltDataType.Name = "sltDataType";
+            sltDataType.ReadOnly = true;
             sltDataType.Size = new Size(409, 38);
-            sltDataType.TabIndex = 45;
+            sltDataType.TabIndex = 58;
+            // 
+            // label4
+            // 
+            label4.Dock = DockStyle.Top;
+            label4.Font = new Font("Microsoft YaHei UI", 12F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            label4.Location = new Point(18, 234);
+            label4.Name = "label4";
+            label4.Size = new Size(409, 24);
+            label4.TabIndex = 57;
+            label4.Text = "数据类型";
+            // 
+            // sltEnable
+            // 
+            sltEnable.Dock = DockStyle.Top;
+            sltEnable.List = true;
+            sltEnable.Location = new Point(18, 196);
+            sltEnable.Name = "sltEnable";
+            sltEnable.Size = new Size(409, 38);
+            sltEnable.TabIndex = 45;
             // 
             // label3
             // 
@@ -321,42 +247,17 @@
             label3.Name = "label3";
             label3.Size = new Size(409, 24);
             label3.TabIndex = 44;
-            label3.Text = "数据类型";
+            label3.Text = "状态";
             // 
-            // iptStartIndex
-            // 
-            iptStartIndex.Location = new Point(277, 3);
-            iptStartIndex.Maximum = new decimal(new int[] { 99999999, 0, 0, 0 });
-            iptStartIndex.Minimum = new decimal(new int[] { 2, 0, 0, int.MinValue });
-            iptStartIndex.Name = "iptStartIndex";
-            iptStartIndex.Size = new Size(129, 39);
-            iptStartIndex.TabIndex = 37;
-            iptStartIndex.Text = "-1";
-            iptStartIndex.Value = new decimal(new int[] { 1, 0, 0, int.MinValue });
-            // 
-            // iptEndIndex
-            // 
-            iptEndIndex.Location = new Point(277, 3);
-            iptEndIndex.Maximum = new decimal(new int[] { 99999999, 0, 0, 0 });
-            iptEndIndex.Minimum = new decimal(new int[] { 2, 0, 0, int.MinValue });
-            iptEndIndex.Name = "iptEndIndex";
-            iptEndIndex.Size = new Size(129, 39);
-            iptEndIndex.TabIndex = 38;
-            iptEndIndex.Text = "-1";
-            iptEndIndex.Value = new decimal(new int[] { 1, 0, 0, int.MinValue });
-            // 
-            // MotionEdit
+            // MotionProcessEdit
             // 
             AutoScaleDimensions = new SizeF(7F, 17F);
             AutoScaleMode = AutoScaleMode.Font;
             Controls.Add(panel1);
-            Name = "MotionEdit";
-            Size = new Size(445, 572);
+            Name = "MotionProcessEdit";
+            Size = new Size(445, 549);
             stackPanel1.ResumeLayout(false);
             panel1.ResumeLayout(false);
-            stackPanel3.ResumeLayout(false);
-            stackPanel2.ResumeLayout(false);
-            stpNum.ResumeLayout(false);
             ResumeLayout(false);
         }
 
@@ -368,24 +269,16 @@
         private AntdUI.StackPanel stackPanel1;
         private AntdUI.Button button_ok;
         private AntdUI.Divider divider1;
-        private AntdUI.Label label1;
+        private AntdUI.Label lbTitleName;
         private AntdUI.Panel panel1;
-        private AntdUI.Select sltDataType;
+        private AntdUI.Select sltEnable;
         private AntdUI.Label label3;
-        private AntdUI.StackPanel stackPanel3;
-        private AntdUI.Select sltEnd;
-        private AntdUI.Label label6;
-        private AntdUI.StackPanel stackPanel2;
-        private AntdUI.Select sltStart;
-        private AntdUI.Label label5;
-        private AntdUI.Select sltBoolValue;
-        private AntdUI.StackPanel stpNum;
-        private AntdUI.Select sltIntType;
         private AntdUI.Input iptValue;
-        private AntdUI.Label label4;
+        private AntdUI.Label label1;
         private AntdUI.Input iptAddress;
         private AntdUI.Label label7;
-        private AntdUI.InputNumber iptStartIndex;
-        private AntdUI.InputNumber iptEndIndex;
+        private AntdUI.Select sltDataType;
+        private AntdUI.Label label4;
+        private AntdUI.Select sltValue;
     }
 }

DHSoftware/Views/Setting/MotionProcessEdit.cs

@@ -0,0 +1,134 @@
+using System.ComponentModel;
+using AntdUI;
+using DH.Commons.Base;
+using DH.Commons.Enums;
+using DH.Devices.PLC;
+
+namespace DHSoftware.Views
+{
+    public partial class MotionProcessEdit : UserControl
+    {
+        private AntdUI.Window window;
+        private PLCItem plcItem;
+        private BindingList<PLCItem> plcItemList;
+        public bool submit;
+        public MotionProcessEdit(AntdUI.Window _window, string TitleName, PLCItem _plcItem, BindingList<PLCItem> _plcItemList)
+        {
+            InitializeComponent();
+            lbTitleName.Text = TitleName;
+            plcItem = _plcItem;
+            plcItemList= _plcItemList;
+            // 绑定事件
+            BindEventHandler();
+            //设置默认值
+            InitData();
+
+        }
+        private void BindEventHandler()
+        {
+            sltName.SelectedIndexChanged += SltName_SelectedIndexChanged;
+            button_ok.Click += Button_ok_Click;
+            button_cancel.Click += Button_cancel_Click;
+            sltDataType.SelectedIndexChanged += SltDataType_SelectedIndexChanged;
+
+
+        }
+
+        private void SltDataType_SelectedIndexChanged(object sender, IntEventArgs e)
+        {
+            iptValue.Visible = e.Value != 3;
+            sltValue.Visible = e.Value == 3;
+        }
+
+        private void SltName_SelectedIndexChanged(object sender, IntEventArgs e)
+        {
+            Select select = (Select)sender;
+            var pLCItems=plcItemList.Where(it=>it.Name==select.Text).FirstOrDefault();
+            if (pLCItems != null)
+            {
+                sltDataType.SelectedIndex =(int)pLCItems.Type;
+                iptAddress.Text= pLCItems.Address;
+            }
+        }
+
+        private void Button_cancel_Click(object sender, EventArgs e)
+        {
+            submit = false;
+            this.Dispose();
+        }
+
+        private void Button_ok_Click(object sender, EventArgs e)
+        {
+            sltName.Status = AntdUI.TType.None;
+            //检查输入内容
+            if (String.IsNullOrEmpty(sltName.Text))
+            {
+                sltName.Status = AntdUI.TType.Error;
+                AntdUI.Message.warn(window, "参数名称不能为空！", autoClose: 3);
+                return;
+            }
+            plcItem.Name = sltName.Text;
+            plcItem.Address = iptAddress.Text;
+            plcItem.Type = (EnumPLCDataType)sltDataType.SelectedIndex;
+            if (sltDataType.SelectedIndex != 3)
+            {
+                plcItem.Value = iptValue.Text;
+            }
+            else
+            {
+                plcItem.Value = sltValue.Text;
+            }
+         
+            plcItem.StartExecute = sltEnable.SelectedIndex != 0;
+            submit = true;
+            this.Dispose();
+        }
+
+        private void InitData()
+        {
+           
+            foreach (var item in plcItemList)
+            {
+                sltName.Items.Add(item.Name);
+            }
+
+            var PLCDataTypes = Enum.GetNames(typeof(EnumPLCDataType));
+            foreach (var name in PLCDataTypes)
+            {
+                sltDataType.Items.Add(name);
+            }
+  
+            var boolNames = Enum.GetNames(typeof(EnumBool));
+            foreach (var name in boolNames)
+            {
+                sltEnable.Items.Add(name);
+            }
+            var bool1Names = Enum.GetNames(typeof(EnumBool1));
+            foreach (var name in bool1Names)
+            {
+                sltValue.Items.Add(name);
+            }
+
+            if (!string.IsNullOrEmpty(plcItem.Name))
+            {
+                sltName.Text = plcItem.Name;
+                iptAddress.Text = plcItem.Address;
+                sltDataType.SelectedIndex = (int)plcItem.Type;
+                sltEnable.SelectedIndex = plcItem.StartExecute ? 1 : 0;
+                if (sltDataType.SelectedIndex != 3)
+                {
+                    iptValue.Text = plcItem.Value;
+                }
+                else
+                {
+                    sltValue.SelectedIndex=plcItem.Value=="True"?1:0;
+                }
+            }
+        }
+
+        private void panel1_Click(object sender, EventArgs e)
+        {
+
+        }
+    }
+}

DHSoftware/Views/Setting/PreTreatEdit.resx

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <root>
   <!--
-    Microsoft ResX Schema 
+    Microsoft ResX Schema
 
     Version 2.0
 
@@ -48,7 +48,7 @@
     value   : The object must be serialized with
             : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
             : and then encoded with base64 encoding.
-    
+
     mimetype: application/x-microsoft.net.object.soap.base64
     value   : The object must be serialized with
             : System.Runtime.Serialization.Formatters.Soap.SoapFormatter

DHSoftware/Views/SettingWindow.Designer.cs

@@ -28,10 +28,12 @@
         /// </summary>
         private void InitializeComponent()
         {
+            AntdUI.MenuItem menuItem1 = new AntdUI.MenuItem();
+            AntdUI.MenuItem menuItem2 = new AntdUI.MenuItem();
+            AntdUI.MenuItem menuItem3 = new AntdUI.MenuItem();
             AntdUI.MenuItem menuItem4 = new AntdUI.MenuItem();
             AntdUI.MenuItem menuItem5 = new AntdUI.MenuItem();
-            AntdUI.MenuItem menuItem6 = new AntdUI.MenuItem();
-            AntdUI.Tabs.StyleCard styleCard2 = new AntdUI.Tabs.StyleCard();
+            AntdUI.Tabs.StyleCard styleCard1 = new AntdUI.Tabs.StyleCard();
             pageHeader1 = new AntdUI.PageHeader();
             panel1 = new AntdUI.Panel();
             panel2 = new AntdUI.StackPanel();
@@ -116,15 +118,25 @@
             // 
             menu1.BackColor = SystemColors.Window;
             menu1.Dock = DockStyle.Top;
-            menuItem4.IconSvg = "VideoCameraOutlined";
-            menuItem4.Text = "相机设置";
-            menuItem5.IconSvg = "AppstoreOutlined";
-            menuItem5.Text = "工位设置";
-            menuItem6.IconSvg = "ControlOutlined";
-            menuItem6.Text = "运控设置";
+            menuItem1.Expand = false;
+            menuItem1.IconSvg = "VideoCameraOutlined";
+            menuItem1.Text = "相机设置";
+            menuItem2.Expand = false;
+            menuItem2.IconSvg = "AppstoreOutlined";
+            menuItem2.Text = "工位设置";
+            menuItem3.Expand = false;
+            menuItem3.IconSvg = "ControlOutlined";
+            menuItem3.Text = "运控设置";
+            menuItem4.Expand = false;
+            menuItem4.IconSvg = "BarsOutlined";
+            menuItem5.IconSvg = "BarsOutlined";
+            menuItem5.Text = "全局设置";
+            menuItem4.Sub.Add(menuItem5);
+            menuItem4.Text = "其他设置";
+            menu1.Items.Add(menuItem1);
+            menu1.Items.Add(menuItem2);
+            menu1.Items.Add(menuItem3);
             menu1.Items.Add(menuItem4);
-            menu1.Items.Add(menuItem5);
-            menu1.Items.Add(menuItem6);
             menu1.Location = new Point(0, 0);
             menu1.Name = "menu1";
             menu1.Size = new Size(141, 632);
@@ -152,8 +164,8 @@
             tabs1.Location = new Point(151, 33);
             tabs1.Name = "tabs1";
             tabs1.Size = new Size(891, 666);
-            styleCard2.Closable = true;
-            tabs1.Style = styleCard2;
+            styleCard1.Closable = true;
+            tabs1.Style = styleCard1;
             tabs1.TabIndex = 5;
             tabs1.Text = "tabs1";
             tabs1.Type = AntdUI.TabType.Card;
@@ -170,13 +182,13 @@
             divider1.Text = "";
             divider1.Vertical = true;
             // 
-            // SettingWindow1
+            // SettingWindow
             // 
             AutoScaleDimensions = new SizeF(7F, 17F);
             AutoScaleMode = AutoScaleMode.Font;
             ClientSize = new Size(1042, 699);
             Controls.Add(panel3);
-            Name = "SettingWindow1";
+            Name = "SettingWindow";
             StartPosition = FormStartPosition.CenterScreen;
             Text = "SettingWinform";
             panel1.ResumeLayout(false);
@@ -195,6 +207,6 @@
         private AntdUI.Tabs tabs1;
         private AntdUI.Divider divider1;
         private AntdUI.Dropdown btnAdd;
-        private AntdUI.Button btnSave;
+        private AntdUI.Dropdown btnSave;
     }
 }

DHSoftware/Views/SettingWindow.cs

@@ -173,6 +173,51 @@ namespace DHSoftware.Views
                             currControl = control;
                         }
                         break;
+                    case "其他设置":
+                        foreach (var tab in tabs1.Pages)
+                        {
+                            if (tab is AntdUI.TabPage existingTab && existingTab.Text == $"{clickedItem.PARENTITEM.Text}-{clickedItem.Text}")
+                            {
+                                isUpdatingTabs = true;
+                                tabs1.SelectedTab = existingTab; // 直接跳转到已存在的 TabPage
+                                isUpdatingTabs = false;
+                                currControl = existingTab.Controls.Count > 0 ? existingTab.Controls[0] as UserControl : null;
+                                return;
+                            }
+                        }
+                       
+                        if (clickedItem.Text == "全局设置")
+                        {
+                            //先获取是否存在该名称的配置
+                            //如果没有新建项
+                            GlobalConfig? global = ConfigModel
+                            .GlobalList.FirstOrDefault() ;
+                            if (global == null)
+                            {
+                                global = new GlobalConfig();
+                            }
+
+                            UserControl control3 = null;
+                            control = new GlobalControl(this, global);
+                            if (control != null)
+                            {
+                                //容器添加控件，需要调整dpi
+                                control.Dock = DockStyle.Fill;
+                                AutoDpi(control);
+                                AntdUI.TabPage tabPage = new AntdUI.TabPage()
+                                {
+                                    Text = $"{clickedItem.PARENTITEM.Text}-{clickedItem.Text}",
+                                    ReadOnly = false,
+                                };
+                                tabPage.Controls.Add(control);
+                                tabs1.Pages.Add(tabPage);
+                                isUpdatingTabs = true;
+                                tabs1.SelectedTab = tabPage;
+                                isUpdatingTabs = false;
+                                currControl = control;
+                            }
+                        }
+                        break;
                 }
             }
         }
@@ -186,7 +231,6 @@ namespace DHSoftware.Views
             btnAdd.Items.Add("相机设置");
             btnAdd.Items.Add("工位设置");
             btnAdd.Items.Add("运控设置");
-
             x = Width;
             y = Height;
             AdaptiveHelper.setTag(this);
@@ -237,6 +281,12 @@ namespace DHSoftware.Views
                     }
                 }
             }
+            if (ConfigModel.GlobalList?.Count <= 0) 
+            {
+                GlobalConfig globalConfig = new GlobalConfig();
+                ConfigModel.GlobalList.Add(globalConfig);
+            }
+          
         }
 
         private void BtnSave_Click(object? sender, EventArgs e)
@@ -652,6 +702,8 @@ namespace DHSoftware.Views
                         }
                     }
                     break;
+
+
             }
         }
     }

DHSoftware/Views/SizeConfigControl.Designer.cs

@@ -1,104 +0,0 @@
-namespace DHSoftware.Views
-{
-    partial class SizeConfigControl
-    {
-        /// <summary> 
-        /// 必需的设计器变量。
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary> 
-        /// 清理所有正在使用的资源。
-        /// </summary>
-        /// <param name="disposing">如果应释放托管资源，为 true；否则为 false。</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region 组件设计器生成的代码
-
-        /// <summary> 
-        /// 设计器支持所需的方法 - 不要修改
-        /// 使用代码编辑器修改此方法的内容。
-        /// </summary>
-        private void InitializeComponent()
-        {
-            panel2 = new Panel();
-            label2 = new Label();
-            btnDelSizeParm = new AntdUI.Button();
-            tbSizeParm = new AntdUI.Table();
-            btnAddSizeParm = new AntdUI.Button();
-            panel2.SuspendLayout();
-            SuspendLayout();
-            // 
-            // panel2
-            // 
-            panel2.Controls.Add(label2);
-            panel2.Controls.Add(btnDelSizeParm);
-            panel2.Controls.Add(tbSizeParm);
-            panel2.Controls.Add(btnAddSizeParm);
-            panel2.Location = new Point(3, 3);
-            panel2.Name = "panel2";
-            panel2.Size = new Size(779, 286);
-            panel2.TabIndex = 36;
-            // 
-            // label2
-            // 
-            label2.AutoSize = true;
-            label2.Location = new Point(3, 5);
-            label2.Name = "label2";
-            label2.Size = new Size(56, 17);
-            label2.TabIndex = 25;
-            label2.Text = "尺寸参数";
-            // 
-            // btnDelSizeParm
-            // 
-            btnDelSizeParm.Location = new Point(93, 25);
-            btnDelSizeParm.Name = "btnDelSizeParm";
-            btnDelSizeParm.Size = new Size(84, 34);
-            btnDelSizeParm.TabIndex = 24;
-            btnDelSizeParm.Text = "删除";
-            // 
-            // tbSizeParm
-            // 
-            tbSizeParm.Location = new Point(3, 65);
-            tbSizeParm.Name = "tbSizeParm";
-            tbSizeParm.Size = new Size(773, 218);
-            tbSizeParm.TabIndex = 22;
-            tbSizeParm.Text = "table1";
-            // 
-            // btnAddSizeParm
-            // 
-            btnAddSizeParm.Location = new Point(3, 25);
-            btnAddSizeParm.Name = "btnAddSizeParm";
-            btnAddSizeParm.Size = new Size(84, 34);
-            btnAddSizeParm.TabIndex = 23;
-            btnAddSizeParm.Text = "新增";
-            // 
-            // SizeConfigControl
-            // 
-            AutoScaleDimensions = new SizeF(7F, 17F);
-            AutoScaleMode = AutoScaleMode.Font;
-            BorderStyle = BorderStyle.FixedSingle;
-            Controls.Add(panel2);
-            Name = "SizeConfigControl";
-            Size = new Size(783, 290);
-            panel2.ResumeLayout(false);
-            panel2.PerformLayout();
-            ResumeLayout(false);
-        }
-
-        #endregion
-
-        private Panel panel2;
-        private Label label2;
-        private AntdUI.Button btnDelSizeParm;
-        private AntdUI.Table tbSizeParm;
-        private AntdUI.Button btnAddSizeParm;
-    }
-}

DHSoftware/Views/SizeConfigControl.cs

@@ -1,20 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-
-namespace DHSoftware.Views
-{
-    public partial class SizeConfigControl : UserControl
-    {
-        public SizeConfigControl()
-        {
-            InitializeComponent();
-        }
-    }
-}

DHSoftware/Views/SizeConfigControl.resx

@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!--
-    Microsoft ResX Schema 
-
-    Version 2.0
-
-    The primary goals of this format is to allow a simple XML format
-    that is mostly human readable. The generation and parsing of the
-    various data types are done through the TypeConverter classes
-    associated with the data types.
-
-    Example:
-
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-
-    There are any number of "resheader" rows that contain simple
-    name/value pairs.
-
-    Each data row contains a name, and value. The row also contains a
-    type or mimetype. Type corresponds to a .NET class that support
-    text/value conversion through the TypeConverter architecture.
-    Classes that don't support this are serialized and stored with the
-    mimetype set.
-
-    The mimetype is used for serialized objects, and tells the
-    ResXResourceReader how to depersist the object. This is currently not
-    extensible. For a given mimetype the value must be set accordingly:
-
-    Note - application/x-microsoft.net.object.binary.base64 is the format
-    that the ResXResourceWriter will generate, however the reader can
-    read any of the formats listed below.
-
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-</root>

DHSoftware/Views/UserConfigFrm.Designer.cs

@@ -1,167 +0,0 @@
-namespace DHSoftware.Views
-{
-    partial class UserConfigFrm
-    {
-        /// <summary> 
-        /// 必需的设计器变量。
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary> 
-        /// 清理所有正在使用的资源。
-        /// </summary>
-        /// <param name="disposing">如果应释放托管资源，为 true；否则为 false。</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region 组件设计器生成的代码
-
-        /// <summary> 
-        /// 设计器支持所需的方法 - 不要修改
-        /// 使用代码编辑器修改此方法的内容。
-        /// </summary>
-        private void InitializeComponent()
-        {
-            AntdUI.Tabs.StyleCard styleCard1 = new AntdUI.Tabs.StyleCard();
-            pnlMenu = new AntdUI.Panel();
-            panel3 = new AntdUI.Panel();
-            btnSave = new AntdUI.Button();
-            btnAdd = new AntdUI.Button();
-            menu = new AntdUI.Menu();
-            panel2 = new AntdUI.Panel();
-            divider1 = new AntdUI.Divider();
-            tabs = new AntdUI.Tabs();
-            pnlMenu.SuspendLayout();
-            panel3.SuspendLayout();
-            panel2.SuspendLayout();
-            SuspendLayout();
-            // 
-            // pnlMenu
-            // 
-            pnlMenu.Controls.Add(panel3);
-            pnlMenu.Controls.Add(menu);
-            pnlMenu.Dock = DockStyle.Left;
-            pnlMenu.Location = new Point(0, 0);
-            pnlMenu.Name = "pnlMenu";
-            pnlMenu.Size = new Size(135, 542);
-            pnlMenu.TabIndex = 0;
-            pnlMenu.Text = "panel1";
-            // 
-            // panel3
-            // 
-            panel3.Back = SystemColors.Window;
-            panel3.BackColor = SystemColors.Window;
-            panel3.Controls.Add(btnSave);
-            panel3.Controls.Add(btnAdd);
-            panel3.Dock = DockStyle.Bottom;
-            panel3.Location = new Point(0, 516);
-            panel3.Name = "panel3";
-            panel3.Size = new Size(135, 26);
-            panel3.TabIndex = 2;
-            panel3.Text = "panel3";
-            // 
-            // btnSave
-            // 
-            btnSave.BackActive = SystemColors.Control;
-            btnSave.BackColor = SystemColors.Control;
-            btnSave.Dock = DockStyle.Left;
-            btnSave.ForeColor = Color.Black;
-            btnSave.IconRatio = 1F;
-            btnSave.IconSvg = "AppstoreAddOutlined";
-            btnSave.Location = new Point(35, 0);
-            btnSave.Name = "btnSave";
-            btnSave.Size = new Size(35, 26);
-            btnSave.TabIndex = 2;
-            // 
-            // btnAdd
-            // 
-            btnAdd.BackActive = SystemColors.Control;
-            btnAdd.BackColor = SystemColors.Control;
-            btnAdd.Dock = DockStyle.Left;
-            btnAdd.ForeColor = Color.Black;
-            btnAdd.IconRatio = 1F;
-            btnAdd.IconSvg = "AppstoreAddOutlined";
-            btnAdd.Location = new Point(0, 0);
-            btnAdd.Name = "btnAdd";
-            btnAdd.Size = new Size(35, 26);
-            btnAdd.TabIndex = 1;
-            btnAdd.Click += btnAdd_Click;
-            // 
-            // menu
-            // 
-            menu.Dock = DockStyle.Fill;
-            menu.Location = new Point(0, 0);
-            menu.Name = "menu";
-            menu.Size = new Size(135, 542);
-            menu.TabIndex = 0;
-            menu.Text = "menu1";
-            menu.SelectChanged += Menu_SelectChanged;
-            menu.MouseDown += Menu_MouseDown;
-            // 
-            // panel2
-            // 
-            panel2.Controls.Add(divider1);
-            panel2.Controls.Add(tabs);
-            panel2.Dock = DockStyle.Fill;
-            panel2.Location = new Point(135, 0);
-            panel2.Name = "panel2";
-            panel2.Size = new Size(745, 542);
-            panel2.TabIndex = 1;
-            panel2.Text = "panel2";
-            // 
-            // divider1
-            // 
-            divider1.BackColor = SystemColors.ActiveCaption;
-            divider1.Dock = DockStyle.Left;
-            divider1.Location = new Point(0, 0);
-            divider1.Name = "divider1";
-            divider1.Size = new Size(10, 542);
-            divider1.TabIndex = 1;
-            divider1.Text = "";
-            divider1.Vertical = true;
-            // 
-            // tabs
-            // 
-            tabs.Dock = DockStyle.Fill;
-            tabs.Location = new Point(0, 0);
-            tabs.Name = "tabs";
-            tabs.Size = new Size(745, 542);
-            tabs.Style = styleCard1;
-            tabs.TabIndex = 0;
-            tabs.Text = "tabs1";
-            tabs.Type = AntdUI.TabType.Card;
-            tabs.SelectedIndexChanged += tabs_SelectedIndexChanged;
-            // 
-            // UserConfigFrm
-            // 
-            AutoScaleDimensions = new SizeF(7F, 17F);
-            AutoScaleMode = AutoScaleMode.Font;
-            AutoSize = true;
-            Controls.Add(panel2);
-            Controls.Add(pnlMenu);
-            Name = "UserConfigFrm";
-            Size = new Size(880, 542);
-            pnlMenu.ResumeLayout(false);
-            panel3.ResumeLayout(false);
-            panel2.ResumeLayout(false);
-            ResumeLayout(false);
-        }
-
-        #endregion
-        private AntdUI.Tabs tabs;
-        private AntdUI.Panel pnlMenu;
-        private AntdUI.Panel panel2;
-        private AntdUI.Menu menu;
-        private AntdUI.Panel panel3;
-        private AntdUI.Button btnSave;
-        private AntdUI.Button btnAdd;
-        private AntdUI.Divider divider1;
-       // private AntdUI.Tabs tabs;
-    }
-}

DHSoftware/Views/UserConfigFrm.cs

@@ -1,257 +0,0 @@
-using AntdUI;
-using AntdUIDemo.Models;
-using DH.Commons.Base;
-using DH.Devices.Vision;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-using static System.Windows.Forms.VisualStyles.VisualStyleElement;
-using Window = AntdUI.Window;
-
-namespace DHSoftware.Views
-{
-    public partial class UserConfigFrm : UserControl
-    {
-        public List<CameraBase> cameras = new List<CameraBase>();
-        public List<DetectionConfig> detections = new List<DetectionConfig>();
-        private UserControl currControl;
-        private bool isUpdatingTabs = false;//用于阻止Tabs更新
-        public Window Window;
-        public UserConfigFrm()
-        {
-            InitializeComponent();
-
-            LoadMenu();
-            menu.Width = (int)(100 * Config.Dpi);
-
-        }
-        private void LoadMenu(string filter = "")
-        {
-            menu.Items.Clear();
-
-            string lang = AntdUI.Localization.CurrentLanguage;
-            var menuItems = DataUtil.Menu_decetion;
-            //var menuIcons = DataUtil.MenuIcons_zhcn;
-            //if (lang.StartsWith("en"))
-            //{
-            //    menuItems = DataUtil.MenuItems_enus;
-            //    menuIcons = DataUtil.MenuIcons_enus;
-            //}
-
-            foreach (var rootItem in menuItems)
-            {
-                var rootKey = rootItem.Key.ToLower();
-                var rootMenu = new AntdUI.MenuItem
-                {
-                    Text = rootItem.Key,
-                    //IconSvg = menuIcons.TryGetValue(rootItem.Key, out var icon) ? icon : "UnorderedListOutlined",
-                };
-                bool rootVisible = false; // 用于标记是否显示根节点
-
-                foreach (var item in rootItem.Value)
-                {
-                    var childText = item.Text.ToLower();
-
-                    // 如果子节点包含搜索文本
-                    if (childText.Contains(filter))
-                    {
-                        var menuItem = new AntdUI.MenuItem
-                        {
-                            Text = item.Text,
-                            IconSvg = item.IconSvg,
-                            Tag = item.Tag,
-                        };
-                        rootMenu.Sub.Add(menuItem);
-                        rootVisible = true; // 如果有子节点包含，则显示根节点
-                    }
-                }
-
-                // 如果根节点包含搜索文本，或有可见的子节点，则显示根节点
-                if (rootKey.Contains(filter) || rootVisible)
-                {
-                    menu.Items.Add(rootMenu);
-                }
-            }
-        }
-        private void SelectMenu()
-        {
-            if (isUpdatingTabs) return;
-            var text = tabs.SelectedTab?.Text; // 使用安全导航操作符，防止 SelectedTab 为 null
-            if (string.IsNullOrEmpty(text)) // 检查 text 是否为 null 或空
-            {
-                return; // 如果 text 为空，直接退出方法
-            }
-            //首页
-            if (text == AntdUI.Localization.Get("home", "主页"))
-            {
-                return;
-            }
-            var rootIndex = 0;
-            var subIndex = 0;
-            var menuItemsCopy = menu.Items.ToList(); // 创建副本
-            for (int i = 0; i < menuItemsCopy.Count; i++)
-            {
-                for (int j = 0; j < menuItemsCopy[i].Sub.Count; j++)
-                {
-                    if (menuItemsCopy[i].Sub[j].Tag.ToString() == text)
-                    {
-                        rootIndex = i;
-                        subIndex = j;
-                        break;
-                    }
-                }
-            }
-            menu.SelectIndex(rootIndex, subIndex, true);
-        }
-        private void Menu_MouseDown(object sender, MouseEventArgs e)
-        {
-            if (e.Button == MouseButtons.Right)
-            {
-                // 转换坐标到控件内部坐标系（考虑滚动条）
-                Point clickPoint = new Point(e.X, e.Y + menu.ScrollBar.Value);
-
-                // 递归查找命中的菜单项
-                MenuItem clickedItem = FindClickedItem(menu.Items, clickPoint);
-
-                if (clickedItem != null)
-                {
-                    // 显示节点名称弹窗
-                    //MessageBox.Show($"右键点击的节点: {clickedItem.Text}");
-
-                    var menulist = new AntdUI.IContextMenuStripItem[]
-                    {
-                    new AntdUI.ContextMenuStripItem("关联相机", "")
-                        {
-                            IconSvg = "VideoCameraAddOutlined"
-                        }
-                    };
-                    AntdUI.ContextMenuStrip.open(menu, it =>
-                    {
-                        if (it.Text == "关联相机")
-                        {
-                            //using (var dlg = new AddCameraWindow(cameras))
-                            //{
-                            //    if (dlg.ShowDialog() == DialogResult.OK)
-                            //    {
-                            //        var newItem = new MenuItem(dlg.CubicleName);
-                            //        newItem.IconSvg = "VideoCameraOutlined";
-                            //        //// 防止重复添加
-                            //        //if (!menu1.Items.Cast<MenuItem>().Any(m => m.Text == newItem.Text))
-                            //        //{
-                            //        clickedItem.Sub.Add(newItem);
-                            //        //}
-                            //        //else
-                            //        //{
-                            //        //    AntdUI.Notification.warn(this, "新增失败", $"{dlg.CubicleName}已存在！", autoClose: 3, align: TAlignFrom.TR);
-                            //        //}
-                            //    }
-                            //}
-                        }
-                    }, menulist);
-                }
-            }
-        }
-
-        private MenuItem FindClickedItem(MenuItemCollection items, Point clickPoint)
-        {
-            foreach (MenuItem item in items)
-            {
-                // 检查当前项是否可见且包含点击坐标
-                if (item.Visible && item.Rect.Contains(clickPoint))
-                {
-                    return item;
-                }
-
-
-            }
-            return null;
-        }
-
-        private void Menu_SelectChanged(object sender, MenuSelectEventArgs e)
-        {
-            string name = (string)e.Value.Tag;
-
-            //// 清理上一个浮动按钮窗体
-            //if (currControl is FloatButtonDemo floatButtonDemo)
-            //{
-            //    floatButtonDemo.CloseFloatButtonForm();
-            //}
-
-            // 检查是否已存在同名 TabPage
-            foreach (var tab in tabs.Pages)
-            {
-                if (tab is AntdUI.TabPage existingTab && existingTab.Text == name)
-                {
-                    isUpdatingTabs = true;
-                    tabs.SelectedTab = existingTab;
-                    isUpdatingTabs = false;
-                    currControl = existingTab.Controls.Count > 0 ? existingTab.Controls[0] as UserControl : null;
-                    return;
-                }
-            }
-            int width = tabs.Width;
-            int height = tabs.Height;
-            // 创建新 TabPage
-            UserDetetion control = new UserDetetion(Window,width, height);
-           // control._windows = Window;
-            switch (name)
-            {
-                case "工位1":
-                    //  control  = 
-                    break;
-            }
-
-            if (control != null)
-            {
-                control.Dock = DockStyle.Fill;
-                // AutoDpi(control); // 如果有 DPI 适配逻辑
-
-                var tabPage = new AntdUI.TabPage
-                {
-                    Dock = DockStyle.Fill,
-                    Text = name,
-                };
-                tabPage.Controls.Add(control);
-                tabs.Pages.Add(tabPage);
-
-                isUpdatingTabs = true;
-                tabs.SelectedTab = tabPage;
-                isUpdatingTabs = false;
-                currControl = control;
-            }
-        }
-
-
-        private void tabs_SelectedIndexChanged(object sender, IntEventArgs e)
-        {
-            SelectMenu();
-        }
-
-        private void btnAdd_Click(object sender, EventArgs e)
-        {
-            //using (var dlg = new AddCubicleWindow())
-            //{
-            //    if (dlg.ShowDialog() == DialogResult.OK)
-            //    {
-            //        var newItem = new MenuItem(dlg.CubicleName);
-            //        //newItem.IconSvg = "AppstoreOutlined";
-            //        // 防止重复添加
-            //        if (!menu.Items.Cast<MenuItem>().Any(m => m.Text == newItem.Text))
-            //        {
-            //            menu.Items.Add(newItem);
-            //        }
-            //        else
-            //        {
-            //           // AntdUI.Notification.warn(this, "新增工位失败", $"{dlg.CubicleName}已存在！", autoClose: 3, align: TAlignFrom.TR);
-            //        }
-            //    }
-            //}
-        }
-    }
-}

DHSoftware/Views/UserDetetion.Designer.cs

@@ -1,70 +0,0 @@
-namespace DHSoftware.Views
-{
-    partial class UserDetetion
-    {
-        /// <summary> 
-        /// 必需的设计器变量。
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary> 
-        /// 清理所有正在使用的资源。
-        /// </summary>
-        /// <param name="disposing">如果应释放托管资源，为 true；否则为 false。</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region 组件设计器生成的代码
-
-        /// <summary> 
-        /// 设计器支持所需的方法 - 不要修改
-        /// 使用代码编辑器修改此方法的内容。
-        /// </summary>
-        private void InitializeComponent()
-        {
-            collapse1 = new AntdUI.Collapse();
-            panel1 = new Panel();
-            SuspendLayout();
-            // 
-            // collapse1
-            // 
-            collapse1.Dock = DockStyle.Fill;
-            collapse1.Location = new Point(0, 0);
-            collapse1.Name = "collapse1";
-            collapse1.Size = new Size(842, 568);
-            collapse1.TabIndex = 0;
-            collapse1.Text = "collapse1";
-            // 
-            // panel1
-            // 
-            panel1.BackColor = SystemColors.GradientActiveCaption;
-            panel1.Dock = DockStyle.Left;
-            panel1.Location = new Point(0, 0);
-            panel1.Name = "panel1";
-            panel1.Size = new Size(2, 568);
-            panel1.TabIndex = 0;
-            // 
-            // UserDetetion
-            // 
-            AutoScaleDimensions = new SizeF(7F, 17F);
-            AutoScaleMode = AutoScaleMode.Font;
-            Controls.Add(panel1);
-            Controls.Add(collapse1);
-            Name = "UserDetetion";
-            Size = new Size(842, 568);
-            ResumeLayout(false);
-        }
-
-        #endregion
-
-        private AntdUI.Collapse collapse1;
-        private Panel panel1;
-        //private AntdUI.Button button1;
-    }
-}

DHSoftware/Views/UserDetetion.cs

@@ -1,226 +0,0 @@
-using AntdUI;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-using Button = AntdUI.Button;
-
-namespace DHSoftware.Views
-{
-    public partial class UserDetetion : UserControl
-    {
-        private StackPanel panel, panel2, panel3, panel4;
-        public Window _windows;
-        //根据检测配置 将对应的相机配置、中处理预处理、尺寸测量
-        public UserDetetion(Window windows,int parentWidth, int parentHeight)
-        {
-            InitializeComponent();
-            _windows = windows;
-            AntdUI.CollapseItem group1 = new CollapseItem();
-            group1.Height = parentHeight / 4;
-            group1.Text = "相机配置";
-            AntdUI.CollapseItem group2 = new CollapseItem();
-            group2.Text = "预处理";
-            group2.Height = parentHeight/4;
-
-            AntdUI.CollapseItem group3 = new CollapseItem();
-            group3.Text = "中处理";
-            group3.Height = parentHeight - 300;
-
-            AntdUI.CollapseItem group4 = new CollapseItem();
-            group4.Text = "尺寸测量";
-            group4.Height = parentHeight / 4;
-
-
-            // 初始化内容面板
-            panel = CreateScrollPanel();
-            panel2 = CreateScrollPanel();
-            panel3 = CreateScrollPanel();
-            panel4 = CreateScrollPanel();
-
-            // 添加预处理控件
-            var ptuc = new PreTreatUserControl { AutoScroll = true, Dock = DockStyle.Top };
-            var detect = new DetectConfigControl { AutoScroll = true , Dock = DockStyle.Fill };
-            detect._window = this._windows;
-
-            // 添加尺寸测量控件
-            var sizeFrm = new SizeConfigControl();
-         
-
-            CameraConfigControl camConfigFrm = new CameraConfigControl();
-            camConfigFrm.Dock = DockStyle.Fill;
-
-
-
-            //PreTreatUserControl ptuc = new PreTreatUserControl();
-            //ptuc.AutoScroll = true;
-            //panel2.Controls.Add(ptuc);
-            //DetectConfigControl detect = new DetectConfigControl();
-            //// detect.Dock = DockStyle.Fill;
-            //detect.AutoScroll = true;
-            //panel2.Controls.Add(detect);
-
-
-            //SizeConfigControl Sizefc = new SizeConfigControl();
-            //Sizefc.Dock = DockStyle.Fill;
-            //panel3.Controls.Add(Sizefc);
-
-
-
-            Button btnAddCam = new Button
-            {
-                Width = 100,
-                Height = 30,
-                Text = "添加相机配置",
-                //Dock=DockStyle.Bottom
-            };
-            Button btnDelCam = new Button
-            {
-                Width = 100,
-                Height = 30,
-                Text = "删除相机配置",
-                // Dock = DockStyle.Bottom
-            };
-
-
-            Button btnAddModel = new Button
-            {
-                Width = 100,
-                Height = 30,
-                Text = "添加模型配置",
-                //Dock=DockStyle.Bottom
-            };
-            Button btnDelModel = new Button
-            {
-                Width = 100,
-                Height = 30,
-                Text = "删除模型配置",
-                // Dock = DockStyle.Bottom
-            };
-
-            FlowLayoutPanel flow = new FlowLayoutPanel();
-            flow.Dock = DockStyle.Bottom;
-            flow.Controls.Add(btnAddCam);
-            flow.Controls.Add(btnDelCam);
-
-            FlowLayoutPanel flowmodel = new FlowLayoutPanel();
-            flowmodel.Dock = DockStyle.Bottom;
-            flowmodel.Controls.Add(btnAddModel);
-            flowmodel.Controls.Add(btnDelModel);
-            btnAddCam.Click += btnAddCam_Click;
-            btnDelCam.Click += btnDelCam_Click;
-            btnAddModel.Click += btnAddModel_Click;
-            btnDelModel.Click += btnDelModel_Click;
-
-            panel.Controls.Add(flow);
-            panel.Controls.Add(camConfigFrm);
-          
-            panel2.Controls.Add(ptuc);
-            panel3.Controls.Add(flowmodel);
-            panel3.Controls.Add(detect);
-            panel4.Controls.Add(sizeFrm);
-            group1.Controls.Add(panel);
-            group2.Controls.Add(panel2);
-            group3.Controls.Add(panel3);
-            group4.Controls.Add(panel4);
-
-
-            //collapse1.Items.Add(group1);
-            collapse1.Items.Add(group1);
-            collapse1.Items.Add(group2);
-            collapse1.Items.Add(group3);
-            collapse1.Items.Add(group4);
-
-
-        }
-       
-        // 统一事件处理
-        private void CameraOperation_Click(object sender, EventArgs e)
-        {
-            if (sender is Button btn)
-            {
-                switch (btn.Tag?.ToString())
-                {
-                    case "Add":
-                        AddCameraConfig();
-                        break;
-                    case "Delete":
-                        DeleteCameraConfig();
-                        break;
-                }
-            }
-        }
-
-        // 实际业务方法
-        private void AddCameraConfig()
-        {
-            var newCamConfig = new CameraConfigControl { Dock = DockStyle.Top };
-            panel.Controls.Add(newCamConfig);
-            panel.ScrollControlIntoView(newCamConfig);
-        }
-
-        private void DeleteCameraConfig()
-        {
-            if (panel.Controls.Count > 1)
-            {
-                panel.Controls.RemoveAt(panel.Controls.Count - 2);
-            }
-        }
-        // 创建带滚动条的面板
-        private StackPanel CreateScrollPanel()
-        {
-            return new StackPanel
-            {
-                Dock = DockStyle.Fill,
-                Vertical = true,
-                AutoScroll = true,
-                Padding = new Padding(5)  // 添加内边距避免内容贴边
-            };
-        }
-
-        private void btnAddCam_Click(object sender, EventArgs e)
-        {
-            CameraConfigControl camConfigFrm2 = new CameraConfigControl();
-            camConfigFrm2.Dock = DockStyle.Fill;
-
-            panel.Controls.Add(camConfigFrm2);
-        }
-        private void btnDelCam_Click(object sender, EventArgs e)
-        {
-            // 遍历 panel 的 Controls，找到最后一个 CameraConfigControl 并移除
-            for (int i = panel.Controls.Count - 1; i >= 0; i--)
-            {
-                if (panel.Controls[i] is CameraConfigControl)
-                {
-                    panel.Controls.RemoveAt(i);
-                    break;  // 只删除一个
-                }
-            }
-        }
-        private void btnAddModel_Click(object sender, EventArgs e)
-        {
-            DetectConfigControl DetectFrm = new DetectConfigControl();
-            DetectFrm._window = this._windows;
-            DetectFrm.Dock = DockStyle.Fill;
-
-            panel3.Controls.Add(DetectFrm);
-        }
-        private void btnDelModel_Click(object sender, EventArgs e)
-        {
-            // 遍历 panel 的 Controls，找到最后一个 CameraConfigControl 并移除
-            for (int i = panel3.Controls.Count - 1; i >= 0; i--)
-            {
-                if (panel3.Controls[i] is DetectConfigControl)
-                {
-                    panel3.Controls.RemoveAt(i);
-                    break;  // 只删除一个
-                }
-            }
-        }
-    }
-}

DHSoftware/Views/UserDetetion.resx

@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!--
-    Microsoft ResX Schema 
-
-    Version 2.0
-
-    The primary goals of this format is to allow a simple XML format
-    that is mostly human readable. The generation and parsing of the
-    various data types are done through the TypeConverter classes
-    associated with the data types.
-
-    Example:
-
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-
-    There are any number of "resheader" rows that contain simple
-    name/value pairs.
-
-    Each data row contains a name, and value. The row also contains a
-    type or mimetype. Type corresponds to a .NET class that support
-    text/value conversion through the TypeConverter architecture.
-    Classes that don't support this are serialized and stored with the
-    mimetype set.
-
-    The mimetype is used for serialized objects, and tells the
-    ResXResourceReader how to depersist the object. This is currently not
-    extensible. For a given mimetype the value must be set accordingly:
-
-    Note - application/x-microsoft.net.object.binary.base64 is the format
-    that the ResXResourceWriter will generate, however the reader can
-    read any of the formats listed below.
-
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-</root>

DHSoftware/productModel.cs

@@ -73,32 +73,48 @@ namespace DHSoftware
         public ProductData( string batchNO, uint pieceNumber, int inferenceLeft = -1) : this(pieceNumber)
         {
             InferenceLeft = inferenceLeft;
-            _countdownEvent = new CountdownEvent(inferenceLeft);
+            //_countdownEvent = new CountdownEvent(inferenceLeft);
 
             BatchNO = batchNO;
           
         }
       
 
-        public void InferenceOne()
-        {
-            //lock (_inferenceLock)
-            //{
-            //    Interlocked.Decrement(ref InferenceLeft);
-            //}
+        //public void InferenceOne()
+        //{
+        //    //lock (_inferenceLock)
+        //    //{
+        //    //    Interlocked.Decrement(ref InferenceLeft);
+        //    //}
 
           
-            _countdownEvent.Signal();
+        //    _countdownEvent.Signal();
          
+        //}
+
+        //public bool InferenceFinished()
+        //{
+        //    //lock (_inferenceLock)
+        //    //{
+        //    //    return 0 == InferenceLeft;
+        //    //}
+        //    return _countdownEvent.CurrentCount == 0; // 判断计数器是否为 0
+        //}
+        public void InferenceOne()
+        {
+            lock (_inferenceLock)
+            {
+                Interlocked.Decrement(ref InferenceLeft);
+
+            }
         }
 
         public bool InferenceFinished()
         {
-            //lock (_inferenceLock)
-            //{
-            //    return 0 == InferenceLeft;
-            //}
-            return _countdownEvent.CurrentCount == 0; // 判断计数器是否为 0
+            lock (_inferenceLock)
+            {
+                return 0 == InferenceLeft;
+            }
         }