Linsk 3 months ago
parent
commit
afdd4cb845

+ 26 - 6
Scada/FormMain.cs

@@ -15,14 +15,34 @@ namespace Scada
             //设置初始页面索引(关联页面,唯一不重复即可)
             //设置初始页面索引(关联页面,唯一不重复即可)
             int pageIndex = 1000;
             int pageIndex = 1000;
 
 
-            TreeNode parent = Aside.CreateNode("监控模块", 61451, 24, pageIndex);
+            TreeNode totalEquipment= Aside.CreateNode("总控模块", 61451, 24, pageIndex);
+            Aside.CreateChildNode(totalEquipment, AddPage(new PageTotalEquipmentControl(), ++pageIndex));
 
 
-            Aside.CreateChildNode(parent, AddPage(new PageEquipmentMonitor1(), ++pageIndex));
-            Aside.CreateChildNode(parent, AddPage(new PageEquipmentMonitor2(), ++pageIndex));
-            Aside.CreateChildNode(parent, AddPage(new PageEquipmentMonitor3(), ++pageIndex));
+            TreeNode equipmentMonitor = Aside.CreateNode("监控模块", 61451, 24, pageIndex);
+            Aside.CreateChildNode(equipmentMonitor, AddPage(new PageEquipmentMonitor1(), ++pageIndex));
+            Aside.CreateChildNode(equipmentMonitor, AddPage(new PageEquipmentMonitor2(), ++pageIndex));
+            Aside.CreateChildNode(equipmentMonitor, AddPage(new PageEquipmentMonitor3(), ++pageIndex));
 
 
-            TreeNode parent1 = Aside.CreateNode("总控模块", 61451, 24, pageIndex);
-            Aside.CreateChildNode(parent1, AddPage(new PageTotalEquipmentControl(), ++pageIndex));
+            TreeNode recipeManage = Aside.CreateNode("配方管理", 61451, 24, pageIndex);
+            Aside.CreateChildNode(recipeManage, AddPage(new PageRecipeManage(), ++pageIndex));
+
+            TreeNode logManage = Aside.CreateNode("日志管理", 61451, 24, pageIndex);
+            Aside.CreateChildNode(logManage, AddPage(new PageLogManage(), ++pageIndex));
+
+            TreeNode AuthManage = Aside.CreateNode("权限管理", 61451, 24, pageIndex);
+            Aside.CreateChildNode(AuthManage, AddPage(new PageAuthManage(), ++pageIndex));
+
+            TreeNode userManage = Aside.CreateNode("用户管理", 61451, 24, pageIndex);
+            Aside.CreateChildNode(userManage, AddPage(new PageUserManage(), ++pageIndex));
+
+            TreeNode reportManage = Aside.CreateNode("报表管理", 61451, 24, pageIndex);
+            Aside.CreateChildNode(reportManage, AddPage(new PageReportManage(), ++pageIndex));
+
+            TreeNode chartManage = Aside.CreateNode("图表管理", 61451, 24, pageIndex);
+            Aside.CreateChildNode(chartManage, AddPage(new PageChartManage(), ++pageIndex));
+
+            TreeNode systemParameterSet = Aside.CreateNode("系统参数", 61451, 24, pageIndex);
+            Aside.CreateChildNode(systemParameterSet, AddPage(new PageSystemParameterSet(), ++pageIndex));
 
 
             //显示默认界面
             //显示默认界面
             //Aside.SelectFirst();
             //Aside.SelectFirst();

+ 332 - 12
Scada/Page/PageEquipmentMonitor1.Designer.cs

@@ -28,32 +28,352 @@
         /// </summary>
         /// </summary>
         private void InitializeComponent()
         private void InitializeComponent()
         {
         {
-            uiLabel1 = new Sunny.UI.UILabel();
+            uiTitlePanel2 = new Sunny.UI.UITitlePanel();
+            userVarCurrentValue3 = new UserVarCurrentValue();
+            userAlarmState3 = new UserAlarmState();
+            userAlarmState2 = new UserAlarmState();
+            userDeviceState3 = new UserDeviceState();
+            uiTitlePanel3 = new Sunny.UI.UITitlePanel();
+            userVarCurrentValue5 = new UserVarCurrentValue();
+            userVarCurrentValue4 = new UserVarCurrentValue();
+            userAlarmState4 = new UserAlarmState();
+            userAlarmState5 = new UserAlarmState();
+            userDeviceState4 = new UserDeviceState();
+            userDeviceState1 = new UserDeviceState();
+            userDeviceState2 = new UserDeviceState();
+            userAlarmState1 = new UserAlarmState();
+            userVarCurrentValue1 = new UserVarCurrentValue();
+            uiTitlePanel1 = new Sunny.UI.UITitlePanel();
+            userVarCurrentValue2 = new UserVarCurrentValue();
+            uiTitlePanel2.SuspendLayout();
+            uiTitlePanel3.SuspendLayout();
+            uiTitlePanel1.SuspendLayout();
             SuspendLayout();
             SuspendLayout();
             // 
             // 
-            // uiLabel1
+            // uiTitlePanel2
             // 
             // 
-            uiLabel1.Font = new Font("宋体", 12F, FontStyle.Regular, GraphicsUnit.Point, 134);
-            uiLabel1.ForeColor = Color.FromArgb(48, 48, 48);
-            uiLabel1.Location = new Point(332, 133);
-            uiLabel1.Name = "uiLabel1";
-            uiLabel1.Size = new Size(125, 29);
-            uiLabel1.TabIndex = 0;
-            uiLabel1.Text = "uiLabel1";
+            uiTitlePanel2.Controls.Add(userVarCurrentValue3);
+            uiTitlePanel2.Controls.Add(userAlarmState3);
+            uiTitlePanel2.Controls.Add(userAlarmState2);
+            uiTitlePanel2.Controls.Add(userDeviceState3);
+            uiTitlePanel2.Font = new Font("宋体", 12F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            uiTitlePanel2.Location = new Point(4, 183);
+            uiTitlePanel2.Margin = new Padding(4, 5, 4, 5);
+            uiTitlePanel2.MinimumSize = new Size(1, 1);
+            uiTitlePanel2.Name = "uiTitlePanel2";
+            uiTitlePanel2.ShowText = false;
+            uiTitlePanel2.Size = new Size(1059, 169);
+            uiTitlePanel2.TabIndex = 1;
+            uiTitlePanel2.Text = "粗洗工位";
+            uiTitlePanel2.TextAlignment = ContentAlignment.MiddleCenter;
+            // 
+            // userVarCurrentValue3
+            // 
+            userVarCurrentValue3.BackColor = Color.Transparent;
+            userVarCurrentValue3.DeviceVarName = "粗洗喷淋泵压力值";
+            userVarCurrentValue3.FillColor = Color.Transparent;
+            userVarCurrentValue3.Font = new Font("宋体", 12F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            userVarCurrentValue3.Location = new Point(43, 111);
+            userVarCurrentValue3.MinimumSize = new Size(1, 1);
+            userVarCurrentValue3.Name = "userVarCurrentValue3";
+            userVarCurrentValue3.RectColor = Color.Transparent;
+            userVarCurrentValue3.Size = new Size(459, 54);
+            userVarCurrentValue3.TabIndex = 5;
+            userVarCurrentValue3.Text = "userVarCurrentValue3";
+            userVarCurrentValue3.TextAlignment = ContentAlignment.MiddleCenter;
+            userVarCurrentValue3.Unit = "Mpa";
+            userVarCurrentValue3.VariableName = "粗洗喷淋泵压力值";
+            userVarCurrentValue3.VarValue = 0F;
+            // 
+            // userAlarmState3
+            // 
+            userAlarmState3.DeviceName = "粗洗低液位报警";
+            userAlarmState3.FillColor = Color.Transparent;
+            userAlarmState3.Font = new Font("宋体", 12F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            userAlarmState3.Location = new Point(704, 55);
+            userAlarmState3.MinimumSize = new Size(1, 1);
+            userAlarmState3.Name = "userAlarmState3";
+            userAlarmState3.RectColor = Color.Transparent;
+            userAlarmState3.Size = new Size(315, 50);
+            userAlarmState3.State = true;
+            userAlarmState3.TabIndex = 4;
+            userAlarmState3.Text = "userAlarmState3";
+            userAlarmState3.TextAlignment = ContentAlignment.MiddleCenter;
+            userAlarmState3.VariableName = "粗洗低液位报警";
+            // 
+            // userAlarmState2
+            // 
+            userAlarmState2.DeviceName = "粗洗喷淋泵过载报警";
+            userAlarmState2.FillColor = Color.Transparent;
+            userAlarmState2.Font = new Font("宋体", 12F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            userAlarmState2.Location = new Point(358, 55);
+            userAlarmState2.MinimumSize = new Size(1, 1);
+            userAlarmState2.Name = "userAlarmState2";
+            userAlarmState2.RectColor = Color.Transparent;
+            userAlarmState2.Size = new Size(315, 50);
+            userAlarmState2.State = true;
+            userAlarmState2.TabIndex = 3;
+            userAlarmState2.Text = "userAlarmState2";
+            userAlarmState2.TextAlignment = ContentAlignment.MiddleCenter;
+            userAlarmState2.VariableName = "粗洗喷淋泵过载报警";
+            // 
+            // userDeviceState3
+            // 
+            userDeviceState3.BackColor = Color.Transparent;
+            userDeviceState3.DeviceRunName = "粗洗喷淋泵运行状态";
+            userDeviceState3.FillColor = Color.Transparent;
+            userDeviceState3.Font = new Font("宋体", 12F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            userDeviceState3.Location = new Point(8, 55);
+            userDeviceState3.MinimumSize = new Size(1, 1);
+            userDeviceState3.Name = "userDeviceState3";
+            userDeviceState3.RectColor = Color.Transparent;
+            userDeviceState3.Size = new Size(316, 50);
+            userDeviceState3.State = false;
+            userDeviceState3.TabIndex = 1;
+            userDeviceState3.Text = "userDeviceState3";
+            userDeviceState3.TextAlignment = ContentAlignment.MiddleCenter;
+            userDeviceState3.VariableName = "粗洗喷淋泵运行状态";
+            // 
+            // uiTitlePanel3
+            // 
+            uiTitlePanel3.Controls.Add(userVarCurrentValue5);
+            uiTitlePanel3.Controls.Add(userVarCurrentValue4);
+            uiTitlePanel3.Controls.Add(userAlarmState4);
+            uiTitlePanel3.Controls.Add(userAlarmState5);
+            uiTitlePanel3.Controls.Add(userDeviceState4);
+            uiTitlePanel3.Font = new Font("宋体", 12F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            uiTitlePanel3.Location = new Point(4, 362);
+            uiTitlePanel3.Margin = new Padding(4, 5, 4, 5);
+            uiTitlePanel3.MinimumSize = new Size(1, 1);
+            uiTitlePanel3.Name = "uiTitlePanel3";
+            uiTitlePanel3.ShowText = false;
+            uiTitlePanel3.Size = new Size(1059, 177);
+            uiTitlePanel3.TabIndex = 1;
+            uiTitlePanel3.Text = "陶化工位";
+            uiTitlePanel3.TextAlignment = ContentAlignment.MiddleCenter;
+            // 
+            // userVarCurrentValue5
+            // 
+            userVarCurrentValue5.BackColor = Color.Transparent;
+            userVarCurrentValue5.DeviceVarName = "脱脂喷淋泵压力值";
+            userVarCurrentValue5.FillColor = Color.Transparent;
+            userVarCurrentValue5.Font = new Font("宋体", 12F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            userVarCurrentValue5.Location = new Point(43, 116);
+            userVarCurrentValue5.MinimumSize = new Size(1, 1);
+            userVarCurrentValue5.Name = "userVarCurrentValue5";
+            userVarCurrentValue5.RectColor = Color.Transparent;
+            userVarCurrentValue5.Size = new Size(459, 54);
+            userVarCurrentValue5.TabIndex = 8;
+            userVarCurrentValue5.Text = "userVarCurrentValue5";
+            userVarCurrentValue5.TextAlignment = ContentAlignment.MiddleCenter;
+            userVarCurrentValue5.Unit = "Mpa";
+            userVarCurrentValue5.VariableName = "脱脂喷淋泵压力值";
+            userVarCurrentValue5.VarValue = 0F;
+            // 
+            // userVarCurrentValue4
+            // 
+            userVarCurrentValue4.BackColor = Color.Transparent;
+            userVarCurrentValue4.DeviceVarName = "脱脂PH值";
+            userVarCurrentValue4.FillColor = Color.Transparent;
+            userVarCurrentValue4.Font = new Font("宋体", 12F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            userVarCurrentValue4.Location = new Point(576, 116);
+            userVarCurrentValue4.MinimumSize = new Size(1, 1);
+            userVarCurrentValue4.Name = "userVarCurrentValue4";
+            userVarCurrentValue4.RectColor = Color.Transparent;
+            userVarCurrentValue4.Size = new Size(459, 54);
+            userVarCurrentValue4.TabIndex = 9;
+            userVarCurrentValue4.Text = "userVarCurrentValue4";
+            userVarCurrentValue4.TextAlignment = ContentAlignment.MiddleCenter;
+            userVarCurrentValue4.Unit = "PH";
+            userVarCurrentValue4.VariableName = "脱脂PH值";
+            userVarCurrentValue4.VarValue = 7F;
+            // 
+            // userAlarmState4
+            // 
+            userAlarmState4.DeviceName = "陶化低液位报警";
+            userAlarmState4.FillColor = Color.Transparent;
+            userAlarmState4.Font = new Font("宋体", 12F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            userAlarmState4.Location = new Point(704, 63);
+            userAlarmState4.MinimumSize = new Size(1, 1);
+            userAlarmState4.Name = "userAlarmState4";
+            userAlarmState4.RectColor = Color.Transparent;
+            userAlarmState4.Size = new Size(315, 50);
+            userAlarmState4.State = true;
+            userAlarmState4.TabIndex = 7;
+            userAlarmState4.Text = "userAlarmState4";
+            userAlarmState4.TextAlignment = ContentAlignment.MiddleCenter;
+            userAlarmState4.VariableName = "陶化低液位报警";
+            // 
+            // userAlarmState5
+            // 
+            userAlarmState5.DeviceName = "陶化喷淋泵过载报警";
+            userAlarmState5.FillColor = Color.Transparent;
+            userAlarmState5.Font = new Font("宋体", 12F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            userAlarmState5.Location = new Point(358, 63);
+            userAlarmState5.MinimumSize = new Size(1, 1);
+            userAlarmState5.Name = "userAlarmState5";
+            userAlarmState5.RectColor = Color.Transparent;
+            userAlarmState5.Size = new Size(315, 50);
+            userAlarmState5.State = true;
+            userAlarmState5.TabIndex = 6;
+            userAlarmState5.Text = "userAlarmState5";
+            userAlarmState5.TextAlignment = ContentAlignment.MiddleCenter;
+            userAlarmState5.VariableName = "陶化喷淋泵过载报警";
+            // 
+            // userDeviceState4
+            // 
+            userDeviceState4.BackColor = Color.Transparent;
+            userDeviceState4.DeviceRunName = "陶化喷淋泵运行状态";
+            userDeviceState4.FillColor = Color.Transparent;
+            userDeviceState4.Font = new Font("宋体", 12F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            userDeviceState4.Location = new Point(8, 63);
+            userDeviceState4.MinimumSize = new Size(1, 1);
+            userDeviceState4.Name = "userDeviceState4";
+            userDeviceState4.RectColor = Color.Transparent;
+            userDeviceState4.Size = new Size(316, 50);
+            userDeviceState4.State = false;
+            userDeviceState4.TabIndex = 5;
+            userDeviceState4.Text = "userDeviceState4";
+            userDeviceState4.TextAlignment = ContentAlignment.MiddleCenter;
+            userDeviceState4.VariableName = "陶化喷淋泵运行状态";
+            // 
+            // userDeviceState1
+            // 
+            userDeviceState1.BackColor = Color.Transparent;
+            userDeviceState1.DeviceRunName = "陶化喷淋泵运行状态";
+            userDeviceState1.FillColor = Color.Transparent;
+            userDeviceState1.Font = new Font("宋体", 12F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            userDeviceState1.Location = new Point(8, 45);
+            userDeviceState1.MinimumSize = new Size(1, 1);
+            userDeviceState1.Name = "userDeviceState1";
+            userDeviceState1.RectColor = Color.Transparent;
+            userDeviceState1.Size = new Size(316, 50);
+            userDeviceState1.State = false;
+            userDeviceState1.TabIndex = 0;
+            userDeviceState1.Text = "userDeviceState1";
+            userDeviceState1.TextAlignment = ContentAlignment.MiddleCenter;
+            userDeviceState1.VariableName = "陶化喷淋泵运行状态";
+            // 
+            // userDeviceState2
+            // 
+            userDeviceState2.BackColor = Color.Transparent;
+            userDeviceState2.DeviceRunName = "脱脂排风机运行状态";
+            userDeviceState2.FillColor = Color.Transparent;
+            userDeviceState2.Font = new Font("宋体", 12F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            userDeviceState2.Location = new Point(357, 45);
+            userDeviceState2.MinimumSize = new Size(1, 1);
+            userDeviceState2.Name = "userDeviceState2";
+            userDeviceState2.RectColor = Color.Transparent;
+            userDeviceState2.Size = new Size(316, 50);
+            userDeviceState2.State = false;
+            userDeviceState2.TabIndex = 1;
+            userDeviceState2.Text = "userDeviceState2";
+            userDeviceState2.TextAlignment = ContentAlignment.MiddleCenter;
+            userDeviceState2.VariableName = "脱脂排风机运行状态";
+            // 
+            // userAlarmState1
+            // 
+            userAlarmState1.DeviceName = "脱脂低液位报警";
+            userAlarmState1.FillColor = Color.Transparent;
+            userAlarmState1.Font = new Font("宋体", 12F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            userAlarmState1.Location = new Point(704, 45);
+            userAlarmState1.MinimumSize = new Size(1, 1);
+            userAlarmState1.Name = "userAlarmState1";
+            userAlarmState1.RectColor = Color.Transparent;
+            userAlarmState1.Size = new Size(315, 50);
+            userAlarmState1.State = true;
+            userAlarmState1.TabIndex = 2;
+            userAlarmState1.Text = "userAlarmState1";
+            userAlarmState1.TextAlignment = ContentAlignment.MiddleCenter;
+            userAlarmState1.VariableName = "脱脂低液位报警";
+            // 
+            // userVarCurrentValue1
+            // 
+            userVarCurrentValue1.BackColor = Color.Transparent;
+            userVarCurrentValue1.DeviceVarName = "脱脂喷淋泵压力值";
+            userVarCurrentValue1.FillColor = Color.Transparent;
+            userVarCurrentValue1.Font = new Font("宋体", 12F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            userVarCurrentValue1.Location = new Point(43, 101);
+            userVarCurrentValue1.MinimumSize = new Size(1, 1);
+            userVarCurrentValue1.Name = "userVarCurrentValue1";
+            userVarCurrentValue1.RectColor = Color.Transparent;
+            userVarCurrentValue1.Size = new Size(459, 54);
+            userVarCurrentValue1.TabIndex = 3;
+            userVarCurrentValue1.Text = "userVarCurrentValue1";
+            userVarCurrentValue1.TextAlignment = ContentAlignment.MiddleCenter;
+            userVarCurrentValue1.Unit = "Mpa";
+            userVarCurrentValue1.VariableName = "脱脂喷淋泵压力值";
+            userVarCurrentValue1.VarValue = 0F;
+            // 
+            // uiTitlePanel1
+            // 
+            uiTitlePanel1.Controls.Add(userVarCurrentValue2);
+            uiTitlePanel1.Controls.Add(userVarCurrentValue1);
+            uiTitlePanel1.Controls.Add(userAlarmState1);
+            uiTitlePanel1.Controls.Add(userDeviceState2);
+            uiTitlePanel1.Controls.Add(userDeviceState1);
+            uiTitlePanel1.Font = new Font("宋体", 12F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            uiTitlePanel1.Location = new Point(4, 3);
+            uiTitlePanel1.Margin = new Padding(4, 5, 4, 5);
+            uiTitlePanel1.MinimumSize = new Size(1, 1);
+            uiTitlePanel1.Name = "uiTitlePanel1";
+            uiTitlePanel1.ShowText = false;
+            uiTitlePanel1.Size = new Size(1059, 170);
+            uiTitlePanel1.TabIndex = 0;
+            uiTitlePanel1.Text = "脱脂工位";
+            uiTitlePanel1.TextAlignment = ContentAlignment.MiddleCenter;
+            // 
+            // userVarCurrentValue2
+            // 
+            userVarCurrentValue2.BackColor = Color.Transparent;
+            userVarCurrentValue2.DeviceVarName = "脱脂PH值";
+            userVarCurrentValue2.FillColor = Color.Transparent;
+            userVarCurrentValue2.Font = new Font("宋体", 12F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            userVarCurrentValue2.Location = new Point(533, 101);
+            userVarCurrentValue2.MinimumSize = new Size(1, 1);
+            userVarCurrentValue2.Name = "userVarCurrentValue2";
+            userVarCurrentValue2.RectColor = Color.Transparent;
+            userVarCurrentValue2.Size = new Size(459, 54);
+            userVarCurrentValue2.TabIndex = 4;
+            userVarCurrentValue2.Text = "userVarCurrentValue2";
+            userVarCurrentValue2.TextAlignment = ContentAlignment.MiddleCenter;
+            userVarCurrentValue2.Unit = "PH";
+            userVarCurrentValue2.VariableName = "脱脂PH值";
+            userVarCurrentValue2.VarValue = 7F;
             // 
             // 
             // PageEquipmentMonitor1
             // PageEquipmentMonitor1
             // 
             // 
             AutoScaleMode = AutoScaleMode.None;
             AutoScaleMode = AutoScaleMode.None;
             ClientSize = new Size(1067, 544);
             ClientSize = new Size(1067, 544);
-            Controls.Add(uiLabel1);
+            Controls.Add(uiTitlePanel3);
+            Controls.Add(uiTitlePanel2);
+            Controls.Add(uiTitlePanel1);
             Name = "PageEquipmentMonitor1";
             Name = "PageEquipmentMonitor1";
             Text = "PageEquipmentMonitor";
             Text = "PageEquipmentMonitor";
             Load += PageEquipmentMonitor_Load;
             Load += PageEquipmentMonitor_Load;
+            uiTitlePanel2.ResumeLayout(false);
+            uiTitlePanel3.ResumeLayout(false);
+            uiTitlePanel1.ResumeLayout(false);
             ResumeLayout(false);
             ResumeLayout(false);
         }
         }
 
 
         #endregion
         #endregion
-
-        private Sunny.UI.UILabel uiLabel1;
+        private Sunny.UI.UITitlePanel uiTitlePanel2;
+        private Sunny.UI.UITitlePanel uiTitlePanel3;
+        private UserAlarmState userAlarmState3;
+        private UserAlarmState userAlarmState2;
+        private UserDeviceState userDeviceState3;
+        private UserDeviceState userDeviceState1;
+        private UserDeviceState userDeviceState2;
+        private UserAlarmState userAlarmState1;
+        private UserVarCurrentValue userVarCurrentValue1;
+        private Sunny.UI.UITitlePanel uiTitlePanel1;
+        private UserVarCurrentValue userVarCurrentValue2;
+        private UserVarCurrentValue userVarCurrentValue3;
+        private UserVarCurrentValue userVarCurrentValue5;
+        private UserVarCurrentValue userVarCurrentValue4;
+        private UserAlarmState userAlarmState4;
+        private UserAlarmState userAlarmState5;
+        private UserDeviceState userDeviceState4;
     }
     }
 }
 }

+ 288 - 11
Scada/Page/PageEquipmentMonitor2.Designer.cs

@@ -28,31 +28,308 @@
         /// </summary>
         /// </summary>
         private void InitializeComponent()
         private void InitializeComponent()
         {
         {
-            uiLabel1 = new Sunny.UI.UILabel();
+            uiTitlePanel3 = new Sunny.UI.UITitlePanel();
+            userAlarmState5 = new UserAlarmState();
+            userDeviceState4 = new UserDeviceState();
+            uiTitlePanel2 = new Sunny.UI.UITitlePanel();
+            userAlarmState7 = new UserAlarmState();
+            userAlarmState2 = new UserAlarmState();
+            userDeviceState2 = new UserDeviceState();
+            userVarCurrentValue3 = new UserVarCurrentValue();
+            userAlarmState3 = new UserAlarmState();
+            userDeviceState3 = new UserDeviceState();
+            uiTitlePanel1 = new Sunny.UI.UITitlePanel();
+            userAlarmState6 = new UserAlarmState();
+            userVarCurrentValue1 = new UserVarCurrentValue();
+            userAlarmState1 = new UserAlarmState();
+            userDeviceState1 = new UserDeviceState();
+            uiTitlePanel3.SuspendLayout();
+            uiTitlePanel2.SuspendLayout();
+            uiTitlePanel1.SuspendLayout();
             SuspendLayout();
             SuspendLayout();
             // 
             // 
-            // uiLabel1
+            // uiTitlePanel3
             // 
             // 
-            uiLabel1.Font = new Font("宋体", 12F, FontStyle.Regular, GraphicsUnit.Point, 134);
-            uiLabel1.ForeColor = Color.FromArgb(48, 48, 48);
-            uiLabel1.Location = new Point(295, 140);
-            uiLabel1.Name = "uiLabel1";
-            uiLabel1.Size = new Size(125, 29);
-            uiLabel1.TabIndex = 0;
-            uiLabel1.Text = "uiLabel2";
+            uiTitlePanel3.Controls.Add(userAlarmState5);
+            uiTitlePanel3.Controls.Add(userDeviceState4);
+            uiTitlePanel3.Font = new Font("宋体", 12F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            uiTitlePanel3.Location = new Point(4, 414);
+            uiTitlePanel3.Margin = new Padding(4, 5, 4, 5);
+            uiTitlePanel3.MinimumSize = new Size(1, 1);
+            uiTitlePanel3.Name = "uiTitlePanel3";
+            uiTitlePanel3.ShowText = false;
+            uiTitlePanel3.Size = new Size(1059, 126);
+            uiTitlePanel3.TabIndex = 4;
+            uiTitlePanel3.Text = "冷却室工位";
+            uiTitlePanel3.TextAlignment = ContentAlignment.MiddleCenter;
+            // 
+            // userAlarmState5
+            // 
+            userAlarmState5.DeviceName = "冷却室离心风机过载报警";
+            userAlarmState5.FillColor = Color.Transparent;
+            userAlarmState5.Font = new Font("宋体", 12F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            userAlarmState5.Location = new Point(432, 63);
+            userAlarmState5.MinimumSize = new Size(1, 1);
+            userAlarmState5.Name = "userAlarmState5";
+            userAlarmState5.RectColor = Color.Transparent;
+            userAlarmState5.Size = new Size(378, 50);
+            userAlarmState5.State = true;
+            userAlarmState5.TabIndex = 6;
+            userAlarmState5.Text = "userAlarmState5";
+            userAlarmState5.TextAlignment = ContentAlignment.MiddleCenter;
+            userAlarmState5.VariableName = "冷却室离心风机过载报警";
+            // 
+            // userDeviceState4
+            // 
+            userDeviceState4.BackColor = Color.Transparent;
+            userDeviceState4.DeviceRunName = "冷却室离心风机运行状态";
+            userDeviceState4.FillColor = Color.Transparent;
+            userDeviceState4.Font = new Font("宋体", 12F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            userDeviceState4.Location = new Point(8, 63);
+            userDeviceState4.MinimumSize = new Size(1, 1);
+            userDeviceState4.Name = "userDeviceState4";
+            userDeviceState4.RectColor = Color.Transparent;
+            userDeviceState4.Size = new Size(379, 50);
+            userDeviceState4.State = false;
+            userDeviceState4.TabIndex = 5;
+            userDeviceState4.Text = "userDeviceState4";
+            userDeviceState4.TextAlignment = ContentAlignment.MiddleCenter;
+            userDeviceState4.VariableName = "冷却室离心风机运行状态";
+            // 
+            // uiTitlePanel2
+            // 
+            uiTitlePanel2.Controls.Add(userAlarmState7);
+            uiTitlePanel2.Controls.Add(userAlarmState2);
+            uiTitlePanel2.Controls.Add(userDeviceState2);
+            uiTitlePanel2.Controls.Add(userVarCurrentValue3);
+            uiTitlePanel2.Controls.Add(userAlarmState3);
+            uiTitlePanel2.Controls.Add(userDeviceState3);
+            uiTitlePanel2.Font = new Font("宋体", 12F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            uiTitlePanel2.Location = new Point(4, 184);
+            uiTitlePanel2.Margin = new Padding(4, 5, 4, 5);
+            uiTitlePanel2.MinimumSize = new Size(1, 1);
+            uiTitlePanel2.Name = "uiTitlePanel2";
+            uiTitlePanel2.ShowText = false;
+            uiTitlePanel2.Size = new Size(1059, 220);
+            uiTitlePanel2.TabIndex = 3;
+            uiTitlePanel2.Text = "水分炉工位";
+            uiTitlePanel2.TextAlignment = ContentAlignment.MiddleCenter;
+            // 
+            // userAlarmState7
+            // 
+            userAlarmState7.DeviceName = "水分炉煤气泄露报警";
+            userAlarmState7.FillColor = Color.Transparent;
+            userAlarmState7.Font = new Font("宋体", 12F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            userAlarmState7.Location = new Point(704, 111);
+            userAlarmState7.MinimumSize = new Size(1, 1);
+            userAlarmState7.Name = "userAlarmState7";
+            userAlarmState7.RectColor = Color.Transparent;
+            userAlarmState7.Size = new Size(315, 50);
+            userAlarmState7.State = true;
+            userAlarmState7.TabIndex = 8;
+            userAlarmState7.Text = "userAlarmState7";
+            userAlarmState7.TextAlignment = ContentAlignment.MiddleCenter;
+            userAlarmState7.VariableName = "水分炉煤气泄露报警";
+            // 
+            // userAlarmState2
+            // 
+            userAlarmState2.DeviceName = "水分炉燃烧机报警";
+            userAlarmState2.FillColor = Color.Transparent;
+            userAlarmState2.Font = new Font("宋体", 12F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            userAlarmState2.Location = new Point(24, 111);
+            userAlarmState2.MinimumSize = new Size(1, 1);
+            userAlarmState2.Name = "userAlarmState2";
+            userAlarmState2.RectColor = Color.Transparent;
+            userAlarmState2.Size = new Size(315, 50);
+            userAlarmState2.State = true;
+            userAlarmState2.TabIndex = 7;
+            userAlarmState2.Text = "userAlarmState2";
+            userAlarmState2.TextAlignment = ContentAlignment.MiddleCenter;
+            userAlarmState2.VariableName = "水分炉燃烧机报警";
+            // 
+            // userDeviceState2
+            // 
+            userDeviceState2.BackColor = Color.Transparent;
+            userDeviceState2.DeviceRunName = "水分炉风帘风机运行状态";
+            userDeviceState2.FillColor = Color.Transparent;
+            userDeviceState2.Font = new Font("宋体", 12F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            userDeviceState2.Location = new Point(362, 55);
+            userDeviceState2.MinimumSize = new Size(1, 1);
+            userDeviceState2.Name = "userDeviceState2";
+            userDeviceState2.RectColor = Color.Transparent;
+            userDeviceState2.Size = new Size(358, 50);
+            userDeviceState2.State = false;
+            userDeviceState2.TabIndex = 6;
+            userDeviceState2.Text = "userDeviceState2";
+            userDeviceState2.TextAlignment = ContentAlignment.MiddleCenter;
+            userDeviceState2.VariableName = "水分炉风帘风机运行状态";
+            // 
+            // userVarCurrentValue3
+            // 
+            userVarCurrentValue3.BackColor = Color.Transparent;
+            userVarCurrentValue3.DeviceVarName = "水分炉测量温度";
+            userVarCurrentValue3.FillColor = Color.Transparent;
+            userVarCurrentValue3.Font = new Font("宋体", 12F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            userVarCurrentValue3.Location = new Point(43, 163);
+            userVarCurrentValue3.MinimumSize = new Size(1, 1);
+            userVarCurrentValue3.Name = "userVarCurrentValue3";
+            userVarCurrentValue3.RectColor = Color.Transparent;
+            userVarCurrentValue3.Size = new Size(459, 54);
+            userVarCurrentValue3.TabIndex = 5;
+            userVarCurrentValue3.Text = "userVarCurrentValue3";
+            userVarCurrentValue3.TextAlignment = ContentAlignment.MiddleCenter;
+            userVarCurrentValue3.Unit = "℃";
+            userVarCurrentValue3.VariableName = "水分炉测量温度";
+            userVarCurrentValue3.VarValue = 0F;
+            // 
+            // userAlarmState3
+            // 
+            userAlarmState3.DeviceName = "水分炉温度报警";
+            userAlarmState3.FillColor = Color.Transparent;
+            userAlarmState3.Font = new Font("宋体", 12F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            userAlarmState3.Location = new Point(704, 55);
+            userAlarmState3.MinimumSize = new Size(1, 1);
+            userAlarmState3.Name = "userAlarmState3";
+            userAlarmState3.RectColor = Color.Transparent;
+            userAlarmState3.Size = new Size(315, 50);
+            userAlarmState3.State = true;
+            userAlarmState3.TabIndex = 4;
+            userAlarmState3.Text = "userAlarmState3";
+            userAlarmState3.TextAlignment = ContentAlignment.MiddleCenter;
+            userAlarmState3.VariableName = "水分炉温度报警";
+            // 
+            // userDeviceState3
+            // 
+            userDeviceState3.BackColor = Color.Transparent;
+            userDeviceState3.DeviceRunName = "水分炉变频器运行状态";
+            userDeviceState3.FillColor = Color.Transparent;
+            userDeviceState3.Font = new Font("宋体", 12F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            userDeviceState3.Location = new Point(8, 55);
+            userDeviceState3.MinimumSize = new Size(1, 1);
+            userDeviceState3.Name = "userDeviceState3";
+            userDeviceState3.RectColor = Color.Transparent;
+            userDeviceState3.Size = new Size(336, 50);
+            userDeviceState3.State = false;
+            userDeviceState3.TabIndex = 1;
+            userDeviceState3.Text = "userDeviceState3";
+            userDeviceState3.TextAlignment = ContentAlignment.MiddleCenter;
+            userDeviceState3.VariableName = "水分炉变频器运行状态";
+            // 
+            // uiTitlePanel1
+            // 
+            uiTitlePanel1.Controls.Add(userAlarmState6);
+            uiTitlePanel1.Controls.Add(userVarCurrentValue1);
+            uiTitlePanel1.Controls.Add(userAlarmState1);
+            uiTitlePanel1.Controls.Add(userDeviceState1);
+            uiTitlePanel1.Font = new Font("宋体", 12F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            uiTitlePanel1.Location = new Point(4, 4);
+            uiTitlePanel1.Margin = new Padding(4, 5, 4, 5);
+            uiTitlePanel1.MinimumSize = new Size(1, 1);
+            uiTitlePanel1.Name = "uiTitlePanel1";
+            uiTitlePanel1.ShowText = false;
+            uiTitlePanel1.Size = new Size(1059, 170);
+            uiTitlePanel1.TabIndex = 2;
+            uiTitlePanel1.Text = "精洗工位";
+            uiTitlePanel1.TextAlignment = ContentAlignment.MiddleCenter;
+            // 
+            // userAlarmState6
+            // 
+            userAlarmState6.DeviceName = "精洗喷淋泵压力值";
+            userAlarmState6.FillColor = Color.Transparent;
+            userAlarmState6.Font = new Font("宋体", 12F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            userAlarmState6.Location = new Point(358, 45);
+            userAlarmState6.MinimumSize = new Size(1, 1);
+            userAlarmState6.Name = "userAlarmState6";
+            userAlarmState6.RectColor = Color.Transparent;
+            userAlarmState6.Size = new Size(315, 50);
+            userAlarmState6.State = true;
+            userAlarmState6.TabIndex = 5;
+            userAlarmState6.Text = "userAlarmState6";
+            userAlarmState6.TextAlignment = ContentAlignment.MiddleCenter;
+            userAlarmState6.VariableName = "精洗喷淋泵压力值";
+            // 
+            // userVarCurrentValue1
+            // 
+            userVarCurrentValue1.BackColor = Color.Transparent;
+            userVarCurrentValue1.DeviceVarName = "精洗喷淋泵压力值";
+            userVarCurrentValue1.FillColor = Color.Transparent;
+            userVarCurrentValue1.Font = new Font("宋体", 12F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            userVarCurrentValue1.Location = new Point(43, 101);
+            userVarCurrentValue1.MinimumSize = new Size(1, 1);
+            userVarCurrentValue1.Name = "userVarCurrentValue1";
+            userVarCurrentValue1.RectColor = Color.Transparent;
+            userVarCurrentValue1.Size = new Size(459, 54);
+            userVarCurrentValue1.TabIndex = 3;
+            userVarCurrentValue1.Text = "userVarCurrentValue1";
+            userVarCurrentValue1.TextAlignment = ContentAlignment.MiddleCenter;
+            userVarCurrentValue1.Unit = "Mpa";
+            userVarCurrentValue1.VariableName = "精洗喷淋泵压力值";
+            userVarCurrentValue1.VarValue = 0F;
+            // 
+            // userAlarmState1
+            // 
+            userAlarmState1.DeviceName = "精洗喷淋泵过载报警";
+            userAlarmState1.FillColor = Color.Transparent;
+            userAlarmState1.Font = new Font("宋体", 12F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            userAlarmState1.Location = new Point(704, 45);
+            userAlarmState1.MinimumSize = new Size(1, 1);
+            userAlarmState1.Name = "userAlarmState1";
+            userAlarmState1.RectColor = Color.Transparent;
+            userAlarmState1.Size = new Size(315, 50);
+            userAlarmState1.State = true;
+            userAlarmState1.TabIndex = 2;
+            userAlarmState1.Text = "userAlarmState1";
+            userAlarmState1.TextAlignment = ContentAlignment.MiddleCenter;
+            userAlarmState1.VariableName = "精洗喷淋泵过载报警";
+            // 
+            // userDeviceState1
+            // 
+            userDeviceState1.BackColor = Color.Transparent;
+            userDeviceState1.DeviceRunName = "精洗喷淋泵运行状态";
+            userDeviceState1.FillColor = Color.Transparent;
+            userDeviceState1.Font = new Font("宋体", 12F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            userDeviceState1.Location = new Point(8, 45);
+            userDeviceState1.MinimumSize = new Size(1, 1);
+            userDeviceState1.Name = "userDeviceState1";
+            userDeviceState1.RectColor = Color.Transparent;
+            userDeviceState1.Size = new Size(316, 50);
+            userDeviceState1.State = false;
+            userDeviceState1.TabIndex = 0;
+            userDeviceState1.Text = "userDeviceState1";
+            userDeviceState1.TextAlignment = ContentAlignment.MiddleCenter;
+            userDeviceState1.VariableName = "精洗喷淋泵运行状态";
             // 
             // 
             // PageEquipmentMonitor2
             // PageEquipmentMonitor2
             // 
             // 
             AutoScaleMode = AutoScaleMode.None;
             AutoScaleMode = AutoScaleMode.None;
             ClientSize = new Size(1067, 544);
             ClientSize = new Size(1067, 544);
-            Controls.Add(uiLabel1);
+            Controls.Add(uiTitlePanel3);
+            Controls.Add(uiTitlePanel2);
+            Controls.Add(uiTitlePanel1);
             Name = "PageEquipmentMonitor2";
             Name = "PageEquipmentMonitor2";
             Text = "PageEquipmentMonitor2";
             Text = "PageEquipmentMonitor2";
+            uiTitlePanel3.ResumeLayout(false);
+            uiTitlePanel2.ResumeLayout(false);
+            uiTitlePanel1.ResumeLayout(false);
             ResumeLayout(false);
             ResumeLayout(false);
         }
         }
 
 
         #endregion
         #endregion
 
 
-        private Sunny.UI.UILabel uiLabel1;
+        private Sunny.UI.UITitlePanel uiTitlePanel3;
+        private UserAlarmState userAlarmState5;
+        private UserDeviceState userDeviceState4;
+        private Sunny.UI.UITitlePanel uiTitlePanel2;
+        private UserVarCurrentValue userVarCurrentValue3;
+        private UserAlarmState userAlarmState3;
+        private UserDeviceState userDeviceState3;
+        private Sunny.UI.UITitlePanel uiTitlePanel1;
+        private UserVarCurrentValue userVarCurrentValue1;
+        private UserAlarmState userAlarmState1;
+        private UserDeviceState userDeviceState1;
+        private UserAlarmState userAlarmState2;
+        private UserDeviceState userDeviceState2;
+        private UserAlarmState userAlarmState6;
+        private UserAlarmState userAlarmState7;
     }
     }
 }
 }

+ 230 - 11
Scada/Page/PageEquipmentMonitor3.Designer.cs

@@ -28,31 +28,250 @@
         /// </summary>
         /// </summary>
         private void InitializeComponent()
         private void InitializeComponent()
         {
         {
-            uiLabel1 = new Sunny.UI.UILabel();
+            uiTitlePanel2 = new Sunny.UI.UITitlePanel();
+            userAlarmState7 = new UserAlarmState();
+            userAlarmState2 = new UserAlarmState();
+            userDeviceState2 = new UserDeviceState();
+            userVarCurrentValue3 = new UserVarCurrentValue();
+            userAlarmState3 = new UserAlarmState();
+            userDeviceState3 = new UserDeviceState();
+            uiTitlePanel1 = new Sunny.UI.UITitlePanel();
+            userAlarmState6 = new UserAlarmState();
+            userDeviceState1 = new UserDeviceState();
+            userDeviceState4 = new UserDeviceState();
+            userAlarmState1 = new UserAlarmState();
+            uiTitlePanel2.SuspendLayout();
+            uiTitlePanel1.SuspendLayout();
             SuspendLayout();
             SuspendLayout();
             // 
             // 
-            // uiLabel1
+            // uiTitlePanel2
             // 
             // 
-            uiLabel1.Font = new Font("宋体", 12F, FontStyle.Regular, GraphicsUnit.Point, 134);
-            uiLabel1.ForeColor = Color.FromArgb(48, 48, 48);
-            uiLabel1.Location = new Point(416, 148);
-            uiLabel1.Name = "uiLabel1";
-            uiLabel1.Size = new Size(125, 29);
-            uiLabel1.TabIndex = 0;
-            uiLabel1.Text = "uiLabel3";
+            uiTitlePanel2.Controls.Add(userAlarmState7);
+            uiTitlePanel2.Controls.Add(userAlarmState2);
+            uiTitlePanel2.Controls.Add(userDeviceState2);
+            uiTitlePanel2.Controls.Add(userVarCurrentValue3);
+            uiTitlePanel2.Controls.Add(userAlarmState3);
+            uiTitlePanel2.Controls.Add(userDeviceState3);
+            uiTitlePanel2.Font = new Font("宋体", 12F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            uiTitlePanel2.Location = new Point(4, 4);
+            uiTitlePanel2.Margin = new Padding(4, 5, 4, 5);
+            uiTitlePanel2.MinimumSize = new Size(1, 1);
+            uiTitlePanel2.Name = "uiTitlePanel2";
+            uiTitlePanel2.ShowText = false;
+            uiTitlePanel2.Size = new Size(1059, 220);
+            uiTitlePanel2.TabIndex = 4;
+            uiTitlePanel2.Text = "固化炉工位";
+            uiTitlePanel2.TextAlignment = ContentAlignment.MiddleCenter;
+            // 
+            // userAlarmState7
+            // 
+            userAlarmState7.DeviceName = "固化炉煤气泄露报警";
+            userAlarmState7.FillColor = Color.Transparent;
+            userAlarmState7.Font = new Font("宋体", 12F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            userAlarmState7.Location = new Point(704, 111);
+            userAlarmState7.MinimumSize = new Size(1, 1);
+            userAlarmState7.Name = "userAlarmState7";
+            userAlarmState7.RectColor = Color.Transparent;
+            userAlarmState7.Size = new Size(315, 50);
+            userAlarmState7.State = true;
+            userAlarmState7.TabIndex = 8;
+            userAlarmState7.Text = "userAlarmState7";
+            userAlarmState7.TextAlignment = ContentAlignment.MiddleCenter;
+            userAlarmState7.VariableName = "固化炉煤气泄露报警";
+            // 
+            // userAlarmState2
+            // 
+            userAlarmState2.DeviceName = "固化炉燃烧机报警";
+            userAlarmState2.FillColor = Color.Transparent;
+            userAlarmState2.Font = new Font("宋体", 12F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            userAlarmState2.Location = new Point(24, 111);
+            userAlarmState2.MinimumSize = new Size(1, 1);
+            userAlarmState2.Name = "userAlarmState2";
+            userAlarmState2.RectColor = Color.Transparent;
+            userAlarmState2.Size = new Size(315, 50);
+            userAlarmState2.State = true;
+            userAlarmState2.TabIndex = 7;
+            userAlarmState2.Text = "userAlarmState2";
+            userAlarmState2.TextAlignment = ContentAlignment.MiddleCenter;
+            userAlarmState2.VariableName = "固化炉燃烧机报警";
+            // 
+            // userDeviceState2
+            // 
+            userDeviceState2.BackColor = Color.Transparent;
+            userDeviceState2.DeviceRunName = "固化炉风帘风机运行状态";
+            userDeviceState2.FillColor = Color.Transparent;
+            userDeviceState2.Font = new Font("宋体", 12F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            userDeviceState2.Location = new Point(362, 55);
+            userDeviceState2.MinimumSize = new Size(1, 1);
+            userDeviceState2.Name = "userDeviceState2";
+            userDeviceState2.RectColor = Color.Transparent;
+            userDeviceState2.Size = new Size(358, 50);
+            userDeviceState2.State = false;
+            userDeviceState2.TabIndex = 6;
+            userDeviceState2.Text = "userDeviceState2";
+            userDeviceState2.TextAlignment = ContentAlignment.MiddleCenter;
+            userDeviceState2.VariableName = "固化炉风帘风机运行状态";
+            // 
+            // userVarCurrentValue3
+            // 
+            userVarCurrentValue3.BackColor = Color.Transparent;
+            userVarCurrentValue3.DeviceVarName = "固化炉测量温度";
+            userVarCurrentValue3.FillColor = Color.Transparent;
+            userVarCurrentValue3.Font = new Font("宋体", 12F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            userVarCurrentValue3.Location = new Point(8, 163);
+            userVarCurrentValue3.MinimumSize = new Size(1, 1);
+            userVarCurrentValue3.Name = "userVarCurrentValue3";
+            userVarCurrentValue3.RectColor = Color.Transparent;
+            userVarCurrentValue3.Size = new Size(459, 54);
+            userVarCurrentValue3.TabIndex = 5;
+            userVarCurrentValue3.Text = "userVarCurrentValue3";
+            userVarCurrentValue3.TextAlignment = ContentAlignment.MiddleCenter;
+            userVarCurrentValue3.Unit = "℃";
+            userVarCurrentValue3.VariableName = "固化炉测量温度";
+            userVarCurrentValue3.VarValue = 0F;
+            // 
+            // userAlarmState3
+            // 
+            userAlarmState3.DeviceName = "固化炉温度报警";
+            userAlarmState3.FillColor = Color.Transparent;
+            userAlarmState3.Font = new Font("宋体", 12F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            userAlarmState3.Location = new Point(704, 55);
+            userAlarmState3.MinimumSize = new Size(1, 1);
+            userAlarmState3.Name = "userAlarmState3";
+            userAlarmState3.RectColor = Color.Transparent;
+            userAlarmState3.Size = new Size(315, 50);
+            userAlarmState3.State = true;
+            userAlarmState3.TabIndex = 4;
+            userAlarmState3.Text = "userAlarmState3";
+            userAlarmState3.TextAlignment = ContentAlignment.MiddleCenter;
+            userAlarmState3.VariableName = "固化炉温度报警";
+            // 
+            // userDeviceState3
+            // 
+            userDeviceState3.BackColor = Color.Transparent;
+            userDeviceState3.DeviceRunName = "固化炉变频器运行状态";
+            userDeviceState3.FillColor = Color.Transparent;
+            userDeviceState3.Font = new Font("宋体", 12F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            userDeviceState3.Location = new Point(8, 55);
+            userDeviceState3.MinimumSize = new Size(1, 1);
+            userDeviceState3.Name = "userDeviceState3";
+            userDeviceState3.RectColor = Color.Transparent;
+            userDeviceState3.Size = new Size(336, 50);
+            userDeviceState3.State = false;
+            userDeviceState3.TabIndex = 1;
+            userDeviceState3.Text = "userDeviceState3";
+            userDeviceState3.TextAlignment = ContentAlignment.MiddleCenter;
+            userDeviceState3.VariableName = "固化炉变频器运行状态";
+            // 
+            // uiTitlePanel1
+            // 
+            uiTitlePanel1.Controls.Add(userAlarmState1);
+            uiTitlePanel1.Controls.Add(userDeviceState4);
+            uiTitlePanel1.Controls.Add(userAlarmState6);
+            uiTitlePanel1.Controls.Add(userDeviceState1);
+            uiTitlePanel1.Font = new Font("宋体", 12F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            uiTitlePanel1.Location = new Point(4, 229);
+            uiTitlePanel1.Margin = new Padding(4, 5, 4, 5);
+            uiTitlePanel1.MinimumSize = new Size(1, 1);
+            uiTitlePanel1.Name = "uiTitlePanel1";
+            uiTitlePanel1.ShowText = false;
+            uiTitlePanel1.Size = new Size(1059, 167);
+            uiTitlePanel1.TabIndex = 5;
+            uiTitlePanel1.Text = "精洗工位";
+            uiTitlePanel1.TextAlignment = ContentAlignment.MiddleCenter;
+            // 
+            // userAlarmState6
+            // 
+            userAlarmState6.DeviceName = "输送机变频器故障报警";
+            userAlarmState6.FillColor = Color.Transparent;
+            userAlarmState6.Font = new Font("宋体", 12F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            userAlarmState6.Location = new Point(358, 45);
+            userAlarmState6.MinimumSize = new Size(1, 1);
+            userAlarmState6.Name = "userAlarmState6";
+            userAlarmState6.RectColor = Color.Transparent;
+            userAlarmState6.Size = new Size(369, 50);
+            userAlarmState6.State = true;
+            userAlarmState6.TabIndex = 5;
+            userAlarmState6.Text = "userAlarmState6";
+            userAlarmState6.TextAlignment = ContentAlignment.MiddleCenter;
+            userAlarmState6.VariableName = "输送机变频器故障报警";
+            // 
+            // userDeviceState1
+            // 
+            userDeviceState1.BackColor = Color.Transparent;
+            userDeviceState1.DeviceRunName = "输送机变频器电源状态";
+            userDeviceState1.FillColor = Color.Transparent;
+            userDeviceState1.Font = new Font("宋体", 12F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            userDeviceState1.Location = new Point(8, 45);
+            userDeviceState1.MinimumSize = new Size(1, 1);
+            userDeviceState1.Name = "userDeviceState1";
+            userDeviceState1.RectColor = Color.Transparent;
+            userDeviceState1.Size = new Size(350, 50);
+            userDeviceState1.State = false;
+            userDeviceState1.TabIndex = 0;
+            userDeviceState1.Text = "userDeviceState1";
+            userDeviceState1.TextAlignment = ContentAlignment.MiddleCenter;
+            userDeviceState1.VariableName = "输送机变频器电源状态";
+            // 
+            // userDeviceState4
+            // 
+            userDeviceState4.BackColor = Color.Transparent;
+            userDeviceState4.DeviceRunName = "输送机变频器运行状态";
+            userDeviceState4.FillColor = Color.Transparent;
+            userDeviceState4.Font = new Font("宋体", 12F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            userDeviceState4.Location = new Point(8, 112);
+            userDeviceState4.MinimumSize = new Size(1, 1);
+            userDeviceState4.Name = "userDeviceState4";
+            userDeviceState4.RectColor = Color.Transparent;
+            userDeviceState4.Size = new Size(350, 50);
+            userDeviceState4.State = false;
+            userDeviceState4.TabIndex = 6;
+            userDeviceState4.Text = "userDeviceState4";
+            userDeviceState4.TextAlignment = ContentAlignment.MiddleCenter;
+            userDeviceState4.VariableName = "输送机变频器运行状态";
+            // 
+            // userAlarmState1
+            // 
+            userAlarmState1.DeviceName = "输送机行程报警";
+            userAlarmState1.FillColor = Color.Transparent;
+            userAlarmState1.Font = new Font("宋体", 12F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            userAlarmState1.Location = new Point(412, 112);
+            userAlarmState1.MinimumSize = new Size(1, 1);
+            userAlarmState1.Name = "userAlarmState1";
+            userAlarmState1.RectColor = Color.Transparent;
+            userAlarmState1.Size = new Size(315, 50);
+            userAlarmState1.State = true;
+            userAlarmState1.TabIndex = 7;
+            userAlarmState1.Text = "userAlarmState1";
+            userAlarmState1.TextAlignment = ContentAlignment.MiddleCenter;
+            userAlarmState1.VariableName = "输送机行程报警";
             // 
             // 
             // PageEquipmentMonitor3
             // PageEquipmentMonitor3
             // 
             // 
             AutoScaleMode = AutoScaleMode.None;
             AutoScaleMode = AutoScaleMode.None;
             ClientSize = new Size(1067, 544);
             ClientSize = new Size(1067, 544);
-            Controls.Add(uiLabel1);
+            Controls.Add(uiTitlePanel1);
+            Controls.Add(uiTitlePanel2);
             Name = "PageEquipmentMonitor3";
             Name = "PageEquipmentMonitor3";
             Text = "PageEquipmentMonitor3";
             Text = "PageEquipmentMonitor3";
+            uiTitlePanel2.ResumeLayout(false);
+            uiTitlePanel1.ResumeLayout(false);
             ResumeLayout(false);
             ResumeLayout(false);
         }
         }
 
 
         #endregion
         #endregion
 
 
-        private Sunny.UI.UILabel uiLabel1;
+        private Sunny.UI.UITitlePanel uiTitlePanel2;
+        private UserAlarmState userAlarmState7;
+        private UserAlarmState userAlarmState2;
+        private UserDeviceState userDeviceState2;
+        private UserVarCurrentValue userVarCurrentValue3;
+        private UserAlarmState userAlarmState3;
+        private UserDeviceState userDeviceState3;
+        private Sunny.UI.UITitlePanel uiTitlePanel1;
+        private UserAlarmState userAlarmState1;
+        private UserDeviceState userDeviceState4;
+        private UserAlarmState userAlarmState6;
+        private UserDeviceState userDeviceState1;
     }
     }
 }
 }

+ 28 - 28
Scada/UserControls/UserAlarmState.Designer.cs

@@ -29,8 +29,8 @@
         private void InitializeComponent()
         private void InitializeComponent()
         {
         {
             uiTableLayoutPanel1 = new Sunny.UI.UITableLayoutPanel();
             uiTableLayoutPanel1 = new Sunny.UI.UITableLayoutPanel();
-            lbl_StateName = new Sunny.UI.UILabel();
-            lbl_AlarmName = new Sunny.UI.UISymbolLabel();
+            lbl_AlarmName = new Sunny.UI.UILabel();
+            lbl_StateName = new Sunny.UI.UISymbolLabel();
             uiTableLayoutPanel1.SuspendLayout();
             uiTableLayoutPanel1.SuspendLayout();
             SuspendLayout();
             SuspendLayout();
             // 
             // 
@@ -39,8 +39,8 @@
             uiTableLayoutPanel1.ColumnCount = 2;
             uiTableLayoutPanel1.ColumnCount = 2;
             uiTableLayoutPanel1.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 100F));
             uiTableLayoutPanel1.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 100F));
             uiTableLayoutPanel1.ColumnStyles.Add(new ColumnStyle(SizeType.Absolute, 60F));
             uiTableLayoutPanel1.ColumnStyles.Add(new ColumnStyle(SizeType.Absolute, 60F));
-            uiTableLayoutPanel1.Controls.Add(lbl_StateName, 0, 0);
-            uiTableLayoutPanel1.Controls.Add(lbl_AlarmName, 1, 0);
+            uiTableLayoutPanel1.Controls.Add(lbl_AlarmName, 0, 0);
+            uiTableLayoutPanel1.Controls.Add(lbl_StateName, 1, 0);
             uiTableLayoutPanel1.Dock = DockStyle.Fill;
             uiTableLayoutPanel1.Dock = DockStyle.Fill;
             uiTableLayoutPanel1.Location = new Point(0, 0);
             uiTableLayoutPanel1.Location = new Point(0, 0);
             uiTableLayoutPanel1.Name = "uiTableLayoutPanel1";
             uiTableLayoutPanel1.Name = "uiTableLayoutPanel1";
@@ -50,32 +50,32 @@
             uiTableLayoutPanel1.TabIndex = 0;
             uiTableLayoutPanel1.TabIndex = 0;
             uiTableLayoutPanel1.TagString = null;
             uiTableLayoutPanel1.TagString = null;
             // 
             // 
-            // lbl_StateName
-            // 
-            lbl_StateName.BackColor = Color.Transparent;
-            lbl_StateName.Dock = DockStyle.Fill;
-            lbl_StateName.Font = new Font("微软雅黑", 15F);
-            lbl_StateName.ForeColor = Color.FromArgb(48, 48, 48);
-            lbl_StateName.Location = new Point(3, 0);
-            lbl_StateName.Name = "lbl_StateName";
-            lbl_StateName.Size = new Size(184, 60);
-            lbl_StateName.TabIndex = 0;
-            lbl_StateName.Text = "报警名称";
-            lbl_StateName.TextAlign = ContentAlignment.MiddleCenter;
-            // 
             // lbl_AlarmName
             // lbl_AlarmName
             // 
             // 
+            lbl_AlarmName.BackColor = Color.Transparent;
             lbl_AlarmName.Dock = DockStyle.Fill;
             lbl_AlarmName.Dock = DockStyle.Fill;
-            lbl_AlarmName.Font = new Font("宋体", 12F, FontStyle.Regular, GraphicsUnit.Point, 134);
-            lbl_AlarmName.Location = new Point(193, 3);
-            lbl_AlarmName.MinimumSize = new Size(1, 1);
+            lbl_AlarmName.Font = new Font("微软雅黑", 15F);
+            lbl_AlarmName.ForeColor = Color.FromArgb(48, 48, 48);
+            lbl_AlarmName.Location = new Point(3, 0);
             lbl_AlarmName.Name = "lbl_AlarmName";
             lbl_AlarmName.Name = "lbl_AlarmName";
-            lbl_AlarmName.Size = new Size(54, 54);
-            lbl_AlarmName.Style = Sunny.UI.UIStyle.Custom;
-            lbl_AlarmName.Symbol = 61683;
-            lbl_AlarmName.SymbolColor = Color.Red;
-            lbl_AlarmName.SymbolSize = 54;
-            lbl_AlarmName.TabIndex = 1;
+            lbl_AlarmName.Size = new Size(184, 60);
+            lbl_AlarmName.TabIndex = 0;
+            lbl_AlarmName.Text = "报警名称";
+            lbl_AlarmName.TextAlign = ContentAlignment.MiddleCenter;
+            // 
+            // lbl_StateName
+            // 
+            lbl_StateName.Dock = DockStyle.Fill;
+            lbl_StateName.Font = new Font("宋体", 12F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            lbl_StateName.Location = new Point(193, 3);
+            lbl_StateName.MinimumSize = new Size(1, 1);
+            lbl_StateName.Name = "lbl_StateName";
+            lbl_StateName.Size = new Size(54, 54);
+            lbl_StateName.Style = Sunny.UI.UIStyle.Custom;
+            lbl_StateName.Symbol = 61683;
+            lbl_StateName.SymbolColor = Color.Red;
+            lbl_StateName.SymbolSize = 54;
+            lbl_StateName.TabIndex = 1;
             // 
             // 
             // UserAlarmState
             // UserAlarmState
             // 
             // 
@@ -92,7 +92,7 @@
         #endregion
         #endregion
 
 
         private Sunny.UI.UITableLayoutPanel uiTableLayoutPanel1;
         private Sunny.UI.UITableLayoutPanel uiTableLayoutPanel1;
-        private Sunny.UI.UILabel lbl_StateName;
-        private Sunny.UI.UISymbolLabel lbl_AlarmName;
+        private Sunny.UI.UILabel lbl_AlarmName;
+        private Sunny.UI.UISymbolLabel lbl_StateName;
     }
     }
 }
 }

+ 2 - 2
Scada/UserControls/UserAlarmState.cs

@@ -47,11 +47,11 @@ namespace Scada
                 state = value;
                 state = value;
                 if (state)
                 if (state)
                 {
                 {
-                    this.lbl_AlarmName.SymbolColor = Color.Red;
+                    this.lbl_StateName.SymbolColor = Color.Red;
                 }
                 }
                 else
                 else
                 {
                 {
-                    this.lbl_AlarmName.SymbolColor = Color.LimeGreen;
+                    this.lbl_StateName.SymbolColor = Color.LimeGreen;
                 }
                 }
             }
             }
         }
         }

+ 1 - 1
Scada/UserControls/UserDeviceState.Designer.cs

@@ -79,7 +79,7 @@
             // UserDeviceState
             // UserDeviceState
             // 
             // 
             AutoScaleMode = AutoScaleMode.None;
             AutoScaleMode = AutoScaleMode.None;
-            BackColor = SystemColors.Control;
+            BackColor = Color.Transparent;
             Controls.Add(uiTableLayoutPanel1);
             Controls.Add(uiTableLayoutPanel1);
             FillColor = Color.Transparent;
             FillColor = Color.Transparent;
             Name = "UserDeviceState";
             Name = "UserDeviceState";

+ 7 - 7
Scada/UserControls/UserVarCurrentValue.Designer.cs

@@ -39,8 +39,8 @@
             // 
             // 
             uiTableLayoutPanel1.ColumnCount = 3;
             uiTableLayoutPanel1.ColumnCount = 3;
             uiTableLayoutPanel1.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 100F));
             uiTableLayoutPanel1.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 100F));
-            uiTableLayoutPanel1.ColumnStyles.Add(new ColumnStyle(SizeType.Absolute, 125F));
-            uiTableLayoutPanel1.ColumnStyles.Add(new ColumnStyle(SizeType.Absolute, 70F));
+            uiTableLayoutPanel1.ColumnStyles.Add(new ColumnStyle(SizeType.Absolute, 140F));
+            uiTableLayoutPanel1.ColumnStyles.Add(new ColumnStyle(SizeType.Absolute, 80F));
             uiTableLayoutPanel1.Controls.Add(lbl_Name, 0, 0);
             uiTableLayoutPanel1.Controls.Add(lbl_Name, 0, 0);
             uiTableLayoutPanel1.Controls.Add(dl_Value, 1, 0);
             uiTableLayoutPanel1.Controls.Add(dl_Value, 1, 0);
             uiTableLayoutPanel1.Controls.Add(lbl_Unit, 2, 0);
             uiTableLayoutPanel1.Controls.Add(lbl_Unit, 2, 0);
@@ -60,7 +60,7 @@
             lbl_Name.ForeColor = Color.FromArgb(48, 48, 48);
             lbl_Name.ForeColor = Color.FromArgb(48, 48, 48);
             lbl_Name.Location = new Point(3, 0);
             lbl_Name.Location = new Point(3, 0);
             lbl_Name.Name = "lbl_Name";
             lbl_Name.Name = "lbl_Name";
-            lbl_Name.Size = new Size(136, 60);
+            lbl_Name.Size = new Size(111, 60);
             lbl_Name.TabIndex = 0;
             lbl_Name.TabIndex = 0;
             lbl_Name.Text = "名称";
             lbl_Name.Text = "名称";
             lbl_Name.TextAlign = ContentAlignment.MiddleCenter;
             lbl_Name.TextAlign = ContentAlignment.MiddleCenter;
@@ -72,10 +72,10 @@
             dl_Value.Dock = DockStyle.Fill;
             dl_Value.Dock = DockStyle.Fill;
             dl_Value.Font = new Font("宋体", 12F, FontStyle.Regular, GraphicsUnit.Point, 134);
             dl_Value.Font = new Font("宋体", 12F, FontStyle.Regular, GraphicsUnit.Point, 134);
             dl_Value.ForeColor = Color.SkyBlue;
             dl_Value.ForeColor = Color.SkyBlue;
-            dl_Value.Location = new Point(145, 3);
+            dl_Value.Location = new Point(120, 3);
             dl_Value.MinimumSize = new Size(1, 1);
             dl_Value.MinimumSize = new Size(1, 1);
             dl_Value.Name = "dl_Value";
             dl_Value.Name = "dl_Value";
-            dl_Value.Size = new Size(119, 54);
+            dl_Value.Size = new Size(134, 54);
             dl_Value.TabIndex = 1;
             dl_Value.TabIndex = 1;
             dl_Value.TextAlign = HorizontalAlignment.Center;
             dl_Value.TextAlign = HorizontalAlignment.Center;
             dl_Value.Value = 100.5D;
             dl_Value.Value = 100.5D;
@@ -85,9 +85,9 @@
             lbl_Unit.Dock = DockStyle.Fill;
             lbl_Unit.Dock = DockStyle.Fill;
             lbl_Unit.Font = new Font("微软雅黑", 15F);
             lbl_Unit.Font = new Font("微软雅黑", 15F);
             lbl_Unit.ForeColor = Color.FromArgb(48, 48, 48);
             lbl_Unit.ForeColor = Color.FromArgb(48, 48, 48);
-            lbl_Unit.Location = new Point(270, 0);
+            lbl_Unit.Location = new Point(260, 0);
             lbl_Unit.Name = "lbl_Unit";
             lbl_Unit.Name = "lbl_Unit";
-            lbl_Unit.Size = new Size(64, 60);
+            lbl_Unit.Size = new Size(74, 60);
             lbl_Unit.TabIndex = 2;
             lbl_Unit.TabIndex = 2;
             lbl_Unit.Text = "单位";
             lbl_Unit.Text = "单位";
             lbl_Unit.TextAlign = ContentAlignment.MiddleCenter;
             lbl_Unit.TextAlign = ContentAlignment.MiddleCenter;