From c2a9a460e38c7c196fe98a94e29e6330eac3626f Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期五, 03 三月 2023 14:30:06 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

---
 BLL/系统管理/Xt_SystemParameter.designer.cs |  248 ++++++++++++++++++++++++++++++-------------------
 1 files changed, 151 insertions(+), 97 deletions(-)

diff --git "a/BLL/\347\263\273\347\273\237\347\256\241\347\220\206/Xt_SystemParameter.designer.cs" "b/BLL/\347\263\273\347\273\237\347\256\241\347\220\206/Xt_SystemParameter.designer.cs"
index 4fb01ef..cb7b351 100644
--- "a/BLL/\347\263\273\347\273\237\347\256\241\347\220\206/Xt_SystemParameter.designer.cs"
+++ "b/BLL/\347\263\273\347\273\237\347\256\241\347\220\206/Xt_SystemParameter.designer.cs"
@@ -55,6 +55,10 @@
             this.tabPage1 = new System.Windows.Forms.TabPage();
             this.grdMain = new System.Windows.Forms.DataGridView();
             this.tabPage2 = new System.Windows.Forms.TabPage();
+            this.label7 = new System.Windows.Forms.Label();
+            this.cmbHValue = new System.Windows.Forms.ComboBox();
+            this.cmbHKey = new System.Windows.Forms.ComboBox();
+            this.cmbHModClass = new System.Windows.Forms.ComboBox();
             this.chkHReadonly = new System.Windows.Forms.CheckBox();
             this.txtHExplanation = new System.Windows.Forms.TextBox();
             this.label6 = new System.Windows.Forms.Label();
@@ -71,15 +75,14 @@
             this.tv = new System.Windows.Forms.TreeView();
             this.panel1 = new System.Windows.Forms.Panel();
             this.label3 = new System.Windows.Forms.Label();
-            this.cmbHModClass = new System.Windows.Forms.ComboBox();
-            this.cmbHKey = new System.Windows.Forms.ComboBox();
-            this.cmbHValue = new System.Windows.Forms.ComboBox();
-            this.label7 = new System.Windows.Forms.Label();
+            this.org = new System.Windows.Forms.ToolStripButton();
+            this.toolStripSeparator6 = new System.Windows.Forms.ToolStripSeparator();
             this.ToolBar.SuspendLayout();
             this.stTab.SuspendLayout();
             this.tabPage1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.grdMain)).BeginInit();
             this.tabPage2.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
             this.splitContainer1.Panel1.SuspendLayout();
             this.splitContainer1.Panel2.SuspendLayout();
             this.splitContainer1.SuspendLayout();
@@ -103,6 +106,8 @@
             this.xs,
             this.toolStripSeparator1,
             this.fz,
+            this.toolStripSeparator6,
+            this.org,
             this.toolStripSeparator3,
             this.toolStripSeparator8,
             this.mrlk,
@@ -114,7 +119,7 @@
             this.ToolBar.Location = new System.Drawing.Point(0, 0);
             this.ToolBar.Name = "ToolBar";
             this.ToolBar.Padding = new System.Windows.Forms.Padding(0);
-            this.ToolBar.Size = new System.Drawing.Size(877, 50);
+            this.ToolBar.Size = new System.Drawing.Size(1169, 62);
             this.ToolBar.Stretch = true;
             this.ToolBar.TabIndex = 13;
             this.ToolBar.Text = "toolStrip1";
@@ -135,7 +140,7 @@
             // toolStripSeparator4
             // 
             this.toolStripSeparator4.Name = "toolStripSeparator4";
-            this.toolStripSeparator4.Size = new System.Drawing.Size(6, 50);
+            this.toolStripSeparator4.Size = new System.Drawing.Size(6, 62);
             // 
             // xz
             // 
@@ -183,7 +188,7 @@
             // toolStripSeparator2
             // 
             this.toolStripSeparator2.Name = "toolStripSeparator2";
-            this.toolStripSeparator2.Size = new System.Drawing.Size(6, 50);
+            this.toolStripSeparator2.Size = new System.Drawing.Size(6, 62);
             // 
             // cx
             // 
@@ -216,7 +221,7 @@
             // toolStripSeparator1
             // 
             this.toolStripSeparator1.Name = "toolStripSeparator1";
-            this.toolStripSeparator1.Size = new System.Drawing.Size(6, 50);
+            this.toolStripSeparator1.Size = new System.Drawing.Size(6, 62);
             // 
             // fz
             // 
@@ -235,13 +240,13 @@
             // toolStripSeparator3
             // 
             this.toolStripSeparator3.Name = "toolStripSeparator3";
-            this.toolStripSeparator3.Size = new System.Drawing.Size(6, 50);
+            this.toolStripSeparator3.Size = new System.Drawing.Size(6, 62);
             // 
             // toolStripSeparator8
             // 
             this.toolStripSeparator8.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
             this.toolStripSeparator8.Name = "toolStripSeparator8";
-            this.toolStripSeparator8.Size = new System.Drawing.Size(6, 50);
+            this.toolStripSeparator8.Size = new System.Drawing.Size(6, 62);
             // 
             // mrlk
             // 
@@ -251,7 +256,7 @@
             this.mrlk.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
             this.mrlk.ImageTransparentColor = System.Drawing.Color.White;
             this.mrlk.Name = "mrlk";
-            this.mrlk.Size = new System.Drawing.Size(57, 47);
+            this.mrlk.Size = new System.Drawing.Size(73, 59);
             this.mrlk.Text = "榛樿鍒楀";
             this.mrlk.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
             this.mrlk.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
@@ -261,7 +266,7 @@
             // 
             this.toolStripSeparator7.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
             this.toolStripSeparator7.Name = "toolStripSeparator7";
-            this.toolStripSeparator7.Size = new System.Drawing.Size(6, 50);
+            this.toolStripSeparator7.Size = new System.Drawing.Size(6, 62);
             // 
             // bclk
             // 
@@ -271,7 +276,7 @@
             this.bclk.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
             this.bclk.ImageTransparentColor = System.Drawing.Color.White;
             this.bclk.Name = "bclk";
-            this.bclk.Size = new System.Drawing.Size(57, 47);
+            this.bclk.Size = new System.Drawing.Size(73, 59);
             this.bclk.Text = "淇濆瓨鍒楀";
             this.bclk.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
             this.bclk.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
@@ -281,7 +286,7 @@
             // 
             this.toolStripSeparator9.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
             this.toolStripSeparator9.Name = "toolStripSeparator9";
-            this.toolStripSeparator9.Size = new System.Drawing.Size(6, 50);
+            this.toolStripSeparator9.Size = new System.Drawing.Size(6, 62);
             // 
             // tc
             // 
@@ -300,7 +305,7 @@
             // toolStripSeparator5
             // 
             this.toolStripSeparator5.Name = "toolStripSeparator5";
-            this.toolStripSeparator5.Size = new System.Drawing.Size(6, 50);
+            this.toolStripSeparator5.Size = new System.Drawing.Size(6, 62);
             // 
             // imageList1
             // 
@@ -315,9 +320,10 @@
             this.stTab.Controls.Add(this.tabPage2);
             this.stTab.Dock = System.Windows.Forms.DockStyle.Fill;
             this.stTab.Location = new System.Drawing.Point(0, 0);
+            this.stTab.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.stTab.Name = "stTab";
             this.stTab.SelectedIndex = 0;
-            this.stTab.Size = new System.Drawing.Size(735, 495);
+            this.stTab.Size = new System.Drawing.Size(981, 619);
             this.stTab.TabIndex = 15;
             // 
             // tabPage1
@@ -325,10 +331,11 @@
             this.tabPage1.BackColor = System.Drawing.SystemColors.Control;
             this.tabPage1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
             this.tabPage1.Controls.Add(this.grdMain);
-            this.tabPage1.Location = new System.Drawing.Point(4, 21);
+            this.tabPage1.Location = new System.Drawing.Point(4, 25);
+            this.tabPage1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.tabPage1.Name = "tabPage1";
-            this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
-            this.tabPage1.Size = new System.Drawing.Size(727, 470);
+            this.tabPage1.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.tabPage1.Size = new System.Drawing.Size(973, 590);
             this.tabPage1.TabIndex = 0;
             this.tabPage1.Text = "鍒楄〃瑙嗗浘";
             // 
@@ -339,12 +346,14 @@
             this.grdMain.BackgroundColor = System.Drawing.Color.White;
             this.grdMain.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
             this.grdMain.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.grdMain.Location = new System.Drawing.Point(3, 3);
+            this.grdMain.Location = new System.Drawing.Point(4, 4);
+            this.grdMain.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.grdMain.Name = "grdMain";
             this.grdMain.ReadOnly = true;
             this.grdMain.RowHeadersVisible = false;
+            this.grdMain.RowHeadersWidth = 51;
             this.grdMain.RowTemplate.Height = 23;
-            this.grdMain.Size = new System.Drawing.Size(719, 462);
+            this.grdMain.Size = new System.Drawing.Size(963, 580);
             this.grdMain.TabIndex = 1;
             this.grdMain.DoubleClick += new System.EventHandler(this.grdMain_DoubleClick);
             // 
@@ -367,19 +376,69 @@
             this.tabPage2.Controls.Add(this.txtHFarmat);
             this.tabPage2.Controls.Add(this.label2);
             this.tabPage2.Controls.Add(this.label1);
-            this.tabPage2.Location = new System.Drawing.Point(4, 21);
+            this.tabPage2.Location = new System.Drawing.Point(4, 25);
+            this.tabPage2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.tabPage2.Name = "tabPage2";
-            this.tabPage2.Padding = new System.Windows.Forms.Padding(3);
-            this.tabPage2.Size = new System.Drawing.Size(727, 470);
+            this.tabPage2.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.tabPage2.Size = new System.Drawing.Size(973, 590);
             this.tabPage2.TabIndex = 1;
             this.tabPage2.Text = "鍗曞紶瑙嗗浘";
+            // 
+            // label7
+            // 
+            this.label7.AutoSize = true;
+            this.label7.Location = new System.Drawing.Point(405, 121);
+            this.label7.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label7.Name = "label7";
+            this.label7.Size = new System.Drawing.Size(67, 15);
+            this.label7.TabIndex = 28;
+            this.label7.Text = "鏁版嵁绫诲瀷";
+            // 
+            // cmbHValue
+            // 
+            this.cmbHValue.FormattingEnabled = true;
+            this.cmbHValue.Items.AddRange(new object[] {
+            "鏄�",
+            "鍚�"});
+            this.cmbHValue.Location = new System.Drawing.Point(147, 116);
+            this.cmbHValue.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.cmbHValue.Name = "cmbHValue";
+            this.cmbHValue.Size = new System.Drawing.Size(220, 23);
+            this.cmbHValue.TabIndex = 27;
+            // 
+            // cmbHKey
+            // 
+            this.cmbHKey.FormattingEnabled = true;
+            this.cmbHKey.Items.AddRange(new object[] {
+            "MakerAndCheckerDiff"});
+            this.cmbHKey.Location = new System.Drawing.Point(489, 39);
+            this.cmbHKey.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.cmbHKey.Name = "cmbHKey";
+            this.cmbHKey.Size = new System.Drawing.Size(220, 23);
+            this.cmbHKey.TabIndex = 26;
+            // 
+            // cmbHModClass
+            // 
+            this.cmbHModClass.FormattingEnabled = true;
+            this.cmbHModClass.Items.AddRange(new object[] {
+            "閿�鍞�",
+            "閲囪喘",
+            "搴撳瓨",
+            "搴旀敹",
+            "搴斾粯"});
+            this.cmbHModClass.Location = new System.Drawing.Point(147, 39);
+            this.cmbHModClass.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.cmbHModClass.Name = "cmbHModClass";
+            this.cmbHModClass.Size = new System.Drawing.Size(220, 23);
+            this.cmbHModClass.TabIndex = 25;
             // 
             // chkHReadonly
             // 
             this.chkHReadonly.AutoSize = true;
-            this.chkHReadonly.Location = new System.Drawing.Point(449, 204);
+            this.chkHReadonly.Location = new System.Drawing.Point(599, 255);
+            this.chkHReadonly.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.chkHReadonly.Name = "chkHReadonly";
-            this.chkHReadonly.Size = new System.Drawing.Size(84, 16);
+            this.chkHReadonly.Size = new System.Drawing.Size(104, 19);
             this.chkHReadonly.TabIndex = 24;
             this.chkHReadonly.Text = "鏄惁鍙紪杈�";
             this.chkHReadonly.UseVisualStyleBackColor = true;
@@ -387,27 +446,30 @@
             // txtHExplanation
             // 
             this.txtHExplanation.ImeMode = System.Windows.Forms.ImeMode.NoControl;
-            this.txtHExplanation.Location = new System.Drawing.Point(110, 128);
+            this.txtHExplanation.Location = new System.Drawing.Point(147, 160);
+            this.txtHExplanation.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.txtHExplanation.Multiline = true;
             this.txtHExplanation.Name = "txtHExplanation";
-            this.txtHExplanation.Size = new System.Drawing.Size(423, 61);
+            this.txtHExplanation.Size = new System.Drawing.Size(563, 75);
             this.txtHExplanation.TabIndex = 19;
             this.txtHExplanation.Tag = "0";
             // 
             // label6
             // 
             this.label6.AutoSize = true;
-            this.label6.Location = new System.Drawing.Point(47, 128);
+            this.label6.Location = new System.Drawing.Point(63, 160);
+            this.label6.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label6.Name = "label6";
-            this.label6.Size = new System.Drawing.Size(53, 12);
+            this.label6.Size = new System.Drawing.Size(69, 15);
             this.label6.TabIndex = 18;
             this.label6.Text = "鎻�    杩�";
             // 
             // cmdCancel
             // 
-            this.cmdCancel.Location = new System.Drawing.Point(468, 239);
+            this.cmdCancel.Location = new System.Drawing.Point(624, 299);
+            this.cmdCancel.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.cmdCancel.Name = "cmdCancel";
-            this.cmdCancel.Size = new System.Drawing.Size(65, 25);
+            this.cmdCancel.Size = new System.Drawing.Size(87, 31);
             this.cmdCancel.TabIndex = 16;
             this.cmdCancel.Text = "鍙�  娑�";
             this.cmdCancel.UseVisualStyleBackColor = true;
@@ -415,9 +477,10 @@
             // 
             // cmdOK
             // 
-            this.cmdOK.Location = new System.Drawing.Point(367, 239);
+            this.cmdOK.Location = new System.Drawing.Point(489, 299);
+            this.cmdOK.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.cmdOK.Name = "cmdOK";
-            this.cmdOK.Size = new System.Drawing.Size(65, 25);
+            this.cmdOK.Size = new System.Drawing.Size(87, 31);
             this.cmdOK.TabIndex = 15;
             this.cmdOK.Text = "淇�  瀛�";
             this.cmdOK.UseVisualStyleBackColor = true;
@@ -426,53 +489,59 @@
             // label5
             // 
             this.label5.AutoSize = true;
-            this.label5.Location = new System.Drawing.Point(83, 97);
+            this.label5.Location = new System.Drawing.Point(111, 121);
+            this.label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label5.Name = "label5";
-            this.label5.Size = new System.Drawing.Size(17, 12);
+            this.label5.Size = new System.Drawing.Size(22, 15);
             this.label5.TabIndex = 9;
             this.label5.Text = "鍊�";
             // 
             // txtHCaption
             // 
             this.txtHCaption.ImeMode = System.Windows.Forms.ImeMode.NoControl;
-            this.txtHCaption.Location = new System.Drawing.Point(110, 62);
+            this.txtHCaption.Location = new System.Drawing.Point(147, 78);
+            this.txtHCaption.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.txtHCaption.Name = "txtHCaption";
-            this.txtHCaption.Size = new System.Drawing.Size(423, 21);
+            this.txtHCaption.Size = new System.Drawing.Size(563, 25);
             this.txtHCaption.TabIndex = 7;
             this.txtHCaption.Tag = "0";
             // 
             // label4
             // 
             this.label4.AutoSize = true;
-            this.label4.Location = new System.Drawing.Point(47, 66);
+            this.label4.Location = new System.Drawing.Point(63, 82);
+            this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label4.Name = "label4";
-            this.label4.Size = new System.Drawing.Size(53, 12);
+            this.label4.Size = new System.Drawing.Size(67, 15);
             this.label4.TabIndex = 6;
             this.label4.Text = "鍙傛暟鍚嶇О";
             // 
             // txtHFarmat
             // 
             this.txtHFarmat.ImeMode = System.Windows.Forms.ImeMode.NoControl;
-            this.txtHFarmat.Location = new System.Drawing.Point(367, 93);
+            this.txtHFarmat.Location = new System.Drawing.Point(489, 116);
+            this.txtHFarmat.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.txtHFarmat.Name = "txtHFarmat";
-            this.txtHFarmat.Size = new System.Drawing.Size(166, 21);
+            this.txtHFarmat.Size = new System.Drawing.Size(220, 25);
             this.txtHFarmat.TabIndex = 3;
             // 
             // label2
             // 
             this.label2.AutoSize = true;
-            this.label2.Location = new System.Drawing.Point(304, 35);
+            this.label2.Location = new System.Drawing.Point(405, 44);
+            this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(53, 12);
+            this.label2.Size = new System.Drawing.Size(68, 15);
             this.label2.TabIndex = 2;
             this.label2.Text = "鍏� 閿� 鐮�";
             // 
             // label1
             // 
             this.label1.AutoSize = true;
-            this.label1.Location = new System.Drawing.Point(47, 35);
+            this.label1.Location = new System.Drawing.Point(63, 44);
+            this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(53, 12);
+            this.label1.Size = new System.Drawing.Size(67, 15);
             this.label1.TabIndex = 0;
             this.label1.Text = "妯″潡澶х被";
             // 
@@ -484,7 +553,8 @@
             // splitContainer1
             // 
             this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.splitContainer1.Location = new System.Drawing.Point(0, 50);
+            this.splitContainer1.Location = new System.Drawing.Point(0, 62);
+            this.splitContainer1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.splitContainer1.Name = "splitContainer1";
             // 
             // splitContainer1.Panel1
@@ -495,8 +565,9 @@
             // splitContainer1.Panel2
             // 
             this.splitContainer1.Panel2.Controls.Add(this.stTab);
-            this.splitContainer1.Size = new System.Drawing.Size(877, 495);
-            this.splitContainer1.SplitterDistance = 138;
+            this.splitContainer1.Size = new System.Drawing.Size(1169, 619);
+            this.splitContainer1.SplitterDistance = 183;
+            this.splitContainer1.SplitterWidth = 5;
             this.splitContainer1.TabIndex = 16;
             // 
             // tv
@@ -509,7 +580,8 @@
             this.tv.Indent = 18;
             this.tv.ItemHeight = 18;
             this.tv.LineColor = System.Drawing.Color.Navy;
-            this.tv.Location = new System.Drawing.Point(0, 20);
+            this.tv.Location = new System.Drawing.Point(0, 24);
+            this.tv.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.tv.Name = "tv";
             treeNode1.ForeColor = System.Drawing.Color.Black;
             treeNode1.Name = "tjbb";
@@ -519,7 +591,7 @@
             this.tv.Nodes.AddRange(new System.Windows.Forms.TreeNode[] {
             treeNode1});
             this.tv.SelectedImageIndex = 1;
-            this.tv.Size = new System.Drawing.Size(138, 475);
+            this.tv.Size = new System.Drawing.Size(183, 595);
             this.tv.TabIndex = 16;
             this.tv.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.tv_NodeMouseClick);
             // 
@@ -529,76 +601,55 @@
             this.panel1.Controls.Add(this.label3);
             this.panel1.Dock = System.Windows.Forms.DockStyle.Top;
             this.panel1.Location = new System.Drawing.Point(0, 0);
+            this.panel1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.panel1.Name = "panel1";
-            this.panel1.Size = new System.Drawing.Size(138, 20);
+            this.panel1.Size = new System.Drawing.Size(183, 24);
             this.panel1.TabIndex = 15;
             // 
             // label3
             // 
             this.label3.AutoSize = true;
-            this.label3.Location = new System.Drawing.Point(0, 3);
+            this.label3.Location = new System.Drawing.Point(0, 4);
+            this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(77, 12);
+            this.label3.Size = new System.Drawing.Size(97, 15);
             this.label3.TabIndex = 0;
             this.label3.Text = "绯荤粺鍙傛暟璧勬枡";
             // 
-            // cmbHModClass
+            // org
             // 
-            this.cmbHModClass.FormattingEnabled = true;
-            this.cmbHModClass.Items.AddRange(new object[] {
-            "閿�鍞�",
-            "閲囪喘",
-            "搴撳瓨",
-            "搴旀敹",
-            "搴斾粯"});
-            this.cmbHModClass.Location = new System.Drawing.Point(110, 31);
-            this.cmbHModClass.Name = "cmbHModClass";
-            this.cmbHModClass.Size = new System.Drawing.Size(166, 20);
-            this.cmbHModClass.TabIndex = 25;
+            this.org.AutoSize = false;
+            this.org.ForeColor = System.Drawing.SystemColors.ControlText;
+            this.org.Image = ((System.Drawing.Image)(resources.GetObject("org.Image")));
+            this.org.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+            this.org.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+            this.org.ImageTransparentColor = System.Drawing.Color.White;
+            this.org.Name = "org";
+            this.org.Size = new System.Drawing.Size(35, 47);
+            this.org.Text = "缁勭粐";
+            this.org.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+            this.org.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+            this.org.Click += new System.EventHandler(this.org_Click);
             // 
-            // cmbHKey
+            // toolStripSeparator6
             // 
-            this.cmbHKey.FormattingEnabled = true;
-            this.cmbHKey.Items.AddRange(new object[] {
-            "MakerAndCheckerDiff"});
-            this.cmbHKey.Location = new System.Drawing.Point(367, 31);
-            this.cmbHKey.Name = "cmbHKey";
-            this.cmbHKey.Size = new System.Drawing.Size(166, 20);
-            this.cmbHKey.TabIndex = 26;
-            // 
-            // cmbHValue
-            // 
-            this.cmbHValue.FormattingEnabled = true;
-            this.cmbHValue.Items.AddRange(new object[] {
-            "鏄�",
-            "鍚�"});
-            this.cmbHValue.Location = new System.Drawing.Point(110, 93);
-            this.cmbHValue.Name = "cmbHValue";
-            this.cmbHValue.Size = new System.Drawing.Size(166, 20);
-            this.cmbHValue.TabIndex = 27;
-            // 
-            // label7
-            // 
-            this.label7.AutoSize = true;
-            this.label7.Location = new System.Drawing.Point(304, 97);
-            this.label7.Name = "label7";
-            this.label7.Size = new System.Drawing.Size(53, 12);
-            this.label7.TabIndex = 28;
-            this.label7.Text = "鏁版嵁绫诲瀷";
+            this.toolStripSeparator6.Name = "toolStripSeparator6";
+            this.toolStripSeparator6.Size = new System.Drawing.Size(6, 62);
             // 
             // Xt_SystemParameter
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.BackColor = System.Drawing.SystemColors.Control;
-            this.ClientSize = new System.Drawing.Size(877, 545);
+            this.ClientSize = new System.Drawing.Size(1169, 681);
             this.Controls.Add(this.splitContainer1);
             this.Controls.Add(this.ToolBar);
+            this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.Name = "Xt_SystemParameter";
             this.Text = "绯荤粺鍙傛暟璁剧疆";
             this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
-            this.Load += new System.EventHandler(this.Xt_SystemParameter_Load);
             this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.Xt_SystemParameter_FormClosing);
+            this.Load += new System.EventHandler(this.Xt_SystemParameter_Load);
             this.ToolBar.ResumeLayout(false);
             this.ToolBar.PerformLayout();
             this.stTab.ResumeLayout(false);
@@ -608,6 +659,7 @@
             this.tabPage2.PerformLayout();
             this.splitContainer1.Panel1.ResumeLayout(false);
             this.splitContainer1.Panel2.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit();
             this.splitContainer1.ResumeLayout(false);
             this.panel1.ResumeLayout(false);
             this.panel1.PerformLayout();
@@ -661,5 +713,7 @@
         private System.Windows.Forms.ComboBox cmbHKey;
         private System.Windows.Forms.ComboBox cmbHValue;
         private System.Windows.Forms.Label label7;
+        private System.Windows.Forms.ToolStripSeparator toolStripSeparator6;
+        private System.Windows.Forms.ToolStripButton org;
     }
 }
\ No newline at end of file

--
Gitblit v1.9.1