diff --git a/solarApp/Model/sensor_model.cs b/solarApp/Model/sensor_model.cs index ab77f0d..0c002ae 100644 --- a/solarApp/Model/sensor_model.cs +++ b/solarApp/Model/sensor_model.cs @@ -30,8 +30,8 @@ namespace solarApp.Model { public string SiteID { get; set; } public string reportdate { get; set; } - public double modelTempAvg { get; set; } public double irrAvg { get; set; } + public double modelTempAvg { get; set; } public double envTempAvg { get; set; } public double humidityAvg { get; set; } public double windAvg { get; set; } @@ -41,9 +41,9 @@ namespace solarApp.Model public class sensor_hour { public string SiteID { get; set; } - public string reportdate { get; set; } - public double modelTempAvg { get; set; } + public string reportdate { get; set; } public double irrAvg { get; set; } + public double modelTempAvg { get; set; } public double envTempAvg { get; set; } public double humidityAvg { get; set; } public double windAvg { get; set; } diff --git a/solarApp/Service/getInvSvc.cs b/solarApp/Service/getInvSvc.cs index 0b0aa0e..cfa9b94 100644 --- a/solarApp/Service/getInvSvc.cs +++ b/solarApp/Service/getInvSvc.cs @@ -78,7 +78,7 @@ namespace solarApp.Service using (MySqlConnection conn = new MySqlConnection(Connection1)) { conn.Open(); - string sql = @"select `TIMESTAMP` reportdate, inverterid, KWH, TODAYKWH, TOTALKWH, round(PR, 2) PR + string sql = @"select DATE_FORMAT(`TIMESTAMP`,'%Y-%m-%d %H:%i') reportdate, inverterid, KWH, TODAYKWH, TOTALKWH, round(PR, 2) PR from inverter_history_hour where left(`TIMESTAMP`, 10) = '" + reportDate + "' and inverterid = '" + invID + "' "; List ds = conn.Query(sql).AsList(); conn.Close(); @@ -86,26 +86,26 @@ namespace solarApp.Service } } - public List get_web_Inv_day(string reportDate, string invID) + public List get_web_Inv_day(string date1, string date2, string invID) { using (MySqlConnection conn = new MySqlConnection(Connection1)) { conn.Open(); - string sql = @"select `TIMESTAMP` reportdate, inverterid, KWH, TODAYKWH, TOTALKWH, round(PR, 2) PR - from inverter_history_day where left(`TIMESTAMP`, 10) = '" + reportDate + "' and inverterid = '" + invID + "' "; + string sql = @"select DATE_FORMAT(`TIMESTAMP`,'%Y-%m-%d') reportdate, inverterid, round(PR, 2) KWH, round(PR, 2) TODAYKWH, round(PR, 2) TOTALKWH, round(PR, 2) PR + from inverter_history_day where left(`TIMESTAMP`, 10) between '" + date1 + "' and '"+ date2 +"' and inverterid = '" + invID + "' "; List ds = conn.Query(sql).AsList(); conn.Close(); return ds; } } - public List get_web_Inv_month(string reportDate, string invID) + public List get_web_Inv_month(string date1, string date2, string invID) { using (MySqlConnection conn = new MySqlConnection(Connection1)) { conn.Open(); - string sql = @"select `TIMESTAMP` reportdate, inverterid, KWH, TODAYKWH, TOTALKWH, round(PR, 2) PR - from inverter_history_month where left(`TIMESTAMP`, 7) = '" + reportDate + "' and inverterid = '" + invID + "' "; + string sql = @"select DATE_FORMAT(`TIMESTAMP`,'%Y-%m-%d') reportdate, inverterid, KWH, TODAYKWH, TOTALKWH, round(PR, 2) PR + from inverter_history_month where left(`TIMESTAMP`, 7) between '" + date1 + "' and '" + date2 + "' and inverterid = '" + invID + "' "; List ds = conn.Query(sql).AsList(); conn.Close(); return ds; diff --git a/solarApp/Service/getSensorSvc.cs b/solarApp/Service/getSensorSvc.cs index a9c8061..76cea75 100644 --- a/solarApp/Service/getSensorSvc.cs +++ b/solarApp/Service/getSensorSvc.cs @@ -111,7 +111,7 @@ namespace solarApp.Service group by FROM_UNIXTIME(`TIMESTAMP`/1000,'%Y-%m-%d %H') ) a left join ( - select FROM_UNIXTIME(`TIMESTAMP`/1000,'%Y-%m-%d %H:%i') reportdate, round(avg("+ irrCol + @"), 2) irrAvg + select concat(FROM_UNIXTIME(`TIMESTAMP`/1000,'%Y-%m-%d %H'), ':00') reportdate, round(avg(" + irrCol + @"), 2) irrAvg from " + siteDB + ".s" + siteID + @"_sensorAvg where FROM_UNIXTIME(`TIMESTAMP`/1000,'%Y-%m-%d') = @reportDate "+ irrNot0 + @" #需要過濾 0 的數值 group by FROM_UNIXTIME(`TIMESTAMP`/1000,'%Y-%m-%d %H') diff --git a/solarApp/fmArchive.Designer.cs b/solarApp/fmArchive.Designer.cs index d9e0945..792af38 100644 --- a/solarApp/fmArchive.Designer.cs +++ b/solarApp/fmArchive.Designer.cs @@ -29,794 +29,89 @@ namespace solarApp /// 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(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle13 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle14 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle15 = new System.Windows.Forms.DataGridViewCellStyle(); - 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 dataGridViewCellStyle19 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle20 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle21 = new System.Windows.Forms.DataGridViewCellStyle(); - this.tb2 = new System.Windows.Forms.TabPage(); - this.sp_main_station = new System.Windows.Forms.SplitContainer(); - this.label12 = new System.Windows.Forms.Label(); - this.dtselect_station2 = new System.Windows.Forms.DateTimePicker(); - this.lbMsg_station = new System.Windows.Forms.Label(); - this.bt_find_station = new System.Windows.Forms.Button(); - this.dtselect_station1 = new System.Windows.Forms.DateTimePicker(); - this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel(); - this.label13 = new System.Windows.Forms.Label(); - this.sp_child_station = new System.Windows.Forms.SplitContainer(); - this.gv_web_station_day = new System.Windows.Forms.DataGridView(); - this.panel7 = new System.Windows.Forms.Panel(); - this.label10 = new System.Windows.Forms.Label(); - this.label11 = new System.Windows.Forms.Label(); - this.gv_web_station_hour = new System.Windows.Forms.DataGridView(); - this.panel4 = new System.Windows.Forms.Panel(); - this.label5 = new System.Windows.Forms.Label(); - this.label6 = new System.Windows.Forms.Label(); - this.gv_fic_station_day = new System.Windows.Forms.DataGridView(); - this.panel5 = new System.Windows.Forms.Panel(); - this.label7 = new System.Windows.Forms.Label(); - this.gv_fic_station_raw = new System.Windows.Forms.DataGridView(); - this.panel6 = new System.Windows.Forms.Panel(); - this.label8 = new System.Windows.Forms.Label(); - this.label9 = new System.Windows.Forms.Label(); - this.tb_inv = new System.Windows.Forms.TabPage(); - this.sp_main_inv = new System.Windows.Forms.SplitContainer(); - this.bt_inv_proc = new System.Windows.Forms.Button(); - this.lbMsg_inv = new System.Windows.Forms.Label(); - this.lbInverterID = new System.Windows.Forms.Label(); - this.fp_inv = new System.Windows.Forms.FlowLayoutPanel(); - this.bt_select1 = new System.Windows.Forms.Button(); - this.sp_child_inv = new System.Windows.Forms.SplitContainer(); - this.gv_web_inv_hour = new System.Windows.Forms.DataGridView(); - this.panel1 = new System.Windows.Forms.Panel(); - this.label3 = new System.Windows.Forms.Label(); - this.lb_inv_hour = new System.Windows.Forms.Label(); - this.gv_fic_inv_hour = new System.Windows.Forms.DataGridView(); - this.panel3 = new System.Windows.Forms.Panel(); - this.label1 = new System.Windows.Forms.Label(); - this.gv_fic_inv_raw = new System.Windows.Forms.DataGridView(); - this.panel2 = new System.Windows.Forms.Panel(); - this.label2 = new System.Windows.Forms.Label(); - this.lb_raw_inv_hour = new System.Windows.Forms.Label(); this.tabControl1 = new System.Windows.Forms.TabControl(); - this.tb2.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.sp_main_station)).BeginInit(); - this.sp_main_station.Panel1.SuspendLayout(); - this.sp_main_station.Panel2.SuspendLayout(); - this.sp_main_station.SuspendLayout(); - this.flowLayoutPanel1.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.sp_child_station)).BeginInit(); - this.sp_child_station.Panel1.SuspendLayout(); - this.sp_child_station.Panel2.SuspendLayout(); - this.sp_child_station.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.gv_web_station_day)).BeginInit(); - this.panel7.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.gv_web_station_hour)).BeginInit(); - this.panel4.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.gv_fic_station_day)).BeginInit(); - this.panel5.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.gv_fic_station_raw)).BeginInit(); - this.panel6.SuspendLayout(); - this.tb_inv.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.sp_main_inv)).BeginInit(); - this.sp_main_inv.Panel1.SuspendLayout(); - this.sp_main_inv.Panel2.SuspendLayout(); - this.sp_main_inv.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.sp_child_inv)).BeginInit(); - this.sp_child_inv.Panel1.SuspendLayout(); - this.sp_child_inv.Panel2.SuspendLayout(); - this.sp_child_inv.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.gv_web_inv_hour)).BeginInit(); - this.panel1.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.gv_fic_inv_hour)).BeginInit(); - this.panel3.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.gv_fic_inv_raw)).BeginInit(); - this.panel2.SuspendLayout(); + this.tabPage1 = new System.Windows.Forms.TabPage(); + this.tabPage2 = new System.Windows.Forms.TabPage(); + this.splitContainer1 = new System.Windows.Forms.SplitContainer(); + this.panel1 = new System.Windows.Forms.Panel(); + this.dataGridView1 = new System.Windows.Forms.DataGridView(); this.tabControl1.SuspendLayout(); + this.tabPage1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); + this.splitContainer1.Panel2.SuspendLayout(); + this.splitContainer1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit(); this.SuspendLayout(); // - // tb2 - // - this.tb2.Controls.Add(this.sp_main_station); - this.tb2.Location = new System.Drawing.Point(4, 28); - this.tb2.Name = "tb2"; - this.tb2.Padding = new System.Windows.Forms.Padding(3); - this.tb2.Size = new System.Drawing.Size(1774, 921); - this.tb2.TabIndex = 1; - this.tb2.Text = " site "; - this.tb2.UseVisualStyleBackColor = true; - // - // sp_main_station - // - this.sp_main_station.BackColor = System.Drawing.SystemColors.ActiveCaption; - this.sp_main_station.Dock = System.Windows.Forms.DockStyle.Fill; - this.sp_main_station.Location = new System.Drawing.Point(3, 3); - this.sp_main_station.Name = "sp_main_station"; - // - // sp_main_station.Panel1 - // - this.sp_main_station.Panel1.Controls.Add(this.label12); - this.sp_main_station.Panel1.Controls.Add(this.dtselect_station2); - 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.Controls.Add(this.flowLayoutPanel1); - // - // 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(1768, 915); - this.sp_main_station.SplitterDistance = 262; - this.sp_main_station.TabIndex = 0; - // - // label12 - // - this.label12.AutoSize = true; - this.label12.Font = new System.Drawing.Font("Microsoft JhengHei UI", 11F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); - this.label12.Location = new System.Drawing.Point(13, 44); - this.label12.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); - this.label12.Name = "label12"; - this.label12.Size = new System.Drawing.Size(24, 24); - this.label12.TabIndex = 12; - this.label12.Text = "~"; - // - // dtselect_station2 - // - this.dtselect_station2.Font = new System.Drawing.Font("Microsoft JhengHei UI", 11F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); - this.dtselect_station2.Location = new System.Drawing.Point(12, 76); - this.dtselect_station2.Name = "dtselect_station2"; - this.dtselect_station2.Size = new System.Drawing.Size(234, 31); - this.dtselect_station2.TabIndex = 10; - // - // lbMsg_station - // - this.lbMsg_station.AutoSize = true; - this.lbMsg_station.Font = new System.Drawing.Font("Microsoft JhengHei UI", 11F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); - this.lbMsg_station.Location = new System.Drawing.Point(26, 162); - this.lbMsg_station.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); - this.lbMsg_station.Name = "lbMsg_station"; - this.lbMsg_station.Size = new System.Drawing.Size(22, 24); - this.lbMsg_station.TabIndex = 9; - this.lbMsg_station.Text = "..."; - // - // bt_find_station - // - this.bt_find_station.Location = new System.Drawing.Point(12, 124); - this.bt_find_station.Name = "bt_find_station"; - this.bt_find_station.Size = new System.Drawing.Size(94, 29); - this.bt_find_station.TabIndex = 7; - this.bt_find_station.Text = "查詢"; - this.bt_find_station.UseVisualStyleBackColor = true; - // - // dtselect_station1 - // - this.dtselect_station1.Font = new System.Drawing.Font("Microsoft JhengHei UI", 11F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); - this.dtselect_station1.Location = new System.Drawing.Point(14, 8); - this.dtselect_station1.Name = "dtselect_station1"; - this.dtselect_station1.Size = new System.Drawing.Size(234, 31); - this.dtselect_station1.TabIndex = 6; - // - // flowLayoutPanel1 - // - this.flowLayoutPanel1.BackColor = System.Drawing.Color.Azure; - this.flowLayoutPanel1.Controls.Add(this.label13); - this.flowLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Bottom; - this.flowLayoutPanel1.FlowDirection = System.Windows.Forms.FlowDirection.TopDown; - this.flowLayoutPanel1.Location = new System.Drawing.Point(0, 270); - this.flowLayoutPanel1.Margin = new System.Windows.Forms.Padding(4); - this.flowLayoutPanel1.Name = "flowLayoutPanel1"; - this.flowLayoutPanel1.Size = new System.Drawing.Size(262, 645); - this.flowLayoutPanel1.TabIndex = 8; - // - // label13 - // - this.label13.AutoSize = true; - this.label13.Font = new System.Drawing.Font("Microsoft JhengHei UI", 11F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); - this.label13.Location = new System.Drawing.Point(4, 0); - this.label13.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); - this.label13.Name = "label13"; - this.label13.Size = new System.Drawing.Size(110, 24); - this.label13.TabIndex = 4; - this.label13.Text = "請選擇 電站"; - // - // sp_child_station - // - this.sp_child_station.Dock = System.Windows.Forms.DockStyle.Fill; - this.sp_child_station.Location = new System.Drawing.Point(0, 0); - this.sp_child_station.Margin = new System.Windows.Forms.Padding(4); - this.sp_child_station.Name = "sp_child_station"; - // - // sp_child_station.Panel1 - // - this.sp_child_station.Panel1.Controls.Add(this.gv_web_station_day); - 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); - // - // sp_child_station.Panel2 - // - this.sp_child_station.Panel2.Controls.Add(this.gv_fic_station_day); - 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(1502, 915); - this.sp_child_station.SplitterDistance = 727; - this.sp_child_station.SplitterWidth = 13; - this.sp_child_station.TabIndex = 1; - // - // gv_web_station_day - // - this.gv_web_station_day.AllowUserToAddRows = false; - this.gv_web_station_day.AllowUserToDeleteRows = false; - dataGridViewCellStyle1.BackColor = System.Drawing.Color.Azure; - this.gv_web_station_day.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1; - dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle2.Font = new System.Drawing.Font("Microsoft JhengHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); - dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.gv_web_station_day.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2; - this.gv_web_station_day.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle3.Font = new System.Drawing.Font("Microsoft JhengHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); - dataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.gv_web_station_day.DefaultCellStyle = dataGridViewCellStyle3; - this.gv_web_station_day.Dock = System.Windows.Forms.DockStyle.Fill; - this.gv_web_station_day.Location = new System.Drawing.Point(0, 583); - this.gv_web_station_day.Margin = new System.Windows.Forms.Padding(4); - this.gv_web_station_day.Name = "gv_web_station_day"; - this.gv_web_station_day.ReadOnly = true; - this.gv_web_station_day.RowHeadersWidth = 51; - this.gv_web_station_day.RowTemplate.Height = 25; - this.gv_web_station_day.Size = new System.Drawing.Size(727, 332); - this.gv_web_station_day.TabIndex = 3; - // - // panel7 - // - this.panel7.Controls.Add(this.label10); - this.panel7.Controls.Add(this.label11); - this.panel7.Dock = System.Windows.Forms.DockStyle.Top; - this.panel7.Location = new System.Drawing.Point(0, 545); - this.panel7.Margin = new System.Windows.Forms.Padding(4); - this.panel7.Name = "panel7"; - this.panel7.Size = new System.Drawing.Size(727, 38); - this.panel7.TabIndex = 2; - // - // label10 - // - this.label10.AutoSize = true; - this.label10.Font = new System.Drawing.Font("Microsoft JhengHei UI", 11F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); - this.label10.Location = new System.Drawing.Point(230, 8); - this.label10.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); - this.label10.Name = "label10"; - this.label10.Size = new System.Drawing.Size(368, 24); - this.label10.TabIndex = 1; - this.label10.Text = "solar_master.power_station_history_day"; - // - // label11 - // - this.label11.AutoSize = true; - this.label11.Font = new System.Drawing.Font("Microsoft JhengHei UI", 11F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); - this.label11.Location = new System.Drawing.Point(35, 8); - this.label11.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); - this.label11.Name = "label11"; - this.label11.Size = new System.Drawing.Size(162, 24); - this.label11.TabIndex = 0; - this.label11.Text = "web: station 每天"; - // - // gv_web_station_hour - // - this.gv_web_station_hour.AllowUserToAddRows = false; - this.gv_web_station_hour.AllowUserToDeleteRows = false; - dataGridViewCellStyle4.BackColor = System.Drawing.Color.Azure; - this.gv_web_station_hour.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle4; - dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle5.Font = new System.Drawing.Font("Microsoft JhengHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); - dataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.gv_web_station_hour.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle5; - this.gv_web_station_hour.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle6.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle6.Font = new System.Drawing.Font("Microsoft JhengHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); - dataGridViewCellStyle6.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle6.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.gv_web_station_hour.DefaultCellStyle = dataGridViewCellStyle6; - this.gv_web_station_hour.Dock = System.Windows.Forms.DockStyle.Top; - this.gv_web_station_hour.Location = new System.Drawing.Point(0, 38); - this.gv_web_station_hour.Margin = new System.Windows.Forms.Padding(4); - this.gv_web_station_hour.Name = "gv_web_station_hour"; - this.gv_web_station_hour.ReadOnly = true; - this.gv_web_station_hour.RowHeadersWidth = 51; - this.gv_web_station_hour.RowTemplate.Height = 25; - this.gv_web_station_hour.Size = new System.Drawing.Size(727, 507); - this.gv_web_station_hour.TabIndex = 1; - // - // panel4 - // - this.panel4.Controls.Add(this.label5); - this.panel4.Controls.Add(this.label6); - this.panel4.Dock = System.Windows.Forms.DockStyle.Top; - this.panel4.Location = new System.Drawing.Point(0, 0); - this.panel4.Margin = new System.Windows.Forms.Padding(4); - this.panel4.Name = "panel4"; - this.panel4.Size = new System.Drawing.Size(727, 38); - this.panel4.TabIndex = 0; - // - // label5 - // - this.label5.AutoSize = true; - this.label5.Font = new System.Drawing.Font("Microsoft JhengHei UI", 11F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); - this.label5.Location = new System.Drawing.Point(230, 8); - this.label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); - this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(379, 24); - this.label5.TabIndex = 1; - this.label5.Text = "solar_master.power_station_history_hour"; - // - // label6 - // - this.label6.AutoSize = true; - this.label6.Font = new System.Drawing.Font("Microsoft JhengHei UI", 11F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); - this.label6.Location = new System.Drawing.Point(35, 8); - this.label6.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); - this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(156, 24); - this.label6.TabIndex = 0; - this.label6.Text = "web: site 每小時 "; - // - // gv_fic_station_day - // - this.gv_fic_station_day.AllowUserToAddRows = false; - this.gv_fic_station_day.AllowUserToDeleteRows = false; - dataGridViewCellStyle7.BackColor = System.Drawing.Color.LightCyan; - this.gv_fic_station_day.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle7; - dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle8.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle8.Font = new System.Drawing.Font("Microsoft JhengHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); - dataGridViewCellStyle8.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle8.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle8.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.gv_fic_station_day.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle8; - this.gv_fic_station_day.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle9.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle9.Font = new System.Drawing.Font("Microsoft JhengHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); - dataGridViewCellStyle9.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle9.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle9.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.gv_fic_station_day.DefaultCellStyle = dataGridViewCellStyle9; - this.gv_fic_station_day.Dock = System.Windows.Forms.DockStyle.Fill; - this.gv_fic_station_day.Location = new System.Drawing.Point(0, 583); - this.gv_fic_station_day.Margin = new System.Windows.Forms.Padding(4); - this.gv_fic_station_day.Name = "gv_fic_station_day"; - this.gv_fic_station_day.ReadOnly = true; - 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(762, 332); - this.gv_fic_station_day.TabIndex = 4; - // - // panel5 - // - this.panel5.Controls.Add(this.label7); - this.panel5.Dock = System.Windows.Forms.DockStyle.Top; - this.panel5.Location = new System.Drawing.Point(0, 545); - this.panel5.Margin = new System.Windows.Forms.Padding(4); - this.panel5.Name = "panel5"; - this.panel5.Size = new System.Drawing.Size(762, 38); - this.panel5.TabIndex = 3; - // - // label7 - // - this.label7.AutoSize = true; - this.label7.Font = new System.Drawing.Font("Microsoft JhengHei UI", 11F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); - this.label7.Location = new System.Drawing.Point(15, 8); - this.label7.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); - this.label7.Name = "label7"; - this.label7.Size = new System.Drawing.Size(152, 24); - this.label7.TabIndex = 2; - this.label7.Text = "FIC: station 每天"; - // - // gv_fic_station_raw - // - this.gv_fic_station_raw.AllowUserToAddRows = false; - this.gv_fic_station_raw.AllowUserToDeleteRows = false; - dataGridViewCellStyle10.BackColor = System.Drawing.Color.LightCyan; - this.gv_fic_station_raw.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle10; - dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle11.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle11.Font = new System.Drawing.Font("Microsoft JhengHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); - dataGridViewCellStyle11.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle11.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle11.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle11.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.gv_fic_station_raw.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle11; - this.gv_fic_station_raw.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - dataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle12.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle12.Font = new System.Drawing.Font("Microsoft JhengHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); - dataGridViewCellStyle12.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle12.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle12.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.gv_fic_station_raw.DefaultCellStyle = dataGridViewCellStyle12; - this.gv_fic_station_raw.Dock = System.Windows.Forms.DockStyle.Top; - this.gv_fic_station_raw.Location = new System.Drawing.Point(0, 38); - this.gv_fic_station_raw.Margin = new System.Windows.Forms.Padding(4); - this.gv_fic_station_raw.Name = "gv_fic_station_raw"; - this.gv_fic_station_raw.ReadOnly = true; - this.gv_fic_station_raw.RowHeadersWidth = 51; - this.gv_fic_station_raw.RowTemplate.Height = 25; - this.gv_fic_station_raw.Size = new System.Drawing.Size(762, 507); - this.gv_fic_station_raw.TabIndex = 2; - // - // panel6 - // - this.panel6.Controls.Add(this.label8); - this.panel6.Controls.Add(this.label9); - this.panel6.Dock = System.Windows.Forms.DockStyle.Top; - this.panel6.Location = new System.Drawing.Point(0, 0); - this.panel6.Margin = new System.Windows.Forms.Padding(4); - this.panel6.Name = "panel6"; - this.panel6.Size = new System.Drawing.Size(762, 38); - this.panel6.TabIndex = 1; - // - // label8 - // - this.label8.AutoSize = true; - this.label8.Font = new System.Drawing.Font("Microsoft JhengHei UI", 11F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); - this.label8.Location = new System.Drawing.Point(255, 8); - this.label8.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); - this.label8.Name = "label8"; - this.label8.Size = new System.Drawing.Size(350, 24); - this.label8.TabIndex = 3; - this.label8.Text = "solar_com0002.s02202000101_station"; - // - // label9 - // - this.label9.AutoSize = true; - this.label9.Font = new System.Drawing.Font("Microsoft JhengHei UI", 11F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); - this.label9.Location = new System.Drawing.Point(15, 8); - this.label9.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); - this.label9.Name = "label9"; - this.label9.Size = new System.Drawing.Size(245, 24); - this.label9.TabIndex = 2; - this.label9.Text = "FIC: station 原始資料(hour)"; - // - // tb_inv - // - this.tb_inv.BackColor = System.Drawing.Color.LightSkyBlue; - this.tb_inv.Controls.Add(this.sp_main_inv); - this.tb_inv.Location = new System.Drawing.Point(4, 28); - this.tb_inv.Name = "tb_inv"; - this.tb_inv.Padding = new System.Windows.Forms.Padding(3); - this.tb_inv.Size = new System.Drawing.Size(1774, 921); - this.tb_inv.TabIndex = 0; - this.tb_inv.Text = " Inverter "; - // - // sp_main_inv - // - this.sp_main_inv.BackColor = System.Drawing.Color.LightSkyBlue; - this.sp_main_inv.Dock = System.Windows.Forms.DockStyle.Fill; - this.sp_main_inv.Location = new System.Drawing.Point(3, 3); - this.sp_main_inv.Name = "sp_main_inv"; - // - // sp_main_inv.Panel1 - // - this.sp_main_inv.Panel1.BackColor = System.Drawing.Color.LightSkyBlue; - this.sp_main_inv.Panel1.Controls.Add(this.bt_inv_proc); - this.sp_main_inv.Panel1.Controls.Add(this.lbMsg_inv); - this.sp_main_inv.Panel1.Controls.Add(this.lbInverterID); - this.sp_main_inv.Panel1.Controls.Add(this.fp_inv); - this.sp_main_inv.Panel1.Controls.Add(this.bt_select1); - // - // sp_main_inv.Panel2 - // - this.sp_main_inv.Panel2.Controls.Add(this.sp_child_inv); - this.sp_main_inv.Size = new System.Drawing.Size(1768, 915); - this.sp_main_inv.SplitterDistance = 357; - this.sp_main_inv.TabIndex = 0; - // - // bt_inv_proc - // - this.bt_inv_proc.Location = new System.Drawing.Point(22, 83); - this.bt_inv_proc.Name = "bt_inv_proc"; - this.bt_inv_proc.Size = new System.Drawing.Size(94, 29); - this.bt_inv_proc.TabIndex = 6; - this.bt_inv_proc.Text = "查詢"; - this.bt_inv_proc.UseVisualStyleBackColor = true; - this.bt_inv_proc.Click += new System.EventHandler(this.bt_inv_proc_Click); - // - // lbMsg_inv - // - this.lbMsg_inv.AutoSize = true; - this.lbMsg_inv.Font = new System.Drawing.Font("Microsoft JhengHei UI", 11F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); - this.lbMsg_inv.Location = new System.Drawing.Point(136, 28); - this.lbMsg_inv.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); - this.lbMsg_inv.Name = "lbMsg_inv"; - this.lbMsg_inv.Size = new System.Drawing.Size(22, 24); - this.lbMsg_inv.TabIndex = 5; - this.lbMsg_inv.Text = "..."; - // - // lbInverterID - // - 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, 246); - this.lbInverterID.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); - this.lbInverterID.Name = "lbInverterID"; - this.lbInverterID.Size = new System.Drawing.Size(105, 24); - this.lbInverterID.TabIndex = 3; - this.lbInverterID.Text = "待處理設備"; - // - // fp_inv - // - this.fp_inv.BackColor = System.Drawing.Color.GhostWhite; - 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, 270); - this.fp_inv.Margin = new System.Windows.Forms.Padding(4); - this.fp_inv.Name = "fp_inv"; - this.fp_inv.Size = new System.Drawing.Size(357, 645); - this.fp_inv.TabIndex = 2; - // - // bt_select1 - // - this.bt_select1.Location = new System.Drawing.Point(22, 23); - this.bt_select1.Name = "bt_select1"; - this.bt_select1.Size = new System.Drawing.Size(94, 29); - this.bt_select1.TabIndex = 1; - this.bt_select1.Text = "查詢"; - this.bt_select1.UseVisualStyleBackColor = true; - // - // sp_child_inv - // - this.sp_child_inv.Dock = System.Windows.Forms.DockStyle.Fill; - this.sp_child_inv.Location = new System.Drawing.Point(0, 0); - this.sp_child_inv.Margin = new System.Windows.Forms.Padding(4); - this.sp_child_inv.Name = "sp_child_inv"; - // - // sp_child_inv.Panel1 - // - this.sp_child_inv.Panel1.Controls.Add(this.gv_web_inv_hour); - this.sp_child_inv.Panel1.Controls.Add(this.panel1); - // - // sp_child_inv.Panel2 - // - this.sp_child_inv.Panel2.Controls.Add(this.gv_fic_inv_hour); - this.sp_child_inv.Panel2.Controls.Add(this.panel3); - 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(1407, 915); - this.sp_child_inv.SplitterDistance = 678; - this.sp_child_inv.SplitterWidth = 13; - this.sp_child_inv.TabIndex = 0; - // - // gv_web_inv_hour - // - this.gv_web_inv_hour.AllowUserToAddRows = false; - this.gv_web_inv_hour.AllowUserToDeleteRows = false; - dataGridViewCellStyle13.BackColor = System.Drawing.Color.Azure; - this.gv_web_inv_hour.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle13; - dataGridViewCellStyle14.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle14.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle14.Font = new System.Drawing.Font("Microsoft JhengHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); - dataGridViewCellStyle14.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle14.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle14.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle14.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.gv_web_inv_hour.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle14; - this.gv_web_inv_hour.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - dataGridViewCellStyle15.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle15.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle15.Font = new System.Drawing.Font("Microsoft JhengHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); - dataGridViewCellStyle15.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle15.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle15.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle15.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.gv_web_inv_hour.DefaultCellStyle = dataGridViewCellStyle15; - this.gv_web_inv_hour.Dock = System.Windows.Forms.DockStyle.Fill; - this.gv_web_inv_hour.Location = new System.Drawing.Point(0, 38); - this.gv_web_inv_hour.Margin = new System.Windows.Forms.Padding(4); - this.gv_web_inv_hour.Name = "gv_web_inv_hour"; - this.gv_web_inv_hour.ReadOnly = true; - this.gv_web_inv_hour.RowHeadersWidth = 51; - this.gv_web_inv_hour.RowTemplate.Height = 25; - this.gv_web_inv_hour.Size = new System.Drawing.Size(678, 877); - this.gv_web_inv_hour.TabIndex = 1; - // - // panel1 - // - this.panel1.Controls.Add(this.label3); - this.panel1.Controls.Add(this.lb_inv_hour); - this.panel1.Dock = System.Windows.Forms.DockStyle.Top; - this.panel1.Location = new System.Drawing.Point(0, 0); - this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(678, 38); - this.panel1.TabIndex = 0; - // - // label3 - // - this.label3.AutoSize = true; - this.label3.Font = new System.Drawing.Font("Microsoft JhengHei UI", 11F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); - this.label3.Location = new System.Drawing.Point(230, 8); - this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); - this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(321, 24); - this.label3.TabIndex = 1; - this.label3.Text = "solar_master.inverter_history_hour"; - // - // lb_inv_hour - // - this.lb_inv_hour.AutoSize = true; - this.lb_inv_hour.Font = new System.Drawing.Font("Microsoft JhengHei UI", 11F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); - this.lb_inv_hour.Location = new System.Drawing.Point(35, 8); - this.lb_inv_hour.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); - this.lb_inv_hour.Name = "lb_inv_hour"; - this.lb_inv_hour.Size = new System.Drawing.Size(151, 24); - this.lb_inv_hour.TabIndex = 0; - this.lb_inv_hour.Text = "web: inv 每小時 "; - // - // gv_fic_inv_hour - // - this.gv_fic_inv_hour.AllowUserToAddRows = false; - this.gv_fic_inv_hour.AllowUserToDeleteRows = false; - dataGridViewCellStyle16.BackColor = System.Drawing.Color.LightCyan; - this.gv_fic_inv_hour.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle16; - dataGridViewCellStyle17.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle17.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle17.Font = new System.Drawing.Font("Microsoft JhengHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); - dataGridViewCellStyle17.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle17.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle17.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle17.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.gv_fic_inv_hour.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle17; - this.gv_fic_inv_hour.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - dataGridViewCellStyle18.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle18.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle18.Font = new System.Drawing.Font("Microsoft JhengHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); - dataGridViewCellStyle18.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle18.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle18.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle18.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.gv_fic_inv_hour.DefaultCellStyle = dataGridViewCellStyle18; - this.gv_fic_inv_hour.Dock = System.Windows.Forms.DockStyle.Fill; - this.gv_fic_inv_hour.Location = new System.Drawing.Point(0, 583); - this.gv_fic_inv_hour.Margin = new System.Windows.Forms.Padding(4); - this.gv_fic_inv_hour.Name = "gv_fic_inv_hour"; - this.gv_fic_inv_hour.ReadOnly = true; - this.gv_fic_inv_hour.RowHeadersWidth = 51; - this.gv_fic_inv_hour.RowTemplate.Height = 25; - this.gv_fic_inv_hour.Size = new System.Drawing.Size(716, 332); - this.gv_fic_inv_hour.TabIndex = 4; - // - // panel3 - // - this.panel3.Controls.Add(this.label1); - this.panel3.Dock = System.Windows.Forms.DockStyle.Top; - this.panel3.Location = new System.Drawing.Point(0, 545); - this.panel3.Margin = new System.Windows.Forms.Padding(4); - this.panel3.Name = "panel3"; - this.panel3.Size = new System.Drawing.Size(716, 38); - this.panel3.TabIndex = 3; - // - // label1 - // - this.label1.AutoSize = true; - this.label1.Font = new System.Drawing.Font("Microsoft JhengHei UI", 11F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); - this.label1.Location = new System.Drawing.Point(15, 8); - this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(141, 24); - this.label1.TabIndex = 2; - this.label1.Text = "FIC: inv 每小時 "; - // - // gv_fic_inv_raw - // - this.gv_fic_inv_raw.AllowUserToAddRows = false; - this.gv_fic_inv_raw.AllowUserToDeleteRows = false; - dataGridViewCellStyle19.BackColor = System.Drawing.Color.LightCyan; - this.gv_fic_inv_raw.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle19; - dataGridViewCellStyle20.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle20.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle20.Font = new System.Drawing.Font("Microsoft JhengHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); - dataGridViewCellStyle20.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle20.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle20.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle20.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.gv_fic_inv_raw.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle20; - this.gv_fic_inv_raw.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - dataGridViewCellStyle21.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle21.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle21.Font = new System.Drawing.Font("Microsoft JhengHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); - dataGridViewCellStyle21.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle21.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle21.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle21.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.gv_fic_inv_raw.DefaultCellStyle = dataGridViewCellStyle21; - this.gv_fic_inv_raw.Dock = System.Windows.Forms.DockStyle.Top; - this.gv_fic_inv_raw.Location = new System.Drawing.Point(0, 38); - this.gv_fic_inv_raw.Margin = new System.Windows.Forms.Padding(4); - this.gv_fic_inv_raw.Name = "gv_fic_inv_raw"; - this.gv_fic_inv_raw.ReadOnly = true; - 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(716, 507); - this.gv_fic_inv_raw.TabIndex = 2; - // - // panel2 - // - this.panel2.Controls.Add(this.label2); - this.panel2.Controls.Add(this.lb_raw_inv_hour); - this.panel2.Dock = System.Windows.Forms.DockStyle.Top; - this.panel2.Location = new System.Drawing.Point(0, 0); - this.panel2.Name = "panel2"; - this.panel2.Size = new System.Drawing.Size(716, 38); - this.panel2.TabIndex = 1; - // - // label2 - // - this.label2.AutoSize = true; - this.label2.Font = new System.Drawing.Font("Microsoft JhengHei UI", 11F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); - this.label2.Location = new System.Drawing.Point(255, 8); - this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(315, 24); - this.label2.TabIndex = 3; - this.label2.Text = "solar_com0002.s02202000101_inv"; - // - // lb_raw_inv_hour - // - this.lb_raw_inv_hour.AutoSize = true; - this.lb_raw_inv_hour.Font = new System.Drawing.Font("Microsoft JhengHei UI", 11F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); - this.lb_raw_inv_hour.Location = new System.Drawing.Point(15, 8); - this.lb_raw_inv_hour.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); - this.lb_raw_inv_hour.Name = "lb_raw_inv_hour"; - this.lb_raw_inv_hour.Size = new System.Drawing.Size(155, 24); - this.lb_raw_inv_hour.TabIndex = 2; - this.lb_raw_inv_hour.Text = "FIC: inv 原始資料"; - // // tabControl1 // - this.tabControl1.Controls.Add(this.tb_inv); - this.tabControl1.Controls.Add(this.tb2); - this.tabControl1.Dock = System.Windows.Forms.DockStyle.Fill; + this.tabControl1.Appearance = System.Windows.Forms.TabAppearance.Buttons; + this.tabControl1.Controls.Add(this.tabPage1); + this.tabControl1.Controls.Add(this.tabPage2); this.tabControl1.Location = new System.Drawing.Point(0, 0); this.tabControl1.Name = "tabControl1"; this.tabControl1.SelectedIndex = 0; this.tabControl1.Size = new System.Drawing.Size(1782, 953); - this.tabControl1.TabIndex = 1; + this.tabControl1.TabIndex = 0; + // + // tabPage1 + // + this.tabPage1.Controls.Add(this.splitContainer1); + this.tabPage1.Location = new System.Drawing.Point(4, 31); + this.tabPage1.Name = "tabPage1"; + this.tabPage1.Padding = new System.Windows.Forms.Padding(3); + this.tabPage1.Size = new System.Drawing.Size(1774, 918); + this.tabPage1.TabIndex = 0; + this.tabPage1.Text = "tabPage1"; + this.tabPage1.UseVisualStyleBackColor = true; + // + // tabPage2 + // + this.tabPage2.Location = new System.Drawing.Point(4, 31); + this.tabPage2.Name = "tabPage2"; + this.tabPage2.Padding = new System.Windows.Forms.Padding(3); + this.tabPage2.Size = new System.Drawing.Size(1774, 918); + this.tabPage2.TabIndex = 1; + this.tabPage2.Text = "tabPage2"; + this.tabPage2.UseVisualStyleBackColor = true; + // + // splitContainer1 + // + this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill; + this.splitContainer1.Location = new System.Drawing.Point(3, 3); + this.splitContainer1.Name = "splitContainer1"; + // + // splitContainer1.Panel1 + // + this.splitContainer1.Panel1.BackColor = System.Drawing.SystemColors.ActiveCaption; + // + // splitContainer1.Panel2 + // + this.splitContainer1.Panel2.Controls.Add(this.dataGridView1); + this.splitContainer1.Panel2.Controls.Add(this.panel1); + this.splitContainer1.Size = new System.Drawing.Size(1768, 912); + this.splitContainer1.SplitterDistance = 300; + this.splitContainer1.SplitterWidth = 10; + this.splitContainer1.TabIndex = 0; + // + // panel1 + // + this.panel1.Dock = System.Windows.Forms.DockStyle.Top; + this.panel1.Location = new System.Drawing.Point(0, 0); + this.panel1.Name = "panel1"; + this.panel1.Size = new System.Drawing.Size(1458, 125); + this.panel1.TabIndex = 0; + // + // dataGridView1 + // + this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dataGridView1.Dock = System.Windows.Forms.DockStyle.Fill; + this.dataGridView1.Location = new System.Drawing.Point(0, 125); + this.dataGridView1.Name = "dataGridView1"; + this.dataGridView1.RowHeadersWidth = 51; + this.dataGridView1.RowTemplate.Height = 29; + this.dataGridView1.Size = new System.Drawing.Size(1458, 787); + this.dataGridView1.TabIndex = 1; // // fmArchive // @@ -826,100 +121,23 @@ namespace solarApp this.Controls.Add(this.tabControl1); this.Name = "fmArchive"; this.Text = "fmArchive"; - this.tb2.ResumeLayout(false); - this.sp_main_station.Panel1.ResumeLayout(false); - this.sp_main_station.Panel1.PerformLayout(); - this.sp_main_station.Panel2.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.sp_main_station)).EndInit(); - this.sp_main_station.ResumeLayout(false); - this.flowLayoutPanel1.ResumeLayout(false); - this.flowLayoutPanel1.PerformLayout(); - this.sp_child_station.Panel1.ResumeLayout(false); - this.sp_child_station.Panel2.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.sp_child_station)).EndInit(); - this.sp_child_station.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.gv_web_station_day)).EndInit(); - this.panel7.ResumeLayout(false); - this.panel7.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.gv_web_station_hour)).EndInit(); - this.panel4.ResumeLayout(false); - this.panel4.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.gv_fic_station_day)).EndInit(); - this.panel5.ResumeLayout(false); - this.panel5.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.gv_fic_station_raw)).EndInit(); - this.panel6.ResumeLayout(false); - this.panel6.PerformLayout(); - this.tb_inv.ResumeLayout(false); - this.sp_main_inv.Panel1.ResumeLayout(false); - this.sp_main_inv.Panel1.PerformLayout(); - this.sp_main_inv.Panel2.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.sp_main_inv)).EndInit(); - this.sp_main_inv.ResumeLayout(false); - this.sp_child_inv.Panel1.ResumeLayout(false); - this.sp_child_inv.Panel2.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.sp_child_inv)).EndInit(); - this.sp_child_inv.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.gv_web_inv_hour)).EndInit(); - this.panel1.ResumeLayout(false); - this.panel1.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.gv_fic_inv_hour)).EndInit(); - this.panel3.ResumeLayout(false); - this.panel3.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.gv_fic_inv_raw)).EndInit(); - this.panel2.ResumeLayout(false); - this.panel2.PerformLayout(); this.tabControl1.ResumeLayout(false); + this.tabPage1.ResumeLayout(false); + this.splitContainer1.Panel2.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit(); + this.splitContainer1.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).EndInit(); this.ResumeLayout(false); } #endregion - private System.Windows.Forms.TabPage tb2; - private System.Windows.Forms.SplitContainer sp_main_station; - private System.Windows.Forms.Label label12; - private System.Windows.Forms.DateTimePicker dtselect_station2; - private System.Windows.Forms.Label lbMsg_station; - private System.Windows.Forms.Button bt_find_station; - private System.Windows.Forms.DateTimePicker dtselect_station1; - private System.Windows.Forms.FlowLayoutPanel flowLayoutPanel1; - private System.Windows.Forms.Label label13; - private System.Windows.Forms.SplitContainer sp_child_station; - private System.Windows.Forms.DataGridView gv_web_station_day; - private System.Windows.Forms.Panel panel7; - private System.Windows.Forms.Label label10; - private System.Windows.Forms.Label label11; - private System.Windows.Forms.DataGridView gv_web_station_hour; - private System.Windows.Forms.Panel panel4; - private System.Windows.Forms.Label label5; - private System.Windows.Forms.Label label6; - private System.Windows.Forms.DataGridView gv_fic_station_day; - private System.Windows.Forms.Panel panel5; - private System.Windows.Forms.Label label7; - private System.Windows.Forms.DataGridView gv_fic_station_raw; - private System.Windows.Forms.Panel panel6; - private System.Windows.Forms.Label label8; - private System.Windows.Forms.Label label9; - private System.Windows.Forms.TabPage tb_inv; - private System.Windows.Forms.SplitContainer sp_main_inv; - private System.Windows.Forms.Button bt_inv_proc; - private System.Windows.Forms.Label lbMsg_inv; - private System.Windows.Forms.Label lbInverterID; - private System.Windows.Forms.FlowLayoutPanel fp_inv; - private System.Windows.Forms.Button bt_select1; - private System.Windows.Forms.SplitContainer sp_child_inv; - private System.Windows.Forms.DataGridView gv_web_inv_hour; - private System.Windows.Forms.Panel panel1; - private System.Windows.Forms.Label label3; - private System.Windows.Forms.Label lb_inv_hour; - private System.Windows.Forms.DataGridView gv_fic_inv_hour; - private System.Windows.Forms.Panel panel3; - private System.Windows.Forms.Label label1; - private System.Windows.Forms.DataGridView gv_fic_inv_raw; - private System.Windows.Forms.Panel panel2; - private System.Windows.Forms.Label label2; - private System.Windows.Forms.Label lb_raw_inv_hour; private System.Windows.Forms.TabControl tabControl1; + private System.Windows.Forms.TabPage tabPage1; + private System.Windows.Forms.SplitContainer splitContainer1; + private System.Windows.Forms.DataGridView dataGridView1; + private System.Windows.Forms.Panel panel1; + private System.Windows.Forms.TabPage tabPage2; } } \ No newline at end of file diff --git a/solarApp/fmMain.Designer.cs b/solarApp/fmMain.Designer.cs index 3da4cbe..9b88f2b 100644 --- a/solarApp/fmMain.Designer.cs +++ b/solarApp/fmMain.Designer.cs @@ -109,8 +109,6 @@ namespace solarApp this.tb2 = new System.Windows.Forms.TabPage(); this.sp_main_station = new System.Windows.Forms.SplitContainer(); this.label13 = new System.Windows.Forms.Label(); - this.label12 = new System.Windows.Forms.Label(); - this.dtselect_station2 = new System.Windows.Forms.DateTimePicker(); this.lbMsg_station = new System.Windows.Forms.Label(); this.bt_find_station = new System.Windows.Forms.Button(); this.dtselect_station1 = new System.Windows.Forms.DateTimePicker(); @@ -137,7 +135,6 @@ namespace solarApp this.label9 = new System.Windows.Forms.Label(); this.tbSensor = new System.Windows.Forms.TabPage(); this.splitContainer1 = new System.Windows.Forms.SplitContainer(); - this.dtSelect_sensor2 = new System.Windows.Forms.DateTimePicker(); this.lbSiteDB_sensor = new System.Windows.Forms.Label(); this.lbSiteID_sensor = new System.Windows.Forms.Label(); this.lbSiteName_sensor = new System.Windows.Forms.Label(); @@ -369,7 +366,7 @@ namespace solarApp // dtselect_inv // this.dtselect_inv.Font = new System.Drawing.Font("Microsoft JhengHei UI", 11F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); - this.dtselect_inv.Location = new System.Drawing.Point(36, 162); + this.dtselect_inv.Location = new System.Drawing.Point(36, 160); this.dtselect_inv.Name = "dtselect_inv"; this.dtselect_inv.Size = new System.Drawing.Size(250, 31); this.dtselect_inv.TabIndex = 0; @@ -426,13 +423,13 @@ namespace solarApp dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.False; this.gv_web_inv_month.DefaultCellStyle = dataGridViewCellStyle3; this.gv_web_inv_month.Dock = System.Windows.Forms.DockStyle.Fill; - this.gv_web_inv_month.Location = new System.Drawing.Point(0, 853); + this.gv_web_inv_month.Location = new System.Drawing.Point(0, 891); this.gv_web_inv_month.Margin = new System.Windows.Forms.Padding(4); this.gv_web_inv_month.Name = "gv_web_inv_month"; this.gv_web_inv_month.ReadOnly = true; 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(666, 183); + this.gv_web_inv_month.Size = new System.Drawing.Size(666, 145); this.gv_web_inv_month.TabIndex = 7; // // panel9 @@ -440,7 +437,7 @@ namespace solarApp this.panel9.Controls.Add(this.label16); this.panel9.Controls.Add(this.label17); this.panel9.Dock = System.Windows.Forms.DockStyle.Top; - this.panel9.Location = new System.Drawing.Point(0, 815); + this.panel9.Location = new System.Drawing.Point(0, 853); this.panel9.Margin = new System.Windows.Forms.Padding(4); this.panel9.Name = "panel9"; this.panel9.Size = new System.Drawing.Size(666, 38); @@ -498,7 +495,7 @@ namespace solarApp this.gv_web_inv_day.ReadOnly = true; this.gv_web_inv_day.RowHeadersWidth = 51; this.gv_web_inv_day.RowTemplate.Height = 25; - this.gv_web_inv_day.Size = new System.Drawing.Size(666, 232); + this.gv_web_inv_day.Size = new System.Drawing.Size(666, 270); this.gv_web_inv_day.TabIndex = 4; // // panel8 @@ -742,8 +739,6 @@ namespace solarApp // sp_main_station.Panel1 // this.sp_main_station.Panel1.Controls.Add(this.label13); - this.sp_main_station.Panel1.Controls.Add(this.label12); - this.sp_main_station.Panel1.Controls.Add(this.dtselect_station2); 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); @@ -769,30 +764,11 @@ namespace solarApp this.label13.TabIndex = 13; this.label13.Text = "請選擇 電站"; // - // label12 - // - this.label12.AutoSize = true; - this.label12.Font = new System.Drawing.Font("Microsoft JhengHei UI", 11F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); - this.label12.Location = new System.Drawing.Point(13, 44); - this.label12.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); - this.label12.Name = "label12"; - this.label12.Size = new System.Drawing.Size(24, 24); - this.label12.TabIndex = 12; - this.label12.Text = "~"; - // - // dtselect_station2 - // - this.dtselect_station2.Font = new System.Drawing.Font("Microsoft JhengHei UI", 11F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); - this.dtselect_station2.Location = new System.Drawing.Point(12, 76); - this.dtselect_station2.Name = "dtselect_station2"; - this.dtselect_station2.Size = new System.Drawing.Size(234, 31); - this.dtselect_station2.TabIndex = 10; - // // lbMsg_station // this.lbMsg_station.AutoSize = true; this.lbMsg_station.Font = new System.Drawing.Font("Microsoft JhengHei UI", 11F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); - this.lbMsg_station.Location = new System.Drawing.Point(26, 162); + this.lbMsg_station.Location = new System.Drawing.Point(30, 111); this.lbMsg_station.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.lbMsg_station.Name = "lbMsg_station"; this.lbMsg_station.Size = new System.Drawing.Size(22, 24); @@ -801,7 +777,7 @@ namespace solarApp // // bt_find_station // - this.bt_find_station.Location = new System.Drawing.Point(12, 124); + this.bt_find_station.Location = new System.Drawing.Point(16, 73); this.bt_find_station.Name = "bt_find_station"; this.bt_find_station.Size = new System.Drawing.Size(94, 29); this.bt_find_station.TabIndex = 7; @@ -1193,7 +1169,6 @@ namespace solarApp // splitContainer1.Panel1 // this.splitContainer1.Panel1.BackColor = System.Drawing.Color.Khaki; - this.splitContainer1.Panel1.Controls.Add(this.dtSelect_sensor2); this.splitContainer1.Panel1.Controls.Add(this.lbSiteDB_sensor); this.splitContainer1.Panel1.Controls.Add(this.lbSiteID_sensor); this.splitContainer1.Panel1.Controls.Add(this.lbSiteName_sensor); @@ -1210,14 +1185,6 @@ namespace solarApp this.splitContainer1.SplitterDistance = 351; this.splitContainer1.TabIndex = 1; // - // dtSelect_sensor2 - // - this.dtSelect_sensor2.Font = new System.Drawing.Font("Microsoft JhengHei UI", 11F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); - this.dtSelect_sensor2.Location = new System.Drawing.Point(36, 189); - this.dtSelect_sensor2.Name = "dtSelect_sensor2"; - this.dtSelect_sensor2.Size = new System.Drawing.Size(250, 31); - this.dtSelect_sensor2.TabIndex = 9; - // // lbSiteDB_sensor // this.lbSiteDB_sensor.AutoSize = true; @@ -1255,7 +1222,7 @@ namespace solarApp // this.lbMsg_sensor.AutoSize = true; this.lbMsg_sensor.Font = new System.Drawing.Font("Microsoft JhengHei UI", 11F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); - this.lbMsg_sensor.Location = new System.Drawing.Point(155, 255); + this.lbMsg_sensor.Location = new System.Drawing.Point(155, 218); this.lbMsg_sensor.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.lbMsg_sensor.Name = "lbMsg_sensor"; this.lbMsg_sensor.Size = new System.Drawing.Size(22, 24); @@ -1299,7 +1266,7 @@ namespace solarApp // // btSearch_sensor // - this.btSearch_sensor.Location = new System.Drawing.Point(36, 252); + this.btSearch_sensor.Location = new System.Drawing.Point(36, 215); this.btSearch_sensor.Name = "btSearch_sensor"; this.btSearch_sensor.Size = new System.Drawing.Size(94, 29); this.btSearch_sensor.TabIndex = 1; @@ -1310,7 +1277,7 @@ namespace solarApp // dtSelect_sensor1 // this.dtSelect_sensor1.Font = new System.Drawing.Font("Microsoft JhengHei UI", 11F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); - this.dtSelect_sensor1.Location = new System.Drawing.Point(36, 137); + this.dtSelect_sensor1.Location = new System.Drawing.Point(36, 148); this.dtSelect_sensor1.Name = "dtSelect_sensor1"; this.dtSelect_sensor1.Size = new System.Drawing.Size(250, 31); this.dtSelect_sensor1.TabIndex = 0; @@ -1366,13 +1333,13 @@ namespace solarApp dataGridViewCellStyle33.WrapMode = System.Windows.Forms.DataGridViewTriState.False; this.gv_web_sensor_month.DefaultCellStyle = dataGridViewCellStyle33; this.gv_web_sensor_month.Dock = System.Windows.Forms.DockStyle.Fill; - this.gv_web_sensor_month.Location = new System.Drawing.Point(0, 853); + this.gv_web_sensor_month.Location = new System.Drawing.Point(0, 874); this.gv_web_sensor_month.Margin = new System.Windows.Forms.Padding(4); this.gv_web_sensor_month.Name = "gv_web_sensor_month"; this.gv_web_sensor_month.ReadOnly = true; 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, 183); + this.gv_web_sensor_month.Size = new System.Drawing.Size(666, 162); this.gv_web_sensor_month.TabIndex = 7; // // panel11 @@ -1380,7 +1347,7 @@ namespace solarApp this.panel11.Controls.Add(this.label26); this.panel11.Controls.Add(this.label27); this.panel11.Dock = System.Windows.Forms.DockStyle.Top; - this.panel11.Location = new System.Drawing.Point(0, 815); + this.panel11.Location = new System.Drawing.Point(0, 836); this.panel11.Margin = new System.Windows.Forms.Padding(4); this.panel11.Name = "panel11"; this.panel11.Size = new System.Drawing.Size(666, 38); @@ -1438,7 +1405,7 @@ namespace solarApp this.gv_web_sensor_day.ReadOnly = true; this.gv_web_sensor_day.RowHeadersWidth = 51; this.gv_web_sensor_day.RowTemplate.Height = 25; - this.gv_web_sensor_day.Size = new System.Drawing.Size(666, 232); + this.gv_web_sensor_day.Size = new System.Drawing.Size(666, 253); this.gv_web_sensor_day.TabIndex = 4; // // panel12 @@ -1801,9 +1768,7 @@ namespace solarApp private System.Windows.Forms.FlowLayoutPanel fp_site; private System.Windows.Forms.Label lbMsg_inv; private System.Windows.Forms.DateTimePicker dateTimePicker1; - private System.Windows.Forms.Label label12; private System.Windows.Forms.DateTimePicker dtselect_station1; - private System.Windows.Forms.DateTimePicker dtselect_station2; private System.Windows.Forms.DataGridView gv_web_inv_day; private System.Windows.Forms.Panel panel8; private System.Windows.Forms.Label label14; @@ -1856,6 +1821,5 @@ namespace solarApp private System.Windows.Forms.DataGridView gv_web_sensor_hour; private System.Windows.Forms.Label lbSiteDB_sensor; private System.Windows.Forms.Button btSearch_sensor; - private System.Windows.Forms.DateTimePicker dtSelect_sensor2; } } \ No newline at end of file diff --git a/solarApp/fmMain.cs b/solarApp/fmMain.cs index cb696b5..1b62c66 100644 --- a/solarApp/fmMain.cs +++ b/solarApp/fmMain.cs @@ -24,16 +24,20 @@ namespace solarApp private async void button1_Click(object sender, EventArgs e) { lbMsg_inv.Text = "loading ... "; - string date1 = dtselect_inv.Value.ToString("yyyy-MM-dd"); - gv_fic_inv_raw.DataSource = inv_svc.Get_rawInv(date1, lbInverterID.Text, lbSiteDB_inv.Text, lbSiteID_inv.Text); + string date2 = dtselect_inv.Value.ToString("yyyy-MM-dd"); + //string date2 = dtSelect_sensor2.Value.ToString("yyyy-MM-dd"); + string date1 = dtselect_inv.Value.AddDays(-7).ToString("yyyy-MM-dd"); - gv_fic_inv_hour.DataSource = inv_svc.get_Inv_rawAvg(date1, lbInverterID.Text, lbSiteDB_inv.Text, lbSiteID_inv.Text); - gv_web_inv_hour.DataSource = inv_svc.get_web_Inv_hour(date1, lbInverterID.Text); + gv_fic_inv_raw.DataSource = inv_svc.Get_rawInv(date2, lbInverterID.Text, lbSiteDB_inv.Text, lbSiteID_inv.Text); - gv_web_inv_day.DataSource = inv_svc.get_web_Inv_day(date1, lbInverterID.Text); + gv_fic_inv_hour.DataSource = inv_svc.get_Inv_rawAvg(date2, lbInverterID.Text, lbSiteDB_inv.Text, lbSiteID_inv.Text); - gv_web_inv_month.DataSource = inv_svc.get_web_Inv_month( date1.Substring(0, 7), lbInverterID.Text); + gv_web_inv_hour.DataSource = inv_svc.get_web_Inv_hour(date2, lbInverterID.Text); + + gv_web_inv_day.DataSource = inv_svc.get_web_Inv_day(date1, date2, lbInverterID.Text); + + gv_web_inv_month.DataSource = inv_svc.get_web_Inv_month( date1.Substring(0, 7), date2.Substring(0, 7), lbInverterID.Text); lbMsg_inv.Text = " done " + System.DateTime.Now.ToShortTimeString(); } @@ -41,13 +45,12 @@ namespace solarApp private void fmMain_Load(object sender, EventArgs e) { - dtselect_station1.Value = DateTime.Today.AddDays(-7); - dtselect_station2.Value = DateTime.Today.AddDays(-1); + dtselect_station1.Value = DateTime.Today.AddDays(-1); + dtselect_inv.Value = DateTime.Today.AddDays(-1); - dtSelect_sensor1.Value = DateTime.Today.AddDays(-7); - dtSelect_sensor2.Value = DateTime.Today.AddDays(-1); - // Cursor.Current = Cursors.Default; + dtSelect_sensor1.Value = DateTime.Today.AddDays(-1); + tabControl1.SelectedTab = tabControl1.TabPages[1]; @@ -163,14 +166,15 @@ namespace solarApp { lbMsg_station.Text = "loading ... "; - string date1 = dtselect_station1.Value.ToString("yyyy-MM-dd"); - string date2 = dtselect_station2.Value.ToString("yyyy-MM-dd"); + string date2 = dtselect_station1.Value.ToString("yyyy-MM-dd"); + //string date2 = dtselect_station2.Value.ToString("yyyy-MM-dd"); + string date1 = dtselect_station1.Value.AddDays(-7).ToString("yyyy-MM-dd"); - gv_fic_station_raw.DataSource = stationSvc.get_station_raw(date1, lbSiteDB_inv.Text, lbSiteID_inv.Text); + gv_fic_station_raw.DataSource = stationSvc.get_station_raw(date2, lbSiteDB_inv.Text, lbSiteID_inv.Text); gv_fic_station_day.DataSource = stationSvc.get_station_rawAvg(date1, date2, lbSiteDB_inv.Text, lbSiteID_inv.Text); - gv_web_station_hour.DataSource = stationSvc.get_web_station_hour( date1 ); + gv_web_station_hour.DataSource = stationSvc.get_web_station_hour(date2); gv_web_station_day.DataSource = stationSvc.get_web_station_day(date1, date2, lbSiteID_inv.Text.Substring(0, 9)); @@ -181,14 +185,15 @@ namespace solarApp private void btSearch_sensor_Click(object sender, EventArgs e) { - string date1 = dtSelect_sensor1.Value.ToString("yyyy-MM-dd"); - string date2 = dtSelect_sensor2.Value.ToString("yyyy-MM-dd"); + string date2 = dtSelect_sensor1.Value.ToString("yyyy-MM-dd"); + //string date2 = dtSelect_sensor2.Value.ToString("yyyy-MM-dd"); + string date1 = dtSelect_sensor1.Value.AddDays(-7).ToString("yyyy-MM-dd"); - gv_fic_sensor_raw.DataSource = sensorSvc.get_sensor_raw(date1, lbSiteDB_inv.Text, lbSiteID_inv.Text); + gv_fic_sensor_raw.DataSource = sensorSvc.get_sensor_raw(date2, lbSiteDB_inv.Text, lbSiteID_inv.Text); - gv_fic_sensor_hour.DataSource = sensorSvc.get_sensor_raw_hour(date1, lbSiteDB_inv.Text, lbSiteID_inv.Text.Substring(0, 11)); + gv_fic_sensor_hour.DataSource = sensorSvc.get_sensor_raw_hour(date2, lbSiteDB_inv.Text, lbSiteID_inv.Text.Substring(0, 11)); - gv_web_sensor_hour.DataSource = sensorSvc.get_web_sensor_hour(date1, lbSiteID_inv.Text.Substring(0, 09)); + gv_web_sensor_hour.DataSource = sensorSvc.get_web_sensor_hour(date2, lbSiteID_inv.Text.Substring(0, 09)); gv_web_sensor_day.DataSource = sensorSvc.get_web_sensor_day(date1, date2, lbSiteID_inv.Text.Substring(0, 09));