20260708

2026-07-08 10:58:42 +08:00
parent 053a90d34f
commit 7d7d6bc3bf
21 changed files with 1528 additions and 1283 deletions
@@ -23,19 +23,20 @@ MES/
 白夜班交替时间=20:30:00
 MES日志保存路径=D:\APILog
 存储服务器IP地址=192.168.2.108
-员工权限校验=http://10.22.160.141/core/api/public/equipment/base/user/login/verify
-设备参数设定值请求=http://10.22.160.141/core/api/public/param/setting/request
-设备参数设定值变更=http://10.22.160.141/core/api/public/param/setting/change
-产品进站=http://10.22.160.141/core/api/public/formation/section/arrival/bz
-产品过程加工参数=http://10.22.160.141/core/api/public/product/process/param/new/process
-产品结果加工参数=http://10.22.160.141/core/api/public/product/process/param/new/result
-产品出站=http://10.22.160.141/core/api/public/eve/pm/formation-section
-设备报警=http://10.22.160.141/core/api/public/equipment/alarm/currency
-设备状态=http://10.22.160.141/core/api/public/eve/pm/eqm/run/status/operation
-能耗=http://10.22.160.141/core/api/public/eve/pm/energy/consumption/collection/submit
+员工权限校验=http://10.22.160.1/core/api/public/equipment/base/user/login/verify
+设备参数设定值请求=http://10.22.160.1/core/api/public/param/setting/request
+设备参数设定值变更=http://10.22.160.1/core/api/public/param/setting/change
+产品进站=http://10.22.160.2/core/api/public/formation/section/arrival
+产品过程加工参数=http://10.22.160.1/core/api/public/product/process/param/new/process
+产品结果加工参数=http://10.22.160.3/core/api/public/product/process/param/new/result
+产品出站=http://10.22.160.1/core/api/public/eve/pm/formation-section/bz
+设备报警=http://10.22.160.1/core/api/public/equipment/alarm/currency
+设备状态=http://10.22.160.1/core/api/public/eve/pm/eqm/run/status/operation
+能耗=http://10.22.160.1/core/api/public/eve/pm/energy/consumption/collection/submit
 风速仪=https://iot.eveportal.com:9470/eve_api/ems/iot/upload_device_collect_data
 风速仪=https://iot.eveportal.com:9470/eve_api/ems/iot/upload_device_collect_data
-分档参数=http://10.22.160.141/core/api/public/eve/pm/eqm/new/grading
+分档参数=http://10.22.160.1/core/api/public/eve/pm/eqm/new/grading
+安全设备状态=http://10.22.161.62:804/device-status
 guid=a270c7d2-9cbd-4739-9a0b-0709b5813332
 DeviceState=1
 run_AlarmMark=0
@@ -32,7 +32,6 @@ namespace LargeSquareOne
            }
            else
            {
-
                int rowCount = this.dgv_Log.Rows.Add();
                this.dgv_Log.Rows[rowCount].Cells[0].Value = CurrentTime;
                this.dgv_Log.Rows[rowCount].Cells[1].Value = isError ? "错误" : "信息";
@@ -63,6 +63,7 @@
            this.rtb_Info = new System.Windows.Forms.RichTextBox();
            this.groupBoxEX5 = new JinYuan.ControlLib.GroupBoxEX();
            this.dgvBlankingData = new System.Windows.Forms.DataGridView();
+            this.imageList1 = new System.Windows.Forms.ImageList(this.components);
            this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
            this.dataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
            this.Column7 = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -90,12 +91,12 @@
            this.Column112 = new System.Windows.Forms.DataGridViewTextBoxColumn();
            this.Column113 = new System.Windows.Forms.DataGridViewTextBoxColumn();
            this.Column114 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.平面度 = new System.Windows.Forms.DataGridViewTextBoxColumn();
            this.Column147 = new System.Windows.Forms.DataGridViewTextBoxColumn();
            this.Column34 = new System.Windows.Forms.DataGridViewTextBoxColumn();
            this.Column35 = new System.Windows.Forms.DataGridViewTextBoxColumn();
            this.Column102 = new System.Windows.Forms.DataGridViewTextBoxColumn();
            this.Column22 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.imageList1 = new System.Windows.Forms.ImageList(this.components);
            this.tableLayoutPanel1.SuspendLayout();
            this.groupBoxEX3.SuspendLayout();
            this.groupBoxEX2.SuspendLayout();
@@ -127,7 +128,7 @@
            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 54.37666F));
            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 477F));
            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 13F));
-            this.tableLayoutPanel1.Size = new System.Drawing.Size(1920, 1080);
+            this.tableLayoutPanel1.Size = new System.Drawing.Size(1920, 1061);
            this.tableLayoutPanel1.TabIndex = 0;
            // 
            // groupBoxEX3
@@ -146,7 +147,7 @@
            this.groupBoxEX3.Margin = new System.Windows.Forms.Padding(2);
            this.groupBoxEX3.Name = "groupBoxEX3";
            this.groupBoxEX3.Padding = new System.Windows.Forms.Padding(2);
-            this.groupBoxEX3.Size = new System.Drawing.Size(343, 271);
+            this.groupBoxEX3.Size = new System.Drawing.Size(343, 262);
            this.groupBoxEX3.TabIndex = 14;
            this.groupBoxEX3.TabStop = false;
            this.groupBoxEX3.Text = "操作设置";
@@ -232,11 +233,11 @@
            this.groupBoxEX2.Controls.Add(this.lVConfigRange);
            this.groupBoxEX2.Dock = System.Windows.Forms.DockStyle.Fill;
            this.groupBoxEX2.ForeColor = System.Drawing.Color.White;
-            this.groupBoxEX2.Location = new System.Drawing.Point(2, 277);
+            this.groupBoxEX2.Location = new System.Drawing.Point(2, 268);
            this.groupBoxEX2.Margin = new System.Windows.Forms.Padding(2);
            this.groupBoxEX2.Name = "groupBoxEX2";
            this.groupBoxEX2.Padding = new System.Windows.Forms.Padding(2);
-            this.groupBoxEX2.Size = new System.Drawing.Size(343, 323);
+            this.groupBoxEX2.Size = new System.Drawing.Size(343, 313);
            this.groupBoxEX2.TabIndex = 13;
            this.groupBoxEX2.TabStop = false;
            this.groupBoxEX2.Text = "参数";
@@ -258,7 +259,7 @@
            this.lVConfigRange.Margin = new System.Windows.Forms.Padding(2);
            this.lVConfigRange.Name = "lVConfigRange";
            this.lVConfigRange.OwnerDraw = true;
-            this.lVConfigRange.Size = new System.Drawing.Size(339, 300);
+            this.lVConfigRange.Size = new System.Drawing.Size(339, 290);
            this.lVConfigRange.TabIndex = 2;
            this.lVConfigRange.UseCompatibleStateImageBehavior = false;
            this.lVConfigRange.View = System.Windows.Forms.View.Details;
@@ -302,7 +303,7 @@
            this.groupBoxEX4.Name = "groupBoxEX4";
            this.groupBoxEX4.Padding = new System.Windows.Forms.Padding(2);
            this.tableLayoutPanel1.SetRowSpan(this.groupBoxEX4, 2);
-            this.groupBoxEX4.Size = new System.Drawing.Size(1569, 598);
+            this.groupBoxEX4.Size = new System.Drawing.Size(1569, 579);
            this.groupBoxEX4.TabIndex = 15;
            this.groupBoxEX4.TabStop = false;
            this.groupBoxEX4.Text = "进站";
@@ -363,7 +364,7 @@
            this.dgvFeedingData.RowHeadersWidth = 60;
            this.dgvFeedingData.RowTemplate.Height = 23;
            this.dgvFeedingData.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
-            this.dgvFeedingData.Size = new System.Drawing.Size(1565, 575);
+            this.dgvFeedingData.Size = new System.Drawing.Size(1565, 556);
            this.dgvFeedingData.TabIndex = 10;
            this.dgvFeedingData.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvFeedingData_CellContentClick);
            this.dgvFeedingData.RowPrePaint += new System.Windows.Forms.DataGridViewRowPrePaintEventHandler(this.dgvFeedingData_RowPrePaint);
@@ -437,7 +438,7 @@
            this.groupBoxEX1.Controls.Add(this.rtb_Info);
            this.groupBoxEX1.Dock = System.Windows.Forms.DockStyle.Fill;
            this.groupBoxEX1.ForeColor = System.Drawing.Color.White;
-            this.groupBoxEX1.Location = new System.Drawing.Point(2, 604);
+            this.groupBoxEX1.Location = new System.Drawing.Point(2, 585);
            this.groupBoxEX1.Margin = new System.Windows.Forms.Padding(2);
            this.groupBoxEX1.Name = "groupBoxEX1";
            this.groupBoxEX1.Padding = new System.Windows.Forms.Padding(2);
@@ -468,7 +469,7 @@
            this.groupBoxEX5.Controls.Add(this.dgvBlankingData);
            this.groupBoxEX5.Dock = System.Windows.Forms.DockStyle.Fill;
            this.groupBoxEX5.ForeColor = System.Drawing.Color.White;
-            this.groupBoxEX5.Location = new System.Drawing.Point(349, 604);
+            this.groupBoxEX5.Location = new System.Drawing.Point(349, 585);
            this.groupBoxEX5.Margin = new System.Windows.Forms.Padding(2);
            this.groupBoxEX5.Name = "groupBoxEX5";
            this.groupBoxEX5.Padding = new System.Windows.Forms.Padding(2);
@@ -524,6 +525,7 @@
            this.Column112,
            this.Column113,
            this.Column114,
+            this.平面度,
            this.Column147,
            this.Column34,
            this.Column35,
@@ -562,6 +564,14 @@
            this.dgvBlankingData.TabIndex = 10;
            this.dgvBlankingData.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvBlankingData_CellContentClick);
            // 
+            // imageList1
+            // 
+            this.imageList1.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("imageList1.ImageStream")));
+            this.imageList1.TransparentColor = System.Drawing.Color.Transparent;
+            this.imageList1.Images.SetKeyName(0, "info.png");
+            this.imageList1.Images.SetKeyName(1, "error.png");
+            this.imageList1.Images.SetKeyName(2, "warning.png");
+            // 
            // dataGridViewTextBoxColumn1
            // 
            this.dataGridViewTextBoxColumn1.HeaderText = "序号";
@@ -590,7 +600,7 @@
            // dataGridViewTextBoxColumn5
            // 
            this.dataGridViewTextBoxColumn5.DataPropertyName = "BarCode";
-            this.dataGridViewTextBoxColumn5.HeaderText = "芯包条码";
+            this.dataGridViewTextBoxColumn5.HeaderText = "电芯码";
            this.dataGridViewTextBoxColumn5.MinimumWidth = 8;
            this.dataGridViewTextBoxColumn5.Name = "dataGridViewTextBoxColumn5";
            this.dataGridViewTextBoxColumn5.ReadOnly = true;
@@ -731,38 +741,45 @@
            // Column110
            // 
            this.Column110.DataPropertyName = "CCDResult15";
-            this.Column110.HeaderText = "极柱(POS/NEG)";
+            this.Column110.HeaderText = "正极柱(POS/NEG)";
            this.Column110.Name = "Column110";
            this.Column110.ReadOnly = true;
            // 
            // Column111
            // 
            this.Column111.DataPropertyName = "CCDResult16";
-            this.Column111.HeaderText = "防爆阀(PRO)";
+            this.Column111.HeaderText = "负极柱(POS/NEG)";
            this.Column111.Name = "Column111";
            this.Column111.ReadOnly = true;
            // 
            // Column112
            // 
            this.Column112.DataPropertyName = "CCDResult17";
-            this.Column112.HeaderText = "厚度1";
+            this.Column112.HeaderText = "防爆阀(PRO)";
            this.Column112.Name = "Column112";
            this.Column112.ReadOnly = true;
            // 
            // Column113
            // 
            this.Column113.DataPropertyName = "CCDResult18";
-            this.Column113.HeaderText = "厚度2";
+            this.Column113.HeaderText = "二维码";
            this.Column113.Name = "Column113";
            this.Column113.ReadOnly = true;
            // 
            // Column114
            // 
            this.Column114.DataPropertyName = "CCDResult19";
-            this.Column114.HeaderText = "厚度3";
+            this.Column114.HeaderText = "厚度";
            this.Column114.Name = "Column114";
            this.Column114.ReadOnly = true;
            // 
+            // 平面度
+            // 
+            this.平面度.DataPropertyName = "CCDResult20";
+            this.平面度.HeaderText = "平面度";
+            this.平面度.Name = "平面度";
+            this.平面度.ReadOnly = true;
+            // 
            // Column147
            // 
            this.Column147.DataPropertyName = "RethrowNum";
@@ -806,21 +823,13 @@
            this.Column22.ReadOnly = true;
            this.Column22.Width = 150;
            // 
-            // imageList1
-            // 
-            this.imageList1.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("imageList1.ImageStream")));
-            this.imageList1.TransparentColor = System.Drawing.Color.Transparent;
-            this.imageList1.Images.SetKeyName(0, "info.png");
-            this.imageList1.Images.SetKeyName(1, "error.png");
-            this.imageList1.Images.SetKeyName(2, "warning.png");
-            // 
            // FrmDataMonitor
            // 
            this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
            this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(14)))), ((int)(((byte)(23)))), ((int)(((byte)(38)))));
            this.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.ClientSize = new System.Drawing.Size(1920, 1080);
+            this.ClientSize = new System.Drawing.Size(1920, 1061);
            this.Controls.Add(this.tableLayoutPanel1);
            this.DoubleBuffered = true;
            this.Font = new System.Drawing.Font("微软雅黑", 10.5F);
@@ -898,6 +907,7 @@
        private System.Windows.Forms.DataGridViewTextBoxColumn Column112;
        private System.Windows.Forms.DataGridViewTextBoxColumn Column113;
        private System.Windows.Forms.DataGridViewTextBoxColumn Column114;
+        private System.Windows.Forms.DataGridViewTextBoxColumn 平面度;
        private System.Windows.Forms.DataGridViewTextBoxColumn Column147;
        private System.Windows.Forms.DataGridViewTextBoxColumn Column34;
        private System.Windows.Forms.DataGridViewTextBoxColumn Column35;
@@ -174,6 +174,9 @@
  <metadata name="Column97.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    <value>True</value>
  </metadata>
+  <metadata name="平面度.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
  <metadata name="Column147.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    <value>True</value>
  </metadata>
@@ -197,7 +200,7 @@
        AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
        LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
        ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABE
-        DQAAAk1TRnQBSQFMAgEBAwEAAZgBAgGYAQIBEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
+        DQAAAk1TRnQBSQFMAgEBAwEAAaABAgGgAQIBEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
        AwABEAMAAQEBAAEgBgABEC4AAxUBHQMkATQDBQEGKAADHQEpAl4BZwHwATUBNgHPAf8BNQE2Ac8B/wE1
        ATYBzwH/ATUBNgHPAf8BNQE2Ac8B/wNOAZagAAMTARkDZQHlA+YB/wPmAf8D5gH/A+YB/wPmAf8DRwGA
        HAACUwFUAaoBNQE2Ac8B/wE1ATYBzwH/ATUBNgHPAf8BNQE2Ac8B/wE1ATYBzwH/ATUBNgHPAf8BNQE2
@@ -28,9 +28,6 @@
        /// </summary>
        private void InitializeComponent()
        {
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
@@ -46,6 +43,9 @@
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle16 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle17 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle18 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
            this.panelEnhanced1 = new JinYuan.ControlLib.PanelEnhanced();
            this.tabControlPlus1 = new HML.TabControlPlus();
            this.tabPagePlus1 = new HML.TabPagePlus();
@@ -60,7 +60,6 @@
            this.label3 = new System.Windows.Forms.Label();
            this.dtp_End = new System.Windows.Forms.DateTimePicker();
            this.label1 = new System.Windows.Forms.Label();
-            this.dgv_Main = new System.Windows.Forms.DataGridView();
            this.tabPagePlus2 = new HML.TabPagePlus();
            this.tabControlPlus2 = new HML.TabControlPlus();
            this.tabPagePlus4 = new HML.TabPagePlus();
@@ -108,6 +107,7 @@
            this.dtp_AlarmTimeEnd = new System.Windows.Forms.DateTimePicker();
            this.label12 = new System.Windows.Forms.Label();
            this.dgv_AlarmData = new System.Windows.Forms.DataGridView();
+            this.dgv_Main = new System.Windows.Forms.DataGridView();
            this.panelEnhanced1.SuspendLayout();
            this.tabControlPlus1.SuspendLayout();
            this.tabPagePlus1.SuspendLayout();
@@ -115,7 +115,6 @@
            this.splitContainer1.Panel1.SuspendLayout();
            this.splitContainer1.Panel2.SuspendLayout();
            this.splitContainer1.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.dgv_Main)).BeginInit();
            this.tabPagePlus2.SuspendLayout();
            this.tabControlPlus2.SuspendLayout();
            this.tabPagePlus4.SuspendLayout();
@@ -140,6 +139,7 @@
            this.splitContainer2.Panel2.SuspendLayout();
            this.splitContainer2.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.dgv_AlarmData)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.dgv_Main)).BeginInit();
            this.SuspendLayout();
            // 
            // panelEnhanced1
@@ -338,58 +338,6 @@
            this.label1.TabIndex = 12;
            this.label1.Text = "开始时间";
            // 
-            // dgv_Main
-            // 
-            this.dgv_Main.AllowUserToAddRows = false;
-            this.dgv_Main.AllowUserToDeleteRows = false;
-            this.dgv_Main.AllowUserToResizeColumns = false;
-            this.dgv_Main.AllowUserToResizeRows = false;
-            this.dgv_Main.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.DisplayedCells;
-            this.dgv_Main.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(14)))), ((int)(((byte)(23)))), ((int)(((byte)(38)))));
-            this.dgv_Main.BorderStyle = System.Windows.Forms.BorderStyle.None;
-            this.dgv_Main.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single;
-            dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(6)))), ((int)(((byte)(30)))), ((int)(((byte)(78)))));
-            dataGridViewCellStyle1.Font = new System.Drawing.Font("微软雅黑", 10.5F);
-            dataGridViewCellStyle1.ForeColor = System.Drawing.Color.White;
-            dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.dgv_Main.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1;
-            this.dgv_Main.ColumnHeadersHeight = 45;
-            this.dgv_Main.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
-            dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(6)))), ((int)(((byte)(40)))), ((int)(((byte)(86)))));
-            dataGridViewCellStyle2.Font = new System.Drawing.Font("微软雅黑", 10.5F);
-            dataGridViewCellStyle2.ForeColor = System.Drawing.Color.White;
-            dataGridViewCellStyle2.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(20)))), ((int)(((byte)(80)))));
-            dataGridViewCellStyle2.SelectionForeColor = System.Drawing.Color.White;
-            dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
-            this.dgv_Main.DefaultCellStyle = dataGridViewCellStyle2;
-            this.dgv_Main.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.dgv_Main.EnableHeadersVisualStyles = false;
-            this.dgv_Main.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(21)))), ((int)(((byte)(77)))), ((int)(((byte)(147)))));
-            this.dgv_Main.Location = new System.Drawing.Point(0, 0);
-            this.dgv_Main.MultiSelect = false;
-            this.dgv_Main.Name = "dgv_Main";
-            this.dgv_Main.ReadOnly = true;
-            this.dgv_Main.RowHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single;
-            dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            dataGridViewCellStyle3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(6)))), ((int)(((byte)(40)))), ((int)(((byte)(86)))));
-            dataGridViewCellStyle3.Font = new System.Drawing.Font("微软雅黑", 10.5F);
-            dataGridViewCellStyle3.ForeColor = System.Drawing.Color.White;
-            dataGridViewCellStyle3.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(20)))), ((int)(((byte)(80)))));
-            dataGridViewCellStyle3.SelectionForeColor = System.Drawing.Color.White;
-            dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.dgv_Main.RowHeadersDefaultCellStyle = dataGridViewCellStyle3;
-            this.dgv_Main.RowHeadersWidth = 45;
-            this.dgv_Main.RowTemplate.Height = 23;
-            this.dgv_Main.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
-            this.dgv_Main.Size = new System.Drawing.Size(1603, 628);
-            this.dgv_Main.TabIndex = 5;
-            this.dgv_Main.RowPostPaint += new System.Windows.Forms.DataGridViewRowPostPaintEventHandler(this.dgv_Main_RowPostPaint);
-            this.dgv_Main.Paint += new System.Windows.Forms.PaintEventHandler(this.dgv_Main_Paint);
-            // 
            // tabPagePlus2
            // 
            this.tabPagePlus2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(32)))), ((int)(((byte)(32)))), ((int)(((byte)(32)))));
@@ -1225,6 +1173,58 @@
            this.dgv_AlarmData.TabIndex = 5;
            this.dgv_AlarmData.RowPostPaint += new System.Windows.Forms.DataGridViewRowPostPaintEventHandler(this.dgv_AlarmData_RowPostPaint);
            // 
+            // dgv_Main
+            // 
+            this.dgv_Main.AllowUserToAddRows = false;
+            this.dgv_Main.AllowUserToDeleteRows = false;
+            this.dgv_Main.AllowUserToResizeColumns = false;
+            this.dgv_Main.AllowUserToResizeRows = false;
+            this.dgv_Main.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.DisplayedCells;
+            this.dgv_Main.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(14)))), ((int)(((byte)(23)))), ((int)(((byte)(38)))));
+            this.dgv_Main.BorderStyle = System.Windows.Forms.BorderStyle.None;
+            this.dgv_Main.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single;
+            dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(6)))), ((int)(((byte)(30)))), ((int)(((byte)(78)))));
+            dataGridViewCellStyle1.Font = new System.Drawing.Font("微软雅黑", 10.5F);
+            dataGridViewCellStyle1.ForeColor = System.Drawing.Color.White;
+            dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.dgv_Main.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1;
+            this.dgv_Main.ColumnHeadersHeight = 45;
+            this.dgv_Main.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
+            dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(6)))), ((int)(((byte)(40)))), ((int)(((byte)(86)))));
+            dataGridViewCellStyle2.Font = new System.Drawing.Font("微软雅黑", 10.5F);
+            dataGridViewCellStyle2.ForeColor = System.Drawing.Color.White;
+            dataGridViewCellStyle2.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(20)))), ((int)(((byte)(80)))));
+            dataGridViewCellStyle2.SelectionForeColor = System.Drawing.Color.White;
+            dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+            this.dgv_Main.DefaultCellStyle = dataGridViewCellStyle2;
+            this.dgv_Main.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.dgv_Main.EnableHeadersVisualStyles = false;
+            this.dgv_Main.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(21)))), ((int)(((byte)(77)))), ((int)(((byte)(147)))));
+            this.dgv_Main.Location = new System.Drawing.Point(0, 0);
+            this.dgv_Main.MultiSelect = false;
+            this.dgv_Main.Name = "dgv_Main";
+            this.dgv_Main.ReadOnly = true;
+            this.dgv_Main.RowHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single;
+            dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(6)))), ((int)(((byte)(40)))), ((int)(((byte)(86)))));
+            dataGridViewCellStyle3.Font = new System.Drawing.Font("微软雅黑", 10.5F);
+            dataGridViewCellStyle3.ForeColor = System.Drawing.Color.White;
+            dataGridViewCellStyle3.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(20)))), ((int)(((byte)(80)))));
+            dataGridViewCellStyle3.SelectionForeColor = System.Drawing.Color.White;
+            dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.dgv_Main.RowHeadersDefaultCellStyle = dataGridViewCellStyle3;
+            this.dgv_Main.RowHeadersWidth = 45;
+            this.dgv_Main.RowTemplate.Height = 23;
+            this.dgv_Main.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
+            this.dgv_Main.Size = new System.Drawing.Size(1603, 628);
+            this.dgv_Main.TabIndex = 5;
+            this.dgv_Main.RowPostPaint += new System.Windows.Forms.DataGridViewRowPostPaintEventHandler(this.dgv_Main_RowPostPaint);
+            this.dgv_Main.Paint += new System.Windows.Forms.PaintEventHandler(this.dgv_Main_Paint);
+            // 
            // FrmHistory
            // 
            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
@@ -1244,7 +1244,6 @@
            this.splitContainer1.Panel2.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit();
            this.splitContainer1.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.dgv_Main)).EndInit();
            this.tabPagePlus2.ResumeLayout(false);
            this.tabControlPlus2.ResumeLayout(false);
            this.tabPagePlus4.ResumeLayout(false);
@@ -1274,6 +1273,7 @@
            ((System.ComponentModel.ISupportInitialize)(this.splitContainer2)).EndInit();
            this.splitContainer2.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.dgv_AlarmData)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.dgv_Main)).EndInit();
            this.ResumeLayout(false);

        }
@@ -1289,7 +1289,6 @@
        private System.Windows.Forms.Label label1;
        private JinYuan.ControlLib.PanelEnhanced panelEnhanced1;
        private System.Windows.Forms.SplitContainer splitContainer1;
-        private System.Windows.Forms.DataGridView dgv_Main;
        private HML.TabControlPlus tabControlPlus1;
        private HML.TabPagePlus tabPagePlus1;
        private HML.TabPagePlus tabPagePlus2;
@@ -1341,5 +1340,6 @@
        private System.Windows.Forms.DataGridView dgv_AlarmData;
        private System.Windows.Forms.TextBox txtBarCode;
        private System.Windows.Forms.Label label10;
+        private System.Windows.Forms.DataGridView dgv_Main;
    }
 }
@@ -455,9 +455,9 @@ namespace LargeSquareOne

            TimeSpan timeSpan = endDateTime - startDateTime;

-            if (timeSpan.TotalDays > 1.0)
+            if (timeSpan.TotalDays > 31.0)
            {
-                return OperateResult.CreateFailResult<DataTable>("查询范围不能超过1天");
+                return OperateResult.CreateFailResult<DataTable>("查询范围不能超过31天");
            }

            DataTable dataTable = CommonMethods.db.QueryDataTable(CommonMethods.dBSQL.SelectHostAlarmData(start, end, alarmType));
@@ -125,6 +125,7 @@
            this.lbl_Title.ForeColor = System.Drawing.Color.White;
            this.lbl_Title.Image = global::LargeSquareOne.Properties.Resources.Current;
            this.lbl_Title.Name = "lbl_Title";
+            this.lbl_Title.Click += new System.EventHandler(this.lbl_Title_Click);
            // 
            // label7
            // 
@@ -204,7 +204,7 @@ namespace LargeSquareOne
            CommonMethods.mesConfig.StatusMesUrl = IniConfigHelper.ReadIniData("MES配置", "设备状态", "0");
            CommonMethods.mesConfig.WattrMeterUrl = IniConfigHelper.ReadIniData("MES配置", "能耗", "0");
            CommonMethods.mesConfig.CollectData = IniConfigHelper.ReadIniData("MES配置", "风速仪", "0");
-
+            CommonMethods.mesConfig.SafeEqptStatusMesUrl = IniConfigHelper.ReadIniData("MES配置", "安全设备状态", "0");
            //CommonMethods.ProdDRFIDNgQty = Convert.ToInt32(IniConfigHelper.ReadIniData("统计计数", "ProdDRFIDNgQty", "0"));
            //CommonMethods.ProdDXNgQty = Convert.ToInt32(IniConfigHelper.ReadIniData("统计计数", "ProdDXNgQty", "0"));
            //CommonMethods.ProdGRFIDNgQty = Convert.ToInt32(IniConfigHelper.ReadIniData("统计计数", "ProdGRFIDNgQty", "0"));
@@ -630,7 +630,7 @@ namespace LargeSquareOne
        /// 通用窗体切换
        /// </summary>
        /// <param name="sender"></param>
-        /// <param name="e"></param>
+        /// <param name="e"></param>     
        private void CommonNaviButton_Click(object sender, EventArgs e)
        {
            if (sender is NaviButton2 navi)
@@ -1043,6 +1043,11 @@ namespace LargeSquareOne
                CommonMethods.IsLoginOk = false;
            }
        }
+
+        private void lbl_Title_Click(object sender, EventArgs e)
+        {
+
+        }
    }

    #region 消息筛选器
@@ -5051,13 +5051,13 @@
 </value>
  </data>
  <data name="MainPanel.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1874, 910</value>
+    <value>1874, 891</value>
  </data>
  <data name="CorePanel.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1920, 936</value>
+    <value>1920, 917</value>
  </data>
  <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
-    <value>1920, 1080</value>
+    <value>1920, 1061</value>
  </data>
  <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>