diff --git a/FrontendWebApi/FrontendWebApi.csproj b/FrontendWebApi/FrontendWebApi.csproj index 615f97b..ef80a5f 100644 --- a/FrontendWebApi/FrontendWebApi.csproj +++ b/FrontendWebApi/FrontendWebApi.csproj @@ -24,14 +24,6 @@ - - - True - True - Resources.resx - - - true @@ -39,12 +31,5 @@ - - - ResXFileCodeGenerator - Resources.Designer.cs - - - diff --git a/slnBIMS.sln b/slnBIMS.sln index 566bb06..37df03d 100644 --- a/slnBIMS.sln +++ b/slnBIMS.sln @@ -15,9 +15,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "z01_WinAPP", "z01_WinAPP\z0 EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "xxxFrontend", "xxxFrontend\xxxFrontend.csproj", "{E3FBA366-0345-4877-BCFF-6A337FDFD361}" EndProject -Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "Frontend(1)", "Frontend\", "{8499475E-631E-49F5-818F-B338E6399E10}" +Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "Frontend", "Frontend\", "{8499475E-631E-49F5-818F-B338E6399E10}" ProjectSection(WebsiteProperties) = preProject - TargetFrameworkMoniker = ".NETFramework,Version%3Dv4.0" + TargetFrameworkMoniker = ".NETFramework,Version%3Dv4.8" Debug.AspNetCompiler.VirtualPath = "/localhost_5966" Debug.AspNetCompiler.PhysicalPath = "Frontend\" Debug.AspNetCompiler.TargetPath = "PrecompiledWeb\localhost_5966\" diff --git a/z01_WinAPP/Properties/launchSettings.json b/z01_WinAPP/Properties/launchSettings.json new file mode 100644 index 0000000..a6ad1b5 --- /dev/null +++ b/z01_WinAPP/Properties/launchSettings.json @@ -0,0 +1,12 @@ +{ + "profiles": { + "z01_WinAPP": { + "commandName": "Project", + "launchBrowser": true, + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + }, + "applicationUrl": "https://localhost:59390;http://localhost:59391" + } + } +} \ No newline at end of file diff --git a/z01_WinAPP/fmCheckTagName.Designer.cs b/z01_WinAPP/fmCheckTagName.Designer.cs index 3f0878b..309b7cd 100644 --- a/z01_WinAPP/fmCheckTagName.Designer.cs +++ b/z01_WinAPP/fmCheckTagName.Designer.cs @@ -100,7 +100,6 @@ namespace tpDomeWinAPP this.splitContainer1.Cursor = System.Windows.Forms.Cursors.VSplit; this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill; this.splitContainer1.Location = new System.Drawing.Point(0, 0); - this.splitContainer1.Margin = new System.Windows.Forms.Padding(2); this.splitContainer1.Name = "splitContainer1"; // // splitContainer1.Panel1 @@ -118,9 +117,8 @@ namespace tpDomeWinAPP // splitContainer1.Panel2 // this.splitContainer1.Panel2.Controls.Add(this.tabControl1); - this.splitContainer1.Size = new System.Drawing.Size(1168, 603); - this.splitContainer1.SplitterDistance = 174; - this.splitContainer1.SplitterWidth = 3; + this.splitContainer1.Size = new System.Drawing.Size(1502, 764); + this.splitContainer1.SplitterDistance = 223; this.splitContainer1.TabIndex = 0; // // rbDome3 @@ -128,10 +126,9 @@ namespace tpDomeWinAPP this.rbDome3.AutoSize = true; this.rbDome3.Cursor = System.Windows.Forms.Cursors.Hand; this.rbDome3.Font = new System.Drawing.Font("Microsoft JhengHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); - this.rbDome3.Location = new System.Drawing.Point(16, 196); - this.rbDome3.Margin = new System.Windows.Forms.Padding(2); + this.rbDome3.Location = new System.Drawing.Point(21, 248); this.rbDome3.Name = "rbDome3"; - this.rbDome3.Size = new System.Drawing.Size(100, 24); + this.rbDome3.Size = new System.Drawing.Size(125, 29); this.rbDome3.TabIndex = 5; this.rbDome3.TabStop = true; this.rbDome3.Tag = "D3"; @@ -144,10 +141,9 @@ namespace tpDomeWinAPP this.rbM.AutoSize = true; this.rbM.Cursor = System.Windows.Forms.Cursors.Hand; this.rbM.Font = new System.Drawing.Font("Microsoft JhengHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); - this.rbM.Location = new System.Drawing.Point(16, 227); - this.rbM.Margin = new System.Windows.Forms.Padding(2); + this.rbM.Location = new System.Drawing.Point(21, 288); this.rbM.Name = "rbM"; - this.rbM.Size = new System.Drawing.Size(95, 24); + this.rbM.Size = new System.Drawing.Size(118, 29); this.rbM.TabIndex = 4; this.rbM.TabStop = true; this.rbM.Tag = "M"; @@ -157,10 +153,9 @@ namespace tpDomeWinAPP // // btLoad // - this.btLoad.Location = new System.Drawing.Point(32, 25); - this.btLoad.Margin = new System.Windows.Forms.Padding(2); + this.btLoad.Location = new System.Drawing.Point(41, 32); this.btLoad.Name = "btLoad"; - this.btLoad.Size = new System.Drawing.Size(73, 23); + this.btLoad.Size = new System.Drawing.Size(94, 29); this.btLoad.TabIndex = 0; this.btLoad.Text = "LoadData"; this.btLoad.UseVisualStyleBackColor = true; @@ -171,10 +166,9 @@ namespace tpDomeWinAPP this.rbDome2.AutoSize = true; this.rbDome2.Cursor = System.Windows.Forms.Cursors.Hand; this.rbDome2.Font = new System.Drawing.Font("Microsoft JhengHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); - this.rbDome2.Location = new System.Drawing.Point(16, 164); - this.rbDome2.Margin = new System.Windows.Forms.Padding(2); + this.rbDome2.Location = new System.Drawing.Point(21, 208); this.rbDome2.Name = "rbDome2"; - this.rbDome2.Size = new System.Drawing.Size(100, 24); + this.rbDome2.Size = new System.Drawing.Size(125, 29); this.rbDome2.TabIndex = 3; this.rbDome2.TabStop = true; this.rbDome2.Tag = "D2"; @@ -187,10 +181,9 @@ namespace tpDomeWinAPP this.rbB1.AutoSize = true; this.rbB1.Cursor = System.Windows.Forms.Cursors.Hand; this.rbB1.Font = new System.Drawing.Font("Microsoft JhengHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); - this.rbB1.Location = new System.Drawing.Point(16, 69); - this.rbB1.Margin = new System.Windows.Forms.Padding(2); + this.rbB1.Location = new System.Drawing.Point(21, 87); this.rbB1.Name = "rbB1"; - this.rbB1.Size = new System.Drawing.Size(78, 24); + this.rbB1.Size = new System.Drawing.Size(97, 29); this.rbB1.TabIndex = 0; this.rbB1.TabStop = true; this.rbB1.Tag = "B1"; @@ -203,10 +196,9 @@ namespace tpDomeWinAPP this.rbCinema.AutoSize = true; this.rbCinema.Cursor = System.Windows.Forms.Cursors.Hand; this.rbCinema.Font = new System.Drawing.Font("Microsoft JhengHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); - this.rbCinema.Location = new System.Drawing.Point(16, 133); - this.rbCinema.Margin = new System.Windows.Forms.Padding(2); + this.rbCinema.Location = new System.Drawing.Point(21, 168); this.rbCinema.Name = "rbCinema"; - this.rbCinema.Size = new System.Drawing.Size(137, 24); + this.rbCinema.Size = new System.Drawing.Size(169, 29); this.rbCinema.TabIndex = 2; this.rbCinema.TabStop = true; this.rbCinema.Tag = "C"; @@ -219,10 +211,9 @@ namespace tpDomeWinAPP this.rbOffice.AutoSize = true; this.rbOffice.Cursor = System.Windows.Forms.Cursors.Hand; this.rbOffice.Font = new System.Drawing.Font("Microsoft JhengHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); - this.rbOffice.Location = new System.Drawing.Point(16, 101); - this.rbOffice.Margin = new System.Windows.Forms.Padding(2); + this.rbOffice.Location = new System.Drawing.Point(21, 128); this.rbOffice.Name = "rbOffice"; - this.rbOffice.Size = new System.Drawing.Size(123, 24); + this.rbOffice.Size = new System.Drawing.Size(154, 29); this.rbOffice.TabIndex = 1; this.rbOffice.TabStop = true; this.rbOffice.Tag = "O"; @@ -242,10 +233,9 @@ namespace tpDomeWinAPP this.tabControl1.HotTrack = true; this.tabControl1.ItemSize = new System.Drawing.Size(150, 40); this.tabControl1.Location = new System.Drawing.Point(0, 0); - this.tabControl1.Margin = new System.Windows.Forms.Padding(2); this.tabControl1.Name = "tabControl1"; this.tabControl1.SelectedIndex = 0; - this.tabControl1.Size = new System.Drawing.Size(991, 603); + this.tabControl1.Size = new System.Drawing.Size(1275, 764); this.tabControl1.TabIndex = 0; this.tabControl1.SelectedIndexChanged += new System.EventHandler(this.tabControl1_SelectedIndexChanged); // @@ -255,10 +245,10 @@ namespace tpDomeWinAPP this.tabPage1.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; this.tabPage1.Controls.Add(this.splitContainer2); this.tabPage1.Location = new System.Drawing.Point(4, 44); - this.tabPage1.Margin = new System.Windows.Forms.Padding(4); + this.tabPage1.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); this.tabPage1.Name = "tabPage1"; - this.tabPage1.Padding = new System.Windows.Forms.Padding(4); - this.tabPage1.Size = new System.Drawing.Size(983, 555); + this.tabPage1.Padding = new System.Windows.Forms.Padding(5, 5, 5, 5); + this.tabPage1.Size = new System.Drawing.Size(1267, 716); this.tabPage1.TabIndex = 0; this.tabPage1.Text = "Niagara Tag"; // @@ -266,8 +256,7 @@ namespace tpDomeWinAPP // this.splitContainer2.Cursor = System.Windows.Forms.Cursors.HSplit; this.splitContainer2.Dock = System.Windows.Forms.DockStyle.Fill; - this.splitContainer2.Location = new System.Drawing.Point(4, 4); - this.splitContainer2.Margin = new System.Windows.Forms.Padding(2); + this.splitContainer2.Location = new System.Drawing.Point(5, 5); this.splitContainer2.Name = "splitContainer2"; this.splitContainer2.Orientation = System.Windows.Forms.Orientation.Horizontal; // @@ -283,27 +272,24 @@ namespace tpDomeWinAPP // splitContainer2.Panel2 // this.splitContainer2.Panel2.Controls.Add(this.splitContainer4); - this.splitContainer2.Size = new System.Drawing.Size(971, 543); - this.splitContainer2.SplitterDistance = 67; - this.splitContainer2.SplitterWidth = 3; + this.splitContainer2.Size = new System.Drawing.Size(1253, 702); + this.splitContainer2.SplitterDistance = 86; this.splitContainer2.TabIndex = 1; // // fp_tab1 // this.fp_tab1.Dock = System.Windows.Forms.DockStyle.Right; - this.fp_tab1.Location = new System.Drawing.Point(308, 0); - this.fp_tab1.Margin = new System.Windows.Forms.Padding(2); + this.fp_tab1.Location = new System.Drawing.Point(401, 0); this.fp_tab1.Name = "fp_tab1"; - this.fp_tab1.Size = new System.Drawing.Size(663, 67); + this.fp_tab1.Size = new System.Drawing.Size(852, 86); this.fp_tab1.TabIndex = 10; // // lbMsg // this.lbMsg.AutoSize = true; - this.lbMsg.Location = new System.Drawing.Point(11, 62); - this.lbMsg.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.lbMsg.Location = new System.Drawing.Point(14, 79); this.lbMsg.Name = "lbMsg"; - this.lbMsg.Size = new System.Drawing.Size(16, 15); + this.lbMsg.Size = new System.Drawing.Size(18, 19); this.lbMsg.TabIndex = 2; this.lbMsg.Text = "..."; // @@ -311,10 +297,9 @@ namespace tpDomeWinAPP // this.rball.AutoSize = true; this.rball.Font = new System.Drawing.Font("Microsoft JhengHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); - this.rball.Location = new System.Drawing.Point(11, 37); - this.rball.Margin = new System.Windows.Forms.Padding(2); + this.rball.Location = new System.Drawing.Point(14, 47); this.rball.Name = "rball"; - this.rball.Size = new System.Drawing.Size(59, 24); + this.rball.Size = new System.Drawing.Size(73, 29); this.rball.TabIndex = 1; this.rball.Text = "全部"; this.rball.UseVisualStyleBackColor = true; @@ -325,10 +310,9 @@ namespace tpDomeWinAPP this.rb100.AutoSize = true; this.rb100.Checked = true; this.rb100.Font = new System.Drawing.Font("Microsoft JhengHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); - this.rb100.Location = new System.Drawing.Point(11, 9); - this.rb100.Margin = new System.Windows.Forms.Padding(2); + this.rb100.Location = new System.Drawing.Point(14, 11); this.rb100.Name = "rb100"; - this.rb100.Size = new System.Drawing.Size(74, 24); + this.rb100.Size = new System.Drawing.Size(94, 29); this.rb100.TabIndex = 0; this.rb100.TabStop = true; this.rb100.Text = "100 筆"; @@ -340,7 +324,6 @@ namespace tpDomeWinAPP this.splitContainer4.Cursor = System.Windows.Forms.Cursors.VSplit; this.splitContainer4.Dock = System.Windows.Forms.DockStyle.Fill; this.splitContainer4.Location = new System.Drawing.Point(0, 0); - this.splitContainer4.Margin = new System.Windows.Forms.Padding(2); this.splitContainer4.Name = "splitContainer4"; // // splitContainer4.Panel1 @@ -350,9 +333,9 @@ namespace tpDomeWinAPP // splitContainer4.Panel2 // this.splitContainer4.Panel2.Cursor = System.Windows.Forms.Cursors.Arrow; - this.splitContainer4.Size = new System.Drawing.Size(971, 473); - this.splitContainer4.SplitterDistance = 658; - this.splitContainer4.SplitterWidth = 8; + this.splitContainer4.Size = new System.Drawing.Size(1253, 612); + this.splitContainer4.SplitterDistance = 849; + this.splitContainer4.SplitterWidth = 10; this.splitContainer4.TabIndex = 0; // // dataGridView1 @@ -361,10 +344,9 @@ namespace tpDomeWinAPP this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.dataGridView1.Dock = System.Windows.Forms.DockStyle.Fill; this.dataGridView1.Location = new System.Drawing.Point(0, 0); - this.dataGridView1.Margin = new System.Windows.Forms.Padding(2); this.dataGridView1.Name = "dataGridView1"; this.dataGridView1.RowHeadersWidth = 51; - this.dataGridView1.Size = new System.Drawing.Size(658, 473); + this.dataGridView1.Size = new System.Drawing.Size(849, 612); this.dataGridView1.TabIndex = 1; this.dataGridView1.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView1_CellContentClick); this.dataGridView1.DataBindingComplete += new System.Windows.Forms.DataGridViewBindingCompleteEventHandler(this.dataGridView1_DataBindingComplete); @@ -373,10 +355,10 @@ namespace tpDomeWinAPP // this.tabPage2.Controls.Add(this.splitContainer3); this.tabPage2.Location = new System.Drawing.Point(4, 44); - this.tabPage2.Margin = new System.Windows.Forms.Padding(4); + this.tabPage2.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); this.tabPage2.Name = "tabPage2"; - this.tabPage2.Padding = new System.Windows.Forms.Padding(4); - this.tabPage2.Size = new System.Drawing.Size(983, 555); + this.tabPage2.Padding = new System.Windows.Forms.Padding(5, 5, 5, 5); + this.tabPage2.Size = new System.Drawing.Size(1267, 716); this.tabPage2.TabIndex = 1; this.tabPage2.Text = "Niagara -> DB"; this.tabPage2.UseVisualStyleBackColor = true; @@ -385,8 +367,7 @@ namespace tpDomeWinAPP // this.splitContainer3.Cursor = System.Windows.Forms.Cursors.HSplit; this.splitContainer3.Dock = System.Windows.Forms.DockStyle.Fill; - this.splitContainer3.Location = new System.Drawing.Point(4, 4); - this.splitContainer3.Margin = new System.Windows.Forms.Padding(2); + this.splitContainer3.Location = new System.Drawing.Point(5, 5); this.splitContainer3.Name = "splitContainer3"; this.splitContainer3.Orientation = System.Windows.Forms.Orientation.Horizontal; // @@ -401,9 +382,8 @@ namespace tpDomeWinAPP // splitContainer3.Panel2 // this.splitContainer3.Panel2.Controls.Add(this.dataGridView2); - this.splitContainer3.Size = new System.Drawing.Size(975, 547); - this.splitContainer3.SplitterDistance = 66; - this.splitContainer3.SplitterWidth = 3; + this.splitContainer3.Size = new System.Drawing.Size(1257, 706); + this.splitContainer3.SplitterDistance = 85; this.splitContainer3.TabIndex = 2; // // tableLayoutPanel1 @@ -425,95 +405,85 @@ namespace tpDomeWinAPP this.tableLayoutPanel1.Controls.Add(this.cbShowEmpty, 0, 0); this.tableLayoutPanel1.Controls.Add(this.btSearch_N4vsDB, 0, 1); this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Right; - this.tableLayoutPanel1.Location = new System.Drawing.Point(232, 0); - this.tableLayoutPanel1.Margin = new System.Windows.Forms.Padding(2); + this.tableLayoutPanel1.Location = new System.Drawing.Point(302, 0); this.tableLayoutPanel1.Name = "tableLayoutPanel1"; - this.tableLayoutPanel1.Padding = new System.Windows.Forms.Padding(4); + this.tableLayoutPanel1.Padding = new System.Windows.Forms.Padding(5, 5, 5, 5); this.tableLayoutPanel1.RowCount = 2; this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); - this.tableLayoutPanel1.Size = new System.Drawing.Size(743, 66); + this.tableLayoutPanel1.Size = new System.Drawing.Size(955, 85); this.tableLayoutPanel1.TabIndex = 4; // // lbSec2 // this.lbSec2.AutoSize = true; - this.lbSec2.Location = new System.Drawing.Point(153, 4); - this.lbSec2.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.lbSec2.Location = new System.Drawing.Point(197, 5); this.lbSec2.Name = "lbSec2"; - this.lbSec2.Size = new System.Drawing.Size(133, 15); + this.lbSec2.Size = new System.Drawing.Size(167, 19); this.lbSec2.TabIndex = 1; this.lbSec2.Text = "第二碼 - system_code1"; // // lbSec3 // this.lbSec3.AutoSize = true; - this.lbSec3.Location = new System.Drawing.Point(300, 4); - this.lbSec3.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.lbSec3.Location = new System.Drawing.Point(386, 5); this.lbSec3.Name = "lbSec3"; - this.lbSec3.Size = new System.Drawing.Size(81, 15); + this.lbSec3.Size = new System.Drawing.Size(101, 19); this.lbSec3.TabIndex = 2; this.lbSec3.Text = "第三碼 - floor"; // // lbSec4 // this.lbSec4.AutoSize = true; - this.lbSec4.Location = new System.Drawing.Point(447, 4); - this.lbSec4.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.lbSec4.Location = new System.Drawing.Point(575, 5); this.lbSec4.Name = "lbSec4"; - this.lbSec4.Size = new System.Drawing.Size(133, 15); + this.lbSec4.Size = new System.Drawing.Size(167, 19); this.lbSec4.TabIndex = 3; this.lbSec4.Text = "第四碼 - system_code2"; // // lbSec5 // this.lbSec5.AutoSize = true; - this.lbSec5.Location = new System.Drawing.Point(594, 4); - this.lbSec5.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.lbSec5.Location = new System.Drawing.Point(764, 5); this.lbSec5.Name = "lbSec5"; - this.lbSec5.Size = new System.Drawing.Size(125, 15); + this.lbSec5.Size = new System.Drawing.Size(157, 19); this.lbSec5.TabIndex = 4; this.lbSec5.Text = "第五碼 - device_serial"; // // tbSec2 // - this.tbSec2.Location = new System.Drawing.Point(153, 35); - this.tbSec2.Margin = new System.Windows.Forms.Padding(2); + this.tbSec2.Location = new System.Drawing.Point(197, 45); this.tbSec2.Name = "tbSec2"; - this.tbSec2.Size = new System.Drawing.Size(98, 23); + this.tbSec2.Size = new System.Drawing.Size(125, 27); this.tbSec2.TabIndex = 5; // // tbSec3 // - this.tbSec3.Location = new System.Drawing.Point(300, 35); - this.tbSec3.Margin = new System.Windows.Forms.Padding(2); + this.tbSec3.Location = new System.Drawing.Point(386, 45); this.tbSec3.Name = "tbSec3"; - this.tbSec3.Size = new System.Drawing.Size(98, 23); + this.tbSec3.Size = new System.Drawing.Size(125, 27); this.tbSec3.TabIndex = 6; // // tbSec4 // - this.tbSec4.Location = new System.Drawing.Point(447, 35); - this.tbSec4.Margin = new System.Windows.Forms.Padding(2); + this.tbSec4.Location = new System.Drawing.Point(575, 45); this.tbSec4.Name = "tbSec4"; - this.tbSec4.Size = new System.Drawing.Size(98, 23); + this.tbSec4.Size = new System.Drawing.Size(125, 27); this.tbSec4.TabIndex = 7; // // tbSec5 // - this.tbSec5.Location = new System.Drawing.Point(594, 35); - this.tbSec5.Margin = new System.Windows.Forms.Padding(2); + this.tbSec5.Location = new System.Drawing.Point(764, 45); this.tbSec5.Name = "tbSec5"; - this.tbSec5.Size = new System.Drawing.Size(98, 23); + this.tbSec5.Size = new System.Drawing.Size(125, 27); this.tbSec5.TabIndex = 8; // // cbShowEmpty // this.cbShowEmpty.AutoSize = true; - this.cbShowEmpty.Location = new System.Drawing.Point(6, 6); - this.cbShowEmpty.Margin = new System.Windows.Forms.Padding(2); + this.cbShowEmpty.Location = new System.Drawing.Point(8, 8); this.cbShowEmpty.Name = "cbShowEmpty"; - this.cbShowEmpty.Size = new System.Drawing.Size(110, 19); + this.cbShowEmpty.Size = new System.Drawing.Size(136, 23); this.cbShowEmpty.TabIndex = 0; this.cbShowEmpty.Text = "只顯示缺失部分"; this.cbShowEmpty.UseVisualStyleBackColor = true; @@ -521,10 +491,9 @@ namespace tpDomeWinAPP // // btSearch_N4vsDB // - this.btSearch_N4vsDB.Location = new System.Drawing.Point(6, 35); - this.btSearch_N4vsDB.Margin = new System.Windows.Forms.Padding(2); + this.btSearch_N4vsDB.Location = new System.Drawing.Point(8, 45); this.btSearch_N4vsDB.Name = "btSearch_N4vsDB"; - this.btSearch_N4vsDB.Size = new System.Drawing.Size(73, 23); + this.btSearch_N4vsDB.Size = new System.Drawing.Size(94, 29); this.btSearch_N4vsDB.TabIndex = 9; this.btSearch_N4vsDB.Text = "查詢"; this.btSearch_N4vsDB.UseVisualStyleBackColor = true; @@ -532,10 +501,9 @@ namespace tpDomeWinAPP // // btTagCompare // - this.btTagCompare.Location = new System.Drawing.Point(11, 6); - this.btTagCompare.Margin = new System.Windows.Forms.Padding(2); + this.btTagCompare.Location = new System.Drawing.Point(14, 8); this.btTagCompare.Name = "btTagCompare"; - this.btTagCompare.Size = new System.Drawing.Size(94, 30); + this.btTagCompare.Size = new System.Drawing.Size(121, 38); this.btTagCompare.TabIndex = 3; this.btTagCompare.Text = "資料比對"; this.btTagCompare.UseVisualStyleBackColor = true; @@ -544,10 +512,9 @@ namespace tpDomeWinAPP // lbMsg2 // this.lbMsg2.AutoSize = true; - this.lbMsg2.Location = new System.Drawing.Point(11, 40); - this.lbMsg2.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.lbMsg2.Location = new System.Drawing.Point(14, 51); this.lbMsg2.Name = "lbMsg2"; - this.lbMsg2.Size = new System.Drawing.Size(207, 15); + this.lbMsg2.Size = new System.Drawing.Size(258, 19); this.lbMsg2.TabIndex = 2; this.lbMsg2.Text = "依據上頁 Niagara 查詢結果與DB比對"; // @@ -557,20 +524,18 @@ namespace tpDomeWinAPP this.dataGridView2.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.dataGridView2.Dock = System.Windows.Forms.DockStyle.Fill; this.dataGridView2.Location = new System.Drawing.Point(0, 0); - this.dataGridView2.Margin = new System.Windows.Forms.Padding(2); this.dataGridView2.Name = "dataGridView2"; this.dataGridView2.RowHeadersWidth = 51; - this.dataGridView2.Size = new System.Drawing.Size(975, 478); + this.dataGridView2.Size = new System.Drawing.Size(1257, 617); this.dataGridView2.TabIndex = 0; this.dataGridView2.DataBindingComplete += new System.Windows.Forms.DataGridViewBindingCompleteEventHandler(this.dataGridView1_DataBindingComplete); // // tabPage3 // this.tabPage3.Location = new System.Drawing.Point(4, 44); - this.tabPage3.Margin = new System.Windows.Forms.Padding(2); this.tabPage3.Name = "tabPage3"; - this.tabPage3.Padding = new System.Windows.Forms.Padding(2); - this.tabPage3.Size = new System.Drawing.Size(983, 555); + this.tabPage3.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3); + this.tabPage3.Size = new System.Drawing.Size(1266, 716); this.tabPage3.TabIndex = 2; this.tabPage3.Text = "DB -> Niagara"; this.tabPage3.UseVisualStyleBackColor = true; @@ -578,10 +543,9 @@ namespace tpDomeWinAPP // tabPage4 // this.tabPage4.Location = new System.Drawing.Point(4, 44); - this.tabPage4.Margin = new System.Windows.Forms.Padding(2); this.tabPage4.Name = "tabPage4"; - this.tabPage4.Padding = new System.Windows.Forms.Padding(2); - this.tabPage4.Size = new System.Drawing.Size(983, 555); + this.tabPage4.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3); + this.tabPage4.Size = new System.Drawing.Size(1266, 716); this.tabPage4.TabIndex = 3; this.tabPage4.Text = "Excel 匯入"; this.tabPage4.UseVisualStyleBackColor = true; @@ -589,10 +553,9 @@ namespace tpDomeWinAPP // tabPage5 // this.tabPage5.Location = new System.Drawing.Point(4, 44); - this.tabPage5.Margin = new System.Windows.Forms.Padding(2); this.tabPage5.Name = "tabPage5"; - this.tabPage5.Padding = new System.Windows.Forms.Padding(2); - this.tabPage5.Size = new System.Drawing.Size(983, 555); + this.tabPage5.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3); + this.tabPage5.Size = new System.Drawing.Size(1266, 716); this.tabPage5.TabIndex = 4; this.tabPage5.Text = "即時狀態"; this.tabPage5.UseVisualStyleBackColor = true; @@ -631,7 +594,7 @@ namespace tpDomeWinAPP this.label1.AutoSize = true; this.label1.Location = new System.Drawing.Point(43, 0); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(34, 90); + this.label1.Size = new System.Drawing.Size(34, 171); this.label1.TabIndex = 1; this.label1.Text = "第二碼 - system_code1"; // @@ -646,11 +609,10 @@ namespace tpDomeWinAPP // // fmCheckTagName // - this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); + this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 19F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1168, 603); + this.ClientSize = new System.Drawing.Size(1502, 764); this.Controls.Add(this.splitContainer1); - this.Margin = new System.Windows.Forms.Padding(2); this.Name = "fmCheckTagName"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "Niagara Tag Management";