diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 2c67d44..b69ab53 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 2c67d44..b69ab53 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_TaskManager.Designer.cs b/EMS_Forms/Form_TaskManager.Designer.cs index 82b283d..af11e6b 100644 --- a/EMS_Forms/Form_TaskManager.Designer.cs +++ b/EMS_Forms/Form_TaskManager.Designer.cs @@ -177,7 +177,7 @@ this.labelX3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX3.Location = new System.Drawing.Point(498, 20); this.labelX3.Name = "labelX3"; - this.labelX3.Size = new System.Drawing.Size(14, 14); + this.labelX3.Size = new System.Drawing.Size(19, 16); this.labelX3.TabIndex = 0; this.labelX3.Text = "—"; // @@ -192,7 +192,7 @@ this.labelX2.Name = "labelX2"; this.labelX2.Size = new System.Drawing.Size(60, 23); this.labelX2.TabIndex = 0; - this.labelX2.Text = "任务时间"; + this.labelX2.Text = "下发时间"; // // labelX1 // diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 2c67d44..b69ab53 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_TaskManager.Designer.cs b/EMS_Forms/Form_TaskManager.Designer.cs index 82b283d..af11e6b 100644 --- a/EMS_Forms/Form_TaskManager.Designer.cs +++ b/EMS_Forms/Form_TaskManager.Designer.cs @@ -177,7 +177,7 @@ this.labelX3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX3.Location = new System.Drawing.Point(498, 20); this.labelX3.Name = "labelX3"; - this.labelX3.Size = new System.Drawing.Size(14, 14); + this.labelX3.Size = new System.Drawing.Size(19, 16); this.labelX3.TabIndex = 0; this.labelX3.Text = "—"; // @@ -192,7 +192,7 @@ this.labelX2.Name = "labelX2"; this.labelX2.Size = new System.Drawing.Size(60, 23); this.labelX2.TabIndex = 0; - this.labelX2.Text = "任务时间"; + this.labelX2.Text = "下发时间"; // // labelX1 // diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 2b3612c..7c98a13 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -394,14 +394,21 @@ this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; this.winGridViewPager1.AddColumnAlias("任务编号", "任务编号"); - this.winGridViewPager1.AddColumnAlias("创建时间", "创建时间"); + //this.winGridViewPager1.AddColumnAlias("创建时间", "创建时间"); + //this.winGridViewPager1.AddColumnAlias("任务描述", "任务描述"); + //this.winGridViewPager1.AddColumnAlias("完成时间", "完成时间"); this.winGridViewPager1.AddColumnAlias("任务描述", "任务描述"); - this.winGridViewPager1.AddColumnAlias("完成时间", "完成时间"); + this.winGridViewPager1.AddColumnAlias("下发任务时间", "下发任务时间"); + this.winGridViewPager1.AddColumnAlias("接受任务时间", "接受任务时间"); + this.winGridViewPager1.AddColumnAlias("开始任务时间", "开始任务时间"); + //this.winGridViewPager1.AddColumnAlias("任务执行中时间", "任务执行中时间"); + this.winGridViewPager1.AddColumnAlias("完成任务时间", "完成任务时间"); this.winGridViewPager1.AddColumnAlias("任务执行区域", "任务执行区域"); this.winGridViewPager1.AddColumnAlias("任务状态", "任务状态"); this.winGridViewPager1.AddColumnAlias("任务执行人员", "任务执行人员"); - this.winGridViewPager1.DisplayColumns = "任务编号,创建时间,任务描述,完成时间,任务执行区域,任务状态,任务执行人员"; + //this.winGridViewPager1.DisplayColumns = "任务编号,创建时间,任务描述,完成时间,任务执行区域,任务状态,任务执行人员"; + this.winGridViewPager1.DisplayColumns = "任务编号,任务描述,下发任务时间,接受任务时间,开始任务时间,结束任务时间,任务执行区域,任务状态,任务执行人员"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -541,11 +548,17 @@ { string sqlCount = "select count(*) from taskinfo t where 1=1"; - string sqlData = "select dbid as 任务编号,deploytime as 创建时间,descirption as 任务描述," + - "finishtime as 完成时间,street as 任务执行区域,taskstate as 任务状态,username as 任务执行人员 " + - "from (select t.*,rownum row_num from taskinfo t order by DBID desc)b " + - " where 1=1"; + //string sqlData = "select dbid as 任务编号,deploytime as 创建时间,descirption as 任务描述," + + //"finishtime as 完成时间,street as 任务执行区域,taskstate as 任务状态,username as 任务执行人员 " + + // "from (select t.*,rownum row_num from taskinfo t order by DBID desc)b " + + // " where 1=1"; + string sqlData = "select dbid as 任务编号,descirption as 任务描述,deploytime as 下发任务时间," + + "case taskstate when '接受任务' then finishtime else null end as 接受任务时间," + + "case taskstate when '开始任务' then finishtime else null end as 开始任务时间," + + "case taskstate when '任务执行中' then finishtime else null end as 任务执行中时间, " + + "case taskstate when '结束任务' then finishtime else null end as 结束任务时间," + + "street as 任务执行区域,taskstate as 任务状态,username as 任务执行人员 from taskinfo t"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; @@ -556,10 +569,16 @@ int minPage = (pageIndex - 1) * maxPageIndex + 1; int maxPage = pageIndex * maxPageIndex; string sqlCount = "select count(*) from taskinfo t where 1=1"; - string sqlData = "select dbid as 任务编号,deploytime as 创建时间,descirption as 任务描述,"+ - "finishtime as 完成时间,street as 任务执行区域,taskstate as 任务状态,username as 任务执行人员 " + + //string sqlData = "select dbid as 任务编号,deploytime as 创建时间,descirption as 任务描述,"+ + //"finishtime as 完成时间,street as 任务执行区域,taskstate as 任务状态,username as 任务执行人员 " + + // "from (select t.*,rownum row_num from taskinfo t where 1=1"; + string sqlData = "select dbid as 任务编号,descirption as 任务描述,deploytime as 下发任务时间," + + "case taskstate when '接受任务' then finishtime else null end as 接受任务时间,"+ + "case taskstate when '开始任务' then finishtime else null end as 开始任务时间,"+ + "case taskstate when '任务执行中' then finishtime else null end as 任务执行中时间, "+ + "case taskstate when '结束任务' then finishtime else null end as 结束任务时间,"+ + "street as 任务执行区域,taskstate as 任务状态,username as 任务执行人员 " + "from (select t.*,rownum row_num from taskinfo t where 1=1"; - if (!String.IsNullOrEmpty(comboBox_userName.Text.Trim()) && !comboBox_userName.Text.Trim().Equals("不限")) { sqlCount += " and username='" + comboBox_userName.Text.Trim() + "' "; diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 2c67d44..b69ab53 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_TaskManager.Designer.cs b/EMS_Forms/Form_TaskManager.Designer.cs index 82b283d..af11e6b 100644 --- a/EMS_Forms/Form_TaskManager.Designer.cs +++ b/EMS_Forms/Form_TaskManager.Designer.cs @@ -177,7 +177,7 @@ this.labelX3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX3.Location = new System.Drawing.Point(498, 20); this.labelX3.Name = "labelX3"; - this.labelX3.Size = new System.Drawing.Size(14, 14); + this.labelX3.Size = new System.Drawing.Size(19, 16); this.labelX3.TabIndex = 0; this.labelX3.Text = "—"; // @@ -192,7 +192,7 @@ this.labelX2.Name = "labelX2"; this.labelX2.Size = new System.Drawing.Size(60, 23); this.labelX2.TabIndex = 0; - this.labelX2.Text = "任务时间"; + this.labelX2.Text = "下发时间"; // // labelX1 // diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 2b3612c..7c98a13 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -394,14 +394,21 @@ this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; this.winGridViewPager1.AddColumnAlias("任务编号", "任务编号"); - this.winGridViewPager1.AddColumnAlias("创建时间", "创建时间"); + //this.winGridViewPager1.AddColumnAlias("创建时间", "创建时间"); + //this.winGridViewPager1.AddColumnAlias("任务描述", "任务描述"); + //this.winGridViewPager1.AddColumnAlias("完成时间", "完成时间"); this.winGridViewPager1.AddColumnAlias("任务描述", "任务描述"); - this.winGridViewPager1.AddColumnAlias("完成时间", "完成时间"); + this.winGridViewPager1.AddColumnAlias("下发任务时间", "下发任务时间"); + this.winGridViewPager1.AddColumnAlias("接受任务时间", "接受任务时间"); + this.winGridViewPager1.AddColumnAlias("开始任务时间", "开始任务时间"); + //this.winGridViewPager1.AddColumnAlias("任务执行中时间", "任务执行中时间"); + this.winGridViewPager1.AddColumnAlias("完成任务时间", "完成任务时间"); this.winGridViewPager1.AddColumnAlias("任务执行区域", "任务执行区域"); this.winGridViewPager1.AddColumnAlias("任务状态", "任务状态"); this.winGridViewPager1.AddColumnAlias("任务执行人员", "任务执行人员"); - this.winGridViewPager1.DisplayColumns = "任务编号,创建时间,任务描述,完成时间,任务执行区域,任务状态,任务执行人员"; + //this.winGridViewPager1.DisplayColumns = "任务编号,创建时间,任务描述,完成时间,任务执行区域,任务状态,任务执行人员"; + this.winGridViewPager1.DisplayColumns = "任务编号,任务描述,下发任务时间,接受任务时间,开始任务时间,结束任务时间,任务执行区域,任务状态,任务执行人员"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -541,11 +548,17 @@ { string sqlCount = "select count(*) from taskinfo t where 1=1"; - string sqlData = "select dbid as 任务编号,deploytime as 创建时间,descirption as 任务描述," + - "finishtime as 完成时间,street as 任务执行区域,taskstate as 任务状态,username as 任务执行人员 " + - "from (select t.*,rownum row_num from taskinfo t order by DBID desc)b " + - " where 1=1"; + //string sqlData = "select dbid as 任务编号,deploytime as 创建时间,descirption as 任务描述," + + //"finishtime as 完成时间,street as 任务执行区域,taskstate as 任务状态,username as 任务执行人员 " + + // "from (select t.*,rownum row_num from taskinfo t order by DBID desc)b " + + // " where 1=1"; + string sqlData = "select dbid as 任务编号,descirption as 任务描述,deploytime as 下发任务时间," + + "case taskstate when '接受任务' then finishtime else null end as 接受任务时间," + + "case taskstate when '开始任务' then finishtime else null end as 开始任务时间," + + "case taskstate when '任务执行中' then finishtime else null end as 任务执行中时间, " + + "case taskstate when '结束任务' then finishtime else null end as 结束任务时间," + + "street as 任务执行区域,taskstate as 任务状态,username as 任务执行人员 from taskinfo t"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; @@ -556,10 +569,16 @@ int minPage = (pageIndex - 1) * maxPageIndex + 1; int maxPage = pageIndex * maxPageIndex; string sqlCount = "select count(*) from taskinfo t where 1=1"; - string sqlData = "select dbid as 任务编号,deploytime as 创建时间,descirption as 任务描述,"+ - "finishtime as 完成时间,street as 任务执行区域,taskstate as 任务状态,username as 任务执行人员 " + + //string sqlData = "select dbid as 任务编号,deploytime as 创建时间,descirption as 任务描述,"+ + //"finishtime as 完成时间,street as 任务执行区域,taskstate as 任务状态,username as 任务执行人员 " + + // "from (select t.*,rownum row_num from taskinfo t where 1=1"; + string sqlData = "select dbid as 任务编号,descirption as 任务描述,deploytime as 下发任务时间," + + "case taskstate when '接受任务' then finishtime else null end as 接受任务时间,"+ + "case taskstate when '开始任务' then finishtime else null end as 开始任务时间,"+ + "case taskstate when '任务执行中' then finishtime else null end as 任务执行中时间, "+ + "case taskstate when '结束任务' then finishtime else null end as 结束任务时间,"+ + "street as 任务执行区域,taskstate as 任务状态,username as 任务执行人员 " + "from (select t.*,rownum row_num from taskinfo t where 1=1"; - if (!String.IsNullOrEmpty(comboBox_userName.Text.Trim()) && !comboBox_userName.Text.Trim().Equals("不限")) { sqlCount += " and username='" + comboBox_userName.Text.Trim() + "' "; diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 04cb929..518c500 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -810,7 +810,7 @@ this.toolStripDropDownButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripDropDownButton1.Image"))); this.toolStripDropDownButton1.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripDropDownButton1.Name = "toolStripDropDownButton1"; - this.toolStripDropDownButton1.Size = new System.Drawing.Size(45, 21); + this.toolStripDropDownButton1.Size = new System.Drawing.Size(45, 20); this.toolStripDropDownButton1.Text = "帮助"; this.toolStripDropDownButton1.Visible = false; this.toolStripDropDownButton1.Click += new System.EventHandler(this.toolStripDropDownButton1_Click); @@ -4124,11 +4124,11 @@ // this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonControl1.Controls.Add(this.ribbonPanel1); - this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel3); this.ribbonControl1.Controls.Add(this.ribbonPanel7); + this.ribbonControl1.Controls.Add(this.ribbonPanel1); + this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Dock = System.Windows.Forms.DockStyle.Top; this.ribbonControl1.ImeMode = System.Windows.Forms.ImeMode.NoControl; @@ -4197,6 +4197,7 @@ this.ribbonPanel1.StyleMouseOver.Class = ""; this.ribbonPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel1.TabIndex = 1; + this.ribbonPanel1.Visible = false; // // ribbonBar21 // @@ -5643,7 +5644,6 @@ this.ribbonPanel2.StyleMouseOver.Class = ""; this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; // // ribbonBar4 // @@ -6017,7 +6017,6 @@ // ribbonTabItem1 // this.ribbonTabItem1.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; - this.ribbonTabItem1.Checked = true; this.ribbonTabItem1.HoverImage = global::Cyberpipe.Properties.Resources._24x24icon_01_hover; this.ribbonTabItem1.Image = global::Cyberpipe.Properties.Resources._24x24icon_01; this.ribbonTabItem1.Name = "ribbonTabItem1"; @@ -6036,6 +6035,7 @@ // ribbonTabItem2 // this.ribbonTabItem2.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; + this.ribbonTabItem2.Checked = true; this.ribbonTabItem2.ColorTable = DevComponents.DotNetBar.eRibbonTabColor.Green; this.ribbonTabItem2.HoverImage = ((System.Drawing.Image)(resources.GetObject("ribbonTabItem2.HoverImage"))); this.ribbonTabItem2.Image = ((System.Drawing.Image)(resources.GetObject("ribbonTabItem2.Image"))); diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 2c67d44..b69ab53 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_TaskManager.Designer.cs b/EMS_Forms/Form_TaskManager.Designer.cs index 82b283d..af11e6b 100644 --- a/EMS_Forms/Form_TaskManager.Designer.cs +++ b/EMS_Forms/Form_TaskManager.Designer.cs @@ -177,7 +177,7 @@ this.labelX3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX3.Location = new System.Drawing.Point(498, 20); this.labelX3.Name = "labelX3"; - this.labelX3.Size = new System.Drawing.Size(14, 14); + this.labelX3.Size = new System.Drawing.Size(19, 16); this.labelX3.TabIndex = 0; this.labelX3.Text = "—"; // @@ -192,7 +192,7 @@ this.labelX2.Name = "labelX2"; this.labelX2.Size = new System.Drawing.Size(60, 23); this.labelX2.TabIndex = 0; - this.labelX2.Text = "任务时间"; + this.labelX2.Text = "下发时间"; // // labelX1 // diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 2b3612c..7c98a13 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -394,14 +394,21 @@ this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; this.winGridViewPager1.AddColumnAlias("任务编号", "任务编号"); - this.winGridViewPager1.AddColumnAlias("创建时间", "创建时间"); + //this.winGridViewPager1.AddColumnAlias("创建时间", "创建时间"); + //this.winGridViewPager1.AddColumnAlias("任务描述", "任务描述"); + //this.winGridViewPager1.AddColumnAlias("完成时间", "完成时间"); this.winGridViewPager1.AddColumnAlias("任务描述", "任务描述"); - this.winGridViewPager1.AddColumnAlias("完成时间", "完成时间"); + this.winGridViewPager1.AddColumnAlias("下发任务时间", "下发任务时间"); + this.winGridViewPager1.AddColumnAlias("接受任务时间", "接受任务时间"); + this.winGridViewPager1.AddColumnAlias("开始任务时间", "开始任务时间"); + //this.winGridViewPager1.AddColumnAlias("任务执行中时间", "任务执行中时间"); + this.winGridViewPager1.AddColumnAlias("完成任务时间", "完成任务时间"); this.winGridViewPager1.AddColumnAlias("任务执行区域", "任务执行区域"); this.winGridViewPager1.AddColumnAlias("任务状态", "任务状态"); this.winGridViewPager1.AddColumnAlias("任务执行人员", "任务执行人员"); - this.winGridViewPager1.DisplayColumns = "任务编号,创建时间,任务描述,完成时间,任务执行区域,任务状态,任务执行人员"; + //this.winGridViewPager1.DisplayColumns = "任务编号,创建时间,任务描述,完成时间,任务执行区域,任务状态,任务执行人员"; + this.winGridViewPager1.DisplayColumns = "任务编号,任务描述,下发任务时间,接受任务时间,开始任务时间,结束任务时间,任务执行区域,任务状态,任务执行人员"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -541,11 +548,17 @@ { string sqlCount = "select count(*) from taskinfo t where 1=1"; - string sqlData = "select dbid as 任务编号,deploytime as 创建时间,descirption as 任务描述," + - "finishtime as 完成时间,street as 任务执行区域,taskstate as 任务状态,username as 任务执行人员 " + - "from (select t.*,rownum row_num from taskinfo t order by DBID desc)b " + - " where 1=1"; + //string sqlData = "select dbid as 任务编号,deploytime as 创建时间,descirption as 任务描述," + + //"finishtime as 完成时间,street as 任务执行区域,taskstate as 任务状态,username as 任务执行人员 " + + // "from (select t.*,rownum row_num from taskinfo t order by DBID desc)b " + + // " where 1=1"; + string sqlData = "select dbid as 任务编号,descirption as 任务描述,deploytime as 下发任务时间," + + "case taskstate when '接受任务' then finishtime else null end as 接受任务时间," + + "case taskstate when '开始任务' then finishtime else null end as 开始任务时间," + + "case taskstate when '任务执行中' then finishtime else null end as 任务执行中时间, " + + "case taskstate when '结束任务' then finishtime else null end as 结束任务时间," + + "street as 任务执行区域,taskstate as 任务状态,username as 任务执行人员 from taskinfo t"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; @@ -556,10 +569,16 @@ int minPage = (pageIndex - 1) * maxPageIndex + 1; int maxPage = pageIndex * maxPageIndex; string sqlCount = "select count(*) from taskinfo t where 1=1"; - string sqlData = "select dbid as 任务编号,deploytime as 创建时间,descirption as 任务描述,"+ - "finishtime as 完成时间,street as 任务执行区域,taskstate as 任务状态,username as 任务执行人员 " + + //string sqlData = "select dbid as 任务编号,deploytime as 创建时间,descirption as 任务描述,"+ + //"finishtime as 完成时间,street as 任务执行区域,taskstate as 任务状态,username as 任务执行人员 " + + // "from (select t.*,rownum row_num from taskinfo t where 1=1"; + string sqlData = "select dbid as 任务编号,descirption as 任务描述,deploytime as 下发任务时间," + + "case taskstate when '接受任务' then finishtime else null end as 接受任务时间,"+ + "case taskstate when '开始任务' then finishtime else null end as 开始任务时间,"+ + "case taskstate when '任务执行中' then finishtime else null end as 任务执行中时间, "+ + "case taskstate when '结束任务' then finishtime else null end as 结束任务时间,"+ + "street as 任务执行区域,taskstate as 任务状态,username as 任务执行人员 " + "from (select t.*,rownum row_num from taskinfo t where 1=1"; - if (!String.IsNullOrEmpty(comboBox_userName.Text.Trim()) && !comboBox_userName.Text.Trim().Equals("不限")) { sqlCount += " and username='" + comboBox_userName.Text.Trim() + "' "; diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 04cb929..518c500 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -810,7 +810,7 @@ this.toolStripDropDownButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripDropDownButton1.Image"))); this.toolStripDropDownButton1.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripDropDownButton1.Name = "toolStripDropDownButton1"; - this.toolStripDropDownButton1.Size = new System.Drawing.Size(45, 21); + this.toolStripDropDownButton1.Size = new System.Drawing.Size(45, 20); this.toolStripDropDownButton1.Text = "帮助"; this.toolStripDropDownButton1.Visible = false; this.toolStripDropDownButton1.Click += new System.EventHandler(this.toolStripDropDownButton1_Click); @@ -4124,11 +4124,11 @@ // this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonControl1.Controls.Add(this.ribbonPanel1); - this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel3); this.ribbonControl1.Controls.Add(this.ribbonPanel7); + this.ribbonControl1.Controls.Add(this.ribbonPanel1); + this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Dock = System.Windows.Forms.DockStyle.Top; this.ribbonControl1.ImeMode = System.Windows.Forms.ImeMode.NoControl; @@ -4197,6 +4197,7 @@ this.ribbonPanel1.StyleMouseOver.Class = ""; this.ribbonPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel1.TabIndex = 1; + this.ribbonPanel1.Visible = false; // // ribbonBar21 // @@ -5643,7 +5644,6 @@ this.ribbonPanel2.StyleMouseOver.Class = ""; this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; // // ribbonBar4 // @@ -6017,7 +6017,6 @@ // ribbonTabItem1 // this.ribbonTabItem1.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; - this.ribbonTabItem1.Checked = true; this.ribbonTabItem1.HoverImage = global::Cyberpipe.Properties.Resources._24x24icon_01_hover; this.ribbonTabItem1.Image = global::Cyberpipe.Properties.Resources._24x24icon_01; this.ribbonTabItem1.Name = "ribbonTabItem1"; @@ -6036,6 +6035,7 @@ // ribbonTabItem2 // this.ribbonTabItem2.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; + this.ribbonTabItem2.Checked = true; this.ribbonTabItem2.ColorTable = DevComponents.DotNetBar.eRibbonTabColor.Green; this.ribbonTabItem2.HoverImage = ((System.Drawing.Image)(resources.GetObject("ribbonTabItem2.HoverImage"))); this.ribbonTabItem2.Image = ((System.Drawing.Image)(resources.GetObject("ribbonTabItem2.Image"))); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 75ae693..773cf0c 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 2c67d44..b69ab53 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_TaskManager.Designer.cs b/EMS_Forms/Form_TaskManager.Designer.cs index 82b283d..af11e6b 100644 --- a/EMS_Forms/Form_TaskManager.Designer.cs +++ b/EMS_Forms/Form_TaskManager.Designer.cs @@ -177,7 +177,7 @@ this.labelX3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX3.Location = new System.Drawing.Point(498, 20); this.labelX3.Name = "labelX3"; - this.labelX3.Size = new System.Drawing.Size(14, 14); + this.labelX3.Size = new System.Drawing.Size(19, 16); this.labelX3.TabIndex = 0; this.labelX3.Text = "—"; // @@ -192,7 +192,7 @@ this.labelX2.Name = "labelX2"; this.labelX2.Size = new System.Drawing.Size(60, 23); this.labelX2.TabIndex = 0; - this.labelX2.Text = "任务时间"; + this.labelX2.Text = "下发时间"; // // labelX1 // diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 2b3612c..7c98a13 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -394,14 +394,21 @@ this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; this.winGridViewPager1.AddColumnAlias("任务编号", "任务编号"); - this.winGridViewPager1.AddColumnAlias("创建时间", "创建时间"); + //this.winGridViewPager1.AddColumnAlias("创建时间", "创建时间"); + //this.winGridViewPager1.AddColumnAlias("任务描述", "任务描述"); + //this.winGridViewPager1.AddColumnAlias("完成时间", "完成时间"); this.winGridViewPager1.AddColumnAlias("任务描述", "任务描述"); - this.winGridViewPager1.AddColumnAlias("完成时间", "完成时间"); + this.winGridViewPager1.AddColumnAlias("下发任务时间", "下发任务时间"); + this.winGridViewPager1.AddColumnAlias("接受任务时间", "接受任务时间"); + this.winGridViewPager1.AddColumnAlias("开始任务时间", "开始任务时间"); + //this.winGridViewPager1.AddColumnAlias("任务执行中时间", "任务执行中时间"); + this.winGridViewPager1.AddColumnAlias("完成任务时间", "完成任务时间"); this.winGridViewPager1.AddColumnAlias("任务执行区域", "任务执行区域"); this.winGridViewPager1.AddColumnAlias("任务状态", "任务状态"); this.winGridViewPager1.AddColumnAlias("任务执行人员", "任务执行人员"); - this.winGridViewPager1.DisplayColumns = "任务编号,创建时间,任务描述,完成时间,任务执行区域,任务状态,任务执行人员"; + //this.winGridViewPager1.DisplayColumns = "任务编号,创建时间,任务描述,完成时间,任务执行区域,任务状态,任务执行人员"; + this.winGridViewPager1.DisplayColumns = "任务编号,任务描述,下发任务时间,接受任务时间,开始任务时间,结束任务时间,任务执行区域,任务状态,任务执行人员"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -541,11 +548,17 @@ { string sqlCount = "select count(*) from taskinfo t where 1=1"; - string sqlData = "select dbid as 任务编号,deploytime as 创建时间,descirption as 任务描述," + - "finishtime as 完成时间,street as 任务执行区域,taskstate as 任务状态,username as 任务执行人员 " + - "from (select t.*,rownum row_num from taskinfo t order by DBID desc)b " + - " where 1=1"; + //string sqlData = "select dbid as 任务编号,deploytime as 创建时间,descirption as 任务描述," + + //"finishtime as 完成时间,street as 任务执行区域,taskstate as 任务状态,username as 任务执行人员 " + + // "from (select t.*,rownum row_num from taskinfo t order by DBID desc)b " + + // " where 1=1"; + string sqlData = "select dbid as 任务编号,descirption as 任务描述,deploytime as 下发任务时间," + + "case taskstate when '接受任务' then finishtime else null end as 接受任务时间," + + "case taskstate when '开始任务' then finishtime else null end as 开始任务时间," + + "case taskstate when '任务执行中' then finishtime else null end as 任务执行中时间, " + + "case taskstate when '结束任务' then finishtime else null end as 结束任务时间," + + "street as 任务执行区域,taskstate as 任务状态,username as 任务执行人员 from taskinfo t"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; @@ -556,10 +569,16 @@ int minPage = (pageIndex - 1) * maxPageIndex + 1; int maxPage = pageIndex * maxPageIndex; string sqlCount = "select count(*) from taskinfo t where 1=1"; - string sqlData = "select dbid as 任务编号,deploytime as 创建时间,descirption as 任务描述,"+ - "finishtime as 完成时间,street as 任务执行区域,taskstate as 任务状态,username as 任务执行人员 " + + //string sqlData = "select dbid as 任务编号,deploytime as 创建时间,descirption as 任务描述,"+ + //"finishtime as 完成时间,street as 任务执行区域,taskstate as 任务状态,username as 任务执行人员 " + + // "from (select t.*,rownum row_num from taskinfo t where 1=1"; + string sqlData = "select dbid as 任务编号,descirption as 任务描述,deploytime as 下发任务时间," + + "case taskstate when '接受任务' then finishtime else null end as 接受任务时间,"+ + "case taskstate when '开始任务' then finishtime else null end as 开始任务时间,"+ + "case taskstate when '任务执行中' then finishtime else null end as 任务执行中时间, "+ + "case taskstate when '结束任务' then finishtime else null end as 结束任务时间,"+ + "street as 任务执行区域,taskstate as 任务状态,username as 任务执行人员 " + "from (select t.*,rownum row_num from taskinfo t where 1=1"; - if (!String.IsNullOrEmpty(comboBox_userName.Text.Trim()) && !comboBox_userName.Text.Trim().Equals("不限")) { sqlCount += " and username='" + comboBox_userName.Text.Trim() + "' "; diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 04cb929..518c500 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -810,7 +810,7 @@ this.toolStripDropDownButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripDropDownButton1.Image"))); this.toolStripDropDownButton1.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripDropDownButton1.Name = "toolStripDropDownButton1"; - this.toolStripDropDownButton1.Size = new System.Drawing.Size(45, 21); + this.toolStripDropDownButton1.Size = new System.Drawing.Size(45, 20); this.toolStripDropDownButton1.Text = "帮助"; this.toolStripDropDownButton1.Visible = false; this.toolStripDropDownButton1.Click += new System.EventHandler(this.toolStripDropDownButton1_Click); @@ -4124,11 +4124,11 @@ // this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonControl1.Controls.Add(this.ribbonPanel1); - this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel3); this.ribbonControl1.Controls.Add(this.ribbonPanel7); + this.ribbonControl1.Controls.Add(this.ribbonPanel1); + this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Dock = System.Windows.Forms.DockStyle.Top; this.ribbonControl1.ImeMode = System.Windows.Forms.ImeMode.NoControl; @@ -4197,6 +4197,7 @@ this.ribbonPanel1.StyleMouseOver.Class = ""; this.ribbonPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel1.TabIndex = 1; + this.ribbonPanel1.Visible = false; // // ribbonBar21 // @@ -5643,7 +5644,6 @@ this.ribbonPanel2.StyleMouseOver.Class = ""; this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; // // ribbonBar4 // @@ -6017,7 +6017,6 @@ // ribbonTabItem1 // this.ribbonTabItem1.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; - this.ribbonTabItem1.Checked = true; this.ribbonTabItem1.HoverImage = global::Cyberpipe.Properties.Resources._24x24icon_01_hover; this.ribbonTabItem1.Image = global::Cyberpipe.Properties.Resources._24x24icon_01; this.ribbonTabItem1.Name = "ribbonTabItem1"; @@ -6036,6 +6035,7 @@ // ribbonTabItem2 // this.ribbonTabItem2.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; + this.ribbonTabItem2.Checked = true; this.ribbonTabItem2.ColorTable = DevComponents.DotNetBar.eRibbonTabColor.Green; this.ribbonTabItem2.HoverImage = ((System.Drawing.Image)(resources.GetObject("ribbonTabItem2.HoverImage"))); this.ribbonTabItem2.Image = ((System.Drawing.Image)(resources.GetObject("ribbonTabItem2.Image"))); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 75ae693..773cf0c 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index 44897ee..b64c73d 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ