From a9bc7819f4f7e66159a93e955944728c25ba3e53 Mon Sep 17 00:00:00 2001
From: C3204 <zhengyabo@lanpucloud.cn>
Date: 星期三, 07 一月 2026 14:10:11 +0800
Subject: [PATCH] 优化相机管理和界面布局 - 在 `CreateCameraForm.cs` 中添加对 `LBCameras` 的引用,并修复相机创建逻辑。 - 调整 `VisionForm.Designer.cs` 和 `2DCameraForm.Designer.cs` 中多个控件的大小和位置,改善界面布局。 - 在 `VisionForm.cs` 中添加对 `LBCameras` 的引用以支持新相机类型。 - 注释掉 `PHM6000Sensor.cs` 和 `PHM6000Profiler.cs` 中与相机信息获取相关的 P/Invoke 方法。 - 重构 `LBCamera.cs`,添加新的相机初始化和参数设置逻辑,确保与 PHM6000 SDK 的兼容性。 - 移除 `PHM6000Camera.cs` 中与 `PHM6000Camera` 相关的代码,简化相机管理逻辑。 Merge branch 'master' of http://lanpucloud.cn:1111/r/~zhengyabo/LB_TyreAppearanceInspectionSoftware

---
 LB_SmartVision/Forms/Pages/UserManagementPage/UserManagementEditPage.cs |   17 ++++++++++-------
 1 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/LB_SmartVision/Forms/Pages/UserManagementPage/UserManagementEditPage.cs b/LB_SmartVision/Forms/Pages/UserManagementPage/UserManagementEditPage.cs
index 0cd133d..10d745d 100644
--- a/LB_SmartVision/Forms/Pages/UserManagementPage/UserManagementEditPage.cs
+++ b/LB_SmartVision/Forms/Pages/UserManagementPage/UserManagementEditPage.cs
@@ -20,12 +20,10 @@
     public partial class UserManagementEditPage : UserControl
     {
         public Action<string, LogInfoType> LogInfo;
-        RunSettingPage RunSettingPage = new RunSettingPage();
-        LayoutPage LayoutPage = new LayoutPage();
-        CsvPage CsvPage = new CsvPage();
+
         public UserManagementEditPage()
         {
-            Name = "UserManagementEditPage"; 
+            Name = "UserManagementEditPage";
             Text = "鐢ㄦ埛绠$悊璁剧疆";
 
             InitializeComponent();
@@ -76,11 +74,14 @@
         private void InitializeComboBox()
         {
             // 娣诲姞鏉冮檺閫夐」
-            comboBoxPermission.Items.Add("绠$悊鍛�");
-            comboBoxPermission.Items.Add("鎿嶄綔鍛�");
+            foreach (var item in Enum.GetValues(typeof(UserPermission)))
+            {
+                comboBoxPermission.Items.Add(item.ToString());
+            }
+            //comboBoxPermission.Items.Add("鎿嶄綔鍛�");
 
             // 璁剧疆榛樿閫夋嫨椤�
-            comboBoxPermission.SelectedIndex = 1;
+            comboBoxPermission.SelectedIndex = 0;
         }
 
         private void ClearInputFields()
@@ -149,5 +150,7 @@
                     MessageBoxButtons.OK, MessageBoxIcon.Information);
             }
         }
+
+
     }
 }

--
Gitblit v1.9.3