Browse Source

各模块UI界面

Linsk 3 months ago
parent
commit
01fc54edfc

+ 0 - 0
Scada/UIExtension.cs → Scada/Extensions/UIExtension.cs


+ 4 - 0
Scada/FormMain.Designer.cs

@@ -28,6 +28,7 @@
         /// </summary>
         private void InitializeComponent()
         {
+            components = new System.ComponentModel.Container();
             uiPanel1 = new Sunny.UI.UIPanel();
             uiSymbolLabel2 = new Sunny.UI.UISymbolLabel();
             uiSymbolLabel1 = new Sunny.UI.UISymbolLabel();
@@ -62,6 +63,7 @@
             uiLabel20 = new Sunny.UI.UILabel();
             uiLabel21 = new Sunny.UI.UILabel();
             uiLabel22 = new Sunny.UI.UILabel();
+            StyleManager = new Sunny.UI.UIStyleManager(components);
             Footer.SuspendLayout();
             Header.SuspendLayout();
             uiPanel1.SuspendLayout();
@@ -104,6 +106,7 @@
             Header.Controls.Add(uiPanel1);
             Header.Location = new Point(0, 0);
             Header.Size = new Size(1280, 120);
+            Header.MenuItemClick += Header_MenuItemClick;
             // 
             // uiPanel1
             // 
@@ -581,5 +584,6 @@
         private Sunny.UI.UILabel uiLabel17;
         private Sunny.UI.UILabel uiLabel16;
         private Sunny.UI.UILabel uiLabel15;
+        private Sunny.UI.UIStyleManager StyleManager;
     }
 }

+ 11 - 1
Scada/FormMain.cs

@@ -15,7 +15,7 @@ namespace Scada
             //设置初始页面索引(关联页面,唯一不重复即可)
             int pageIndex = 1000;
 
-            TreeNode totalEquipment= Aside.CreateNode("总控模块", 61451, 24, pageIndex);
+            TreeNode totalEquipment = Aside.CreateNode("总控模块", 61451, 24, pageIndex);
             Aside.CreateChildNode(totalEquipment, AddPage(new PageTotalEquipmentControl(), ++pageIndex));
 
             TreeNode equipmentMonitor = Aside.CreateNode("监控模块", 61451, 24, pageIndex);
@@ -57,5 +57,15 @@ namespace Scada
         {
             this.WindowState = FormWindowState.Minimized;
         }
+
+        private void Header_MenuItemClick(string itemText, int menuIndex, int pageIndex)
+        {
+            UIStyle style = (UIStyle)pageIndex;
+            StyleManager.Style = style;
+            if (UIExtension.SetStyleManager != null)
+            {
+                UIExtension.SetStyleManager(StyleManager);
+            }
+        }
     }
 }

+ 3 - 0
Scada/FormMain.resx

@@ -117,4 +117,7 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <metadata name="StyleManager.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
 </root>

+ 133 - 1
Scada/Page/PageAuthManage.Designer.cs

@@ -28,18 +28,150 @@
         /// </summary>
         private void InitializeComponent()
         {
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(PageAuthManage));
+            uiLabel1 = new Sunny.UI.UILabel();
+            cbg_Engineer = new Sunny.UI.UICheckBoxGroup();
+            cbg_Operator = new Sunny.UI.UICheckBoxGroup();
+            cbg_Visitor = new Sunny.UI.UICheckBoxGroup();
+            btn_UpdateEngAuth = new Sunny.UI.UIButton();
+            btn_UpdateOpAuth = new Sunny.UI.UIButton();
+            btn_UpdateVisitorAuth = new Sunny.UI.UIButton();
             SuspendLayout();
             // 
+            // uiLabel1
+            // 
+            uiLabel1.Font = new Font("宋体", 18F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            uiLabel1.ForeColor = Color.FromArgb(48, 48, 48);
+            uiLabel1.Location = new Point(29, 23);
+            uiLabel1.Name = "uiLabel1";
+            uiLabel1.Size = new Size(882, 58);
+            uiLabel1.TabIndex = 0;
+            uiLabel1.Text = "温馨提示:管理员默认开放所有权限,用户权限只有管理员有";
+            // 
+            // cbg_Engineer
+            // 
+            cbg_Engineer.CheckBoxSize = 25;
+            cbg_Engineer.ColumnInterval = 20;
+            cbg_Engineer.Font = new Font("宋体", 21.75F);
+            cbg_Engineer.HoverColor = Color.FromArgb(220, 236, 255);
+            cbg_Engineer.Items.AddRange(new object[] { "控制模块", "监控模块", "配方模块", "日志模块", "报表模块", "图标模块", "参数模块" });
+            cbg_Engineer.Location = new Point(40, 86);
+            cbg_Engineer.Margin = new Padding(4, 5, 4, 5);
+            cbg_Engineer.MinimumSize = new Size(1, 1);
+            cbg_Engineer.Name = "cbg_Engineer";
+            cbg_Engineer.Padding = new Padding(0, 46, 0, 0);
+            cbg_Engineer.RowInterval = 20;
+            cbg_Engineer.SelectedIndexes = (List<int>)resources.GetObject("cbg_Engineer.SelectedIndexes");
+            cbg_Engineer.Size = new Size(269, 411);
+            cbg_Engineer.StartPos = new Point(30, 30);
+            cbg_Engineer.TabIndex = 1;
+            cbg_Engineer.Text = "工程师权限";
+            cbg_Engineer.TextAlignment = ContentAlignment.MiddleLeft;
+            cbg_Engineer.TitleInterval = 35;
+            cbg_Engineer.TitleTop = 30;
+            // 
+            // cbg_Operator
+            // 
+            cbg_Operator.CheckBoxSize = 25;
+            cbg_Operator.ColumnInterval = 20;
+            cbg_Operator.Font = new Font("宋体", 21.75F);
+            cbg_Operator.HoverColor = Color.FromArgb(220, 236, 255);
+            cbg_Operator.Items.AddRange(new object[] { "控制模块", "监控模块", "配方模块", "日志模块", "报表模块", "图标模块", "参数模块" });
+            cbg_Operator.Location = new Point(317, 86);
+            cbg_Operator.Margin = new Padding(4, 5, 4, 5);
+            cbg_Operator.MinimumSize = new Size(1, 1);
+            cbg_Operator.Name = "cbg_Operator";
+            cbg_Operator.Padding = new Padding(0, 46, 0, 0);
+            cbg_Operator.RowInterval = 20;
+            cbg_Operator.SelectedIndexes = (List<int>)resources.GetObject("cbg_Operator.SelectedIndexes");
+            cbg_Operator.Size = new Size(269, 411);
+            cbg_Operator.StartPos = new Point(30, 30);
+            cbg_Operator.TabIndex = 2;
+            cbg_Operator.Text = "操作员权限";
+            cbg_Operator.TextAlignment = ContentAlignment.MiddleLeft;
+            cbg_Operator.TitleInterval = 35;
+            cbg_Operator.TitleTop = 30;
+            // 
+            // cbg_Visitor
+            // 
+            cbg_Visitor.CheckBoxSize = 25;
+            cbg_Visitor.ColumnInterval = 20;
+            cbg_Visitor.Font = new Font("宋体", 21.75F);
+            cbg_Visitor.HoverColor = Color.FromArgb(220, 236, 255);
+            cbg_Visitor.Items.AddRange(new object[] { "控制模块", "监控模块", "配方模块", "日志模块", "报表模块", "图标模块", "参数模块" });
+            cbg_Visitor.Location = new Point(594, 86);
+            cbg_Visitor.Margin = new Padding(4, 5, 4, 5);
+            cbg_Visitor.MinimumSize = new Size(1, 1);
+            cbg_Visitor.Name = "cbg_Visitor";
+            cbg_Visitor.Padding = new Padding(0, 46, 0, 0);
+            cbg_Visitor.RowInterval = 20;
+            cbg_Visitor.SelectedIndexes = (List<int>)resources.GetObject("cbg_Visitor.SelectedIndexes");
+            cbg_Visitor.Size = new Size(269, 411);
+            cbg_Visitor.StartPos = new Point(30, 30);
+            cbg_Visitor.TabIndex = 3;
+            cbg_Visitor.Text = "访客权限";
+            cbg_Visitor.TextAlignment = ContentAlignment.MiddleLeft;
+            cbg_Visitor.TitleInterval = 35;
+            cbg_Visitor.TitleTop = 30;
+            // 
+            // btn_UpdateEngAuth
+            // 
+            btn_UpdateEngAuth.Font = new Font("宋体", 12F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            btn_UpdateEngAuth.Location = new Point(870, 116);
+            btn_UpdateEngAuth.MinimumSize = new Size(1, 1);
+            btn_UpdateEngAuth.Name = "btn_UpdateEngAuth";
+            btn_UpdateEngAuth.Size = new Size(185, 86);
+            btn_UpdateEngAuth.TabIndex = 4;
+            btn_UpdateEngAuth.Text = "修改工程师权限";
+            btn_UpdateEngAuth.TipsFont = new Font("宋体", 9F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            // 
+            // btn_UpdateOpAuth
+            // 
+            btn_UpdateOpAuth.Font = new Font("宋体", 12F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            btn_UpdateOpAuth.Location = new Point(870, 266);
+            btn_UpdateOpAuth.MinimumSize = new Size(1, 1);
+            btn_UpdateOpAuth.Name = "btn_UpdateOpAuth";
+            btn_UpdateOpAuth.Size = new Size(185, 86);
+            btn_UpdateOpAuth.TabIndex = 5;
+            btn_UpdateOpAuth.Text = "修改操作员权限";
+            btn_UpdateOpAuth.TipsFont = new Font("宋体", 9F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            // 
+            // btn_UpdateVisitorAuth
+            // 
+            btn_UpdateVisitorAuth.Font = new Font("宋体", 12F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            btn_UpdateVisitorAuth.Location = new Point(870, 411);
+            btn_UpdateVisitorAuth.MinimumSize = new Size(1, 1);
+            btn_UpdateVisitorAuth.Name = "btn_UpdateVisitorAuth";
+            btn_UpdateVisitorAuth.Size = new Size(185, 86);
+            btn_UpdateVisitorAuth.TabIndex = 6;
+            btn_UpdateVisitorAuth.Text = "修改访客权限";
+            btn_UpdateVisitorAuth.TipsFont = new Font("宋体", 9F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            // 
             // PageAuthManage
             // 
             AutoScaleMode = AutoScaleMode.None;
             ClientSize = new Size(1067, 544);
+            Controls.Add(btn_UpdateVisitorAuth);
+            Controls.Add(btn_UpdateOpAuth);
+            Controls.Add(btn_UpdateEngAuth);
+            Controls.Add(cbg_Visitor);
+            Controls.Add(cbg_Operator);
+            Controls.Add(cbg_Engineer);
+            Controls.Add(uiLabel1);
             Name = "PageAuthManage";
-            Text = "PageAuthManage";
+            Text = "权限管理";
             Load += PageAuthManage_Load;
             ResumeLayout(false);
         }
 
         #endregion
+
+        private Sunny.UI.UILabel uiLabel1;
+        private Sunny.UI.UICheckBoxGroup cbg_Engineer;
+        private Sunny.UI.UICheckBoxGroup cbg_Operator;
+        private Sunny.UI.UICheckBoxGroup cbg_Visitor;
+        private Sunny.UI.UIButton btn_UpdateEngAuth;
+        private Sunny.UI.UIButton btn_UpdateOpAuth;
+        private Sunny.UI.UIButton btn_UpdateVisitorAuth;
     }
 }

+ 24 - 0
Scada/Page/PageAuthManage.resx

@@ -117,4 +117,28 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <data name="cbg_Engineer.SelectedIndexes" mimetype="application/x-microsoft.net.object.binary.base64">
+    <value>
+        AAEAAAD/////AQAAAAAAAAAEAQAAAH5TeXN0ZW0uQ29sbGVjdGlvbnMuR2VuZXJpYy5MaXN0YDFbW1N5
+        c3RlbS5JbnQzMiwgbXNjb3JsaWIsIFZlcnNpb249NC4wLjAuMCwgQ3VsdHVyZT1uZXV0cmFsLCBQdWJs
+        aWNLZXlUb2tlbj1iNzdhNWM1NjE5MzRlMDg5XV0DAAAABl9pdGVtcwVfc2l6ZQhfdmVyc2lvbgcAAAgI
+        CAkCAAAAAAAAAAAAAAAPAgAAAAAAAAAICw==
+</value>
+  </data>
+  <data name="cbg_Operator.SelectedIndexes" mimetype="application/x-microsoft.net.object.binary.base64">
+    <value>
+        AAEAAAD/////AQAAAAAAAAAEAQAAAH5TeXN0ZW0uQ29sbGVjdGlvbnMuR2VuZXJpYy5MaXN0YDFbW1N5
+        c3RlbS5JbnQzMiwgbXNjb3JsaWIsIFZlcnNpb249NC4wLjAuMCwgQ3VsdHVyZT1uZXV0cmFsLCBQdWJs
+        aWNLZXlUb2tlbj1iNzdhNWM1NjE5MzRlMDg5XV0DAAAABl9pdGVtcwVfc2l6ZQhfdmVyc2lvbgcAAAgI
+        CAkCAAAAAAAAAAAAAAAPAgAAAAAAAAAICw==
+</value>
+  </data>
+  <data name="cbg_Visitor.SelectedIndexes" mimetype="application/x-microsoft.net.object.binary.base64">
+    <value>
+        AAEAAAD/////AQAAAAAAAAAEAQAAAH5TeXN0ZW0uQ29sbGVjdGlvbnMuR2VuZXJpYy5MaXN0YDFbW1N5
+        c3RlbS5JbnQzMiwgbXNjb3JsaWIsIFZlcnNpb249NC4wLjAuMCwgQ3VsdHVyZT1uZXV0cmFsLCBQdWJs
+        aWNLZXlUb2tlbj1iNzdhNWM1NjE5MzRlMDg5XV0DAAAABl9pdGVtcwVfc2l6ZQhfdmVyc2lvbgcAAAgI
+        CAkCAAAAAAAAAAAAAAAPAgAAAAAAAAAICw==
+</value>
+  </data>
 </root>

+ 106 - 0
Scada/Page/PageChartManage.Designer.cs

@@ -28,12 +28,111 @@
         /// </summary>
         private void InitializeComponent()
         {
+            btn_QueryData = new Sunny.UI.UISymbolButton();
+            dtp_End = new Sunny.UI.UIDatePicker();
+            dtp_Start = new Sunny.UI.UIDatePicker();
+            uiSymbolLabel2 = new Sunny.UI.UISymbolLabel();
+            uiSymbolLabel1 = new Sunny.UI.UISymbolLabel();
+            lc_Chart = new Sunny.UI.UILineChart();
             SuspendLayout();
             // 
+            // btn_QueryData
+            // 
+            btn_QueryData.Font = new Font("宋体", 12F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            btn_QueryData.Location = new Point(751, 20);
+            btn_QueryData.MinimumSize = new Size(1, 1);
+            btn_QueryData.Name = "btn_QueryData";
+            btn_QueryData.Size = new Size(131, 36);
+            btn_QueryData.Symbol = 559520;
+            btn_QueryData.TabIndex = 9;
+            btn_QueryData.Text = "查询数据";
+            btn_QueryData.TipsFont = new Font("宋体", 9F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            // 
+            // dtp_End
+            // 
+            dtp_End.FillColor = Color.White;
+            dtp_End.Font = new Font("宋体", 12F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            dtp_End.Location = new Point(506, 20);
+            dtp_End.Margin = new Padding(4, 5, 4, 5);
+            dtp_End.MaxLength = 10;
+            dtp_End.MinimumSize = new Size(63, 0);
+            dtp_End.Name = "dtp_End";
+            dtp_End.Padding = new Padding(0, 0, 30, 2);
+            dtp_End.Size = new Size(219, 36);
+            dtp_End.SymbolDropDown = 61555;
+            dtp_End.SymbolNormal = 61555;
+            dtp_End.SymbolSize = 24;
+            dtp_End.TabIndex = 8;
+            dtp_End.Text = "2025-06-06";
+            dtp_End.TextAlignment = ContentAlignment.MiddleLeft;
+            dtp_End.Value = new DateTime(2025, 6, 6, 9, 19, 19, 219);
+            dtp_End.Watermark = "";
+            // 
+            // dtp_Start
+            // 
+            dtp_Start.FillColor = Color.White;
+            dtp_Start.Font = new Font("宋体", 12F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            dtp_Start.Location = new Point(146, 20);
+            dtp_Start.Margin = new Padding(4, 5, 4, 5);
+            dtp_Start.MaxLength = 10;
+            dtp_Start.MinimumSize = new Size(63, 0);
+            dtp_Start.Name = "dtp_Start";
+            dtp_Start.Padding = new Padding(0, 0, 30, 2);
+            dtp_Start.Size = new Size(219, 36);
+            dtp_Start.SymbolDropDown = 61555;
+            dtp_Start.SymbolNormal = 61555;
+            dtp_Start.SymbolSize = 24;
+            dtp_Start.TabIndex = 7;
+            dtp_Start.Text = "2025-06-06";
+            dtp_Start.TextAlignment = ContentAlignment.MiddleLeft;
+            dtp_Start.Value = new DateTime(2025, 6, 6, 0, 0, 0, 0);
+            dtp_Start.Watermark = "";
+            // 
+            // uiSymbolLabel2
+            // 
+            uiSymbolLabel2.Font = new Font("宋体", 12F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            uiSymbolLabel2.Location = new Point(372, 12);
+            uiSymbolLabel2.MinimumSize = new Size(1, 1);
+            uiSymbolLabel2.Name = "uiSymbolLabel2";
+            uiSymbolLabel2.Size = new Size(127, 44);
+            uiSymbolLabel2.Symbol = 62067;
+            uiSymbolLabel2.TabIndex = 6;
+            uiSymbolLabel2.Text = "结束时间";
+            // 
+            // uiSymbolLabel1
+            // 
+            uiSymbolLabel1.Font = new Font("宋体", 12F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            uiSymbolLabel1.Location = new Point(12, 12);
+            uiSymbolLabel1.MinimumSize = new Size(1, 1);
+            uiSymbolLabel1.Name = "uiSymbolLabel1";
+            uiSymbolLabel1.Size = new Size(127, 44);
+            uiSymbolLabel1.Symbol = 62067;
+            uiSymbolLabel1.TabIndex = 5;
+            uiSymbolLabel1.Text = "开始时间";
+            // 
+            // lc_Chart
+            // 
+            lc_Chart.Font = new Font("宋体", 12F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            lc_Chart.LegendFont = new Font("宋体", 9F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            lc_Chart.Location = new Point(12, 64);
+            lc_Chart.MinimumSize = new Size(1, 1);
+            lc_Chart.MouseDownType = Sunny.UI.UILineChartMouseDownType.Zoom;
+            lc_Chart.Name = "lc_Chart";
+            lc_Chart.Size = new Size(1043, 468);
+            lc_Chart.SubFont = new Font("宋体", 9F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            lc_Chart.TabIndex = 10;
+            lc_Chart.Text = "曲线图表";
+            // 
             // PageChartManage
             // 
             AutoScaleMode = AutoScaleMode.None;
             ClientSize = new Size(1067, 544);
+            Controls.Add(lc_Chart);
+            Controls.Add(btn_QueryData);
+            Controls.Add(dtp_End);
+            Controls.Add(dtp_Start);
+            Controls.Add(uiSymbolLabel2);
+            Controls.Add(uiSymbolLabel1);
             Name = "PageChartManage";
             Text = "PageChartManage";
             Load += PageChartManage_Load;
@@ -41,5 +140,12 @@
         }
 
         #endregion
+
+        private Sunny.UI.UISymbolButton btn_QueryData;
+        private Sunny.UI.UIDatePicker dtp_End;
+        private Sunny.UI.UIDatePicker dtp_Start;
+        private Sunny.UI.UISymbolLabel uiSymbolLabel2;
+        private Sunny.UI.UISymbolLabel uiSymbolLabel1;
+        private Sunny.UI.UILineChart lc_Chart;
     }
 }

+ 1 - 1
Scada/Page/PageEquipmentMonitor1.Designer.cs

@@ -349,7 +349,7 @@
             Controls.Add(uiTitlePanel2);
             Controls.Add(uiTitlePanel1);
             Name = "PageEquipmentMonitor1";
-            Text = "PageEquipmentMonitor";
+            Text = "监控子模块1";
             Load += PageEquipmentMonitor_Load;
             uiTitlePanel2.ResumeLayout(false);
             uiTitlePanel3.ResumeLayout(false);

+ 1 - 1
Scada/Page/PageEquipmentMonitor2.Designer.cs

@@ -307,7 +307,7 @@
             Controls.Add(uiTitlePanel2);
             Controls.Add(uiTitlePanel1);
             Name = "PageEquipmentMonitor2";
-            Text = "PageEquipmentMonitor2";
+            Text = "监控子模块2";
             uiTitlePanel3.ResumeLayout(false);
             uiTitlePanel2.ResumeLayout(false);
             uiTitlePanel1.ResumeLayout(false);

+ 1 - 1
Scada/Page/PageEquipmentMonitor3.Designer.cs

@@ -253,7 +253,7 @@
             Controls.Add(uiTitlePanel1);
             Controls.Add(uiTitlePanel2);
             Name = "PageEquipmentMonitor3";
-            Text = "PageEquipmentMonitor3";
+            Text = "监控子模块3";
             uiTitlePanel2.ResumeLayout(false);
             uiTitlePanel1.ResumeLayout(false);
             ResumeLayout(false);

+ 2 - 1
Scada/Page/PageLogManage.Designer.cs

@@ -250,6 +250,7 @@
             dataGridViewCellStyle4.SelectionForeColor = Color.White;
             dataGridViewCellStyle4.WrapMode = DataGridViewTriState.True;
             dgv_ShowLog.RowHeadersDefaultCellStyle = dataGridViewCellStyle4;
+            dgv_ShowLog.RowHeadersWidth = 51;
             dataGridViewCellStyle5.BackColor = Color.White;
             dataGridViewCellStyle5.Font = new Font("宋体", 12F, FontStyle.Regular, GraphicsUnit.Point, 134);
             dgv_ShowLog.RowsDefaultCellStyle = dataGridViewCellStyle5;
@@ -266,7 +267,7 @@
             Controls.Add(uiTitlePanel2);
             Controls.Add(uiTitlePanel1);
             Name = "PageLogManage";
-            Text = "PageLogManage";
+            Text = "日志管理";
             Initialize += PageLogManage_Initialize;
             Load += PageLogManage_Load;
             uiTitlePanel1.ResumeLayout(false);

+ 5 - 4
Scada/Page/PageRecipeManage.Designer.cs

@@ -402,6 +402,7 @@
             dataGridViewCellStyle4.SelectionForeColor = Color.White;
             dataGridViewCellStyle4.WrapMode = DataGridViewTriState.True;
             dgv_Recipe.RowHeadersDefaultCellStyle = dataGridViewCellStyle4;
+            dgv_Recipe.RowHeadersWidth = 51;
             dataGridViewCellStyle5.BackColor = Color.White;
             dataGridViewCellStyle5.Font = new Font("宋体", 12F, FontStyle.Regular, GraphicsUnit.Point, 134);
             dgv_Recipe.RowsDefaultCellStyle = dataGridViewCellStyle5;
@@ -510,11 +511,11 @@
             // 
             // uiLabel1
             // 
-            uiLabel1.Font = new Font("宋体", 21F);
+            uiLabel1.Font = new Font("宋体", 13.8F, FontStyle.Regular, GraphicsUnit.Point, 134);
             uiLabel1.ForeColor = Color.FromArgb(48, 48, 48);
-            uiLabel1.Location = new Point(5, 44);
+            uiLabel1.Location = new Point(20, 44);
             uiLabel1.Name = "uiLabel1";
-            uiLabel1.Size = new Size(162, 46);
+            uiLabel1.Size = new Size(126, 46);
             uiLabel1.TabIndex = 0;
             uiLabel1.Text = "产品型号:";
             uiLabel1.TextAlign = ContentAlignment.MiddleCenter;
@@ -526,7 +527,7 @@
             Controls.Add(uiTitlePanel1);
             Controls.Add(uiTitlePanel2);
             Name = "PageRecipeManage";
-            Text = "PageRecipeManage";
+            Text = "配方管理";
             Load += PageRecipeManage_Load;
             uiTitlePanel1.ResumeLayout(false);
             uiTitlePanel2.ResumeLayout(false);

+ 285 - 1
Scada/Page/PageReportManage.Designer.cs

@@ -28,18 +28,302 @@
         /// </summary>
         private void InitializeComponent()
         {
+            DataGridViewCellStyle dataGridViewCellStyle1 = new DataGridViewCellStyle();
+            DataGridViewCellStyle dataGridViewCellStyle2 = new DataGridViewCellStyle();
+            DataGridViewCellStyle dataGridViewCellStyle3 = new DataGridViewCellStyle();
+            DataGridViewCellStyle dataGridViewCellStyle4 = new DataGridViewCellStyle();
+            DataGridViewCellStyle dataGridViewCellStyle5 = new DataGridViewCellStyle();
+            uiSymbolLabel1 = new Sunny.UI.UISymbolLabel();
+            uiSymbolLabel2 = new Sunny.UI.UISymbolLabel();
+            dtp_Start = new Sunny.UI.UIDatePicker();
+            dtp_End = new Sunny.UI.UIDatePicker();
+            btn_QueryData = new Sunny.UI.UISymbolButton();
+            btn_ExportData = new Sunny.UI.UISymbolButton();
+            dgv_Data = new Sunny.UI.UIDataGridView();
+            Column1 = new DataGridViewTextBoxColumn();
+            Column2 = new DataGridViewTextBoxColumn();
+            Column3 = new DataGridViewTextBoxColumn();
+            Column4 = new DataGridViewTextBoxColumn();
+            Column5 = new DataGridViewTextBoxColumn();
+            Column6 = new DataGridViewTextBoxColumn();
+            Column7 = new DataGridViewTextBoxColumn();
+            Column8 = new DataGridViewTextBoxColumn();
+            Column9 = new DataGridViewTextBoxColumn();
+            Column10 = new DataGridViewTextBoxColumn();
+            pgn_Data = new Sunny.UI.UIPagination();
+            ((System.ComponentModel.ISupportInitialize)dgv_Data).BeginInit();
             SuspendLayout();
             // 
+            // uiSymbolLabel1
+            // 
+            uiSymbolLabel1.Font = new Font("宋体", 12F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            uiSymbolLabel1.Location = new Point(12, 12);
+            uiSymbolLabel1.MinimumSize = new Size(1, 1);
+            uiSymbolLabel1.Name = "uiSymbolLabel1";
+            uiSymbolLabel1.Size = new Size(127, 44);
+            uiSymbolLabel1.Symbol = 62067;
+            uiSymbolLabel1.TabIndex = 0;
+            uiSymbolLabel1.Text = "开始时间";
+            // 
+            // uiSymbolLabel2
+            // 
+            uiSymbolLabel2.Font = new Font("宋体", 12F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            uiSymbolLabel2.Location = new Point(372, 12);
+            uiSymbolLabel2.MinimumSize = new Size(1, 1);
+            uiSymbolLabel2.Name = "uiSymbolLabel2";
+            uiSymbolLabel2.Size = new Size(127, 44);
+            uiSymbolLabel2.Symbol = 62067;
+            uiSymbolLabel2.TabIndex = 1;
+            uiSymbolLabel2.Text = "结束时间";
+            // 
+            // dtp_Start
+            // 
+            dtp_Start.FillColor = Color.White;
+            dtp_Start.Font = new Font("宋体", 12F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            dtp_Start.Location = new Point(146, 20);
+            dtp_Start.Margin = new Padding(4, 5, 4, 5);
+            dtp_Start.MaxLength = 10;
+            dtp_Start.MinimumSize = new Size(63, 0);
+            dtp_Start.Name = "dtp_Start";
+            dtp_Start.Padding = new Padding(0, 0, 30, 2);
+            dtp_Start.Size = new Size(219, 36);
+            dtp_Start.SymbolDropDown = 61555;
+            dtp_Start.SymbolNormal = 61555;
+            dtp_Start.SymbolSize = 24;
+            dtp_Start.TabIndex = 2;
+            dtp_Start.Text = "2025-06-06";
+            dtp_Start.TextAlignment = ContentAlignment.MiddleLeft;
+            dtp_Start.Value = new DateTime(2025, 6, 6, 0, 0, 0, 0);
+            dtp_Start.Watermark = "";
+            // 
+            // dtp_End
+            // 
+            dtp_End.FillColor = Color.White;
+            dtp_End.Font = new Font("宋体", 12F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            dtp_End.Location = new Point(506, 20);
+            dtp_End.Margin = new Padding(4, 5, 4, 5);
+            dtp_End.MaxLength = 10;
+            dtp_End.MinimumSize = new Size(63, 0);
+            dtp_End.Name = "dtp_End";
+            dtp_End.Padding = new Padding(0, 0, 30, 2);
+            dtp_End.Size = new Size(219, 36);
+            dtp_End.SymbolDropDown = 61555;
+            dtp_End.SymbolNormal = 61555;
+            dtp_End.SymbolSize = 24;
+            dtp_End.TabIndex = 3;
+            dtp_End.Text = "2025-06-06";
+            dtp_End.TextAlignment = ContentAlignment.MiddleLeft;
+            dtp_End.Value = new DateTime(2025, 6, 6, 9, 19, 19, 219);
+            dtp_End.Watermark = "";
+            // 
+            // btn_QueryData
+            // 
+            btn_QueryData.Font = new Font("宋体", 12F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            btn_QueryData.Location = new Point(751, 20);
+            btn_QueryData.MinimumSize = new Size(1, 1);
+            btn_QueryData.Name = "btn_QueryData";
+            btn_QueryData.Size = new Size(131, 36);
+            btn_QueryData.Symbol = 559520;
+            btn_QueryData.TabIndex = 4;
+            btn_QueryData.Text = "查询数据";
+            btn_QueryData.TipsFont = new Font("宋体", 9F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            // 
+            // btn_ExportData
+            // 
+            btn_ExportData.Font = new Font("宋体", 12F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            btn_ExportData.Location = new Point(906, 20);
+            btn_ExportData.MinimumSize = new Size(1, 1);
+            btn_ExportData.Name = "btn_ExportData";
+            btn_ExportData.Size = new Size(131, 36);
+            btn_ExportData.Symbol = 362830;
+            btn_ExportData.TabIndex = 5;
+            btn_ExportData.Text = "导出数据";
+            btn_ExportData.TipsFont = new Font("宋体", 9F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            // 
+            // dgv_Data
+            // 
+            dgv_Data.AllowUserToAddRows = false;
+            dgv_Data.AllowUserToDeleteRows = false;
+            dataGridViewCellStyle1.BackColor = Color.FromArgb(235, 243, 255);
+            dgv_Data.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1;
+            dgv_Data.BackgroundColor = Color.White;
+            dgv_Data.ColumnHeadersBorderStyle = DataGridViewHeaderBorderStyle.Single;
+            dataGridViewCellStyle2.Alignment = DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle2.BackColor = Color.FromArgb(80, 160, 255);
+            dataGridViewCellStyle2.Font = new Font("宋体", 12F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            dataGridViewCellStyle2.ForeColor = Color.White;
+            dataGridViewCellStyle2.SelectionBackColor = SystemColors.Highlight;
+            dataGridViewCellStyle2.SelectionForeColor = SystemColors.HighlightText;
+            dataGridViewCellStyle2.WrapMode = DataGridViewTriState.True;
+            dgv_Data.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2;
+            dgv_Data.ColumnHeadersHeight = 45;
+            dgv_Data.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
+            dgv_Data.Columns.AddRange(new DataGridViewColumn[] { Column1, Column2, Column3, Column4, Column5, Column6, Column7, Column8, Column9, Column10 });
+            dataGridViewCellStyle3.Alignment = DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle3.BackColor = SystemColors.Window;
+            dataGridViewCellStyle3.Font = new Font("宋体", 12F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            dataGridViewCellStyle3.ForeColor = Color.FromArgb(48, 48, 48);
+            dataGridViewCellStyle3.SelectionBackColor = SystemColors.Highlight;
+            dataGridViewCellStyle3.SelectionForeColor = SystemColors.HighlightText;
+            dataGridViewCellStyle3.WrapMode = DataGridViewTriState.False;
+            dgv_Data.DefaultCellStyle = dataGridViewCellStyle3;
+            dgv_Data.EnableHeadersVisualStyles = false;
+            dgv_Data.Font = new Font("宋体", 12F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            dgv_Data.GridColor = Color.FromArgb(80, 160, 255);
+            dgv_Data.Location = new Point(12, 64);
+            dgv_Data.Name = "dgv_Data";
+            dgv_Data.ReadOnly = true;
+            dataGridViewCellStyle4.Alignment = DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle4.BackColor = Color.FromArgb(235, 243, 255);
+            dataGridViewCellStyle4.Font = new Font("宋体", 12F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            dataGridViewCellStyle4.ForeColor = Color.FromArgb(48, 48, 48);
+            dataGridViewCellStyle4.SelectionBackColor = Color.FromArgb(80, 160, 255);
+            dataGridViewCellStyle4.SelectionForeColor = Color.White;
+            dataGridViewCellStyle4.WrapMode = DataGridViewTriState.True;
+            dgv_Data.RowHeadersDefaultCellStyle = dataGridViewCellStyle4;
+            dgv_Data.RowHeadersWidth = 51;
+            dataGridViewCellStyle5.BackColor = Color.White;
+            dataGridViewCellStyle5.Font = new Font("宋体", 12F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            dgv_Data.RowsDefaultCellStyle = dataGridViewCellStyle5;
+            dgv_Data.SelectedIndex = -1;
+            dgv_Data.Size = new Size(1025, 418);
+            dgv_Data.StripeOddColor = Color.FromArgb(235, 243, 255);
+            dgv_Data.TabIndex = 6;
+            // 
+            // Column1
+            // 
+            Column1.HeaderText = "脱脂喷淋泵压力值";
+            Column1.MinimumWidth = 6;
+            Column1.Name = "Column1";
+            Column1.ReadOnly = true;
+            Column1.Width = 125;
+            // 
+            // Column2
+            // 
+            Column2.HeaderText = "脱脂PH值";
+            Column2.MinimumWidth = 6;
+            Column2.Name = "Column2";
+            Column2.ReadOnly = true;
+            Column2.Width = 125;
+            // 
+            // Column3
+            // 
+            Column3.HeaderText = "陶化喷淋泵压力值";
+            Column3.MinimumWidth = 6;
+            Column3.Name = "Column3";
+            Column3.ReadOnly = true;
+            Column3.Width = 125;
+            // 
+            // Column4
+            // 
+            Column4.HeaderText = "陶化pH值";
+            Column4.MinimumWidth = 6;
+            Column4.Name = "Column4";
+            Column4.ReadOnly = true;
+            Column4.Width = 125;
+            // 
+            // Column5
+            // 
+            Column5.HeaderText = "精洗喷淋泵压力值";
+            Column5.MinimumWidth = 6;
+            Column5.Name = "Column5";
+            Column5.ReadOnly = true;
+            Column5.Width = 125;
+            // 
+            // Column6
+            // 
+            Column6.HeaderText = "粗洗喷淋泵压力值";
+            Column6.MinimumWidth = 6;
+            Column6.Name = "Column6";
+            Column6.ReadOnly = true;
+            Column6.Width = 125;
+            // 
+            // Column7
+            // 
+            Column7.HeaderText = "水分炉测量温度";
+            Column7.MinimumWidth = 6;
+            Column7.Name = "Column7";
+            Column7.ReadOnly = true;
+            Column7.Width = 125;
+            // 
+            // Column8
+            // 
+            Column8.HeaderText = "固化炉测量温度";
+            Column8.MinimumWidth = 6;
+            Column8.Name = "Column8";
+            Column8.ReadOnly = true;
+            Column8.Width = 125;
+            // 
+            // Column9
+            // 
+            Column9.HeaderText = "厂内温度";
+            Column9.MinimumWidth = 6;
+            Column9.Name = "Column9";
+            Column9.ReadOnly = true;
+            Column9.Width = 125;
+            // 
+            // Column10
+            // 
+            Column10.HeaderText = "厂内湿度";
+            Column10.MinimumWidth = 6;
+            Column10.Name = "Column10";
+            Column10.ReadOnly = true;
+            Column10.Width = 125;
+            // 
+            // pgn_Data
+            // 
+            pgn_Data.ButtonFillSelectedColor = Color.FromArgb(64, 128, 204);
+            pgn_Data.ButtonStyleInherited = false;
+            pgn_Data.Font = new Font("宋体", 12F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            pgn_Data.Location = new Point(13, 503);
+            pgn_Data.Margin = new Padding(4, 5, 4, 5);
+            pgn_Data.MinimumSize = new Size(1, 1);
+            pgn_Data.Name = "pgn_Data";
+            pgn_Data.RectSides = ToolStripStatusLabelBorderSides.None;
+            pgn_Data.ShowText = false;
+            pgn_Data.Size = new Size(1424, 44);
+            pgn_Data.TabIndex = 7;
+            pgn_Data.Text = "uiPagination1";
+            pgn_Data.TextAlignment = ContentAlignment.MiddleCenter;
+            // 
             // PageReportManage
             // 
             AutoScaleMode = AutoScaleMode.None;
             ClientSize = new Size(1067, 544);
+            Controls.Add(pgn_Data);
+            Controls.Add(dgv_Data);
+            Controls.Add(btn_ExportData);
+            Controls.Add(btn_QueryData);
+            Controls.Add(dtp_End);
+            Controls.Add(dtp_Start);
+            Controls.Add(uiSymbolLabel2);
+            Controls.Add(uiSymbolLabel1);
             Name = "PageReportManage";
-            Text = "PageReportManage";
+            Text = "报表管理";
             Load += PageReportManage_Load;
+            ((System.ComponentModel.ISupportInitialize)dgv_Data).EndInit();
             ResumeLayout(false);
         }
 
         #endregion
+
+        private Sunny.UI.UISymbolLabel uiSymbolLabel1;
+        private Sunny.UI.UISymbolLabel uiSymbolLabel2;
+        private Sunny.UI.UIDatePicker dtp_Start;
+        private Sunny.UI.UIDatePicker dtp_End;
+        private Sunny.UI.UISymbolButton btn_QueryData;
+        private Sunny.UI.UISymbolButton btn_ExportData;
+        private Sunny.UI.UIDataGridView dgv_Data;
+        private DataGridViewTextBoxColumn Column1;
+        private DataGridViewTextBoxColumn Column2;
+        private DataGridViewTextBoxColumn Column3;
+        private DataGridViewTextBoxColumn Column4;
+        private DataGridViewTextBoxColumn Column5;
+        private DataGridViewTextBoxColumn Column6;
+        private DataGridViewTextBoxColumn Column7;
+        private DataGridViewTextBoxColumn Column8;
+        private DataGridViewTextBoxColumn Column9;
+        private DataGridViewTextBoxColumn Column10;
+        private Sunny.UI.UIPagination pgn_Data;
     }
 }

+ 30 - 0
Scada/Page/PageReportManage.resx

@@ -117,4 +117,34 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <metadata name="Column1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Column2.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Column3.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Column4.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Column5.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Column6.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Column7.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Column8.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Column9.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Column10.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
 </root>

+ 434 - 1
Scada/Page/PageSystemParameterSet.Designer.cs

@@ -28,18 +28,451 @@
         /// </summary>
         private void InitializeComponent()
         {
+            uiTitlePanel1 = new Sunny.UI.UITitlePanel();
+            txt_ReConnectTimeInterval = new Sunny.UI.UITextBox();
+            uiLabel8 = new Sunny.UI.UILabel();
+            txt_ReadTimeInterval = new Sunny.UI.UITextBox();
+            uiLabel6 = new Sunny.UI.UILabel();
+            txt_ConnectTimeOut = new Sunny.UI.UITextBox();
+            uiLabel7 = new Sunny.UI.UILabel();
+            cb_CPUType = new Sunny.UI.UIComboBox();
+            txt_Slot = new Sunny.UI.UITextBox();
+            uiLabel5 = new Sunny.UI.UILabel();
+            txt_Rack = new Sunny.UI.UITextBox();
+            uiLabel4 = new Sunny.UI.UILabel();
+            uiLabel3 = new Sunny.UI.UILabel();
+            txt_Port = new Sunny.UI.UITextBox();
+            uiLabel2 = new Sunny.UI.UILabel();
+            txt_IPAddress = new Sunny.UI.UIIPTextBox();
+            uiLabel1 = new Sunny.UI.UILabel();
+            uiTitlePanel3 = new Sunny.UI.UITitlePanel();
+            rbg_Save = new Sunny.UI.UIRadioButtonGroup();
+            txt_DirePath = new Sunny.UI.UITextBox();
+            uiLabel12 = new Sunny.UI.UILabel();
+            uiTitlePanel2 = new Sunny.UI.UITitlePanel();
+            uiLabel11 = new Sunny.UI.UILabel();
+            txt_SoftTime = new Sunny.UI.UITextBox();
+            uiLabel9 = new Sunny.UI.UILabel();
+            txt_SoftwareVersion = new Sunny.UI.UITextBox();
+            uiLabel10 = new Sunny.UI.UILabel();
+            btn_Save = new Sunny.UI.UIButton();
+            uiTitlePanel1.SuspendLayout();
+            uiTitlePanel3.SuspendLayout();
+            uiTitlePanel2.SuspendLayout();
             SuspendLayout();
             // 
+            // uiTitlePanel1
+            // 
+            uiTitlePanel1.Controls.Add(txt_ReConnectTimeInterval);
+            uiTitlePanel1.Controls.Add(uiLabel8);
+            uiTitlePanel1.Controls.Add(txt_ReadTimeInterval);
+            uiTitlePanel1.Controls.Add(uiLabel6);
+            uiTitlePanel1.Controls.Add(txt_ConnectTimeOut);
+            uiTitlePanel1.Controls.Add(uiLabel7);
+            uiTitlePanel1.Controls.Add(cb_CPUType);
+            uiTitlePanel1.Controls.Add(txt_Slot);
+            uiTitlePanel1.Controls.Add(uiLabel5);
+            uiTitlePanel1.Controls.Add(txt_Rack);
+            uiTitlePanel1.Controls.Add(uiLabel4);
+            uiTitlePanel1.Controls.Add(uiLabel3);
+            uiTitlePanel1.Controls.Add(txt_Port);
+            uiTitlePanel1.Controls.Add(uiLabel2);
+            uiTitlePanel1.Controls.Add(txt_IPAddress);
+            uiTitlePanel1.Controls.Add(uiLabel1);
+            uiTitlePanel1.Font = new Font("宋体", 12F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            uiTitlePanel1.Location = new Point(13, 14);
+            uiTitlePanel1.Margin = new Padding(4, 5, 4, 5);
+            uiTitlePanel1.MinimumSize = new Size(1, 1);
+            uiTitlePanel1.Name = "uiTitlePanel1";
+            uiTitlePanel1.ShowText = false;
+            uiTitlePanel1.Size = new Size(610, 321);
+            uiTitlePanel1.TabIndex = 0;
+            uiTitlePanel1.Text = "PLC参数";
+            uiTitlePanel1.TextAlignment = ContentAlignment.MiddleCenter;
+            // 
+            // txt_ReConnectTimeInterval
+            // 
+            txt_ReConnectTimeInterval.Font = new Font("宋体", 12F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            txt_ReConnectTimeInterval.Location = new Point(422, 152);
+            txt_ReConnectTimeInterval.Margin = new Padding(4, 5, 4, 5);
+            txt_ReConnectTimeInterval.MinimumSize = new Size(1, 16);
+            txt_ReConnectTimeInterval.Name = "txt_ReConnectTimeInterval";
+            txt_ReConnectTimeInterval.Padding = new Padding(5);
+            txt_ReConnectTimeInterval.ShowText = false;
+            txt_ReConnectTimeInterval.Size = new Size(179, 36);
+            txt_ReConnectTimeInterval.TabIndex = 16;
+            txt_ReConnectTimeInterval.TextAlignment = ContentAlignment.MiddleLeft;
+            txt_ReConnectTimeInterval.Watermark = "";
+            // 
+            // uiLabel8
+            // 
+            uiLabel8.Font = new Font("宋体", 12F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            uiLabel8.ForeColor = Color.FromArgb(48, 48, 48);
+            uiLabel8.Location = new Point(300, 159);
+            uiLabel8.Name = "uiLabel8";
+            uiLabel8.Size = new Size(102, 29);
+            uiLabel8.TabIndex = 15;
+            uiLabel8.Text = "重连时间";
+            // 
+            // txt_ReadTimeInterval
+            // 
+            txt_ReadTimeInterval.Font = new Font("宋体", 12F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            txt_ReadTimeInterval.Location = new Point(422, 95);
+            txt_ReadTimeInterval.Margin = new Padding(4, 5, 4, 5);
+            txt_ReadTimeInterval.MinimumSize = new Size(1, 16);
+            txt_ReadTimeInterval.Name = "txt_ReadTimeInterval";
+            txt_ReadTimeInterval.Padding = new Padding(5);
+            txt_ReadTimeInterval.ShowText = false;
+            txt_ReadTimeInterval.Size = new Size(179, 36);
+            txt_ReadTimeInterval.TabIndex = 14;
+            txt_ReadTimeInterval.TextAlignment = ContentAlignment.MiddleLeft;
+            txt_ReadTimeInterval.Watermark = "";
+            // 
+            // uiLabel6
+            // 
+            uiLabel6.Font = new Font("宋体", 12F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            uiLabel6.ForeColor = Color.FromArgb(48, 48, 48);
+            uiLabel6.Location = new Point(300, 102);
+            uiLabel6.Name = "uiLabel6";
+            uiLabel6.Size = new Size(102, 29);
+            uiLabel6.TabIndex = 13;
+            uiLabel6.Text = "读取超时";
+            // 
+            // txt_ConnectTimeOut
+            // 
+            txt_ConnectTimeOut.Font = new Font("宋体", 12F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            txt_ConnectTimeOut.Location = new Point(422, 41);
+            txt_ConnectTimeOut.Margin = new Padding(4, 5, 4, 5);
+            txt_ConnectTimeOut.MinimumSize = new Size(1, 16);
+            txt_ConnectTimeOut.Name = "txt_ConnectTimeOut";
+            txt_ConnectTimeOut.Padding = new Padding(5);
+            txt_ConnectTimeOut.ShowText = false;
+            txt_ConnectTimeOut.Size = new Size(179, 36);
+            txt_ConnectTimeOut.TabIndex = 12;
+            txt_ConnectTimeOut.TextAlignment = ContentAlignment.MiddleLeft;
+            txt_ConnectTimeOut.Watermark = "";
+            // 
+            // uiLabel7
+            // 
+            uiLabel7.Font = new Font("宋体", 12F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            uiLabel7.ForeColor = Color.FromArgb(48, 48, 48);
+            uiLabel7.Location = new Point(300, 48);
+            uiLabel7.Name = "uiLabel7";
+            uiLabel7.Size = new Size(138, 54);
+            uiLabel7.TabIndex = 11;
+            uiLabel7.Text = "PLC连接超时";
+            // 
+            // cb_CPUType
+            // 
+            cb_CPUType.DataSource = null;
+            cb_CPUType.FillColor = Color.White;
+            cb_CPUType.Font = new Font("宋体", 12F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            cb_CPUType.ItemHoverColor = Color.FromArgb(155, 200, 255);
+            cb_CPUType.ItemSelectForeColor = Color.FromArgb(235, 243, 255);
+            cb_CPUType.Location = new Point(100, 152);
+            cb_CPUType.Margin = new Padding(4, 5, 4, 5);
+            cb_CPUType.MinimumSize = new Size(63, 0);
+            cb_CPUType.Name = "cb_CPUType";
+            cb_CPUType.Padding = new Padding(0, 0, 30, 2);
+            cb_CPUType.Size = new Size(179, 36);
+            cb_CPUType.SymbolSize = 24;
+            cb_CPUType.TabIndex = 10;
+            cb_CPUType.TextAlignment = ContentAlignment.MiddleLeft;
+            cb_CPUType.Watermark = "";
+            // 
+            // txt_Slot
+            // 
+            txt_Slot.Font = new Font("宋体", 12F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            txt_Slot.Location = new Point(100, 262);
+            txt_Slot.Margin = new Padding(4, 5, 4, 5);
+            txt_Slot.MinimumSize = new Size(1, 16);
+            txt_Slot.Name = "txt_Slot";
+            txt_Slot.Padding = new Padding(5);
+            txt_Slot.ShowText = false;
+            txt_Slot.Size = new Size(179, 36);
+            txt_Slot.TabIndex = 9;
+            txt_Slot.TextAlignment = ContentAlignment.MiddleLeft;
+            txt_Slot.Watermark = "";
+            // 
+            // uiLabel5
+            // 
+            uiLabel5.Font = new Font("宋体", 12F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            uiLabel5.ForeColor = Color.FromArgb(48, 48, 48);
+            uiLabel5.Location = new Point(17, 269);
+            uiLabel5.Name = "uiLabel5";
+            uiLabel5.Size = new Size(76, 29);
+            uiLabel5.TabIndex = 8;
+            uiLabel5.Text = "插槽号";
+            // 
+            // txt_Rack
+            // 
+            txt_Rack.Font = new Font("宋体", 12F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            txt_Rack.Location = new Point(100, 208);
+            txt_Rack.Margin = new Padding(4, 5, 4, 5);
+            txt_Rack.MinimumSize = new Size(1, 16);
+            txt_Rack.Name = "txt_Rack";
+            txt_Rack.Padding = new Padding(5);
+            txt_Rack.ShowText = false;
+            txt_Rack.Size = new Size(179, 36);
+            txt_Rack.TabIndex = 7;
+            txt_Rack.TextAlignment = ContentAlignment.MiddleLeft;
+            txt_Rack.Watermark = "";
+            // 
+            // uiLabel4
+            // 
+            uiLabel4.Font = new Font("宋体", 12F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            uiLabel4.ForeColor = Color.FromArgb(48, 48, 48);
+            uiLabel4.Location = new Point(17, 215);
+            uiLabel4.Name = "uiLabel4";
+            uiLabel4.Size = new Size(76, 29);
+            uiLabel4.TabIndex = 6;
+            uiLabel4.Text = "机架号";
+            // 
+            // uiLabel3
+            // 
+            uiLabel3.Font = new Font("宋体", 12F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            uiLabel3.ForeColor = Color.FromArgb(48, 48, 48);
+            uiLabel3.Location = new Point(17, 159);
+            uiLabel3.Name = "uiLabel3";
+            uiLabel3.Size = new Size(88, 29);
+            uiLabel3.TabIndex = 4;
+            uiLabel3.Text = "CPU类型";
+            // 
+            // txt_Port
+            // 
+            txt_Port.Font = new Font("宋体", 12F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            txt_Port.Location = new Point(100, 97);
+            txt_Port.Margin = new Padding(4, 5, 4, 5);
+            txt_Port.MinimumSize = new Size(1, 16);
+            txt_Port.Name = "txt_Port";
+            txt_Port.Padding = new Padding(5);
+            txt_Port.ShowText = false;
+            txt_Port.Size = new Size(179, 36);
+            txt_Port.TabIndex = 3;
+            txt_Port.TextAlignment = ContentAlignment.MiddleLeft;
+            txt_Port.Watermark = "";
+            // 
+            // uiLabel2
+            // 
+            uiLabel2.Font = new Font("宋体", 12F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            uiLabel2.ForeColor = Color.FromArgb(48, 48, 48);
+            uiLabel2.Location = new Point(17, 104);
+            uiLabel2.Name = "uiLabel2";
+            uiLabel2.Size = new Size(76, 29);
+            uiLabel2.TabIndex = 2;
+            uiLabel2.Text = "端口号";
+            // 
+            // txt_IPAddress
+            // 
+            txt_IPAddress.FillColor2 = Color.FromArgb(235, 243, 255);
+            txt_IPAddress.Font = new Font("宋体", 12F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            txt_IPAddress.Location = new Point(100, 41);
+            txt_IPAddress.Margin = new Padding(4, 5, 4, 5);
+            txt_IPAddress.MinimumSize = new Size(1, 1);
+            txt_IPAddress.Name = "txt_IPAddress";
+            txt_IPAddress.Padding = new Padding(1);
+            txt_IPAddress.ShowText = false;
+            txt_IPAddress.Size = new Size(179, 36);
+            txt_IPAddress.TabIndex = 1;
+            txt_IPAddress.TextAlignment = ContentAlignment.MiddleCenter;
+            // 
+            // uiLabel1
+            // 
+            uiLabel1.Font = new Font("宋体", 12F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            uiLabel1.ForeColor = Color.FromArgb(48, 48, 48);
+            uiLabel1.Location = new Point(17, 48);
+            uiLabel1.Name = "uiLabel1";
+            uiLabel1.Size = new Size(76, 29);
+            uiLabel1.TabIndex = 0;
+            uiLabel1.Text = "Ip地址";
+            // 
+            // uiTitlePanel3
+            // 
+            uiTitlePanel3.Controls.Add(rbg_Save);
+            uiTitlePanel3.Controls.Add(txt_DirePath);
+            uiTitlePanel3.Controls.Add(uiLabel12);
+            uiTitlePanel3.Font = new Font("宋体", 12F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            uiTitlePanel3.Location = new Point(631, 14);
+            uiTitlePanel3.Margin = new Padding(4, 5, 4, 5);
+            uiTitlePanel3.MinimumSize = new Size(1, 1);
+            uiTitlePanel3.Name = "uiTitlePanel3";
+            uiTitlePanel3.ShowText = false;
+            uiTitlePanel3.Size = new Size(423, 321);
+            uiTitlePanel3.TabIndex = 2;
+            uiTitlePanel3.Text = "定期清理log";
+            uiTitlePanel3.TextAlignment = ContentAlignment.MiddleCenter;
+            // 
+            // rbg_Save
+            // 
+            rbg_Save.Font = new Font("宋体", 12F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            rbg_Save.Items.AddRange(new object[] { "不清理", "3天", "7天", "15天", "30天", "60天" });
+            rbg_Save.Location = new Point(13, 82);
+            rbg_Save.Margin = new Padding(4, 5, 4, 5);
+            rbg_Save.MinimumSize = new Size(1, 1);
+            rbg_Save.Name = "rbg_Save";
+            rbg_Save.Padding = new Padding(0, 32, 0, 0);
+            rbg_Save.Size = new Size(397, 216);
+            rbg_Save.TabIndex = 19;
+            rbg_Save.Text = "定期清理";
+            rbg_Save.TextAlignment = ContentAlignment.MiddleLeft;
+            // 
+            // txt_DirePath
+            // 
+            txt_DirePath.Font = new Font("宋体", 12F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            txt_DirePath.Location = new Point(143, 41);
+            txt_DirePath.Margin = new Padding(4, 5, 4, 5);
+            txt_DirePath.MinimumSize = new Size(1, 16);
+            txt_DirePath.Name = "txt_DirePath";
+            txt_DirePath.Padding = new Padding(5);
+            txt_DirePath.ShowText = false;
+            txt_DirePath.Size = new Size(218, 36);
+            txt_DirePath.TabIndex = 18;
+            txt_DirePath.TextAlignment = ContentAlignment.MiddleLeft;
+            txt_DirePath.Watermark = "";
+            // 
+            // uiLabel12
+            // 
+            uiLabel12.Font = new Font("宋体", 12F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            uiLabel12.ForeColor = Color.FromArgb(48, 48, 48);
+            uiLabel12.Location = new Point(24, 48);
+            uiLabel12.Name = "uiLabel12";
+            uiLabel12.Size = new Size(151, 29);
+            uiLabel12.TabIndex = 17;
+            uiLabel12.Text = "文件夹路径";
+            // 
+            // uiTitlePanel2
+            // 
+            uiTitlePanel2.Controls.Add(uiLabel11);
+            uiTitlePanel2.Controls.Add(txt_SoftTime);
+            uiTitlePanel2.Controls.Add(uiLabel9);
+            uiTitlePanel2.Controls.Add(txt_SoftwareVersion);
+            uiTitlePanel2.Controls.Add(uiLabel10);
+            uiTitlePanel2.Font = new Font("宋体", 12F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            uiTitlePanel2.Location = new Point(13, 345);
+            uiTitlePanel2.Margin = new Padding(4, 5, 4, 5);
+            uiTitlePanel2.MinimumSize = new Size(1, 1);
+            uiTitlePanel2.Name = "uiTitlePanel2";
+            uiTitlePanel2.ShowText = false;
+            uiTitlePanel2.Size = new Size(610, 185);
+            uiTitlePanel2.TabIndex = 1;
+            uiTitlePanel2.Text = "软件参数";
+            uiTitlePanel2.TextAlignment = ContentAlignment.MiddleCenter;
+            // 
+            // uiLabel11
+            // 
+            uiLabel11.Font = new Font("宋体", 12F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            uiLabel11.ForeColor = Color.FromArgb(48, 48, 48);
+            uiLabel11.Location = new Point(338, 121);
+            uiLabel11.Name = "uiLabel11";
+            uiLabel11.Size = new Size(33, 29);
+            uiLabel11.TabIndex = 14;
+            uiLabel11.Text = "s";
+            // 
+            // txt_SoftTime
+            // 
+            txt_SoftTime.Font = new Font("宋体", 12F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            txt_SoftTime.Location = new Point(152, 114);
+            txt_SoftTime.Margin = new Padding(4, 5, 4, 5);
+            txt_SoftTime.MinimumSize = new Size(1, 16);
+            txt_SoftTime.Name = "txt_SoftTime";
+            txt_SoftTime.Padding = new Padding(5);
+            txt_SoftTime.ShowText = false;
+            txt_SoftTime.Size = new Size(179, 36);
+            txt_SoftTime.TabIndex = 13;
+            txt_SoftTime.TextAlignment = ContentAlignment.MiddleLeft;
+            txt_SoftTime.Watermark = "";
+            // 
+            // uiLabel9
+            // 
+            uiLabel9.Font = new Font("宋体", 12F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            uiLabel9.ForeColor = Color.FromArgb(48, 48, 48);
+            uiLabel9.Location = new Point(17, 121);
+            uiLabel9.Name = "uiLabel9";
+            uiLabel9.Size = new Size(145, 29);
+            uiLabel9.TabIndex = 12;
+            uiLabel9.Text = "软件试用时间";
+            // 
+            // txt_SoftwareVersion
+            // 
+            txt_SoftwareVersion.Font = new Font("宋体", 12F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            txt_SoftwareVersion.Location = new Point(152, 60);
+            txt_SoftwareVersion.Margin = new Padding(4, 5, 4, 5);
+            txt_SoftwareVersion.MinimumSize = new Size(1, 16);
+            txt_SoftwareVersion.Name = "txt_SoftwareVersion";
+            txt_SoftwareVersion.Padding = new Padding(5);
+            txt_SoftwareVersion.ShowText = false;
+            txt_SoftwareVersion.Size = new Size(179, 36);
+            txt_SoftwareVersion.TabIndex = 11;
+            txt_SoftwareVersion.TextAlignment = ContentAlignment.MiddleLeft;
+            txt_SoftwareVersion.Watermark = "";
+            // 
+            // uiLabel10
+            // 
+            uiLabel10.Font = new Font("宋体", 12F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            uiLabel10.ForeColor = Color.FromArgb(48, 48, 48);
+            uiLabel10.Location = new Point(17, 67);
+            uiLabel10.Name = "uiLabel10";
+            uiLabel10.Size = new Size(128, 29);
+            uiLabel10.TabIndex = 10;
+            uiLabel10.Text = "软件版本";
+            // 
+            // btn_Save
+            // 
+            btn_Save.Font = new Font("宋体", 12F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            btn_Save.Location = new Point(879, 475);
+            btn_Save.MinimumSize = new Size(1, 1);
+            btn_Save.Name = "btn_Save";
+            btn_Save.Size = new Size(175, 55);
+            btn_Save.TabIndex = 3;
+            btn_Save.Text = "保存";
+            btn_Save.TipsFont = new Font("宋体", 9F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            // 
             // PageSystemParameterSet
             // 
             AutoScaleMode = AutoScaleMode.None;
             ClientSize = new Size(1067, 544);
+            Controls.Add(btn_Save);
+            Controls.Add(uiTitlePanel3);
+            Controls.Add(uiTitlePanel2);
+            Controls.Add(uiTitlePanel1);
             Name = "PageSystemParameterSet";
-            Text = "PageSystemParameterSet";
+            Text = "系统参数";
             Load += PageSystemParameterSet_Load;
+            uiTitlePanel1.ResumeLayout(false);
+            uiTitlePanel3.ResumeLayout(false);
+            uiTitlePanel2.ResumeLayout(false);
             ResumeLayout(false);
         }
 
         #endregion
+
+        private Sunny.UI.UITitlePanel uiTitlePanel1;
+        private Sunny.UI.UITextBox txt_ReConnectTimeInterval;
+        private Sunny.UI.UILabel uiLabel8;
+        private Sunny.UI.UITextBox txt_ReadTimeInterval;
+        private Sunny.UI.UILabel uiLabel6;
+        private Sunny.UI.UITextBox txt_ConnectTimeOut;
+        private Sunny.UI.UILabel uiLabel7;
+        private Sunny.UI.UIComboBox cb_CPUType;
+        private Sunny.UI.UITextBox txt_Slot;
+        private Sunny.UI.UILabel uiLabel5;
+        private Sunny.UI.UITextBox txt_Rack;
+        private Sunny.UI.UILabel uiLabel4;
+        private Sunny.UI.UILabel uiLabel3;
+        private Sunny.UI.UITextBox txt_Port;
+        private Sunny.UI.UILabel uiLabel2;
+        private Sunny.UI.UIIPTextBox txt_IPAddress;
+        private Sunny.UI.UILabel uiLabel1;
+        private Sunny.UI.UITitlePanel uiTitlePanel3;
+        private Sunny.UI.UITitlePanel uiTitlePanel2;
+        private Sunny.UI.UILabel uiLabel11;
+        private Sunny.UI.UITextBox txt_SoftTime;
+        private Sunny.UI.UILabel uiLabel9;
+        private Sunny.UI.UITextBox txt_SoftwareVersion;
+        private Sunny.UI.UILabel uiLabel10;
+        private Sunny.UI.UITextBox txt_DirePath;
+        private Sunny.UI.UILabel uiLabel12;
+        private Sunny.UI.UIRadioButtonGroup rbg_Save;
+        private Sunny.UI.UIButton btn_Save;
     }
 }

+ 1 - 1
Scada/Page/PageTotalEquipmentControl.Designer.cs

@@ -346,7 +346,7 @@
             Controls.Add(uiTitlePanel2);
             Controls.Add(uiTitlePanel1);
             Name = "PageTotalEquipmentControl";
-            Text = "PageTotalEquipmentControl";
+            Text = "设备总控";
             uiTitlePanel1.ResumeLayout(false);
             uiTitlePanel2.ResumeLayout(false);
             uiTitlePanel3.ResumeLayout(false);

+ 272 - 1
Scada/Page/PageUserManage.Designer.cs

@@ -28,18 +28,289 @@
         /// </summary>
         private void InitializeComponent()
         {
+            DataGridViewCellStyle dataGridViewCellStyle1 = new DataGridViewCellStyle();
+            DataGridViewCellStyle dataGridViewCellStyle2 = new DataGridViewCellStyle();
+            DataGridViewCellStyle dataGridViewCellStyle3 = new DataGridViewCellStyle();
+            DataGridViewCellStyle dataGridViewCellStyle4 = new DataGridViewCellStyle();
+            DataGridViewCellStyle dataGridViewCellStyle5 = new DataGridViewCellStyle();
+            uiLabel1 = new Sunny.UI.UILabel();
+            txt_UserName = new Sunny.UI.UITextBox();
+            txt_Password = new Sunny.UI.UITextBox();
+            uiLabel2 = new Sunny.UI.UILabel();
+            txt_EnterPassword = new Sunny.UI.UITextBox();
+            uiLabel3 = new Sunny.UI.UILabel();
+            uiLabel4 = new Sunny.UI.UILabel();
+            cb_Auth = new Sunny.UI.UIComboBox();
+            btn_AddUser = new Sunny.UI.UISymbolButton();
+            btn_Update = new Sunny.UI.UISymbolButton();
+            btn_Delete = new Sunny.UI.UISymbolButton();
+            dgv_User = new Sunny.UI.UIDataGridView();
+            Id = new DataGridViewTextBoxColumn();
+            UserName = new DataGridViewTextBoxColumn();
+            UserPassword = new DataGridViewTextBoxColumn();
+            Role = new DataGridViewTextBoxColumn();
+            ((System.ComponentModel.ISupportInitialize)dgv_User).BeginInit();
             SuspendLayout();
             // 
+            // uiLabel1
+            // 
+            uiLabel1.Font = new Font("宋体", 12F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            uiLabel1.ForeColor = Color.FromArgb(48, 48, 48);
+            uiLabel1.Location = new Point(33, 30);
+            uiLabel1.Name = "uiLabel1";
+            uiLabel1.Size = new Size(125, 29);
+            uiLabel1.TabIndex = 0;
+            uiLabel1.Text = "用户名称:";
+            // 
+            // txt_UserName
+            // 
+            txt_UserName.Font = new Font("宋体", 12F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            txt_UserName.Location = new Point(149, 23);
+            txt_UserName.Margin = new Padding(4, 5, 4, 5);
+            txt_UserName.MinimumSize = new Size(1, 16);
+            txt_UserName.Name = "txt_UserName";
+            txt_UserName.Padding = new Padding(5);
+            txt_UserName.ShowText = false;
+            txt_UserName.Size = new Size(188, 36);
+            txt_UserName.TabIndex = 1;
+            txt_UserName.TextAlignment = ContentAlignment.MiddleLeft;
+            txt_UserName.Watermark = "用户名称";
+            // 
+            // txt_Password
+            // 
+            txt_Password.Font = new Font("宋体", 12F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            txt_Password.Location = new Point(149, 82);
+            txt_Password.Margin = new Padding(4, 5, 4, 5);
+            txt_Password.MinimumSize = new Size(1, 16);
+            txt_Password.Name = "txt_Password";
+            txt_Password.Padding = new Padding(5);
+            txt_Password.ShowText = false;
+            txt_Password.Size = new Size(188, 36);
+            txt_Password.TabIndex = 3;
+            txt_Password.TextAlignment = ContentAlignment.MiddleLeft;
+            txt_Password.Watermark = "用户密码";
+            // 
+            // uiLabel2
+            // 
+            uiLabel2.Font = new Font("宋体", 12F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            uiLabel2.ForeColor = Color.FromArgb(48, 48, 48);
+            uiLabel2.Location = new Point(33, 89);
+            uiLabel2.Name = "uiLabel2";
+            uiLabel2.Size = new Size(125, 29);
+            uiLabel2.TabIndex = 2;
+            uiLabel2.Text = "用户密码:";
+            // 
+            // txt_EnterPassword
+            // 
+            txt_EnterPassword.Font = new Font("宋体", 12F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            txt_EnterPassword.Location = new Point(149, 139);
+            txt_EnterPassword.Margin = new Padding(4, 5, 4, 5);
+            txt_EnterPassword.MinimumSize = new Size(1, 16);
+            txt_EnterPassword.Name = "txt_EnterPassword";
+            txt_EnterPassword.Padding = new Padding(5);
+            txt_EnterPassword.ShowText = false;
+            txt_EnterPassword.Size = new Size(188, 36);
+            txt_EnterPassword.TabIndex = 5;
+            txt_EnterPassword.TextAlignment = ContentAlignment.MiddleLeft;
+            txt_EnterPassword.Watermark = "确认密码";
+            // 
+            // uiLabel3
+            // 
+            uiLabel3.Font = new Font("宋体", 12F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            uiLabel3.ForeColor = Color.FromArgb(48, 48, 48);
+            uiLabel3.Location = new Point(33, 146);
+            uiLabel3.Name = "uiLabel3";
+            uiLabel3.Size = new Size(125, 29);
+            uiLabel3.TabIndex = 4;
+            uiLabel3.Text = "确认密码:";
+            // 
+            // uiLabel4
+            // 
+            uiLabel4.Font = new Font("宋体", 12F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            uiLabel4.ForeColor = Color.FromArgb(48, 48, 48);
+            uiLabel4.Location = new Point(33, 204);
+            uiLabel4.Name = "uiLabel4";
+            uiLabel4.Size = new Size(125, 29);
+            uiLabel4.TabIndex = 6;
+            uiLabel4.Text = "权限选择:";
+            // 
+            // cb_Auth
+            // 
+            cb_Auth.DataSource = null;
+            cb_Auth.FillColor = Color.White;
+            cb_Auth.Font = new Font("宋体", 12F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            cb_Auth.ItemHoverColor = Color.FromArgb(155, 200, 255);
+            cb_Auth.ItemSelectForeColor = Color.FromArgb(235, 243, 255);
+            cb_Auth.Location = new Point(149, 197);
+            cb_Auth.Margin = new Padding(4, 5, 4, 5);
+            cb_Auth.MinimumSize = new Size(63, 0);
+            cb_Auth.Name = "cb_Auth";
+            cb_Auth.Padding = new Padding(0, 0, 30, 2);
+            cb_Auth.Size = new Size(188, 36);
+            cb_Auth.SymbolSize = 24;
+            cb_Auth.TabIndex = 7;
+            cb_Auth.TextAlignment = ContentAlignment.MiddleLeft;
+            cb_Auth.Watermark = "权限选择";
+            // 
+            // btn_AddUser
+            // 
+            btn_AddUser.Font = new Font("宋体", 12F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            btn_AddUser.Location = new Point(33, 262);
+            btn_AddUser.MinimumSize = new Size(1, 1);
+            btn_AddUser.Name = "btn_AddUser";
+            btn_AddUser.Size = new Size(304, 56);
+            btn_AddUser.Symbol = 561285;
+            btn_AddUser.TabIndex = 8;
+            btn_AddUser.Text = "添加用户";
+            btn_AddUser.TipsFont = new Font("宋体", 9F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            // 
+            // btn_Update
+            // 
+            btn_Update.Font = new Font("宋体", 12F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            btn_Update.Location = new Point(33, 359);
+            btn_Update.MinimumSize = new Size(1, 1);
+            btn_Update.Name = "btn_Update";
+            btn_Update.Size = new Size(304, 56);
+            btn_Update.Symbol = 362719;
+            btn_Update.TabIndex = 9;
+            btn_Update.Text = "修改用户";
+            btn_Update.TipsFont = new Font("宋体", 9F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            // 
+            // btn_Delete
+            // 
+            btn_Delete.Font = new Font("宋体", 12F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            btn_Delete.Location = new Point(33, 456);
+            btn_Delete.MinimumSize = new Size(1, 1);
+            btn_Delete.Name = "btn_Delete";
+            btn_Delete.Size = new Size(304, 56);
+            btn_Delete.Symbol = 561286;
+            btn_Delete.TabIndex = 10;
+            btn_Delete.Text = "删除用户";
+            btn_Delete.TipsFont = new Font("宋体", 9F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            // 
+            // dgv_User
+            // 
+            dgv_User.AllowUserToAddRows = false;
+            dgv_User.AllowUserToDeleteRows = false;
+            dataGridViewCellStyle1.BackColor = Color.FromArgb(235, 243, 255);
+            dgv_User.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1;
+            dgv_User.BackgroundColor = Color.White;
+            dgv_User.ColumnHeadersBorderStyle = DataGridViewHeaderBorderStyle.Single;
+            dataGridViewCellStyle2.Alignment = DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle2.BackColor = Color.FromArgb(80, 160, 255);
+            dataGridViewCellStyle2.Font = new Font("宋体", 12F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            dataGridViewCellStyle2.ForeColor = Color.White;
+            dataGridViewCellStyle2.SelectionBackColor = SystemColors.Highlight;
+            dataGridViewCellStyle2.SelectionForeColor = SystemColors.HighlightText;
+            dataGridViewCellStyle2.WrapMode = DataGridViewTriState.True;
+            dgv_User.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2;
+            dgv_User.ColumnHeadersHeight = 32;
+            dgv_User.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
+            dgv_User.Columns.AddRange(new DataGridViewColumn[] { Id, UserName, UserPassword, Role });
+            dataGridViewCellStyle3.Alignment = DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle3.BackColor = SystemColors.Window;
+            dataGridViewCellStyle3.Font = new Font("宋体", 12F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            dataGridViewCellStyle3.ForeColor = Color.FromArgb(48, 48, 48);
+            dataGridViewCellStyle3.SelectionBackColor = SystemColors.Highlight;
+            dataGridViewCellStyle3.SelectionForeColor = SystemColors.HighlightText;
+            dataGridViewCellStyle3.WrapMode = DataGridViewTriState.False;
+            dgv_User.DefaultCellStyle = dataGridViewCellStyle3;
+            dgv_User.EnableHeadersVisualStyles = false;
+            dgv_User.Font = new Font("宋体", 12F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            dgv_User.GridColor = Color.FromArgb(80, 160, 255);
+            dgv_User.Location = new Point(392, 23);
+            dgv_User.Name = "dgv_User";
+            dgv_User.ReadOnly = true;
+            dataGridViewCellStyle4.Alignment = DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle4.BackColor = Color.FromArgb(235, 243, 255);
+            dataGridViewCellStyle4.Font = new Font("宋体", 12F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            dataGridViewCellStyle4.ForeColor = Color.FromArgb(48, 48, 48);
+            dataGridViewCellStyle4.SelectionBackColor = Color.FromArgb(80, 160, 255);
+            dataGridViewCellStyle4.SelectionForeColor = Color.White;
+            dataGridViewCellStyle4.WrapMode = DataGridViewTriState.True;
+            dgv_User.RowHeadersDefaultCellStyle = dataGridViewCellStyle4;
+            dgv_User.RowHeadersWidth = 51;
+            dataGridViewCellStyle5.BackColor = Color.White;
+            dataGridViewCellStyle5.Font = new Font("宋体", 12F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            dgv_User.RowsDefaultCellStyle = dataGridViewCellStyle5;
+            dgv_User.SelectedIndex = -1;
+            dgv_User.Size = new Size(663, 489);
+            dgv_User.StripeOddColor = Color.FromArgb(235, 243, 255);
+            dgv_User.TabIndex = 11;
+            // 
+            // Id
+            // 
+            Id.HeaderText = "Id";
+            Id.MinimumWidth = 6;
+            Id.Name = "Id";
+            Id.ReadOnly = true;
+            Id.Width = 60;
+            // 
+            // UserName
+            // 
+            UserName.HeaderText = "用户名";
+            UserName.MinimumWidth = 6;
+            UserName.Name = "UserName";
+            UserName.ReadOnly = true;
+            UserName.Width = 200;
+            // 
+            // UserPassword
+            // 
+            UserPassword.HeaderText = "密码";
+            UserPassword.MinimumWidth = 6;
+            UserPassword.Name = "UserPassword";
+            UserPassword.ReadOnly = true;
+            UserPassword.Width = 200;
+            // 
+            // Role
+            // 
+            Role.HeaderText = "角色";
+            Role.MinimumWidth = 6;
+            Role.Name = "Role";
+            Role.ReadOnly = true;
+            Role.Width = 150;
+            // 
             // PageUserManage
             // 
             AutoScaleMode = AutoScaleMode.None;
             ClientSize = new Size(1067, 544);
+            Controls.Add(dgv_User);
+            Controls.Add(btn_Delete);
+            Controls.Add(btn_Update);
+            Controls.Add(btn_AddUser);
+            Controls.Add(cb_Auth);
+            Controls.Add(uiLabel4);
+            Controls.Add(txt_EnterPassword);
+            Controls.Add(uiLabel3);
+            Controls.Add(txt_Password);
+            Controls.Add(uiLabel2);
+            Controls.Add(txt_UserName);
+            Controls.Add(uiLabel1);
             Name = "PageUserManage";
-            Text = "PageUserManage";
+            Text = "用户管理";
+            Initialize += PageUserManage_Initialize;
             Load += PageUserManage_Load;
+            ((System.ComponentModel.ISupportInitialize)dgv_User).EndInit();
             ResumeLayout(false);
         }
 
         #endregion
+
+        private Sunny.UI.UILabel uiLabel1;
+        private Sunny.UI.UITextBox txt_UserName;
+        private Sunny.UI.UITextBox txt_Password;
+        private Sunny.UI.UILabel uiLabel2;
+        private Sunny.UI.UITextBox txt_EnterPassword;
+        private Sunny.UI.UILabel uiLabel3;
+        private Sunny.UI.UILabel uiLabel4;
+        private Sunny.UI.UIComboBox cb_Auth;
+        private Sunny.UI.UISymbolButton btn_AddUser;
+        private Sunny.UI.UISymbolButton btn_Update;
+        private Sunny.UI.UISymbolButton btn_Delete;
+        private Sunny.UI.UIDataGridView dgv_User;
+        private DataGridViewTextBoxColumn Id;
+        private DataGridViewTextBoxColumn UserName;
+        private DataGridViewTextBoxColumn UserPassword;
+        private DataGridViewTextBoxColumn Role;
     }
 }

+ 5 - 0
Scada/Page/PageUserManage.cs

@@ -22,5 +22,10 @@ namespace Scada.Page
         {
 
         }
+
+        private void PageUserManage_Initialize(object sender, EventArgs e)
+        {
+
+        }
     }
 }

+ 12 - 0
Scada/Page/PageUserManage.resx

@@ -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>
+  <metadata name="Id.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="UserName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="UserPassword.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Role.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
 </root>