diff --git a/.vsold/ProjectSettings.json b/.vsold/ProjectSettings.json deleted file mode 100644 index f8b4888..0000000 --- a/.vsold/ProjectSettings.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "CurrentProjectSetting": null -} \ No newline at end of file diff --git a/.vsold/VSWorkspaceState.json b/.vsold/VSWorkspaceState.json deleted file mode 100644 index 919f6a6..0000000 --- a/.vsold/VSWorkspaceState.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "ExpandedNodes": [ - "" - ], - "SelectedNode": "\\solarApp.sln", - "PreviewInSolutionExplorer": false -} \ No newline at end of file diff --git a/.vsold/slnSolarPower/DesignTimeBuild/.dtbcache.v2 b/.vsold/slnSolarPower/DesignTimeBuild/.dtbcache.v2 deleted file mode 100644 index 329cb5a..0000000 Binary files a/.vsold/slnSolarPower/DesignTimeBuild/.dtbcache.v2 and /dev/null differ diff --git a/.vsold/slnSolarPower/config/applicationhost.config b/.vsold/slnSolarPower/config/applicationhost.config deleted file mode 100644 index 3269632..0000000 --- a/.vsold/slnSolarPower/config/applicationhost.config +++ /dev/null @@ -1,995 +0,0 @@ - - - - - - -
-
-
-
-
-
-
-
- - -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- -
-
- -
-
-
-
-
-
- -
-
-
-
-
- -
-
-
- -
-
- -
-
- -
-
-
- - -
-
-
-
-
-
- -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.vsold/slnx.sqlite b/.vsold/slnx.sqlite deleted file mode 100644 index 4bc9b7b..0000000 Binary files a/.vsold/slnx.sqlite and /dev/null differ diff --git a/solarApp/Service/procSyncError.cs b/solarApp/Service/procSyncError.cs index 3b0843f..e109cb5 100644 --- a/solarApp/Service/procSyncError.cs +++ b/solarApp/Service/procSyncError.cs @@ -146,7 +146,7 @@ namespace solarApp.Service #region update 異常訊息 sql = $@" update err_main a join alarmorion_orionalarmfacetvalue b on a.id = b.alarm - set a.errMsg = unicode_decode(`value`) + set a.errMsg = b.errMsg where facetName = 6 and alarm in ({sb.ToString()});"; rowCT = conn.Execute(sql, commandTimeout: 600); duration = DateTime.Now - dt_start; diff --git a/solarApp/fmArchive.Designer.cs b/solarApp/fmArchive.Designer.cs index 31a037b..f31f64f 100644 --- a/solarApp/fmArchive.Designer.cs +++ b/solarApp/fmArchive.Designer.cs @@ -59,6 +59,7 @@ namespace solarApp this.gv_inv_detail = new System.Windows.Forms.DataGridView(); this.gv_rpt_invDay = new System.Windows.Forms.DataGridView(); this.panel1 = new System.Windows.Forms.Panel(); + this.btSyncErr = new System.Windows.Forms.Button(); this.lbMsgStatus = new System.Windows.Forms.Label(); this.lbMsgTitle = new System.Windows.Forms.Label(); this.bt_invDay = new System.Windows.Forms.Button(); @@ -66,6 +67,7 @@ namespace solarApp this.lbSiteDB_sensor = new System.Windows.Forms.Label(); this.lbSiteID_sensor = new System.Windows.Forms.Label(); this.lbSiteName_sensor = new System.Windows.Forms.Label(); + this.tabPage5 = new System.Windows.Forms.TabPage(); this.tabPage2 = new System.Windows.Forms.TabPage(); this.splitContainer2 = new System.Windows.Forms.SplitContainer(); this.richTextBox1 = new System.Windows.Forms.RichTextBox(); @@ -85,10 +87,6 @@ namespace solarApp this.lbUserName = new System.Windows.Forms.Label(); this.tbUserName = new System.Windows.Forms.TextBox(); this.btSendMail = new System.Windows.Forms.Button(); - this.tabPage3 = new System.Windows.Forms.TabPage(); - this.button1 = new System.Windows.Forms.Button(); - this.tabPage4 = new System.Windows.Forms.TabPage(); - this.btSyncErr = new System.Windows.Forms.Button(); this.timer1 = new System.Windows.Forms.Timer(this.components); this.tabControl1.SuspendLayout(); this.tabPage1.SuspendLayout(); @@ -105,18 +103,16 @@ namespace solarApp this.splitContainer2.SuspendLayout(); this.panel2.SuspendLayout(); this.gbox.SuspendLayout(); - this.tabPage3.SuspendLayout(); - this.tabPage4.SuspendLayout(); this.SuspendLayout(); // // tabControl1 // this.tabControl1.Appearance = System.Windows.Forms.TabAppearance.Buttons; this.tabControl1.Controls.Add(this.tabPage1); + this.tabControl1.Controls.Add(this.tabPage5); this.tabControl1.Controls.Add(this.tabPage2); - this.tabControl1.Controls.Add(this.tabPage3); - this.tabControl1.Controls.Add(this.tabPage4); this.tabControl1.Dock = System.Windows.Forms.DockStyle.Fill; + this.tabControl1.ItemSize = new System.Drawing.Size(80, 45); this.tabControl1.Location = new System.Drawing.Point(0, 0); this.tabControl1.Name = "tabControl1"; this.tabControl1.SelectedIndex = 0; @@ -126,12 +122,13 @@ namespace solarApp // tabPage1 // this.tabPage1.Controls.Add(this.splitContainer1); - this.tabPage1.Location = new System.Drawing.Point(4, 31); + this.tabPage1.Font = new System.Drawing.Font("Microsoft JhengHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); + this.tabPage1.Location = new System.Drawing.Point(4, 49); this.tabPage1.Name = "tabPage1"; this.tabPage1.Padding = new System.Windows.Forms.Padding(3); - this.tabPage1.Size = new System.Drawing.Size(1774, 918); + this.tabPage1.Size = new System.Drawing.Size(1774, 900); this.tabPage1.TabIndex = 0; - this.tabPage1.Text = "tabPage1"; + this.tabPage1.Text = " 歸檔 "; this.tabPage1.UseVisualStyleBackColor = true; // // splitContainer1 @@ -170,7 +167,7 @@ namespace solarApp this.splitContainer1.Panel2.Controls.Add(this.gv_inv_detail); this.splitContainer1.Panel2.Controls.Add(this.gv_rpt_invDay); this.splitContainer1.Panel2.Controls.Add(this.panel1); - this.splitContainer1.Size = new System.Drawing.Size(1768, 912); + this.splitContainer1.Size = new System.Drawing.Size(1768, 894); this.splitContainer1.SplitterDistance = 400; this.splitContainer1.SplitterWidth = 10; this.splitContainer1.TabIndex = 0; @@ -404,7 +401,7 @@ namespace solarApp this.gv_inv_detail.ReadOnly = true; this.gv_inv_detail.RowHeadersWidth = 51; this.gv_inv_detail.RowTemplate.Height = 29; - this.gv_inv_detail.Size = new System.Drawing.Size(590, 837); + this.gv_inv_detail.Size = new System.Drawing.Size(590, 819); this.gv_inv_detail.TabIndex = 2; this.gv_inv_detail.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.gv_inv_detail_CellDoubleClick); // @@ -421,7 +418,7 @@ namespace solarApp this.gv_rpt_invDay.ReadOnly = true; this.gv_rpt_invDay.RowHeadersWidth = 51; this.gv_rpt_invDay.RowTemplate.Height = 29; - this.gv_rpt_invDay.Size = new System.Drawing.Size(768, 837); + this.gv_rpt_invDay.Size = new System.Drawing.Size(768, 819); this.gv_rpt_invDay.TabIndex = 1; this.gv_rpt_invDay.CellFormatting += new System.Windows.Forms.DataGridViewCellFormattingEventHandler(this.gv_rpt_invDay_CellFormatting); this.gv_rpt_invDay.CellMouseDoubleClick += new System.Windows.Forms.DataGridViewCellMouseEventHandler(this.gv_rpt_invDay_CellMouseDoubleClick); @@ -429,6 +426,7 @@ namespace solarApp // panel1 // this.panel1.BackColor = System.Drawing.SystemColors.GradientActiveCaption; + this.panel1.Controls.Add(this.btSyncErr); this.panel1.Controls.Add(this.lbMsgStatus); this.panel1.Controls.Add(this.lbMsgTitle); this.panel1.Controls.Add(this.bt_invDay); @@ -442,6 +440,16 @@ namespace solarApp this.panel1.Size = new System.Drawing.Size(1358, 75); this.panel1.TabIndex = 0; // + // btSyncErr + // + this.btSyncErr.Location = new System.Drawing.Point(1229, 8); + this.btSyncErr.Name = "btSyncErr"; + this.btSyncErr.Size = new System.Drawing.Size(124, 60); + this.btSyncErr.TabIndex = 17; + this.btSyncErr.Text = "同步異常資料"; + this.btSyncErr.UseVisualStyleBackColor = true; + this.btSyncErr.Click += new System.EventHandler(this.btSyncErr_Click); + // // lbMsgStatus // this.lbMsgStatus.AutoSize = true; @@ -480,6 +488,7 @@ namespace solarApp this.btVerifyData.TabIndex = 12; this.btVerifyData.Text = "各資料表明細"; this.btVerifyData.UseVisualStyleBackColor = true; + this.btVerifyData.Visible = false; this.btVerifyData.Click += new System.EventHandler(this.btVerifyData_Click); // // lbSiteDB_sensor @@ -516,15 +525,25 @@ namespace solarApp this.lbSiteName_sensor.TabIndex = 9; this.lbSiteName_sensor.Text = "Site_Name"; // + // tabPage5 + // + this.tabPage5.Location = new System.Drawing.Point(4, 49); + this.tabPage5.Name = "tabPage5"; + this.tabPage5.Padding = new System.Windows.Forms.Padding(3); + this.tabPage5.Size = new System.Drawing.Size(1774, 900); + this.tabPage5.TabIndex = 4; + this.tabPage5.Text = "資料查詢"; + this.tabPage5.UseVisualStyleBackColor = true; + // // tabPage2 // this.tabPage2.Controls.Add(this.splitContainer2); - this.tabPage2.Location = new System.Drawing.Point(4, 31); + this.tabPage2.Location = new System.Drawing.Point(4, 49); this.tabPage2.Name = "tabPage2"; this.tabPage2.Padding = new System.Windows.Forms.Padding(3); - this.tabPage2.Size = new System.Drawing.Size(1774, 918); + this.tabPage2.Size = new System.Drawing.Size(1774, 900); this.tabPage2.TabIndex = 1; - this.tabPage2.Text = "tabPage2"; + this.tabPage2.Text = "email 測試"; this.tabPage2.UseVisualStyleBackColor = true; // // splitContainer2 @@ -543,7 +562,7 @@ namespace solarApp // this.splitContainer2.Panel2.Controls.Add(this.richTextBox1); this.splitContainer2.Panel2.Controls.Add(this.panel2); - this.splitContainer2.Size = new System.Drawing.Size(1768, 912); + this.splitContainer2.Size = new System.Drawing.Size(1768, 894); this.splitContainer2.SplitterDistance = 299; this.splitContainer2.SplitterWidth = 10; this.splitContainer2.TabIndex = 1; @@ -554,7 +573,7 @@ namespace solarApp this.richTextBox1.Dock = System.Windows.Forms.DockStyle.Fill; this.richTextBox1.Location = new System.Drawing.Point(0, 321); this.richTextBox1.Name = "richTextBox1"; - this.richTextBox1.Size = new System.Drawing.Size(1459, 591); + this.richTextBox1.Size = new System.Drawing.Size(1459, 573); this.richTextBox1.TabIndex = 1; this.richTextBox1.Text = ""; // @@ -720,48 +739,6 @@ namespace solarApp this.btSendMail.UseVisualStyleBackColor = true; this.btSendMail.Click += new System.EventHandler(this.btSendMail_Click); // - // tabPage3 - // - this.tabPage3.Controls.Add(this.button1); - this.tabPage3.Location = new System.Drawing.Point(4, 31); - this.tabPage3.Name = "tabPage3"; - this.tabPage3.Padding = new System.Windows.Forms.Padding(3); - this.tabPage3.Size = new System.Drawing.Size(1774, 918); - this.tabPage3.TabIndex = 2; - this.tabPage3.Text = "tabPage3"; - this.tabPage3.UseVisualStyleBackColor = true; - // - // button1 - // - this.button1.Location = new System.Drawing.Point(99, 41); - this.button1.Name = "button1"; - this.button1.Size = new System.Drawing.Size(94, 29); - this.button1.TabIndex = 0; - this.button1.Text = "button1"; - this.button1.UseVisualStyleBackColor = true; - this.button1.Click += new System.EventHandler(this.button1_Click_1); - // - // tabPage4 - // - this.tabPage4.Controls.Add(this.btSyncErr); - this.tabPage4.Location = new System.Drawing.Point(4, 31); - this.tabPage4.Name = "tabPage4"; - this.tabPage4.Padding = new System.Windows.Forms.Padding(3); - this.tabPage4.Size = new System.Drawing.Size(1774, 918); - this.tabPage4.TabIndex = 3; - this.tabPage4.Text = "tabPage4"; - this.tabPage4.UseVisualStyleBackColor = true; - // - // btSyncErr - // - this.btSyncErr.Location = new System.Drawing.Point(135, 83); - this.btSyncErr.Name = "btSyncErr"; - this.btSyncErr.Size = new System.Drawing.Size(158, 60); - this.btSyncErr.TabIndex = 0; - this.btSyncErr.Text = "同步異常資料"; - this.btSyncErr.UseVisualStyleBackColor = true; - this.btSyncErr.Click += new System.EventHandler(this.btSyncErr_Click); - // // timer1 // this.timer1.Interval = 10000; @@ -773,7 +750,7 @@ namespace solarApp this.ClientSize = new System.Drawing.Size(1782, 953); this.Controls.Add(this.tabControl1); this.Name = "fmArchive"; - this.Text = "fmArchive 0907"; + this.Text = "fmArchive 0910"; this.Load += new System.EventHandler(this.fmArchive_Load); this.tabControl1.ResumeLayout(false); this.tabPage1.ResumeLayout(false); @@ -794,8 +771,6 @@ namespace solarApp this.panel2.PerformLayout(); this.gbox.ResumeLayout(false); this.gbox.PerformLayout(); - this.tabPage3.ResumeLayout(false); - this.tabPage4.ResumeLayout(false); this.ResumeLayout(false); } @@ -852,14 +827,12 @@ namespace solarApp private System.Windows.Forms.TextBox tbReceiver; private System.Windows.Forms.Label lbMsgTitle; private System.Windows.Forms.Button bt_archive_One; - private System.Windows.Forms.TabPage tabPage3; - private System.Windows.Forms.Button button1; private System.Windows.Forms.Button button2; private System.Windows.Forms.Label label2; private System.Windows.Forms.TextBox textBox1; - private System.Windows.Forms.TabPage tabPage4; - private System.Windows.Forms.Button btSyncErr; private System.Windows.Forms.Button button3; private System.Windows.Forms.Label lbMsgStatus; + private System.Windows.Forms.TabPage tabPage5; + private System.Windows.Forms.Button btSyncErr; } } \ No newline at end of file diff --git a/solarApp/fmArchive.cs b/solarApp/fmArchive.cs index e707c83..71528d8 100644 --- a/solarApp/fmArchive.cs +++ b/solarApp/fmArchive.cs @@ -95,13 +95,14 @@ namespace solarApp dtSelect1.Value = System.DateTime.Today.AddDays(-1); dtSelect2.Value = System.DateTime.Today.AddDays(-1); - // - // Run this procedure in an appropriate event. - //counter = 0; - //timer1.Interval = 600; - //timer1.Enabled = true; - // Hook up timer's tick event handler. - // + #region 載入 DB -> Niagara + fmMain f2 = new fmMain(); + f2.TopLevel = false; + f2.Parent = tabControl1.TabPages[1]; + f2.FormBorderStyle = FormBorderStyle.None; + f2.Dock = DockStyle.Fill; + f2.Show(); + #endregion } private void _timer_Elapsed(object sender, System.Timers.ElapsedEventArgs e) @@ -728,7 +729,11 @@ namespace solarApp } } - + /// + /// + /// + /// + /// private void button1_Click_1(object sender, EventArgs e) { int i = 0; diff --git a/solarApp/fmMain.Designer.cs b/solarApp/fmMain.Designer.cs index c682979..962dce4 100644 --- a/solarApp/fmMain.Designer.cs +++ b/solarApp/fmMain.Designer.cs @@ -252,13 +252,19 @@ namespace solarApp // // tabControl1 // + this.tabControl1.Appearance = System.Windows.Forms.TabAppearance.Buttons; this.tabControl1.Controls.Add(this.tb_inv); this.tabControl1.Controls.Add(this.tb2); this.tabControl1.Controls.Add(this.tbSensor); this.tabControl1.Controls.Add(this.tabPage1); this.tabControl1.Dock = System.Windows.Forms.DockStyle.Fill; + this.tabControl1.HotTrack = true; + this.tabControl1.ImeMode = System.Windows.Forms.ImeMode.NoControl; + this.tabControl1.ItemSize = new System.Drawing.Size(82, 40); this.tabControl1.Location = new System.Drawing.Point(0, 0); + this.tabControl1.Multiline = true; this.tabControl1.Name = "tabControl1"; + this.tabControl1.RightToLeft = System.Windows.Forms.RightToLeft.No; this.tabControl1.SelectedIndex = 0; this.tabControl1.Size = new System.Drawing.Size(1743, 1055); this.tabControl1.TabIndex = 0; @@ -267,11 +273,11 @@ namespace solarApp // this.tb_inv.BackColor = System.Drawing.Color.Azure; this.tb_inv.Controls.Add(this.sp_main_inv); - this.tb_inv.Location = new System.Drawing.Point(4, 28); + this.tb_inv.Location = new System.Drawing.Point(4, 44); this.tb_inv.Margin = new System.Windows.Forms.Padding(10); this.tb_inv.Name = "tb_inv"; this.tb_inv.Padding = new System.Windows.Forms.Padding(10); - this.tb_inv.Size = new System.Drawing.Size(1735, 1023); + this.tb_inv.Size = new System.Drawing.Size(1735, 1007); this.tb_inv.TabIndex = 0; this.tb_inv.Text = " Inverter "; // @@ -292,11 +298,13 @@ namespace solarApp this.sp_main_inv.Panel1.Controls.Add(this.fp_inv); this.sp_main_inv.Panel1.Controls.Add(this.bt_InvSearch); this.sp_main_inv.Panel1.Controls.Add(this.dtselect_inv); + this.sp_main_inv.Panel1.RightToLeft = System.Windows.Forms.RightToLeft.No; // // sp_main_inv.Panel2 // this.sp_main_inv.Panel2.Controls.Add(this.sp_child_inv); - this.sp_main_inv.Size = new System.Drawing.Size(1715, 1003); + this.sp_main_inv.Panel2.RightToLeft = System.Windows.Forms.RightToLeft.No; + this.sp_main_inv.Size = new System.Drawing.Size(1715, 987); this.sp_main_inv.SplitterDistance = 348; this.sp_main_inv.TabIndex = 0; // @@ -349,7 +357,7 @@ namespace solarApp this.lbInverterID.AutoSize = true; this.lbInverterID.Dock = System.Windows.Forms.DockStyle.Bottom; this.lbInverterID.Font = new System.Drawing.Font("Microsoft JhengHei UI", 11F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); - this.lbInverterID.Location = new System.Drawing.Point(0, 334); + this.lbInverterID.Location = new System.Drawing.Point(0, 318); this.lbInverterID.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.lbInverterID.Name = "lbInverterID"; this.lbInverterID.Size = new System.Drawing.Size(142, 24); @@ -362,7 +370,7 @@ namespace solarApp this.fp_inv.Controls.Add(this.label4); this.fp_inv.Dock = System.Windows.Forms.DockStyle.Bottom; this.fp_inv.FlowDirection = System.Windows.Forms.FlowDirection.TopDown; - this.fp_inv.Location = new System.Drawing.Point(0, 358); + this.fp_inv.Location = new System.Drawing.Point(0, 342); this.fp_inv.Margin = new System.Windows.Forms.Padding(4); this.fp_inv.Name = "fp_inv"; this.fp_inv.Size = new System.Drawing.Size(348, 645); @@ -413,12 +421,14 @@ namespace solarApp this.sp_child_inv.Panel1.Controls.Add(this.panel8); this.sp_child_inv.Panel1.Controls.Add(this.gv_web_inv_hour); this.sp_child_inv.Panel1.Controls.Add(this.panel1); + this.sp_child_inv.Panel1.RightToLeft = System.Windows.Forms.RightToLeft.No; // // sp_child_inv.Panel2 // this.sp_child_inv.Panel2.Controls.Add(this.gv_fic_inv_raw); this.sp_child_inv.Panel2.Controls.Add(this.panel2); - this.sp_child_inv.Size = new System.Drawing.Size(1363, 1003); + this.sp_child_inv.Panel2.RightToLeft = System.Windows.Forms.RightToLeft.No; + this.sp_child_inv.Size = new System.Drawing.Size(1363, 987); this.sp_child_inv.SplitterDistance = 660; this.sp_child_inv.SplitterWidth = 13; this.sp_child_inv.TabIndex = 0; @@ -461,7 +471,7 @@ namespace solarApp this.gv_web_inv_month.RowHeadersDefaultCellStyle = dataGridViewCellStyle4; this.gv_web_inv_month.RowHeadersWidth = 51; this.gv_web_inv_month.RowTemplate.Height = 25; - this.gv_web_inv_month.Size = new System.Drawing.Size(660, 112); + this.gv_web_inv_month.Size = new System.Drawing.Size(660, 96); this.gv_web_inv_month.TabIndex = 7; // // panel9 @@ -694,7 +704,7 @@ namespace solarApp this.gv_fic_inv_raw.RowHeadersDefaultCellStyle = dataGridViewCellStyle16; this.gv_fic_inv_raw.RowHeadersWidth = 51; this.gv_fic_inv_raw.RowTemplate.Height = 25; - this.gv_fic_inv_raw.Size = new System.Drawing.Size(690, 965); + this.gv_fic_inv_raw.Size = new System.Drawing.Size(690, 949); this.gv_fic_inv_raw.TabIndex = 2; // // panel2 @@ -732,10 +742,10 @@ namespace solarApp // tb2 // this.tb2.Controls.Add(this.sp_main_station); - this.tb2.Location = new System.Drawing.Point(4, 28); + this.tb2.Location = new System.Drawing.Point(4, 44); this.tb2.Name = "tb2"; this.tb2.Padding = new System.Windows.Forms.Padding(3); - this.tb2.Size = new System.Drawing.Size(1735, 1023); + this.tb2.Size = new System.Drawing.Size(1735, 1007); this.tb2.TabIndex = 1; this.tb2.Text = " site "; this.tb2.UseVisualStyleBackColor = true; @@ -753,12 +763,14 @@ namespace solarApp this.sp_main_station.Panel1.Controls.Add(this.lbMsg_station); this.sp_main_station.Panel1.Controls.Add(this.bt_find_station); this.sp_main_station.Panel1.Controls.Add(this.dtselect_station1); + this.sp_main_station.Panel1.RightToLeft = System.Windows.Forms.RightToLeft.No; // // sp_main_station.Panel2 // this.sp_main_station.Panel2.BackColor = System.Drawing.Color.OldLace; this.sp_main_station.Panel2.Controls.Add(this.sp_child_station); - this.sp_main_station.Size = new System.Drawing.Size(1729, 1017); + this.sp_main_station.Panel2.RightToLeft = System.Windows.Forms.RightToLeft.No; + this.sp_main_station.Size = new System.Drawing.Size(1729, 1001); this.sp_main_station.SplitterDistance = 257; this.sp_main_station.TabIndex = 0; // @@ -817,6 +829,7 @@ namespace solarApp this.sp_child_station.Panel1.Controls.Add(this.panel7); this.sp_child_station.Panel1.Controls.Add(this.gv_web_station_hour); this.sp_child_station.Panel1.Controls.Add(this.panel4); + this.sp_child_station.Panel1.RightToLeft = System.Windows.Forms.RightToLeft.No; // // sp_child_station.Panel2 // @@ -824,7 +837,8 @@ namespace solarApp this.sp_child_station.Panel2.Controls.Add(this.panel5); this.sp_child_station.Panel2.Controls.Add(this.gv_fic_station_raw); this.sp_child_station.Panel2.Controls.Add(this.panel6); - this.sp_child_station.Size = new System.Drawing.Size(1468, 1017); + this.sp_child_station.Panel2.RightToLeft = System.Windows.Forms.RightToLeft.No; + this.sp_child_station.Size = new System.Drawing.Size(1468, 1001); this.sp_child_station.SplitterDistance = 711; this.sp_child_station.SplitterWidth = 13; this.sp_child_station.TabIndex = 1; @@ -867,7 +881,7 @@ namespace solarApp this.gv_web_station_month.RowHeadersDefaultCellStyle = dataGridViewCellStyle20; this.gv_web_station_month.RowHeadersWidth = 51; this.gv_web_station_month.RowTemplate.Height = 25; - this.gv_web_station_month.Size = new System.Drawing.Size(711, 104); + this.gv_web_station_month.Size = new System.Drawing.Size(711, 88); this.gv_web_station_month.TabIndex = 5; // // panel10 @@ -1090,7 +1104,7 @@ namespace solarApp this.gv_fic_station_day.RowHeadersDefaultCellStyle = dataGridViewCellStyle32; this.gv_fic_station_day.RowHeadersWidth = 51; this.gv_fic_station_day.RowTemplate.Height = 25; - this.gv_fic_station_day.Size = new System.Drawing.Size(744, 434); + this.gv_fic_station_day.Size = new System.Drawing.Size(744, 418); this.gv_fic_station_day.TabIndex = 4; this.gv_fic_station_day.CellFormatting += new System.Windows.Forms.DataGridViewCellFormattingEventHandler(this.gv_fic_station_day_CellFormatting); // @@ -1192,10 +1206,10 @@ namespace solarApp // tbSensor // this.tbSensor.Controls.Add(this.splitContainer1); - this.tbSensor.Location = new System.Drawing.Point(4, 28); + this.tbSensor.Location = new System.Drawing.Point(4, 44); this.tbSensor.Name = "tbSensor"; this.tbSensor.Padding = new System.Windows.Forms.Padding(3); - this.tbSensor.Size = new System.Drawing.Size(1735, 1023); + this.tbSensor.Size = new System.Drawing.Size(1735, 1007); this.tbSensor.TabIndex = 2; this.tbSensor.Text = "Sensor"; this.tbSensor.UseVisualStyleBackColor = true; @@ -1217,11 +1231,13 @@ namespace solarApp this.splitContainer1.Panel1.Controls.Add(this.flowLayoutPanel1); this.splitContainer1.Panel1.Controls.Add(this.btSearch_sensor); this.splitContainer1.Panel1.Controls.Add(this.dtSelect_sensor1); + this.splitContainer1.Panel1.RightToLeft = System.Windows.Forms.RightToLeft.No; // // splitContainer1.Panel2 // this.splitContainer1.Panel2.Controls.Add(this.splitContainer2); - this.splitContainer1.Size = new System.Drawing.Size(1729, 1017); + this.splitContainer1.Panel2.RightToLeft = System.Windows.Forms.RightToLeft.No; + this.splitContainer1.Size = new System.Drawing.Size(1729, 1001); this.splitContainer1.SplitterDistance = 351; this.splitContainer1.TabIndex = 1; // @@ -1274,7 +1290,7 @@ namespace solarApp this.label24.AutoSize = true; this.label24.Dock = System.Windows.Forms.DockStyle.Bottom; this.label24.Font = new System.Drawing.Font("Microsoft JhengHei UI", 11F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); - this.label24.Location = new System.Drawing.Point(0, 348); + this.label24.Location = new System.Drawing.Point(0, 332); this.label24.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label24.Name = "label24"; this.label24.Size = new System.Drawing.Size(132, 24); @@ -1287,7 +1303,7 @@ namespace solarApp this.flowLayoutPanel1.Controls.Add(this.label25); this.flowLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Bottom; this.flowLayoutPanel1.FlowDirection = System.Windows.Forms.FlowDirection.TopDown; - this.flowLayoutPanel1.Location = new System.Drawing.Point(0, 372); + this.flowLayoutPanel1.Location = new System.Drawing.Point(0, 356); this.flowLayoutPanel1.Margin = new System.Windows.Forms.Padding(4); this.flowLayoutPanel1.Name = "flowLayoutPanel1"; this.flowLayoutPanel1.Size = new System.Drawing.Size(351, 645); @@ -1337,12 +1353,14 @@ namespace solarApp this.splitContainer2.Panel1.Controls.Add(this.panel12); this.splitContainer2.Panel1.Controls.Add(this.gv_web_sensor_hour); this.splitContainer2.Panel1.Controls.Add(this.panel13); + this.splitContainer2.Panel1.RightToLeft = System.Windows.Forms.RightToLeft.No; // // splitContainer2.Panel2 // this.splitContainer2.Panel2.Controls.Add(this.gv_fic_sensor_raw); this.splitContainer2.Panel2.Controls.Add(this.panel15); - this.splitContainer2.Size = new System.Drawing.Size(1374, 1017); + this.splitContainer2.Panel2.RightToLeft = System.Windows.Forms.RightToLeft.No; + this.splitContainer2.Size = new System.Drawing.Size(1374, 1001); this.splitContainer2.SplitterDistance = 666; this.splitContainer2.SplitterWidth = 13; this.splitContainer2.TabIndex = 0; @@ -1385,7 +1403,7 @@ namespace solarApp this.gv_web_sensor_month.RowHeadersDefaultCellStyle = dataGridViewCellStyle40; this.gv_web_sensor_month.RowHeadersWidth = 51; this.gv_web_sensor_month.RowTemplate.Height = 25; - this.gv_web_sensor_month.Size = new System.Drawing.Size(666, 143); + this.gv_web_sensor_month.Size = new System.Drawing.Size(666, 127); this.gv_web_sensor_month.TabIndex = 7; // // panel11 @@ -1619,7 +1637,7 @@ namespace solarApp this.gv_fic_sensor_raw.RowHeadersDefaultCellStyle = dataGridViewCellStyle52; this.gv_fic_sensor_raw.RowHeadersWidth = 51; this.gv_fic_sensor_raw.RowTemplate.Height = 25; - this.gv_fic_sensor_raw.Size = new System.Drawing.Size(695, 979); + this.gv_fic_sensor_raw.Size = new System.Drawing.Size(695, 963); this.gv_fic_sensor_raw.TabIndex = 2; // // panel15 @@ -1658,10 +1676,10 @@ namespace solarApp // tabPage1 // this.tabPage1.Controls.Add(this.splitContainer3); - this.tabPage1.Location = new System.Drawing.Point(4, 28); + this.tabPage1.Location = new System.Drawing.Point(4, 44); this.tabPage1.Name = "tabPage1"; this.tabPage1.Padding = new System.Windows.Forms.Padding(3); - this.tabPage1.Size = new System.Drawing.Size(1735, 1023); + this.tabPage1.Size = new System.Drawing.Size(1735, 1007); this.tabPage1.TabIndex = 3; this.tabPage1.Text = "異常"; this.tabPage1.UseVisualStyleBackColor = true; @@ -1681,12 +1699,14 @@ namespace solarApp this.splitContainer3.Panel1.Controls.Add(this.label13); this.splitContainer3.Panel1.Controls.Add(this.label12); this.splitContainer3.Panel1.Controls.Add(this.btLoadData); + this.splitContainer3.Panel1.RightToLeft = System.Windows.Forms.RightToLeft.No; // // splitContainer3.Panel2 // this.splitContainer3.Panel2.Controls.Add(this.splitContainer4); - this.splitContainer3.Size = new System.Drawing.Size(1729, 1017); - this.splitContainer3.SplitterDistance = 91; + this.splitContainer3.Panel2.RightToLeft = System.Windows.Forms.RightToLeft.No; + this.splitContainer3.Size = new System.Drawing.Size(1729, 1001); + this.splitContainer3.SplitterDistance = 89; this.splitContainer3.TabIndex = 0; // // button1 @@ -1739,11 +1759,13 @@ namespace solarApp // splitContainer4.Panel1 // this.splitContainer4.Panel1.Controls.Add(this.gv_all_data); + this.splitContainer4.Panel1.RightToLeft = System.Windows.Forms.RightToLeft.No; // // splitContainer4.Panel2 // this.splitContainer4.Panel2.Controls.Add(this.gv_notice_data); - this.splitContainer4.Size = new System.Drawing.Size(1727, 920); + this.splitContainer4.Panel2.RightToLeft = System.Windows.Forms.RightToLeft.No; + this.splitContainer4.Size = new System.Drawing.Size(1727, 906); this.splitContainer4.SplitterDistance = 733; this.splitContainer4.SplitterWidth = 15; this.splitContainer4.TabIndex = 1; @@ -1778,7 +1800,7 @@ namespace solarApp this.gv_all_data.ReadOnly = true; this.gv_all_data.RowHeadersWidth = 51; this.gv_all_data.RowTemplate.Height = 29; - this.gv_all_data.Size = new System.Drawing.Size(733, 920); + this.gv_all_data.Size = new System.Drawing.Size(733, 906); this.gv_all_data.TabIndex = 2; // // gv_notice_data @@ -1812,7 +1834,7 @@ namespace solarApp this.gv_notice_data.ReadOnly = true; this.gv_notice_data.RowHeadersWidth = 51; this.gv_notice_data.RowTemplate.Height = 29; - this.gv_notice_data.Size = new System.Drawing.Size(979, 920); + this.gv_notice_data.Size = new System.Drawing.Size(979, 906); this.gv_notice_data.TabIndex = 1; // // fmMain