diff --git a/Cyberpipe.csproj b/Cyberpipe.csproj index fe600e5..501fd09 100644 --- a/Cyberpipe.csproj +++ b/Cyberpipe.csproj @@ -246,6 +246,12 @@ Form_TaskManager.cs + + Form + + + FrmFlagDetail.cs + Form @@ -1368,6 +1374,9 @@ Form_TaskManager.cs + + FrmFlagDetail.cs + FormDocumentManager.cs diff --git a/Cyberpipe.csproj b/Cyberpipe.csproj index fe600e5..501fd09 100644 --- a/Cyberpipe.csproj +++ b/Cyberpipe.csproj @@ -246,6 +246,12 @@ Form_TaskManager.cs + + Form + + + FrmFlagDetail.cs + Form @@ -1368,6 +1374,9 @@ Form_TaskManager.cs + + FrmFlagDetail.cs + FormDocumentManager.cs diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 537b4c3..1acf22a 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/Cyberpipe.csproj b/Cyberpipe.csproj index fe600e5..501fd09 100644 --- a/Cyberpipe.csproj +++ b/Cyberpipe.csproj @@ -246,6 +246,12 @@ Form_TaskManager.cs + + Form + + + FrmFlagDetail.cs + Form @@ -1368,6 +1374,9 @@ Form_TaskManager.cs + + FrmFlagDetail.cs + FormDocumentManager.cs diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 537b4c3..1acf22a 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 7d5dd95..3f178cb 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -90,20 +90,20 @@ this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - - this.winGridViewPager1.AddColumnAlias("ACCIDENTTIME", "上报时间"); - this.winGridViewPager1.AddColumnAlias("DBID", "编号"); - this.winGridViewPager1.AddColumnAlias("DESCRIBE", "事件描述"); - this.winGridViewPager1.AddColumnAlias("LATITUDE", "纬度"); - this.winGridViewPager1.AddColumnAlias("LOCALE", "事件地点"); - this.winGridViewPager1.AddColumnAlias("LONGITUDE", "经度"); - this.winGridViewPager1.AddColumnAlias("PATROLERNAME", "上报人员"); - this.winGridViewPager1.AddColumnAlias("PATROLER_ID", "人员ID"); - this.winGridViewPager1.AddColumnAlias("TASK_ID", "任务编号"); - this.winGridViewPager1.AddColumnAlias("RESULT", "处理结果"); - this.winGridViewPager1.AddColumnAlias("STATE", "处理状态"); - this.winGridViewPager1.DisplayColumns = "ACCIDENTTIME,DESCRIBE,LOCALE,PATROLERNAME,TASK_ID,RESULT,STATE"; + this.winGridViewPager1.AddColumnAlias("上报时间", "上报时间"); + this.winGridViewPager1.AddColumnAlias("编号", "编号"); + this.winGridViewPager1.AddColumnAlias("事件描述", "事件描述"); + this.winGridViewPager1.AddColumnAlias("纬度", "纬度"); + this.winGridViewPager1.AddColumnAlias("事件地点", "事件地点"); + this.winGridViewPager1.AddColumnAlias("经度", "经度"); + this.winGridViewPager1.AddColumnAlias("上报人员", "上报人员"); + this.winGridViewPager1.AddColumnAlias("人员ID", "人员ID"); + this.winGridViewPager1.AddColumnAlias("任务编号", "任务编号"); + this.winGridViewPager1.AddColumnAlias("处理结果", "处理结果"); + this.winGridViewPager1.AddColumnAlias("处理状态", "处理状态"); + + this.winGridViewPager1.DisplayColumns = "上报时间,事件描述,事件地点,上报人员,任务编号,处理结果,处理状态"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -114,8 +114,8 @@ winGridViewPager1.dataGridView1.ContextMenuStrip.Items[5].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[6].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[7].Visible = false; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[1].Text = "查看位置"; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "结果编辑"; + winGridViewPager1.dataGridView1.ContextMenuStrip.Items[1].Text = "结果编辑"; + winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "查看位置"; //右键菜单宽度 winGridViewPager1.dataGridView1.ContextMenuStrip.AutoSize = false; @@ -160,13 +160,12 @@ this.WindowState = FormWindowState.Minimized; globeControl1.Globe.MemoryLayer.RemoveAllFeature(); this.WindowState = FormWindowState.Minimized; - double x = Convert.ToDouble(row.Cells["LONGITUDE"].Value); - double y = Convert.ToDouble(row.Cells["LATITUDE"].Value); - - string username = Convert.ToString(row.Cells["PATROLERNAME"].Value); - string Atime = Convert.ToString(row.Cells["ACCIDENTTIME"].Value); - string location = Convert.ToString(row.Cells["LOCALE"].Value); - string descp = Convert.ToString(row.Cells["DESCRIBE"].Value); + double x = Convert.ToDouble(row.Cells["经度"].Value); + double y = Convert.ToDouble(row.Cells["纬度"].Value); + string username = Convert.ToString(row.Cells["上报人员"].Value); + string Atime = Convert.ToString(row.Cells["上报时间"].Value); + string location = Convert.ToString(row.Cells["事件地点"].Value); + string descp = Convert.ToString(row.Cells["事件描述"].Value); /////////////////////////////////////// /*******设置飞行与创建模型******/ @@ -228,8 +227,8 @@ DataGridViewRow row = grid.SelectedRows[0]; try { - int dbId = Convert.ToInt32(row.Cells["DBID"].Value); - string result = Convert.ToString(row.Cells["RESULT"].Value); + int dbId = Convert.ToInt32(row.Cells["编号"].Value); + string result = Convert.ToString(row.Cells["处理结果"].Value); EMS_Forms.Form_EventResult form = new Form_EventResult(dbId, result); form.refresh += new Form_EventResult.Handle(LoadData);//改变值的事件 form.ShowDialog(); @@ -276,9 +275,9 @@ } for (int i = 0; i < table.Rows.Count; i++) { - if (winGridViewPager1.dataGridView1.Rows[i].Cells["RESULT"].Value != null && !(winGridViewPager1.dataGridView1.Rows[i].Cells["RESULT"].Value.ToString().Trim().Equals(""))) + if (winGridViewPager1.dataGridView1.Rows[i].Cells["处理结果"].Value != null && !(winGridViewPager1.dataGridView1.Rows[i].Cells["处理结果"].Value.ToString().Trim().Equals(""))) { - winGridViewPager1.dataGridView1.Rows[i].Cells["STATE"].Value = "已处理"; + winGridViewPager1.dataGridView1.Rows[i].Cells["处理状态"].Value = "已处理"; } } @@ -307,9 +306,9 @@ } for (int i = 0; i < table.Rows.Count; i++) { - if (winGridViewPager1.dataGridView1.Rows[i].Cells["RESULT"].Value != null && !(winGridViewPager1.dataGridView1.Rows[i].Cells["RESULT"].Value.ToString().Trim().Equals(""))) + if (winGridViewPager1.dataGridView1.Rows[i].Cells["处理结果"].Value != null && !(winGridViewPager1.dataGridView1.Rows[i].Cells["处理结果"].Value.ToString().Trim().Equals(""))) { - winGridViewPager1.dataGridView1.Rows[i].Cells["STATE"].Value = "已处理"; + winGridViewPager1.dataGridView1.Rows[i].Cells["处理状态"].Value = "已处理"; } } @@ -320,10 +319,12 @@ { string sqlCount = "select count(*) from ACCIDENT where 1=1"; - string sqlData = "select ACCIDENTTIME,DBID,DESCRIBE,LATITUDE,LOCALE,LONGITUDE,PATROLERNAME,PATROLER_ID,TASK_ID,RESULT,'' as STATE " + + string sqlData = "select ACCIDENTTIME as 上报时间,DBID as 编号,DESCRIBE as 事件描述,"+ + "LATITUDE as 纬度,LOCALE as 事件地点,LONGITUDE as 经度,PATROLERNAME 上报人员,"+ + "PATROLER_ID as 人员ID,TASK_ID as 任务编号,RESULT as 处理结果,'' as 处理状态 " + "from (select t.*,rownum row_num from ACCIDENT t order by DBID)b " + " where 1=1"; - + rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; @@ -340,9 +341,10 @@ string sqlCount = "select count(*) from ACCIDENT where 1=1"; - string sqlData = "select ACCIDENTTIME,DBID,DESCRIBE,LATITUDE,LOCALE,LONGITUDE,PATROLERNAME,PATROLER_ID,TASK_ID,RESULT,'' as STATE " + - "from (select t.*,rownum row_num from ACCIDENT t order by DBID)b " + - " where(b.row_num between " + minPage + " and " + maxPage + ")"; + string sqlData = "select ACCIDENTTIME as 上报时间,DBID as 编号,DESCRIBE as 事件描述," + + "LATITUDE as 纬度,LOCALE as 事件地点,LONGITUDE as 经度,PATROLERNAME 上报人员," + + "PATROLER_ID as 人员ID,TASK_ID as 任务编号,RESULT as 处理结果,'' as 处理状态 " + + "from (select t.*,rownum row_num from ACCIDENT t where 1=1"; if (!String.IsNullOrEmpty(comboBox_name.Text.Trim())) { @@ -361,7 +363,8 @@ sqlCount += "and ACCIDENTTIME<=to_date('" + time.ToShortDateString() + "','yyyy-MM-dd') "; sqlData += "and ACCIDENTTIME<=to_date('" + time.ToShortDateString() + "','yyyy-MM-dd') "; } - + sqlData += " order by DBID desc)b " + + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; diff --git a/Cyberpipe.csproj b/Cyberpipe.csproj index fe600e5..501fd09 100644 --- a/Cyberpipe.csproj +++ b/Cyberpipe.csproj @@ -246,6 +246,12 @@ Form_TaskManager.cs + + Form + + + FrmFlagDetail.cs + Form @@ -1368,6 +1374,9 @@ Form_TaskManager.cs + + FrmFlagDetail.cs + FormDocumentManager.cs diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 537b4c3..1acf22a 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 7d5dd95..3f178cb 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -90,20 +90,20 @@ this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - - this.winGridViewPager1.AddColumnAlias("ACCIDENTTIME", "上报时间"); - this.winGridViewPager1.AddColumnAlias("DBID", "编号"); - this.winGridViewPager1.AddColumnAlias("DESCRIBE", "事件描述"); - this.winGridViewPager1.AddColumnAlias("LATITUDE", "纬度"); - this.winGridViewPager1.AddColumnAlias("LOCALE", "事件地点"); - this.winGridViewPager1.AddColumnAlias("LONGITUDE", "经度"); - this.winGridViewPager1.AddColumnAlias("PATROLERNAME", "上报人员"); - this.winGridViewPager1.AddColumnAlias("PATROLER_ID", "人员ID"); - this.winGridViewPager1.AddColumnAlias("TASK_ID", "任务编号"); - this.winGridViewPager1.AddColumnAlias("RESULT", "处理结果"); - this.winGridViewPager1.AddColumnAlias("STATE", "处理状态"); - this.winGridViewPager1.DisplayColumns = "ACCIDENTTIME,DESCRIBE,LOCALE,PATROLERNAME,TASK_ID,RESULT,STATE"; + this.winGridViewPager1.AddColumnAlias("上报时间", "上报时间"); + this.winGridViewPager1.AddColumnAlias("编号", "编号"); + this.winGridViewPager1.AddColumnAlias("事件描述", "事件描述"); + this.winGridViewPager1.AddColumnAlias("纬度", "纬度"); + this.winGridViewPager1.AddColumnAlias("事件地点", "事件地点"); + this.winGridViewPager1.AddColumnAlias("经度", "经度"); + this.winGridViewPager1.AddColumnAlias("上报人员", "上报人员"); + this.winGridViewPager1.AddColumnAlias("人员ID", "人员ID"); + this.winGridViewPager1.AddColumnAlias("任务编号", "任务编号"); + this.winGridViewPager1.AddColumnAlias("处理结果", "处理结果"); + this.winGridViewPager1.AddColumnAlias("处理状态", "处理状态"); + + this.winGridViewPager1.DisplayColumns = "上报时间,事件描述,事件地点,上报人员,任务编号,处理结果,处理状态"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -114,8 +114,8 @@ winGridViewPager1.dataGridView1.ContextMenuStrip.Items[5].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[6].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[7].Visible = false; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[1].Text = "查看位置"; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "结果编辑"; + winGridViewPager1.dataGridView1.ContextMenuStrip.Items[1].Text = "结果编辑"; + winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "查看位置"; //右键菜单宽度 winGridViewPager1.dataGridView1.ContextMenuStrip.AutoSize = false; @@ -160,13 +160,12 @@ this.WindowState = FormWindowState.Minimized; globeControl1.Globe.MemoryLayer.RemoveAllFeature(); this.WindowState = FormWindowState.Minimized; - double x = Convert.ToDouble(row.Cells["LONGITUDE"].Value); - double y = Convert.ToDouble(row.Cells["LATITUDE"].Value); - - string username = Convert.ToString(row.Cells["PATROLERNAME"].Value); - string Atime = Convert.ToString(row.Cells["ACCIDENTTIME"].Value); - string location = Convert.ToString(row.Cells["LOCALE"].Value); - string descp = Convert.ToString(row.Cells["DESCRIBE"].Value); + double x = Convert.ToDouble(row.Cells["经度"].Value); + double y = Convert.ToDouble(row.Cells["纬度"].Value); + string username = Convert.ToString(row.Cells["上报人员"].Value); + string Atime = Convert.ToString(row.Cells["上报时间"].Value); + string location = Convert.ToString(row.Cells["事件地点"].Value); + string descp = Convert.ToString(row.Cells["事件描述"].Value); /////////////////////////////////////// /*******设置飞行与创建模型******/ @@ -228,8 +227,8 @@ DataGridViewRow row = grid.SelectedRows[0]; try { - int dbId = Convert.ToInt32(row.Cells["DBID"].Value); - string result = Convert.ToString(row.Cells["RESULT"].Value); + int dbId = Convert.ToInt32(row.Cells["编号"].Value); + string result = Convert.ToString(row.Cells["处理结果"].Value); EMS_Forms.Form_EventResult form = new Form_EventResult(dbId, result); form.refresh += new Form_EventResult.Handle(LoadData);//改变值的事件 form.ShowDialog(); @@ -276,9 +275,9 @@ } for (int i = 0; i < table.Rows.Count; i++) { - if (winGridViewPager1.dataGridView1.Rows[i].Cells["RESULT"].Value != null && !(winGridViewPager1.dataGridView1.Rows[i].Cells["RESULT"].Value.ToString().Trim().Equals(""))) + if (winGridViewPager1.dataGridView1.Rows[i].Cells["处理结果"].Value != null && !(winGridViewPager1.dataGridView1.Rows[i].Cells["处理结果"].Value.ToString().Trim().Equals(""))) { - winGridViewPager1.dataGridView1.Rows[i].Cells["STATE"].Value = "已处理"; + winGridViewPager1.dataGridView1.Rows[i].Cells["处理状态"].Value = "已处理"; } } @@ -307,9 +306,9 @@ } for (int i = 0; i < table.Rows.Count; i++) { - if (winGridViewPager1.dataGridView1.Rows[i].Cells["RESULT"].Value != null && !(winGridViewPager1.dataGridView1.Rows[i].Cells["RESULT"].Value.ToString().Trim().Equals(""))) + if (winGridViewPager1.dataGridView1.Rows[i].Cells["处理结果"].Value != null && !(winGridViewPager1.dataGridView1.Rows[i].Cells["处理结果"].Value.ToString().Trim().Equals(""))) { - winGridViewPager1.dataGridView1.Rows[i].Cells["STATE"].Value = "已处理"; + winGridViewPager1.dataGridView1.Rows[i].Cells["处理状态"].Value = "已处理"; } } @@ -320,10 +319,12 @@ { string sqlCount = "select count(*) from ACCIDENT where 1=1"; - string sqlData = "select ACCIDENTTIME,DBID,DESCRIBE,LATITUDE,LOCALE,LONGITUDE,PATROLERNAME,PATROLER_ID,TASK_ID,RESULT,'' as STATE " + + string sqlData = "select ACCIDENTTIME as 上报时间,DBID as 编号,DESCRIBE as 事件描述,"+ + "LATITUDE as 纬度,LOCALE as 事件地点,LONGITUDE as 经度,PATROLERNAME 上报人员,"+ + "PATROLER_ID as 人员ID,TASK_ID as 任务编号,RESULT as 处理结果,'' as 处理状态 " + "from (select t.*,rownum row_num from ACCIDENT t order by DBID)b " + " where 1=1"; - + rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; @@ -340,9 +341,10 @@ string sqlCount = "select count(*) from ACCIDENT where 1=1"; - string sqlData = "select ACCIDENTTIME,DBID,DESCRIBE,LATITUDE,LOCALE,LONGITUDE,PATROLERNAME,PATROLER_ID,TASK_ID,RESULT,'' as STATE " + - "from (select t.*,rownum row_num from ACCIDENT t order by DBID)b " + - " where(b.row_num between " + minPage + " and " + maxPage + ")"; + string sqlData = "select ACCIDENTTIME as 上报时间,DBID as 编号,DESCRIBE as 事件描述," + + "LATITUDE as 纬度,LOCALE as 事件地点,LONGITUDE as 经度,PATROLERNAME 上报人员," + + "PATROLER_ID as 人员ID,TASK_ID as 任务编号,RESULT as 处理结果,'' as 处理状态 " + + "from (select t.*,rownum row_num from ACCIDENT t where 1=1"; if (!String.IsNullOrEmpty(comboBox_name.Text.Trim())) { @@ -361,7 +363,8 @@ sqlCount += "and ACCIDENTTIME<=to_date('" + time.ToShortDateString() + "','yyyy-MM-dd') "; sqlData += "and ACCIDENTTIME<=to_date('" + time.ToShortDateString() + "','yyyy-MM-dd') "; } - + sqlData += " order by DBID desc)b " + + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 225c8d7..8bd9e48 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -120,8 +120,8 @@ private void flyToTask(DataGridViewRow row, int taskState) { int dbID = 0; - dbID = Convert.ToInt32(row.Cells["DBID"].Value); - string userName = Convert.ToString(row.Cells["USERNAME"].Value); + dbID = Convert.ToInt32(row.Cells["任务编号"].Value); + string userName = Convert.ToString(row.Cells["任务执行人员"].Value); System.DateTime t = new DateTime(); try { @@ -392,15 +392,15 @@ //控制表格显示的列，以及每一列要显示的列名 this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - this.winGridViewPager1.AddColumnAlias("DBID", "任务编号"); - this.winGridViewPager1.AddColumnAlias("DEPLOYTIME", "创建时间"); - this.winGridViewPager1.AddColumnAlias("DESCIRPTION", "任务描述"); - this.winGridViewPager1.AddColumnAlias("FINISHTIME", "完成时间"); - this.winGridViewPager1.AddColumnAlias("STREET", "任务执行区域"); - this.winGridViewPager1.AddColumnAlias("TASKSTATE", "任务状态"); - this.winGridViewPager1.AddColumnAlias("USERNAME", "任务执行人员"); + this.winGridViewPager1.AddColumnAlias("任务编号", "任务编号"); + this.winGridViewPager1.AddColumnAlias("创建时间", "创建时间"); + this.winGridViewPager1.AddColumnAlias("任务描述", "任务描述"); + this.winGridViewPager1.AddColumnAlias("完成时间", "完成时间"); + this.winGridViewPager1.AddColumnAlias("任务执行区域", "任务执行区域"); + this.winGridViewPager1.AddColumnAlias("任务状态", "任务状态"); + this.winGridViewPager1.AddColumnAlias("任务执行人员", "任务执行人员"); - this.winGridViewPager1.DisplayColumns = "DBID,DEPLOYTIME,DESCIRPTION,FINISHTIME,STREET,TASKSTATE,USERNAME"; + this.winGridViewPager1.DisplayColumns = "任务编号,创建时间,任务描述,完成时间,任务执行区域,任务状态,任务执行人员"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -464,8 +464,8 @@ { int dbID = 0; int taskStateInt = 0; - dbID = Convert.ToInt32(row.Cells["DBID"].Value); - string taskState = row.Cells["TASKSTATE"].Value.ToString(); + dbID = Convert.ToInt32(row.Cells["任务编号"].Value); + string taskState = row.Cells["任务状态"].Value.ToString(); if (taskState.Equals("开始任务")) { taskStateInt = 1; @@ -534,9 +534,10 @@ private string GetSql() { - string sqlCount = "select count(*) from taskinfo t where 1=1'"; + string sqlCount = "select count(*) from taskinfo t where 1=1"; - string sqlData = "select dbid,deploytime,descirption,finishtime,street,taskstate,username " + + 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"; @@ -550,9 +551,9 @@ int minPage = (pageIndex - 1) * maxPageIndex + 1; int maxPage = pageIndex * maxPageIndex; string sqlCount = "select count(*) from taskinfo t where 1=1"; - string sqlData = "select dbid,deploytime,descirption,finishtime,street,taskstate,username " + - "from (select t.*,rownum row_num from taskinfo t order by DBID desc)b " + - " where(b.row_num between " + minPage + " and " + maxPage + ")"; + 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"; if (!String.IsNullOrEmpty(comboBox_userName.Text.Trim()) && !comboBox_userName.Text.Trim().Equals("不限")) { @@ -581,6 +582,8 @@ sqlCount += "and street='" + combo_street.Text + "' "; sqlData += "and street='" + combo_street.Text + "' "; } + sqlData += " order by DBID desc)b " + + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); diff --git a/Cyberpipe.csproj b/Cyberpipe.csproj index fe600e5..501fd09 100644 --- a/Cyberpipe.csproj +++ b/Cyberpipe.csproj @@ -246,6 +246,12 @@ Form_TaskManager.cs + + Form + + + FrmFlagDetail.cs + Form @@ -1368,6 +1374,9 @@ Form_TaskManager.cs + + FrmFlagDetail.cs + FormDocumentManager.cs diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 537b4c3..1acf22a 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 7d5dd95..3f178cb 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -90,20 +90,20 @@ this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - - this.winGridViewPager1.AddColumnAlias("ACCIDENTTIME", "上报时间"); - this.winGridViewPager1.AddColumnAlias("DBID", "编号"); - this.winGridViewPager1.AddColumnAlias("DESCRIBE", "事件描述"); - this.winGridViewPager1.AddColumnAlias("LATITUDE", "纬度"); - this.winGridViewPager1.AddColumnAlias("LOCALE", "事件地点"); - this.winGridViewPager1.AddColumnAlias("LONGITUDE", "经度"); - this.winGridViewPager1.AddColumnAlias("PATROLERNAME", "上报人员"); - this.winGridViewPager1.AddColumnAlias("PATROLER_ID", "人员ID"); - this.winGridViewPager1.AddColumnAlias("TASK_ID", "任务编号"); - this.winGridViewPager1.AddColumnAlias("RESULT", "处理结果"); - this.winGridViewPager1.AddColumnAlias("STATE", "处理状态"); - this.winGridViewPager1.DisplayColumns = "ACCIDENTTIME,DESCRIBE,LOCALE,PATROLERNAME,TASK_ID,RESULT,STATE"; + this.winGridViewPager1.AddColumnAlias("上报时间", "上报时间"); + this.winGridViewPager1.AddColumnAlias("编号", "编号"); + this.winGridViewPager1.AddColumnAlias("事件描述", "事件描述"); + this.winGridViewPager1.AddColumnAlias("纬度", "纬度"); + this.winGridViewPager1.AddColumnAlias("事件地点", "事件地点"); + this.winGridViewPager1.AddColumnAlias("经度", "经度"); + this.winGridViewPager1.AddColumnAlias("上报人员", "上报人员"); + this.winGridViewPager1.AddColumnAlias("人员ID", "人员ID"); + this.winGridViewPager1.AddColumnAlias("任务编号", "任务编号"); + this.winGridViewPager1.AddColumnAlias("处理结果", "处理结果"); + this.winGridViewPager1.AddColumnAlias("处理状态", "处理状态"); + + this.winGridViewPager1.DisplayColumns = "上报时间,事件描述,事件地点,上报人员,任务编号,处理结果,处理状态"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -114,8 +114,8 @@ winGridViewPager1.dataGridView1.ContextMenuStrip.Items[5].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[6].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[7].Visible = false; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[1].Text = "查看位置"; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "结果编辑"; + winGridViewPager1.dataGridView1.ContextMenuStrip.Items[1].Text = "结果编辑"; + winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "查看位置"; //右键菜单宽度 winGridViewPager1.dataGridView1.ContextMenuStrip.AutoSize = false; @@ -160,13 +160,12 @@ this.WindowState = FormWindowState.Minimized; globeControl1.Globe.MemoryLayer.RemoveAllFeature(); this.WindowState = FormWindowState.Minimized; - double x = Convert.ToDouble(row.Cells["LONGITUDE"].Value); - double y = Convert.ToDouble(row.Cells["LATITUDE"].Value); - - string username = Convert.ToString(row.Cells["PATROLERNAME"].Value); - string Atime = Convert.ToString(row.Cells["ACCIDENTTIME"].Value); - string location = Convert.ToString(row.Cells["LOCALE"].Value); - string descp = Convert.ToString(row.Cells["DESCRIBE"].Value); + double x = Convert.ToDouble(row.Cells["经度"].Value); + double y = Convert.ToDouble(row.Cells["纬度"].Value); + string username = Convert.ToString(row.Cells["上报人员"].Value); + string Atime = Convert.ToString(row.Cells["上报时间"].Value); + string location = Convert.ToString(row.Cells["事件地点"].Value); + string descp = Convert.ToString(row.Cells["事件描述"].Value); /////////////////////////////////////// /*******设置飞行与创建模型******/ @@ -228,8 +227,8 @@ DataGridViewRow row = grid.SelectedRows[0]; try { - int dbId = Convert.ToInt32(row.Cells["DBID"].Value); - string result = Convert.ToString(row.Cells["RESULT"].Value); + int dbId = Convert.ToInt32(row.Cells["编号"].Value); + string result = Convert.ToString(row.Cells["处理结果"].Value); EMS_Forms.Form_EventResult form = new Form_EventResult(dbId, result); form.refresh += new Form_EventResult.Handle(LoadData);//改变值的事件 form.ShowDialog(); @@ -276,9 +275,9 @@ } for (int i = 0; i < table.Rows.Count; i++) { - if (winGridViewPager1.dataGridView1.Rows[i].Cells["RESULT"].Value != null && !(winGridViewPager1.dataGridView1.Rows[i].Cells["RESULT"].Value.ToString().Trim().Equals(""))) + if (winGridViewPager1.dataGridView1.Rows[i].Cells["处理结果"].Value != null && !(winGridViewPager1.dataGridView1.Rows[i].Cells["处理结果"].Value.ToString().Trim().Equals(""))) { - winGridViewPager1.dataGridView1.Rows[i].Cells["STATE"].Value = "已处理"; + winGridViewPager1.dataGridView1.Rows[i].Cells["处理状态"].Value = "已处理"; } } @@ -307,9 +306,9 @@ } for (int i = 0; i < table.Rows.Count; i++) { - if (winGridViewPager1.dataGridView1.Rows[i].Cells["RESULT"].Value != null && !(winGridViewPager1.dataGridView1.Rows[i].Cells["RESULT"].Value.ToString().Trim().Equals(""))) + if (winGridViewPager1.dataGridView1.Rows[i].Cells["处理结果"].Value != null && !(winGridViewPager1.dataGridView1.Rows[i].Cells["处理结果"].Value.ToString().Trim().Equals(""))) { - winGridViewPager1.dataGridView1.Rows[i].Cells["STATE"].Value = "已处理"; + winGridViewPager1.dataGridView1.Rows[i].Cells["处理状态"].Value = "已处理"; } } @@ -320,10 +319,12 @@ { string sqlCount = "select count(*) from ACCIDENT where 1=1"; - string sqlData = "select ACCIDENTTIME,DBID,DESCRIBE,LATITUDE,LOCALE,LONGITUDE,PATROLERNAME,PATROLER_ID,TASK_ID,RESULT,'' as STATE " + + string sqlData = "select ACCIDENTTIME as 上报时间,DBID as 编号,DESCRIBE as 事件描述,"+ + "LATITUDE as 纬度,LOCALE as 事件地点,LONGITUDE as 经度,PATROLERNAME 上报人员,"+ + "PATROLER_ID as 人员ID,TASK_ID as 任务编号,RESULT as 处理结果,'' as 处理状态 " + "from (select t.*,rownum row_num from ACCIDENT t order by DBID)b " + " where 1=1"; - + rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; @@ -340,9 +341,10 @@ string sqlCount = "select count(*) from ACCIDENT where 1=1"; - string sqlData = "select ACCIDENTTIME,DBID,DESCRIBE,LATITUDE,LOCALE,LONGITUDE,PATROLERNAME,PATROLER_ID,TASK_ID,RESULT,'' as STATE " + - "from (select t.*,rownum row_num from ACCIDENT t order by DBID)b " + - " where(b.row_num between " + minPage + " and " + maxPage + ")"; + string sqlData = "select ACCIDENTTIME as 上报时间,DBID as 编号,DESCRIBE as 事件描述," + + "LATITUDE as 纬度,LOCALE as 事件地点,LONGITUDE as 经度,PATROLERNAME 上报人员," + + "PATROLER_ID as 人员ID,TASK_ID as 任务编号,RESULT as 处理结果,'' as 处理状态 " + + "from (select t.*,rownum row_num from ACCIDENT t where 1=1"; if (!String.IsNullOrEmpty(comboBox_name.Text.Trim())) { @@ -361,7 +363,8 @@ sqlCount += "and ACCIDENTTIME<=to_date('" + time.ToShortDateString() + "','yyyy-MM-dd') "; sqlData += "and ACCIDENTTIME<=to_date('" + time.ToShortDateString() + "','yyyy-MM-dd') "; } - + sqlData += " order by DBID desc)b " + + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 225c8d7..8bd9e48 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -120,8 +120,8 @@ private void flyToTask(DataGridViewRow row, int taskState) { int dbID = 0; - dbID = Convert.ToInt32(row.Cells["DBID"].Value); - string userName = Convert.ToString(row.Cells["USERNAME"].Value); + dbID = Convert.ToInt32(row.Cells["任务编号"].Value); + string userName = Convert.ToString(row.Cells["任务执行人员"].Value); System.DateTime t = new DateTime(); try { @@ -392,15 +392,15 @@ //控制表格显示的列，以及每一列要显示的列名 this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - this.winGridViewPager1.AddColumnAlias("DBID", "任务编号"); - this.winGridViewPager1.AddColumnAlias("DEPLOYTIME", "创建时间"); - this.winGridViewPager1.AddColumnAlias("DESCIRPTION", "任务描述"); - this.winGridViewPager1.AddColumnAlias("FINISHTIME", "完成时间"); - this.winGridViewPager1.AddColumnAlias("STREET", "任务执行区域"); - this.winGridViewPager1.AddColumnAlias("TASKSTATE", "任务状态"); - this.winGridViewPager1.AddColumnAlias("USERNAME", "任务执行人员"); + this.winGridViewPager1.AddColumnAlias("任务编号", "任务编号"); + this.winGridViewPager1.AddColumnAlias("创建时间", "创建时间"); + this.winGridViewPager1.AddColumnAlias("任务描述", "任务描述"); + this.winGridViewPager1.AddColumnAlias("完成时间", "完成时间"); + this.winGridViewPager1.AddColumnAlias("任务执行区域", "任务执行区域"); + this.winGridViewPager1.AddColumnAlias("任务状态", "任务状态"); + this.winGridViewPager1.AddColumnAlias("任务执行人员", "任务执行人员"); - this.winGridViewPager1.DisplayColumns = "DBID,DEPLOYTIME,DESCIRPTION,FINISHTIME,STREET,TASKSTATE,USERNAME"; + this.winGridViewPager1.DisplayColumns = "任务编号,创建时间,任务描述,完成时间,任务执行区域,任务状态,任务执行人员"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -464,8 +464,8 @@ { int dbID = 0; int taskStateInt = 0; - dbID = Convert.ToInt32(row.Cells["DBID"].Value); - string taskState = row.Cells["TASKSTATE"].Value.ToString(); + dbID = Convert.ToInt32(row.Cells["任务编号"].Value); + string taskState = row.Cells["任务状态"].Value.ToString(); if (taskState.Equals("开始任务")) { taskStateInt = 1; @@ -534,9 +534,10 @@ private string GetSql() { - string sqlCount = "select count(*) from taskinfo t where 1=1'"; + string sqlCount = "select count(*) from taskinfo t where 1=1"; - string sqlData = "select dbid,deploytime,descirption,finishtime,street,taskstate,username " + + 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"; @@ -550,9 +551,9 @@ int minPage = (pageIndex - 1) * maxPageIndex + 1; int maxPage = pageIndex * maxPageIndex; string sqlCount = "select count(*) from taskinfo t where 1=1"; - string sqlData = "select dbid,deploytime,descirption,finishtime,street,taskstate,username " + - "from (select t.*,rownum row_num from taskinfo t order by DBID desc)b " + - " where(b.row_num between " + minPage + " and " + maxPage + ")"; + 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"; if (!String.IsNullOrEmpty(comboBox_userName.Text.Trim()) && !comboBox_userName.Text.Trim().Equals("不限")) { @@ -581,6 +582,8 @@ sqlCount += "and street='" + combo_street.Text + "' "; sqlData += "and street='" + combo_street.Text + "' "; } + sqlData += " order by DBID desc)b " + + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index e65a4bd..58f5342 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -73,13 +73,13 @@ //控制表格显示的列，以及每一列要显示的列名 this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - this.winGridViewPager1.AddColumnAlias("FILENAME", "文档名称"); - this.winGridViewPager1.AddColumnAlias("DBID", "编号"); - this.winGridViewPager1.AddColumnAlias("TITLE", "文档标题"); - this.winGridViewPager1.AddColumnAlias("FILETYPE", "文档类型"); - this.winGridViewPager1.AddColumnAlias("UPDAY", "上传日期"); - this.winGridViewPager1.AddColumnAlias("WRITER", "上传人"); - this.winGridViewPager1.DisplayColumns = "FILENAME,TITLE,FILETYPE,UPDAY,WRITER"; + this.winGridViewPager1.AddColumnAlias("文档名称", "文档名称"); + this.winGridViewPager1.AddColumnAlias("编号", "编号"); + this.winGridViewPager1.AddColumnAlias("文档标题", "文档标题"); + this.winGridViewPager1.AddColumnAlias("文档类型", "文档类型"); + this.winGridViewPager1.AddColumnAlias("上传日期", "上传日期"); + this.winGridViewPager1.AddColumnAlias("上传人", "上传人"); + this.winGridViewPager1.DisplayColumns = "文档名称,文档标题,文档类型,上传日期,上传人"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -167,7 +167,7 @@ if (grid != null) { DataGridViewRow row = grid.SelectedRows[0]; - string dbid = row.Cells["dbid"].Value.ToString(); + string dbid = row.Cells["编号"].Value.ToString(); try { if (MessageBox.Show("确认删除吗？", "确认", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) @@ -212,7 +212,8 @@ { string sqlCount = "select count(*) from casic_userdocument where sysname = 'EMS'"; - string sqlData = "select filename,dbid,title,filetype,upday,writer " + + string sqlData = "select filename as 文档名称,dbid as 编号,title as 文档标题," + + "filetype as 文档类型,upday as 上传日期,writer as 上传人 " + "from (select t.*,rownum row_num from casic_userdocument t order by DBID desc)b " + " where sysname = 'EMS'"; @@ -226,9 +227,9 @@ int minPage = (pageIndex - 1) * maxPageIndex + 1; int maxPage = pageIndex * maxPageIndex; string sqlCount = "select count(*) from casic_userdocument where sysname = 'EMS'"; - string sqlData = "select filename,dbid,title,filetype,upday,writer " + - "from (select t.*,rownum row_num from casic_userdocument t where sysname = 'EMS' order by DBID desc)b " + - " where(b.row_num between " + minPage + " and " + maxPage + ")"; + string sqlData = "select filename as 文档名称,dbid as 编号,title as 文档标题,"+ + "filetype as 文档类型,upday as 上传日期,writer as 上传人 " + + "from (select t.*,rownum row_num from casic_userdocument t where sysname = 'EMS'"; string txtTitleText = null; string comboFileType = null; @@ -278,7 +279,8 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - + sqlData += " order by DBID desc)b " + + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; @@ -437,7 +439,7 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - string filename = row.Cells["filename"].Value.ToString(); + string filename = row.Cells["文档名称"].Value.ToString(); string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; string file = System.Environment.CurrentDirectory + "\\download\\" + filename; int result = DownloadFile(url, file, progressBar1); @@ -515,7 +517,7 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - string filename = row.Cells["filename"].Value.ToString(); + string filename = row.Cells["文档名称"].Value.ToString(); string ext = Path.GetExtension(filename); SaveFileDialog dlg = new SaveFileDialog(); dlg.Filter = "保存文档|*" + ext + ";"; diff --git a/Cyberpipe.csproj b/Cyberpipe.csproj index fe600e5..501fd09 100644 --- a/Cyberpipe.csproj +++ b/Cyberpipe.csproj @@ -246,6 +246,12 @@ Form_TaskManager.cs + + Form + + + FrmFlagDetail.cs + Form @@ -1368,6 +1374,9 @@ Form_TaskManager.cs + + FrmFlagDetail.cs + FormDocumentManager.cs diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 537b4c3..1acf22a 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 7d5dd95..3f178cb 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -90,20 +90,20 @@ this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - - this.winGridViewPager1.AddColumnAlias("ACCIDENTTIME", "上报时间"); - this.winGridViewPager1.AddColumnAlias("DBID", "编号"); - this.winGridViewPager1.AddColumnAlias("DESCRIBE", "事件描述"); - this.winGridViewPager1.AddColumnAlias("LATITUDE", "纬度"); - this.winGridViewPager1.AddColumnAlias("LOCALE", "事件地点"); - this.winGridViewPager1.AddColumnAlias("LONGITUDE", "经度"); - this.winGridViewPager1.AddColumnAlias("PATROLERNAME", "上报人员"); - this.winGridViewPager1.AddColumnAlias("PATROLER_ID", "人员ID"); - this.winGridViewPager1.AddColumnAlias("TASK_ID", "任务编号"); - this.winGridViewPager1.AddColumnAlias("RESULT", "处理结果"); - this.winGridViewPager1.AddColumnAlias("STATE", "处理状态"); - this.winGridViewPager1.DisplayColumns = "ACCIDENTTIME,DESCRIBE,LOCALE,PATROLERNAME,TASK_ID,RESULT,STATE"; + this.winGridViewPager1.AddColumnAlias("上报时间", "上报时间"); + this.winGridViewPager1.AddColumnAlias("编号", "编号"); + this.winGridViewPager1.AddColumnAlias("事件描述", "事件描述"); + this.winGridViewPager1.AddColumnAlias("纬度", "纬度"); + this.winGridViewPager1.AddColumnAlias("事件地点", "事件地点"); + this.winGridViewPager1.AddColumnAlias("经度", "经度"); + this.winGridViewPager1.AddColumnAlias("上报人员", "上报人员"); + this.winGridViewPager1.AddColumnAlias("人员ID", "人员ID"); + this.winGridViewPager1.AddColumnAlias("任务编号", "任务编号"); + this.winGridViewPager1.AddColumnAlias("处理结果", "处理结果"); + this.winGridViewPager1.AddColumnAlias("处理状态", "处理状态"); + + this.winGridViewPager1.DisplayColumns = "上报时间,事件描述,事件地点,上报人员,任务编号,处理结果,处理状态"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -114,8 +114,8 @@ winGridViewPager1.dataGridView1.ContextMenuStrip.Items[5].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[6].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[7].Visible = false; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[1].Text = "查看位置"; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "结果编辑"; + winGridViewPager1.dataGridView1.ContextMenuStrip.Items[1].Text = "结果编辑"; + winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "查看位置"; //右键菜单宽度 winGridViewPager1.dataGridView1.ContextMenuStrip.AutoSize = false; @@ -160,13 +160,12 @@ this.WindowState = FormWindowState.Minimized; globeControl1.Globe.MemoryLayer.RemoveAllFeature(); this.WindowState = FormWindowState.Minimized; - double x = Convert.ToDouble(row.Cells["LONGITUDE"].Value); - double y = Convert.ToDouble(row.Cells["LATITUDE"].Value); - - string username = Convert.ToString(row.Cells["PATROLERNAME"].Value); - string Atime = Convert.ToString(row.Cells["ACCIDENTTIME"].Value); - string location = Convert.ToString(row.Cells["LOCALE"].Value); - string descp = Convert.ToString(row.Cells["DESCRIBE"].Value); + double x = Convert.ToDouble(row.Cells["经度"].Value); + double y = Convert.ToDouble(row.Cells["纬度"].Value); + string username = Convert.ToString(row.Cells["上报人员"].Value); + string Atime = Convert.ToString(row.Cells["上报时间"].Value); + string location = Convert.ToString(row.Cells["事件地点"].Value); + string descp = Convert.ToString(row.Cells["事件描述"].Value); /////////////////////////////////////// /*******设置飞行与创建模型******/ @@ -228,8 +227,8 @@ DataGridViewRow row = grid.SelectedRows[0]; try { - int dbId = Convert.ToInt32(row.Cells["DBID"].Value); - string result = Convert.ToString(row.Cells["RESULT"].Value); + int dbId = Convert.ToInt32(row.Cells["编号"].Value); + string result = Convert.ToString(row.Cells["处理结果"].Value); EMS_Forms.Form_EventResult form = new Form_EventResult(dbId, result); form.refresh += new Form_EventResult.Handle(LoadData);//改变值的事件 form.ShowDialog(); @@ -276,9 +275,9 @@ } for (int i = 0; i < table.Rows.Count; i++) { - if (winGridViewPager1.dataGridView1.Rows[i].Cells["RESULT"].Value != null && !(winGridViewPager1.dataGridView1.Rows[i].Cells["RESULT"].Value.ToString().Trim().Equals(""))) + if (winGridViewPager1.dataGridView1.Rows[i].Cells["处理结果"].Value != null && !(winGridViewPager1.dataGridView1.Rows[i].Cells["处理结果"].Value.ToString().Trim().Equals(""))) { - winGridViewPager1.dataGridView1.Rows[i].Cells["STATE"].Value = "已处理"; + winGridViewPager1.dataGridView1.Rows[i].Cells["处理状态"].Value = "已处理"; } } @@ -307,9 +306,9 @@ } for (int i = 0; i < table.Rows.Count; i++) { - if (winGridViewPager1.dataGridView1.Rows[i].Cells["RESULT"].Value != null && !(winGridViewPager1.dataGridView1.Rows[i].Cells["RESULT"].Value.ToString().Trim().Equals(""))) + if (winGridViewPager1.dataGridView1.Rows[i].Cells["处理结果"].Value != null && !(winGridViewPager1.dataGridView1.Rows[i].Cells["处理结果"].Value.ToString().Trim().Equals(""))) { - winGridViewPager1.dataGridView1.Rows[i].Cells["STATE"].Value = "已处理"; + winGridViewPager1.dataGridView1.Rows[i].Cells["处理状态"].Value = "已处理"; } } @@ -320,10 +319,12 @@ { string sqlCount = "select count(*) from ACCIDENT where 1=1"; - string sqlData = "select ACCIDENTTIME,DBID,DESCRIBE,LATITUDE,LOCALE,LONGITUDE,PATROLERNAME,PATROLER_ID,TASK_ID,RESULT,'' as STATE " + + string sqlData = "select ACCIDENTTIME as 上报时间,DBID as 编号,DESCRIBE as 事件描述,"+ + "LATITUDE as 纬度,LOCALE as 事件地点,LONGITUDE as 经度,PATROLERNAME 上报人员,"+ + "PATROLER_ID as 人员ID,TASK_ID as 任务编号,RESULT as 处理结果,'' as 处理状态 " + "from (select t.*,rownum row_num from ACCIDENT t order by DBID)b " + " where 1=1"; - + rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; @@ -340,9 +341,10 @@ string sqlCount = "select count(*) from ACCIDENT where 1=1"; - string sqlData = "select ACCIDENTTIME,DBID,DESCRIBE,LATITUDE,LOCALE,LONGITUDE,PATROLERNAME,PATROLER_ID,TASK_ID,RESULT,'' as STATE " + - "from (select t.*,rownum row_num from ACCIDENT t order by DBID)b " + - " where(b.row_num between " + minPage + " and " + maxPage + ")"; + string sqlData = "select ACCIDENTTIME as 上报时间,DBID as 编号,DESCRIBE as 事件描述," + + "LATITUDE as 纬度,LOCALE as 事件地点,LONGITUDE as 经度,PATROLERNAME 上报人员," + + "PATROLER_ID as 人员ID,TASK_ID as 任务编号,RESULT as 处理结果,'' as 处理状态 " + + "from (select t.*,rownum row_num from ACCIDENT t where 1=1"; if (!String.IsNullOrEmpty(comboBox_name.Text.Trim())) { @@ -361,7 +363,8 @@ sqlCount += "and ACCIDENTTIME<=to_date('" + time.ToShortDateString() + "','yyyy-MM-dd') "; sqlData += "and ACCIDENTTIME<=to_date('" + time.ToShortDateString() + "','yyyy-MM-dd') "; } - + sqlData += " order by DBID desc)b " + + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 225c8d7..8bd9e48 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -120,8 +120,8 @@ private void flyToTask(DataGridViewRow row, int taskState) { int dbID = 0; - dbID = Convert.ToInt32(row.Cells["DBID"].Value); - string userName = Convert.ToString(row.Cells["USERNAME"].Value); + dbID = Convert.ToInt32(row.Cells["任务编号"].Value); + string userName = Convert.ToString(row.Cells["任务执行人员"].Value); System.DateTime t = new DateTime(); try { @@ -392,15 +392,15 @@ //控制表格显示的列，以及每一列要显示的列名 this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - this.winGridViewPager1.AddColumnAlias("DBID", "任务编号"); - this.winGridViewPager1.AddColumnAlias("DEPLOYTIME", "创建时间"); - this.winGridViewPager1.AddColumnAlias("DESCIRPTION", "任务描述"); - this.winGridViewPager1.AddColumnAlias("FINISHTIME", "完成时间"); - this.winGridViewPager1.AddColumnAlias("STREET", "任务执行区域"); - this.winGridViewPager1.AddColumnAlias("TASKSTATE", "任务状态"); - this.winGridViewPager1.AddColumnAlias("USERNAME", "任务执行人员"); + this.winGridViewPager1.AddColumnAlias("任务编号", "任务编号"); + this.winGridViewPager1.AddColumnAlias("创建时间", "创建时间"); + this.winGridViewPager1.AddColumnAlias("任务描述", "任务描述"); + this.winGridViewPager1.AddColumnAlias("完成时间", "完成时间"); + this.winGridViewPager1.AddColumnAlias("任务执行区域", "任务执行区域"); + this.winGridViewPager1.AddColumnAlias("任务状态", "任务状态"); + this.winGridViewPager1.AddColumnAlias("任务执行人员", "任务执行人员"); - this.winGridViewPager1.DisplayColumns = "DBID,DEPLOYTIME,DESCIRPTION,FINISHTIME,STREET,TASKSTATE,USERNAME"; + this.winGridViewPager1.DisplayColumns = "任务编号,创建时间,任务描述,完成时间,任务执行区域,任务状态,任务执行人员"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -464,8 +464,8 @@ { int dbID = 0; int taskStateInt = 0; - dbID = Convert.ToInt32(row.Cells["DBID"].Value); - string taskState = row.Cells["TASKSTATE"].Value.ToString(); + dbID = Convert.ToInt32(row.Cells["任务编号"].Value); + string taskState = row.Cells["任务状态"].Value.ToString(); if (taskState.Equals("开始任务")) { taskStateInt = 1; @@ -534,9 +534,10 @@ private string GetSql() { - string sqlCount = "select count(*) from taskinfo t where 1=1'"; + string sqlCount = "select count(*) from taskinfo t where 1=1"; - string sqlData = "select dbid,deploytime,descirption,finishtime,street,taskstate,username " + + 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"; @@ -550,9 +551,9 @@ int minPage = (pageIndex - 1) * maxPageIndex + 1; int maxPage = pageIndex * maxPageIndex; string sqlCount = "select count(*) from taskinfo t where 1=1"; - string sqlData = "select dbid,deploytime,descirption,finishtime,street,taskstate,username " + - "from (select t.*,rownum row_num from taskinfo t order by DBID desc)b " + - " where(b.row_num between " + minPage + " and " + maxPage + ")"; + 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"; if (!String.IsNullOrEmpty(comboBox_userName.Text.Trim()) && !comboBox_userName.Text.Trim().Equals("不限")) { @@ -581,6 +582,8 @@ sqlCount += "and street='" + combo_street.Text + "' "; sqlData += "and street='" + combo_street.Text + "' "; } + sqlData += " order by DBID desc)b " + + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index e65a4bd..58f5342 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -73,13 +73,13 @@ //控制表格显示的列，以及每一列要显示的列名 this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - this.winGridViewPager1.AddColumnAlias("FILENAME", "文档名称"); - this.winGridViewPager1.AddColumnAlias("DBID", "编号"); - this.winGridViewPager1.AddColumnAlias("TITLE", "文档标题"); - this.winGridViewPager1.AddColumnAlias("FILETYPE", "文档类型"); - this.winGridViewPager1.AddColumnAlias("UPDAY", "上传日期"); - this.winGridViewPager1.AddColumnAlias("WRITER", "上传人"); - this.winGridViewPager1.DisplayColumns = "FILENAME,TITLE,FILETYPE,UPDAY,WRITER"; + this.winGridViewPager1.AddColumnAlias("文档名称", "文档名称"); + this.winGridViewPager1.AddColumnAlias("编号", "编号"); + this.winGridViewPager1.AddColumnAlias("文档标题", "文档标题"); + this.winGridViewPager1.AddColumnAlias("文档类型", "文档类型"); + this.winGridViewPager1.AddColumnAlias("上传日期", "上传日期"); + this.winGridViewPager1.AddColumnAlias("上传人", "上传人"); + this.winGridViewPager1.DisplayColumns = "文档名称,文档标题,文档类型,上传日期,上传人"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -167,7 +167,7 @@ if (grid != null) { DataGridViewRow row = grid.SelectedRows[0]; - string dbid = row.Cells["dbid"].Value.ToString(); + string dbid = row.Cells["编号"].Value.ToString(); try { if (MessageBox.Show("确认删除吗？", "确认", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) @@ -212,7 +212,8 @@ { string sqlCount = "select count(*) from casic_userdocument where sysname = 'EMS'"; - string sqlData = "select filename,dbid,title,filetype,upday,writer " + + string sqlData = "select filename as 文档名称,dbid as 编号,title as 文档标题," + + "filetype as 文档类型,upday as 上传日期,writer as 上传人 " + "from (select t.*,rownum row_num from casic_userdocument t order by DBID desc)b " + " where sysname = 'EMS'"; @@ -226,9 +227,9 @@ int minPage = (pageIndex - 1) * maxPageIndex + 1; int maxPage = pageIndex * maxPageIndex; string sqlCount = "select count(*) from casic_userdocument where sysname = 'EMS'"; - string sqlData = "select filename,dbid,title,filetype,upday,writer " + - "from (select t.*,rownum row_num from casic_userdocument t where sysname = 'EMS' order by DBID desc)b " + - " where(b.row_num between " + minPage + " and " + maxPage + ")"; + string sqlData = "select filename as 文档名称,dbid as 编号,title as 文档标题,"+ + "filetype as 文档类型,upday as 上传日期,writer as 上传人 " + + "from (select t.*,rownum row_num from casic_userdocument t where sysname = 'EMS'"; string txtTitleText = null; string comboFileType = null; @@ -278,7 +279,8 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - + sqlData += " order by DBID desc)b " + + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; @@ -437,7 +439,7 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - string filename = row.Cells["filename"].Value.ToString(); + string filename = row.Cells["文档名称"].Value.ToString(); string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; string file = System.Environment.CurrentDirectory + "\\download\\" + filename; int result = DownloadFile(url, file, progressBar1); @@ -515,7 +517,7 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - string filename = row.Cells["filename"].Value.ToString(); + string filename = row.Cells["文档名称"].Value.ToString(); string ext = Path.GetExtension(filename); SaveFileDialog dlg = new SaveFileDialog(); dlg.Filter = "保存文档|*" + ext + ";"; diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 1d1201b..3902629 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -748,6 +748,7 @@ this.Name = "FrmAddSinMark"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "单个标识器添加"; + this.TopMost = true; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmAddSinMark_FormClosing); this.Load += new System.EventHandler(this.FrmAddSinMark_Load); this.groupPanel1.ResumeLayout(false); diff --git a/Cyberpipe.csproj b/Cyberpipe.csproj index fe600e5..501fd09 100644 --- a/Cyberpipe.csproj +++ b/Cyberpipe.csproj @@ -246,6 +246,12 @@ Form_TaskManager.cs + + Form + + + FrmFlagDetail.cs + Form @@ -1368,6 +1374,9 @@ Form_TaskManager.cs + + FrmFlagDetail.cs + FormDocumentManager.cs diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 537b4c3..1acf22a 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 7d5dd95..3f178cb 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -90,20 +90,20 @@ this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - - this.winGridViewPager1.AddColumnAlias("ACCIDENTTIME", "上报时间"); - this.winGridViewPager1.AddColumnAlias("DBID", "编号"); - this.winGridViewPager1.AddColumnAlias("DESCRIBE", "事件描述"); - this.winGridViewPager1.AddColumnAlias("LATITUDE", "纬度"); - this.winGridViewPager1.AddColumnAlias("LOCALE", "事件地点"); - this.winGridViewPager1.AddColumnAlias("LONGITUDE", "经度"); - this.winGridViewPager1.AddColumnAlias("PATROLERNAME", "上报人员"); - this.winGridViewPager1.AddColumnAlias("PATROLER_ID", "人员ID"); - this.winGridViewPager1.AddColumnAlias("TASK_ID", "任务编号"); - this.winGridViewPager1.AddColumnAlias("RESULT", "处理结果"); - this.winGridViewPager1.AddColumnAlias("STATE", "处理状态"); - this.winGridViewPager1.DisplayColumns = "ACCIDENTTIME,DESCRIBE,LOCALE,PATROLERNAME,TASK_ID,RESULT,STATE"; + this.winGridViewPager1.AddColumnAlias("上报时间", "上报时间"); + this.winGridViewPager1.AddColumnAlias("编号", "编号"); + this.winGridViewPager1.AddColumnAlias("事件描述", "事件描述"); + this.winGridViewPager1.AddColumnAlias("纬度", "纬度"); + this.winGridViewPager1.AddColumnAlias("事件地点", "事件地点"); + this.winGridViewPager1.AddColumnAlias("经度", "经度"); + this.winGridViewPager1.AddColumnAlias("上报人员", "上报人员"); + this.winGridViewPager1.AddColumnAlias("人员ID", "人员ID"); + this.winGridViewPager1.AddColumnAlias("任务编号", "任务编号"); + this.winGridViewPager1.AddColumnAlias("处理结果", "处理结果"); + this.winGridViewPager1.AddColumnAlias("处理状态", "处理状态"); + + this.winGridViewPager1.DisplayColumns = "上报时间,事件描述,事件地点,上报人员,任务编号,处理结果,处理状态"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -114,8 +114,8 @@ winGridViewPager1.dataGridView1.ContextMenuStrip.Items[5].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[6].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[7].Visible = false; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[1].Text = "查看位置"; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "结果编辑"; + winGridViewPager1.dataGridView1.ContextMenuStrip.Items[1].Text = "结果编辑"; + winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "查看位置"; //右键菜单宽度 winGridViewPager1.dataGridView1.ContextMenuStrip.AutoSize = false; @@ -160,13 +160,12 @@ this.WindowState = FormWindowState.Minimized; globeControl1.Globe.MemoryLayer.RemoveAllFeature(); this.WindowState = FormWindowState.Minimized; - double x = Convert.ToDouble(row.Cells["LONGITUDE"].Value); - double y = Convert.ToDouble(row.Cells["LATITUDE"].Value); - - string username = Convert.ToString(row.Cells["PATROLERNAME"].Value); - string Atime = Convert.ToString(row.Cells["ACCIDENTTIME"].Value); - string location = Convert.ToString(row.Cells["LOCALE"].Value); - string descp = Convert.ToString(row.Cells["DESCRIBE"].Value); + double x = Convert.ToDouble(row.Cells["经度"].Value); + double y = Convert.ToDouble(row.Cells["纬度"].Value); + string username = Convert.ToString(row.Cells["上报人员"].Value); + string Atime = Convert.ToString(row.Cells["上报时间"].Value); + string location = Convert.ToString(row.Cells["事件地点"].Value); + string descp = Convert.ToString(row.Cells["事件描述"].Value); /////////////////////////////////////// /*******设置飞行与创建模型******/ @@ -228,8 +227,8 @@ DataGridViewRow row = grid.SelectedRows[0]; try { - int dbId = Convert.ToInt32(row.Cells["DBID"].Value); - string result = Convert.ToString(row.Cells["RESULT"].Value); + int dbId = Convert.ToInt32(row.Cells["编号"].Value); + string result = Convert.ToString(row.Cells["处理结果"].Value); EMS_Forms.Form_EventResult form = new Form_EventResult(dbId, result); form.refresh += new Form_EventResult.Handle(LoadData);//改变值的事件 form.ShowDialog(); @@ -276,9 +275,9 @@ } for (int i = 0; i < table.Rows.Count; i++) { - if (winGridViewPager1.dataGridView1.Rows[i].Cells["RESULT"].Value != null && !(winGridViewPager1.dataGridView1.Rows[i].Cells["RESULT"].Value.ToString().Trim().Equals(""))) + if (winGridViewPager1.dataGridView1.Rows[i].Cells["处理结果"].Value != null && !(winGridViewPager1.dataGridView1.Rows[i].Cells["处理结果"].Value.ToString().Trim().Equals(""))) { - winGridViewPager1.dataGridView1.Rows[i].Cells["STATE"].Value = "已处理"; + winGridViewPager1.dataGridView1.Rows[i].Cells["处理状态"].Value = "已处理"; } } @@ -307,9 +306,9 @@ } for (int i = 0; i < table.Rows.Count; i++) { - if (winGridViewPager1.dataGridView1.Rows[i].Cells["RESULT"].Value != null && !(winGridViewPager1.dataGridView1.Rows[i].Cells["RESULT"].Value.ToString().Trim().Equals(""))) + if (winGridViewPager1.dataGridView1.Rows[i].Cells["处理结果"].Value != null && !(winGridViewPager1.dataGridView1.Rows[i].Cells["处理结果"].Value.ToString().Trim().Equals(""))) { - winGridViewPager1.dataGridView1.Rows[i].Cells["STATE"].Value = "已处理"; + winGridViewPager1.dataGridView1.Rows[i].Cells["处理状态"].Value = "已处理"; } } @@ -320,10 +319,12 @@ { string sqlCount = "select count(*) from ACCIDENT where 1=1"; - string sqlData = "select ACCIDENTTIME,DBID,DESCRIBE,LATITUDE,LOCALE,LONGITUDE,PATROLERNAME,PATROLER_ID,TASK_ID,RESULT,'' as STATE " + + string sqlData = "select ACCIDENTTIME as 上报时间,DBID as 编号,DESCRIBE as 事件描述,"+ + "LATITUDE as 纬度,LOCALE as 事件地点,LONGITUDE as 经度,PATROLERNAME 上报人员,"+ + "PATROLER_ID as 人员ID,TASK_ID as 任务编号,RESULT as 处理结果,'' as 处理状态 " + "from (select t.*,rownum row_num from ACCIDENT t order by DBID)b " + " where 1=1"; - + rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; @@ -340,9 +341,10 @@ string sqlCount = "select count(*) from ACCIDENT where 1=1"; - string sqlData = "select ACCIDENTTIME,DBID,DESCRIBE,LATITUDE,LOCALE,LONGITUDE,PATROLERNAME,PATROLER_ID,TASK_ID,RESULT,'' as STATE " + - "from (select t.*,rownum row_num from ACCIDENT t order by DBID)b " + - " where(b.row_num between " + minPage + " and " + maxPage + ")"; + string sqlData = "select ACCIDENTTIME as 上报时间,DBID as 编号,DESCRIBE as 事件描述," + + "LATITUDE as 纬度,LOCALE as 事件地点,LONGITUDE as 经度,PATROLERNAME 上报人员," + + "PATROLER_ID as 人员ID,TASK_ID as 任务编号,RESULT as 处理结果,'' as 处理状态 " + + "from (select t.*,rownum row_num from ACCIDENT t where 1=1"; if (!String.IsNullOrEmpty(comboBox_name.Text.Trim())) { @@ -361,7 +363,8 @@ sqlCount += "and ACCIDENTTIME<=to_date('" + time.ToShortDateString() + "','yyyy-MM-dd') "; sqlData += "and ACCIDENTTIME<=to_date('" + time.ToShortDateString() + "','yyyy-MM-dd') "; } - + sqlData += " order by DBID desc)b " + + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 225c8d7..8bd9e48 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -120,8 +120,8 @@ private void flyToTask(DataGridViewRow row, int taskState) { int dbID = 0; - dbID = Convert.ToInt32(row.Cells["DBID"].Value); - string userName = Convert.ToString(row.Cells["USERNAME"].Value); + dbID = Convert.ToInt32(row.Cells["任务编号"].Value); + string userName = Convert.ToString(row.Cells["任务执行人员"].Value); System.DateTime t = new DateTime(); try { @@ -392,15 +392,15 @@ //控制表格显示的列，以及每一列要显示的列名 this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - this.winGridViewPager1.AddColumnAlias("DBID", "任务编号"); - this.winGridViewPager1.AddColumnAlias("DEPLOYTIME", "创建时间"); - this.winGridViewPager1.AddColumnAlias("DESCIRPTION", "任务描述"); - this.winGridViewPager1.AddColumnAlias("FINISHTIME", "完成时间"); - this.winGridViewPager1.AddColumnAlias("STREET", "任务执行区域"); - this.winGridViewPager1.AddColumnAlias("TASKSTATE", "任务状态"); - this.winGridViewPager1.AddColumnAlias("USERNAME", "任务执行人员"); + this.winGridViewPager1.AddColumnAlias("任务编号", "任务编号"); + this.winGridViewPager1.AddColumnAlias("创建时间", "创建时间"); + this.winGridViewPager1.AddColumnAlias("任务描述", "任务描述"); + this.winGridViewPager1.AddColumnAlias("完成时间", "完成时间"); + this.winGridViewPager1.AddColumnAlias("任务执行区域", "任务执行区域"); + this.winGridViewPager1.AddColumnAlias("任务状态", "任务状态"); + this.winGridViewPager1.AddColumnAlias("任务执行人员", "任务执行人员"); - this.winGridViewPager1.DisplayColumns = "DBID,DEPLOYTIME,DESCIRPTION,FINISHTIME,STREET,TASKSTATE,USERNAME"; + this.winGridViewPager1.DisplayColumns = "任务编号,创建时间,任务描述,完成时间,任务执行区域,任务状态,任务执行人员"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -464,8 +464,8 @@ { int dbID = 0; int taskStateInt = 0; - dbID = Convert.ToInt32(row.Cells["DBID"].Value); - string taskState = row.Cells["TASKSTATE"].Value.ToString(); + dbID = Convert.ToInt32(row.Cells["任务编号"].Value); + string taskState = row.Cells["任务状态"].Value.ToString(); if (taskState.Equals("开始任务")) { taskStateInt = 1; @@ -534,9 +534,10 @@ private string GetSql() { - string sqlCount = "select count(*) from taskinfo t where 1=1'"; + string sqlCount = "select count(*) from taskinfo t where 1=1"; - string sqlData = "select dbid,deploytime,descirption,finishtime,street,taskstate,username " + + 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"; @@ -550,9 +551,9 @@ int minPage = (pageIndex - 1) * maxPageIndex + 1; int maxPage = pageIndex * maxPageIndex; string sqlCount = "select count(*) from taskinfo t where 1=1"; - string sqlData = "select dbid,deploytime,descirption,finishtime,street,taskstate,username " + - "from (select t.*,rownum row_num from taskinfo t order by DBID desc)b " + - " where(b.row_num between " + minPage + " and " + maxPage + ")"; + 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"; if (!String.IsNullOrEmpty(comboBox_userName.Text.Trim()) && !comboBox_userName.Text.Trim().Equals("不限")) { @@ -581,6 +582,8 @@ sqlCount += "and street='" + combo_street.Text + "' "; sqlData += "and street='" + combo_street.Text + "' "; } + sqlData += " order by DBID desc)b " + + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index e65a4bd..58f5342 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -73,13 +73,13 @@ //控制表格显示的列，以及每一列要显示的列名 this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - this.winGridViewPager1.AddColumnAlias("FILENAME", "文档名称"); - this.winGridViewPager1.AddColumnAlias("DBID", "编号"); - this.winGridViewPager1.AddColumnAlias("TITLE", "文档标题"); - this.winGridViewPager1.AddColumnAlias("FILETYPE", "文档类型"); - this.winGridViewPager1.AddColumnAlias("UPDAY", "上传日期"); - this.winGridViewPager1.AddColumnAlias("WRITER", "上传人"); - this.winGridViewPager1.DisplayColumns = "FILENAME,TITLE,FILETYPE,UPDAY,WRITER"; + this.winGridViewPager1.AddColumnAlias("文档名称", "文档名称"); + this.winGridViewPager1.AddColumnAlias("编号", "编号"); + this.winGridViewPager1.AddColumnAlias("文档标题", "文档标题"); + this.winGridViewPager1.AddColumnAlias("文档类型", "文档类型"); + this.winGridViewPager1.AddColumnAlias("上传日期", "上传日期"); + this.winGridViewPager1.AddColumnAlias("上传人", "上传人"); + this.winGridViewPager1.DisplayColumns = "文档名称,文档标题,文档类型,上传日期,上传人"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -167,7 +167,7 @@ if (grid != null) { DataGridViewRow row = grid.SelectedRows[0]; - string dbid = row.Cells["dbid"].Value.ToString(); + string dbid = row.Cells["编号"].Value.ToString(); try { if (MessageBox.Show("确认删除吗？", "确认", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) @@ -212,7 +212,8 @@ { string sqlCount = "select count(*) from casic_userdocument where sysname = 'EMS'"; - string sqlData = "select filename,dbid,title,filetype,upday,writer " + + string sqlData = "select filename as 文档名称,dbid as 编号,title as 文档标题," + + "filetype as 文档类型,upday as 上传日期,writer as 上传人 " + "from (select t.*,rownum row_num from casic_userdocument t order by DBID desc)b " + " where sysname = 'EMS'"; @@ -226,9 +227,9 @@ int minPage = (pageIndex - 1) * maxPageIndex + 1; int maxPage = pageIndex * maxPageIndex; string sqlCount = "select count(*) from casic_userdocument where sysname = 'EMS'"; - string sqlData = "select filename,dbid,title,filetype,upday,writer " + - "from (select t.*,rownum row_num from casic_userdocument t where sysname = 'EMS' order by DBID desc)b " + - " where(b.row_num between " + minPage + " and " + maxPage + ")"; + string sqlData = "select filename as 文档名称,dbid as 编号,title as 文档标题,"+ + "filetype as 文档类型,upday as 上传日期,writer as 上传人 " + + "from (select t.*,rownum row_num from casic_userdocument t where sysname = 'EMS'"; string txtTitleText = null; string comboFileType = null; @@ -278,7 +279,8 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - + sqlData += " order by DBID desc)b " + + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; @@ -437,7 +439,7 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - string filename = row.Cells["filename"].Value.ToString(); + string filename = row.Cells["文档名称"].Value.ToString(); string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; string file = System.Environment.CurrentDirectory + "\\download\\" + filename; int result = DownloadFile(url, file, progressBar1); @@ -515,7 +517,7 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - string filename = row.Cells["filename"].Value.ToString(); + string filename = row.Cells["文档名称"].Value.ToString(); string ext = Path.GetExtension(filename); SaveFileDialog dlg = new SaveFileDialog(); dlg.Filter = "保存文档|*" + ext + ";"; diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 1d1201b..3902629 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -748,6 +748,7 @@ this.Name = "FrmAddSinMark"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "单个标识器添加"; + this.TopMost = true; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmAddSinMark_FormClosing); this.Load += new System.EventHandler(this.FrmAddSinMark_Load); this.groupPanel1.ResumeLayout(false); diff --git a/FrmEquipmentManage.cs b/FrmEquipmentManage.cs index 90bfdb2..a3cf55c 100644 --- a/FrmEquipmentManage.cs +++ b/FrmEquipmentManage.cs @@ -74,13 +74,13 @@ //控制表格显示的列，以及每一列要显示的列名 this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - this.winGridViewPager1.AddColumnAlias("DESCIRPTION", "设备描述"); - this.winGridViewPager1.AddColumnAlias("DBID", "编号"); - this.winGridViewPager1.AddColumnAlias("MACID", "MAC地址"); - this.winGridViewPager1.AddColumnAlias("OWNER", "设备所有人"); - this.winGridViewPager1.AddColumnAlias("STATUS", "设备状态"); + this.winGridViewPager1.AddColumnAlias("设备描述", "设备描述"); + this.winGridViewPager1.AddColumnAlias("编号", "编号"); + this.winGridViewPager1.AddColumnAlias("MAC地址", "MAC地址"); + this.winGridViewPager1.AddColumnAlias("设备所有人", "设备所有人"); + this.winGridViewPager1.AddColumnAlias("设备状态", "设备状态"); - this.winGridViewPager1.DisplayColumns = "DESCIRPTION,MACID,OWNER,STATUS"; + this.winGridViewPager1.DisplayColumns = "设备描述,MAC地址,设备所有人,设备状态"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -146,10 +146,10 @@ DataGridViewRow row = grid.SelectedRows[0]; try { - long dbid = long.Parse(row.Cells["DBID"].Value.ToString()); - String macId = row.Cells["MACID"].Value.ToString(); - String username = row.Cells["OWNER"].Value.ToString(); - String descn = row.Cells["DESCIRPTION"].Value.ToString(); + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); + String macId = row.Cells["MAC地址"].Value.ToString(); + String username = row.Cells["设备所有人"].Value.ToString(); + String descn = row.Cells["设备状态"].Value.ToString(); FrmEquipmentEdit frm = new FrmEquipmentEdit(dbid.ToString(), macId, username, descn); frm.reloadGrid += new ReloadEquipmentGrid(LoadData); frm.ShowDialog(); @@ -179,7 +179,7 @@ { return; } - String macId = row.Cells["MACID"].Value.ToString(); + String macId = row.Cells["MAC地址"].Value.ToString(); FrmLog frm = new FrmLog(macId); frm.Show(); } @@ -201,7 +201,7 @@ if (grid != null) { DataGridViewRow row = grid.SelectedRows[0]; - long dbid = long.Parse(row.Cells["DBID"].Value.ToString()); + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); try { if (MessageBox.Show("确定删除？", "确认", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) @@ -243,7 +243,8 @@ { string sqlCount = "select count(*) from equipment where status = 'USING'"; - string sqlData = "select descirption,DBID,macid,owner,case when status = 'USING' then '可用' when status = 'DAMAGE' then '损坏' end as status " + + string sqlData = "select descirption as 设备描述,DBID as 编号,macid as MAC地址,owner as 设备所有人,"+ + "case when status = 'USING' then '可用' when status = 'DAMAGE' then '损坏' end as 设备状态 " + "from (select t.*,rownum row_num from equipment t where status = 'USING' order by dbid desc)b " + " where 1=1"; @@ -258,16 +259,17 @@ int maxPage = pageIndex * maxPageIndex; string sqlCount = "select count(*) from equipment where status = 'USING' "; - string sqlData = "select descirption,DBID,macid,owner,case when status = 'USING' then '可用' when status = 'DAMAGE' then '损坏' end as status " + - "from (select t.*,rownum row_num from equipment t where status = 'USING' order by DBID desc)b " + - " where(b.row_num between " + minPage + " and " + maxPage + ")"; + string sqlData = "select descirption as 设备描述,DBID as 编号,macid as MAC地址,owner as 设备所有人," + + "case when status = 'USING' then '可用' when status = 'DAMAGE' then '损坏' end as 设备状态 " + + "from (select t.*,rownum row_num from equipment t where status = 'USING'"; if (!String.IsNullOrEmpty(txtMacId.Text.Trim())) { sqlData += " and macid like '%" + txtMacId.Text.Trim() + "%'"; sqlCount += " and macid like '%" + txtMacId.Text.Trim() + "%'"; } - + sqlData += " order by DBID desc)b " + + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; @@ -299,76 +301,6 @@ } } - //public void reloadGrid(int pageIndex) - //{ - // if (pageIndex <= 0) - // { - // pageIndex = 1; - // currentpage = 1; - // } - // String sqlrows = "select * from (select rownum as rowno,dbid,descirption,macid,owner,case when status = 'USING' then '可用' when status = 'DAMAGE' then '损坏' end as status,'编辑' as btnEdit,'删除' as btnDel from equipment t where status = 'USING' "; - // string sqlcount = "select count(*) from equipment where status = 'USING' "; - // if (!String.IsNullOrEmpty(txtMacId.Text.Trim())) - // { - // sqlrows += " and macid like '%" + txtMacId.Text.Trim() + "%'"; - // sqlcount += " and macid like '%" + txtMacId.Text.Trim() + "%'"; - // } - // sqlrows += " and rownum<=" + (pagesize * pageIndex) + ") table_alias where table_alias.rowno>=" + ((pageIndex - 1) * pagesize + 1); - - // int rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlcount).ToString()); - // int pages = 0; - // if (rows % pagesize == 0) - // { - // pages = rows / pagesize; - // } - // else - // { - // pages = rows / pagesize + 1; - // } - - // lastpage = pages; - - // lab_page_msg.Text = "共" + rows + "条记录，每页" + pagesize + "条，第" + pageIndex + "页，共" + pages + "页"; - // combo_page_num.Items.Clear(); - // for (int i = 1; i <= pages; i++) - // { - // combo_page_num.Items.Add(new ComboBoxItem(i.ToString(), i.ToString())); - // } - - // if (lastpage == 1) - // { - // btn_page_first.Enabled = false; - // btn_page_pre.Enabled = false; - // btn_page_last.Enabled = false; - // btn_page_next.Enabled = false; - // } - // else if (currentpage == 1) - // { - // btn_page_first.Enabled = false; - // btn_page_pre.Enabled = false; - // btn_page_last.Enabled = true; - // btn_page_next.Enabled = true; - // } - // else if (currentpage == lastpage) - // { - // btn_page_first.Enabled = true; - // btn_page_pre.Enabled = true; - // btn_page_last.Enabled = false; - // btn_page_next.Enabled = false; - // } - // else - // { - // btn_page_first.Enabled = true; - // btn_page_pre.Enabled = true; - // btn_page_last.Enabled = true; - // btn_page_next.Enabled = true; - // } - - // DataTable table = OracleUtils.ExecuteDataset(OracleUtils.ConnectionString, CommandType.Text, sqlrows).Tables[0]; - // dataGridViewX1.DataSource = table; - - //} - private void FrmEquipmentManage_FormClosing(object sender, FormClosingEventArgs e) diff --git a/Cyberpipe.csproj b/Cyberpipe.csproj index fe600e5..501fd09 100644 --- a/Cyberpipe.csproj +++ b/Cyberpipe.csproj @@ -246,6 +246,12 @@ Form_TaskManager.cs + + Form + + + FrmFlagDetail.cs + Form @@ -1368,6 +1374,9 @@ Form_TaskManager.cs + + FrmFlagDetail.cs + FormDocumentManager.cs diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 537b4c3..1acf22a 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 7d5dd95..3f178cb 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -90,20 +90,20 @@ this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - - this.winGridViewPager1.AddColumnAlias("ACCIDENTTIME", "上报时间"); - this.winGridViewPager1.AddColumnAlias("DBID", "编号"); - this.winGridViewPager1.AddColumnAlias("DESCRIBE", "事件描述"); - this.winGridViewPager1.AddColumnAlias("LATITUDE", "纬度"); - this.winGridViewPager1.AddColumnAlias("LOCALE", "事件地点"); - this.winGridViewPager1.AddColumnAlias("LONGITUDE", "经度"); - this.winGridViewPager1.AddColumnAlias("PATROLERNAME", "上报人员"); - this.winGridViewPager1.AddColumnAlias("PATROLER_ID", "人员ID"); - this.winGridViewPager1.AddColumnAlias("TASK_ID", "任务编号"); - this.winGridViewPager1.AddColumnAlias("RESULT", "处理结果"); - this.winGridViewPager1.AddColumnAlias("STATE", "处理状态"); - this.winGridViewPager1.DisplayColumns = "ACCIDENTTIME,DESCRIBE,LOCALE,PATROLERNAME,TASK_ID,RESULT,STATE"; + this.winGridViewPager1.AddColumnAlias("上报时间", "上报时间"); + this.winGridViewPager1.AddColumnAlias("编号", "编号"); + this.winGridViewPager1.AddColumnAlias("事件描述", "事件描述"); + this.winGridViewPager1.AddColumnAlias("纬度", "纬度"); + this.winGridViewPager1.AddColumnAlias("事件地点", "事件地点"); + this.winGridViewPager1.AddColumnAlias("经度", "经度"); + this.winGridViewPager1.AddColumnAlias("上报人员", "上报人员"); + this.winGridViewPager1.AddColumnAlias("人员ID", "人员ID"); + this.winGridViewPager1.AddColumnAlias("任务编号", "任务编号"); + this.winGridViewPager1.AddColumnAlias("处理结果", "处理结果"); + this.winGridViewPager1.AddColumnAlias("处理状态", "处理状态"); + + this.winGridViewPager1.DisplayColumns = "上报时间,事件描述,事件地点,上报人员,任务编号,处理结果,处理状态"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -114,8 +114,8 @@ winGridViewPager1.dataGridView1.ContextMenuStrip.Items[5].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[6].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[7].Visible = false; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[1].Text = "查看位置"; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "结果编辑"; + winGridViewPager1.dataGridView1.ContextMenuStrip.Items[1].Text = "结果编辑"; + winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "查看位置"; //右键菜单宽度 winGridViewPager1.dataGridView1.ContextMenuStrip.AutoSize = false; @@ -160,13 +160,12 @@ this.WindowState = FormWindowState.Minimized; globeControl1.Globe.MemoryLayer.RemoveAllFeature(); this.WindowState = FormWindowState.Minimized; - double x = Convert.ToDouble(row.Cells["LONGITUDE"].Value); - double y = Convert.ToDouble(row.Cells["LATITUDE"].Value); - - string username = Convert.ToString(row.Cells["PATROLERNAME"].Value); - string Atime = Convert.ToString(row.Cells["ACCIDENTTIME"].Value); - string location = Convert.ToString(row.Cells["LOCALE"].Value); - string descp = Convert.ToString(row.Cells["DESCRIBE"].Value); + double x = Convert.ToDouble(row.Cells["经度"].Value); + double y = Convert.ToDouble(row.Cells["纬度"].Value); + string username = Convert.ToString(row.Cells["上报人员"].Value); + string Atime = Convert.ToString(row.Cells["上报时间"].Value); + string location = Convert.ToString(row.Cells["事件地点"].Value); + string descp = Convert.ToString(row.Cells["事件描述"].Value); /////////////////////////////////////// /*******设置飞行与创建模型******/ @@ -228,8 +227,8 @@ DataGridViewRow row = grid.SelectedRows[0]; try { - int dbId = Convert.ToInt32(row.Cells["DBID"].Value); - string result = Convert.ToString(row.Cells["RESULT"].Value); + int dbId = Convert.ToInt32(row.Cells["编号"].Value); + string result = Convert.ToString(row.Cells["处理结果"].Value); EMS_Forms.Form_EventResult form = new Form_EventResult(dbId, result); form.refresh += new Form_EventResult.Handle(LoadData);//改变值的事件 form.ShowDialog(); @@ -276,9 +275,9 @@ } for (int i = 0; i < table.Rows.Count; i++) { - if (winGridViewPager1.dataGridView1.Rows[i].Cells["RESULT"].Value != null && !(winGridViewPager1.dataGridView1.Rows[i].Cells["RESULT"].Value.ToString().Trim().Equals(""))) + if (winGridViewPager1.dataGridView1.Rows[i].Cells["处理结果"].Value != null && !(winGridViewPager1.dataGridView1.Rows[i].Cells["处理结果"].Value.ToString().Trim().Equals(""))) { - winGridViewPager1.dataGridView1.Rows[i].Cells["STATE"].Value = "已处理"; + winGridViewPager1.dataGridView1.Rows[i].Cells["处理状态"].Value = "已处理"; } } @@ -307,9 +306,9 @@ } for (int i = 0; i < table.Rows.Count; i++) { - if (winGridViewPager1.dataGridView1.Rows[i].Cells["RESULT"].Value != null && !(winGridViewPager1.dataGridView1.Rows[i].Cells["RESULT"].Value.ToString().Trim().Equals(""))) + if (winGridViewPager1.dataGridView1.Rows[i].Cells["处理结果"].Value != null && !(winGridViewPager1.dataGridView1.Rows[i].Cells["处理结果"].Value.ToString().Trim().Equals(""))) { - winGridViewPager1.dataGridView1.Rows[i].Cells["STATE"].Value = "已处理"; + winGridViewPager1.dataGridView1.Rows[i].Cells["处理状态"].Value = "已处理"; } } @@ -320,10 +319,12 @@ { string sqlCount = "select count(*) from ACCIDENT where 1=1"; - string sqlData = "select ACCIDENTTIME,DBID,DESCRIBE,LATITUDE,LOCALE,LONGITUDE,PATROLERNAME,PATROLER_ID,TASK_ID,RESULT,'' as STATE " + + string sqlData = "select ACCIDENTTIME as 上报时间,DBID as 编号,DESCRIBE as 事件描述,"+ + "LATITUDE as 纬度,LOCALE as 事件地点,LONGITUDE as 经度,PATROLERNAME 上报人员,"+ + "PATROLER_ID as 人员ID,TASK_ID as 任务编号,RESULT as 处理结果,'' as 处理状态 " + "from (select t.*,rownum row_num from ACCIDENT t order by DBID)b " + " where 1=1"; - + rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; @@ -340,9 +341,10 @@ string sqlCount = "select count(*) from ACCIDENT where 1=1"; - string sqlData = "select ACCIDENTTIME,DBID,DESCRIBE,LATITUDE,LOCALE,LONGITUDE,PATROLERNAME,PATROLER_ID,TASK_ID,RESULT,'' as STATE " + - "from (select t.*,rownum row_num from ACCIDENT t order by DBID)b " + - " where(b.row_num between " + minPage + " and " + maxPage + ")"; + string sqlData = "select ACCIDENTTIME as 上报时间,DBID as 编号,DESCRIBE as 事件描述," + + "LATITUDE as 纬度,LOCALE as 事件地点,LONGITUDE as 经度,PATROLERNAME 上报人员," + + "PATROLER_ID as 人员ID,TASK_ID as 任务编号,RESULT as 处理结果,'' as 处理状态 " + + "from (select t.*,rownum row_num from ACCIDENT t where 1=1"; if (!String.IsNullOrEmpty(comboBox_name.Text.Trim())) { @@ -361,7 +363,8 @@ sqlCount += "and ACCIDENTTIME<=to_date('" + time.ToShortDateString() + "','yyyy-MM-dd') "; sqlData += "and ACCIDENTTIME<=to_date('" + time.ToShortDateString() + "','yyyy-MM-dd') "; } - + sqlData += " order by DBID desc)b " + + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 225c8d7..8bd9e48 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -120,8 +120,8 @@ private void flyToTask(DataGridViewRow row, int taskState) { int dbID = 0; - dbID = Convert.ToInt32(row.Cells["DBID"].Value); - string userName = Convert.ToString(row.Cells["USERNAME"].Value); + dbID = Convert.ToInt32(row.Cells["任务编号"].Value); + string userName = Convert.ToString(row.Cells["任务执行人员"].Value); System.DateTime t = new DateTime(); try { @@ -392,15 +392,15 @@ //控制表格显示的列，以及每一列要显示的列名 this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - this.winGridViewPager1.AddColumnAlias("DBID", "任务编号"); - this.winGridViewPager1.AddColumnAlias("DEPLOYTIME", "创建时间"); - this.winGridViewPager1.AddColumnAlias("DESCIRPTION", "任务描述"); - this.winGridViewPager1.AddColumnAlias("FINISHTIME", "完成时间"); - this.winGridViewPager1.AddColumnAlias("STREET", "任务执行区域"); - this.winGridViewPager1.AddColumnAlias("TASKSTATE", "任务状态"); - this.winGridViewPager1.AddColumnAlias("USERNAME", "任务执行人员"); + this.winGridViewPager1.AddColumnAlias("任务编号", "任务编号"); + this.winGridViewPager1.AddColumnAlias("创建时间", "创建时间"); + this.winGridViewPager1.AddColumnAlias("任务描述", "任务描述"); + this.winGridViewPager1.AddColumnAlias("完成时间", "完成时间"); + this.winGridViewPager1.AddColumnAlias("任务执行区域", "任务执行区域"); + this.winGridViewPager1.AddColumnAlias("任务状态", "任务状态"); + this.winGridViewPager1.AddColumnAlias("任务执行人员", "任务执行人员"); - this.winGridViewPager1.DisplayColumns = "DBID,DEPLOYTIME,DESCIRPTION,FINISHTIME,STREET,TASKSTATE,USERNAME"; + this.winGridViewPager1.DisplayColumns = "任务编号,创建时间,任务描述,完成时间,任务执行区域,任务状态,任务执行人员"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -464,8 +464,8 @@ { int dbID = 0; int taskStateInt = 0; - dbID = Convert.ToInt32(row.Cells["DBID"].Value); - string taskState = row.Cells["TASKSTATE"].Value.ToString(); + dbID = Convert.ToInt32(row.Cells["任务编号"].Value); + string taskState = row.Cells["任务状态"].Value.ToString(); if (taskState.Equals("开始任务")) { taskStateInt = 1; @@ -534,9 +534,10 @@ private string GetSql() { - string sqlCount = "select count(*) from taskinfo t where 1=1'"; + string sqlCount = "select count(*) from taskinfo t where 1=1"; - string sqlData = "select dbid,deploytime,descirption,finishtime,street,taskstate,username " + + 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"; @@ -550,9 +551,9 @@ int minPage = (pageIndex - 1) * maxPageIndex + 1; int maxPage = pageIndex * maxPageIndex; string sqlCount = "select count(*) from taskinfo t where 1=1"; - string sqlData = "select dbid,deploytime,descirption,finishtime,street,taskstate,username " + - "from (select t.*,rownum row_num from taskinfo t order by DBID desc)b " + - " where(b.row_num between " + minPage + " and " + maxPage + ")"; + 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"; if (!String.IsNullOrEmpty(comboBox_userName.Text.Trim()) && !comboBox_userName.Text.Trim().Equals("不限")) { @@ -581,6 +582,8 @@ sqlCount += "and street='" + combo_street.Text + "' "; sqlData += "and street='" + combo_street.Text + "' "; } + sqlData += " order by DBID desc)b " + + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index e65a4bd..58f5342 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -73,13 +73,13 @@ //控制表格显示的列，以及每一列要显示的列名 this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - this.winGridViewPager1.AddColumnAlias("FILENAME", "文档名称"); - this.winGridViewPager1.AddColumnAlias("DBID", "编号"); - this.winGridViewPager1.AddColumnAlias("TITLE", "文档标题"); - this.winGridViewPager1.AddColumnAlias("FILETYPE", "文档类型"); - this.winGridViewPager1.AddColumnAlias("UPDAY", "上传日期"); - this.winGridViewPager1.AddColumnAlias("WRITER", "上传人"); - this.winGridViewPager1.DisplayColumns = "FILENAME,TITLE,FILETYPE,UPDAY,WRITER"; + this.winGridViewPager1.AddColumnAlias("文档名称", "文档名称"); + this.winGridViewPager1.AddColumnAlias("编号", "编号"); + this.winGridViewPager1.AddColumnAlias("文档标题", "文档标题"); + this.winGridViewPager1.AddColumnAlias("文档类型", "文档类型"); + this.winGridViewPager1.AddColumnAlias("上传日期", "上传日期"); + this.winGridViewPager1.AddColumnAlias("上传人", "上传人"); + this.winGridViewPager1.DisplayColumns = "文档名称,文档标题,文档类型,上传日期,上传人"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -167,7 +167,7 @@ if (grid != null) { DataGridViewRow row = grid.SelectedRows[0]; - string dbid = row.Cells["dbid"].Value.ToString(); + string dbid = row.Cells["编号"].Value.ToString(); try { if (MessageBox.Show("确认删除吗？", "确认", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) @@ -212,7 +212,8 @@ { string sqlCount = "select count(*) from casic_userdocument where sysname = 'EMS'"; - string sqlData = "select filename,dbid,title,filetype,upday,writer " + + string sqlData = "select filename as 文档名称,dbid as 编号,title as 文档标题," + + "filetype as 文档类型,upday as 上传日期,writer as 上传人 " + "from (select t.*,rownum row_num from casic_userdocument t order by DBID desc)b " + " where sysname = 'EMS'"; @@ -226,9 +227,9 @@ int minPage = (pageIndex - 1) * maxPageIndex + 1; int maxPage = pageIndex * maxPageIndex; string sqlCount = "select count(*) from casic_userdocument where sysname = 'EMS'"; - string sqlData = "select filename,dbid,title,filetype,upday,writer " + - "from (select t.*,rownum row_num from casic_userdocument t where sysname = 'EMS' order by DBID desc)b " + - " where(b.row_num between " + minPage + " and " + maxPage + ")"; + string sqlData = "select filename as 文档名称,dbid as 编号,title as 文档标题,"+ + "filetype as 文档类型,upday as 上传日期,writer as 上传人 " + + "from (select t.*,rownum row_num from casic_userdocument t where sysname = 'EMS'"; string txtTitleText = null; string comboFileType = null; @@ -278,7 +279,8 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - + sqlData += " order by DBID desc)b " + + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; @@ -437,7 +439,7 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - string filename = row.Cells["filename"].Value.ToString(); + string filename = row.Cells["文档名称"].Value.ToString(); string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; string file = System.Environment.CurrentDirectory + "\\download\\" + filename; int result = DownloadFile(url, file, progressBar1); @@ -515,7 +517,7 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - string filename = row.Cells["filename"].Value.ToString(); + string filename = row.Cells["文档名称"].Value.ToString(); string ext = Path.GetExtension(filename); SaveFileDialog dlg = new SaveFileDialog(); dlg.Filter = "保存文档|*" + ext + ";"; diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 1d1201b..3902629 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -748,6 +748,7 @@ this.Name = "FrmAddSinMark"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "单个标识器添加"; + this.TopMost = true; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmAddSinMark_FormClosing); this.Load += new System.EventHandler(this.FrmAddSinMark_Load); this.groupPanel1.ResumeLayout(false); diff --git a/FrmEquipmentManage.cs b/FrmEquipmentManage.cs index 90bfdb2..a3cf55c 100644 --- a/FrmEquipmentManage.cs +++ b/FrmEquipmentManage.cs @@ -74,13 +74,13 @@ //控制表格显示的列，以及每一列要显示的列名 this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - this.winGridViewPager1.AddColumnAlias("DESCIRPTION", "设备描述"); - this.winGridViewPager1.AddColumnAlias("DBID", "编号"); - this.winGridViewPager1.AddColumnAlias("MACID", "MAC地址"); - this.winGridViewPager1.AddColumnAlias("OWNER", "设备所有人"); - this.winGridViewPager1.AddColumnAlias("STATUS", "设备状态"); + this.winGridViewPager1.AddColumnAlias("设备描述", "设备描述"); + this.winGridViewPager1.AddColumnAlias("编号", "编号"); + this.winGridViewPager1.AddColumnAlias("MAC地址", "MAC地址"); + this.winGridViewPager1.AddColumnAlias("设备所有人", "设备所有人"); + this.winGridViewPager1.AddColumnAlias("设备状态", "设备状态"); - this.winGridViewPager1.DisplayColumns = "DESCIRPTION,MACID,OWNER,STATUS"; + this.winGridViewPager1.DisplayColumns = "设备描述,MAC地址,设备所有人,设备状态"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -146,10 +146,10 @@ DataGridViewRow row = grid.SelectedRows[0]; try { - long dbid = long.Parse(row.Cells["DBID"].Value.ToString()); - String macId = row.Cells["MACID"].Value.ToString(); - String username = row.Cells["OWNER"].Value.ToString(); - String descn = row.Cells["DESCIRPTION"].Value.ToString(); + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); + String macId = row.Cells["MAC地址"].Value.ToString(); + String username = row.Cells["设备所有人"].Value.ToString(); + String descn = row.Cells["设备状态"].Value.ToString(); FrmEquipmentEdit frm = new FrmEquipmentEdit(dbid.ToString(), macId, username, descn); frm.reloadGrid += new ReloadEquipmentGrid(LoadData); frm.ShowDialog(); @@ -179,7 +179,7 @@ { return; } - String macId = row.Cells["MACID"].Value.ToString(); + String macId = row.Cells["MAC地址"].Value.ToString(); FrmLog frm = new FrmLog(macId); frm.Show(); } @@ -201,7 +201,7 @@ if (grid != null) { DataGridViewRow row = grid.SelectedRows[0]; - long dbid = long.Parse(row.Cells["DBID"].Value.ToString()); + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); try { if (MessageBox.Show("确定删除？", "确认", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) @@ -243,7 +243,8 @@ { string sqlCount = "select count(*) from equipment where status = 'USING'"; - string sqlData = "select descirption,DBID,macid,owner,case when status = 'USING' then '可用' when status = 'DAMAGE' then '损坏' end as status " + + string sqlData = "select descirption as 设备描述,DBID as 编号,macid as MAC地址,owner as 设备所有人,"+ + "case when status = 'USING' then '可用' when status = 'DAMAGE' then '损坏' end as 设备状态 " + "from (select t.*,rownum row_num from equipment t where status = 'USING' order by dbid desc)b " + " where 1=1"; @@ -258,16 +259,17 @@ int maxPage = pageIndex * maxPageIndex; string sqlCount = "select count(*) from equipment where status = 'USING' "; - string sqlData = "select descirption,DBID,macid,owner,case when status = 'USING' then '可用' when status = 'DAMAGE' then '损坏' end as status " + - "from (select t.*,rownum row_num from equipment t where status = 'USING' order by DBID desc)b " + - " where(b.row_num between " + minPage + " and " + maxPage + ")"; + string sqlData = "select descirption as 设备描述,DBID as 编号,macid as MAC地址,owner as 设备所有人," + + "case when status = 'USING' then '可用' when status = 'DAMAGE' then '损坏' end as 设备状态 " + + "from (select t.*,rownum row_num from equipment t where status = 'USING'"; if (!String.IsNullOrEmpty(txtMacId.Text.Trim())) { sqlData += " and macid like '%" + txtMacId.Text.Trim() + "%'"; sqlCount += " and macid like '%" + txtMacId.Text.Trim() + "%'"; } - + sqlData += " order by DBID desc)b " + + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; @@ -299,76 +301,6 @@ } } - //public void reloadGrid(int pageIndex) - //{ - // if (pageIndex <= 0) - // { - // pageIndex = 1; - // currentpage = 1; - // } - // String sqlrows = "select * from (select rownum as rowno,dbid,descirption,macid,owner,case when status = 'USING' then '可用' when status = 'DAMAGE' then '损坏' end as status,'编辑' as btnEdit,'删除' as btnDel from equipment t where status = 'USING' "; - // string sqlcount = "select count(*) from equipment where status = 'USING' "; - // if (!String.IsNullOrEmpty(txtMacId.Text.Trim())) - // { - // sqlrows += " and macid like '%" + txtMacId.Text.Trim() + "%'"; - // sqlcount += " and macid like '%" + txtMacId.Text.Trim() + "%'"; - // } - // sqlrows += " and rownum<=" + (pagesize * pageIndex) + ") table_alias where table_alias.rowno>=" + ((pageIndex - 1) * pagesize + 1); - - // int rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlcount).ToString()); - // int pages = 0; - // if (rows % pagesize == 0) - // { - // pages = rows / pagesize; - // } - // else - // { - // pages = rows / pagesize + 1; - // } - - // lastpage = pages; - - // lab_page_msg.Text = "共" + rows + "条记录，每页" + pagesize + "条，第" + pageIndex + "页，共" + pages + "页"; - // combo_page_num.Items.Clear(); - // for (int i = 1; i <= pages; i++) - // { - // combo_page_num.Items.Add(new ComboBoxItem(i.ToString(), i.ToString())); - // } - - // if (lastpage == 1) - // { - // btn_page_first.Enabled = false; - // btn_page_pre.Enabled = false; - // btn_page_last.Enabled = false; - // btn_page_next.Enabled = false; - // } - // else if (currentpage == 1) - // { - // btn_page_first.Enabled = false; - // btn_page_pre.Enabled = false; - // btn_page_last.Enabled = true; - // btn_page_next.Enabled = true; - // } - // else if (currentpage == lastpage) - // { - // btn_page_first.Enabled = true; - // btn_page_pre.Enabled = true; - // btn_page_last.Enabled = false; - // btn_page_next.Enabled = false; - // } - // else - // { - // btn_page_first.Enabled = true; - // btn_page_pre.Enabled = true; - // btn_page_last.Enabled = true; - // btn_page_next.Enabled = true; - // } - - // DataTable table = OracleUtils.ExecuteDataset(OracleUtils.ConnectionString, CommandType.Text, sqlrows).Tables[0]; - // dataGridViewX1.DataSource = table; - - //} - private void FrmEquipmentManage_FormClosing(object sender, FormClosingEventArgs e) diff --git a/FrmFlagDetail.Designer.cs b/FrmFlagDetail.Designer.cs new file mode 100644 index 0000000..982bfc6 --- /dev/null +++ b/FrmFlagDetail.Designer.cs @@ -0,0 +1,103 @@ +namespace Cyberpipe +{ + partial class FrmFlagDetail + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); + this.dataGridViewX_markDetail = new DevComponents.DotNetBar.Controls.DataGridViewX(); + this.对象类型 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.对象编号 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.对象名称 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX_markDetail)).BeginInit(); + this.SuspendLayout(); + // + // dataGridViewX_markDetail + // + this.dataGridViewX_markDetail.AllowUserToAddRows = false; + this.dataGridViewX_markDetail.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; + this.dataGridViewX_markDetail.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dataGridViewX_markDetail.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.对象类型, + this.对象编号, + this.对象名称}); + dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle3.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dataGridViewX_markDetail.DefaultCellStyle = dataGridViewCellStyle3; + this.dataGridViewX_markDetail.Dock = System.Windows.Forms.DockStyle.Fill; + this.dataGridViewX_markDetail.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(170)))), ((int)(((byte)(170)))), ((int)(((byte)(170))))); + this.dataGridViewX_markDetail.Location = new System.Drawing.Point(0, 0); + this.dataGridViewX_markDetail.Name = "dataGridViewX_markDetail"; + this.dataGridViewX_markDetail.RowTemplate.Height = 23; + this.dataGridViewX_markDetail.Size = new System.Drawing.Size(508, 321); + this.dataGridViewX_markDetail.TabIndex = 0; + // + // 对象类型 + // + this.对象类型.HeaderText = "对象类型"; + this.对象类型.Name = "对象类型"; + // + // 对象编号 + // + this.对象编号.HeaderText = "对象编号"; + this.对象编号.Name = "对象编号"; + // + // 对象名称 + // + this.对象名称.HeaderText = "对象名称"; + this.对象名称.Name = "对象名称"; + // + // FrmFlagDetail + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(508, 321); + this.Controls.Add(this.dataGridViewX_markDetail); + this.Name = "FrmFlagDetail"; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; + this.Text = "标识对象信息"; + this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmFlagDetail_FormClosing); + this.Load += new System.EventHandler(this.FrmFlagDetail_Load); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX_markDetail)).EndInit(); + this.ResumeLayout(false); + + } + + #endregion + + private DevComponents.DotNetBar.Controls.DataGridViewX dataGridViewX_markDetail; + private System.Windows.Forms.DataGridViewTextBoxColumn 对象类型; + private System.Windows.Forms.DataGridViewTextBoxColumn 对象编号; + private System.Windows.Forms.DataGridViewTextBoxColumn 对象名称; + + } +} \ No newline at end of file diff --git a/Cyberpipe.csproj b/Cyberpipe.csproj index fe600e5..501fd09 100644 --- a/Cyberpipe.csproj +++ b/Cyberpipe.csproj @@ -246,6 +246,12 @@ Form_TaskManager.cs + + Form + + + FrmFlagDetail.cs + Form @@ -1368,6 +1374,9 @@ Form_TaskManager.cs + + FrmFlagDetail.cs + FormDocumentManager.cs diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 537b4c3..1acf22a 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 7d5dd95..3f178cb 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -90,20 +90,20 @@ this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - - this.winGridViewPager1.AddColumnAlias("ACCIDENTTIME", "上报时间"); - this.winGridViewPager1.AddColumnAlias("DBID", "编号"); - this.winGridViewPager1.AddColumnAlias("DESCRIBE", "事件描述"); - this.winGridViewPager1.AddColumnAlias("LATITUDE", "纬度"); - this.winGridViewPager1.AddColumnAlias("LOCALE", "事件地点"); - this.winGridViewPager1.AddColumnAlias("LONGITUDE", "经度"); - this.winGridViewPager1.AddColumnAlias("PATROLERNAME", "上报人员"); - this.winGridViewPager1.AddColumnAlias("PATROLER_ID", "人员ID"); - this.winGridViewPager1.AddColumnAlias("TASK_ID", "任务编号"); - this.winGridViewPager1.AddColumnAlias("RESULT", "处理结果"); - this.winGridViewPager1.AddColumnAlias("STATE", "处理状态"); - this.winGridViewPager1.DisplayColumns = "ACCIDENTTIME,DESCRIBE,LOCALE,PATROLERNAME,TASK_ID,RESULT,STATE"; + this.winGridViewPager1.AddColumnAlias("上报时间", "上报时间"); + this.winGridViewPager1.AddColumnAlias("编号", "编号"); + this.winGridViewPager1.AddColumnAlias("事件描述", "事件描述"); + this.winGridViewPager1.AddColumnAlias("纬度", "纬度"); + this.winGridViewPager1.AddColumnAlias("事件地点", "事件地点"); + this.winGridViewPager1.AddColumnAlias("经度", "经度"); + this.winGridViewPager1.AddColumnAlias("上报人员", "上报人员"); + this.winGridViewPager1.AddColumnAlias("人员ID", "人员ID"); + this.winGridViewPager1.AddColumnAlias("任务编号", "任务编号"); + this.winGridViewPager1.AddColumnAlias("处理结果", "处理结果"); + this.winGridViewPager1.AddColumnAlias("处理状态", "处理状态"); + + this.winGridViewPager1.DisplayColumns = "上报时间,事件描述,事件地点,上报人员,任务编号,处理结果,处理状态"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -114,8 +114,8 @@ winGridViewPager1.dataGridView1.ContextMenuStrip.Items[5].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[6].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[7].Visible = false; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[1].Text = "查看位置"; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "结果编辑"; + winGridViewPager1.dataGridView1.ContextMenuStrip.Items[1].Text = "结果编辑"; + winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "查看位置"; //右键菜单宽度 winGridViewPager1.dataGridView1.ContextMenuStrip.AutoSize = false; @@ -160,13 +160,12 @@ this.WindowState = FormWindowState.Minimized; globeControl1.Globe.MemoryLayer.RemoveAllFeature(); this.WindowState = FormWindowState.Minimized; - double x = Convert.ToDouble(row.Cells["LONGITUDE"].Value); - double y = Convert.ToDouble(row.Cells["LATITUDE"].Value); - - string username = Convert.ToString(row.Cells["PATROLERNAME"].Value); - string Atime = Convert.ToString(row.Cells["ACCIDENTTIME"].Value); - string location = Convert.ToString(row.Cells["LOCALE"].Value); - string descp = Convert.ToString(row.Cells["DESCRIBE"].Value); + double x = Convert.ToDouble(row.Cells["经度"].Value); + double y = Convert.ToDouble(row.Cells["纬度"].Value); + string username = Convert.ToString(row.Cells["上报人员"].Value); + string Atime = Convert.ToString(row.Cells["上报时间"].Value); + string location = Convert.ToString(row.Cells["事件地点"].Value); + string descp = Convert.ToString(row.Cells["事件描述"].Value); /////////////////////////////////////// /*******设置飞行与创建模型******/ @@ -228,8 +227,8 @@ DataGridViewRow row = grid.SelectedRows[0]; try { - int dbId = Convert.ToInt32(row.Cells["DBID"].Value); - string result = Convert.ToString(row.Cells["RESULT"].Value); + int dbId = Convert.ToInt32(row.Cells["编号"].Value); + string result = Convert.ToString(row.Cells["处理结果"].Value); EMS_Forms.Form_EventResult form = new Form_EventResult(dbId, result); form.refresh += new Form_EventResult.Handle(LoadData);//改变值的事件 form.ShowDialog(); @@ -276,9 +275,9 @@ } for (int i = 0; i < table.Rows.Count; i++) { - if (winGridViewPager1.dataGridView1.Rows[i].Cells["RESULT"].Value != null && !(winGridViewPager1.dataGridView1.Rows[i].Cells["RESULT"].Value.ToString().Trim().Equals(""))) + if (winGridViewPager1.dataGridView1.Rows[i].Cells["处理结果"].Value != null && !(winGridViewPager1.dataGridView1.Rows[i].Cells["处理结果"].Value.ToString().Trim().Equals(""))) { - winGridViewPager1.dataGridView1.Rows[i].Cells["STATE"].Value = "已处理"; + winGridViewPager1.dataGridView1.Rows[i].Cells["处理状态"].Value = "已处理"; } } @@ -307,9 +306,9 @@ } for (int i = 0; i < table.Rows.Count; i++) { - if (winGridViewPager1.dataGridView1.Rows[i].Cells["RESULT"].Value != null && !(winGridViewPager1.dataGridView1.Rows[i].Cells["RESULT"].Value.ToString().Trim().Equals(""))) + if (winGridViewPager1.dataGridView1.Rows[i].Cells["处理结果"].Value != null && !(winGridViewPager1.dataGridView1.Rows[i].Cells["处理结果"].Value.ToString().Trim().Equals(""))) { - winGridViewPager1.dataGridView1.Rows[i].Cells["STATE"].Value = "已处理"; + winGridViewPager1.dataGridView1.Rows[i].Cells["处理状态"].Value = "已处理"; } } @@ -320,10 +319,12 @@ { string sqlCount = "select count(*) from ACCIDENT where 1=1"; - string sqlData = "select ACCIDENTTIME,DBID,DESCRIBE,LATITUDE,LOCALE,LONGITUDE,PATROLERNAME,PATROLER_ID,TASK_ID,RESULT,'' as STATE " + + string sqlData = "select ACCIDENTTIME as 上报时间,DBID as 编号,DESCRIBE as 事件描述,"+ + "LATITUDE as 纬度,LOCALE as 事件地点,LONGITUDE as 经度,PATROLERNAME 上报人员,"+ + "PATROLER_ID as 人员ID,TASK_ID as 任务编号,RESULT as 处理结果,'' as 处理状态 " + "from (select t.*,rownum row_num from ACCIDENT t order by DBID)b " + " where 1=1"; - + rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; @@ -340,9 +341,10 @@ string sqlCount = "select count(*) from ACCIDENT where 1=1"; - string sqlData = "select ACCIDENTTIME,DBID,DESCRIBE,LATITUDE,LOCALE,LONGITUDE,PATROLERNAME,PATROLER_ID,TASK_ID,RESULT,'' as STATE " + - "from (select t.*,rownum row_num from ACCIDENT t order by DBID)b " + - " where(b.row_num between " + minPage + " and " + maxPage + ")"; + string sqlData = "select ACCIDENTTIME as 上报时间,DBID as 编号,DESCRIBE as 事件描述," + + "LATITUDE as 纬度,LOCALE as 事件地点,LONGITUDE as 经度,PATROLERNAME 上报人员," + + "PATROLER_ID as 人员ID,TASK_ID as 任务编号,RESULT as 处理结果,'' as 处理状态 " + + "from (select t.*,rownum row_num from ACCIDENT t where 1=1"; if (!String.IsNullOrEmpty(comboBox_name.Text.Trim())) { @@ -361,7 +363,8 @@ sqlCount += "and ACCIDENTTIME<=to_date('" + time.ToShortDateString() + "','yyyy-MM-dd') "; sqlData += "and ACCIDENTTIME<=to_date('" + time.ToShortDateString() + "','yyyy-MM-dd') "; } - + sqlData += " order by DBID desc)b " + + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 225c8d7..8bd9e48 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -120,8 +120,8 @@ private void flyToTask(DataGridViewRow row, int taskState) { int dbID = 0; - dbID = Convert.ToInt32(row.Cells["DBID"].Value); - string userName = Convert.ToString(row.Cells["USERNAME"].Value); + dbID = Convert.ToInt32(row.Cells["任务编号"].Value); + string userName = Convert.ToString(row.Cells["任务执行人员"].Value); System.DateTime t = new DateTime(); try { @@ -392,15 +392,15 @@ //控制表格显示的列，以及每一列要显示的列名 this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - this.winGridViewPager1.AddColumnAlias("DBID", "任务编号"); - this.winGridViewPager1.AddColumnAlias("DEPLOYTIME", "创建时间"); - this.winGridViewPager1.AddColumnAlias("DESCIRPTION", "任务描述"); - this.winGridViewPager1.AddColumnAlias("FINISHTIME", "完成时间"); - this.winGridViewPager1.AddColumnAlias("STREET", "任务执行区域"); - this.winGridViewPager1.AddColumnAlias("TASKSTATE", "任务状态"); - this.winGridViewPager1.AddColumnAlias("USERNAME", "任务执行人员"); + this.winGridViewPager1.AddColumnAlias("任务编号", "任务编号"); + this.winGridViewPager1.AddColumnAlias("创建时间", "创建时间"); + this.winGridViewPager1.AddColumnAlias("任务描述", "任务描述"); + this.winGridViewPager1.AddColumnAlias("完成时间", "完成时间"); + this.winGridViewPager1.AddColumnAlias("任务执行区域", "任务执行区域"); + this.winGridViewPager1.AddColumnAlias("任务状态", "任务状态"); + this.winGridViewPager1.AddColumnAlias("任务执行人员", "任务执行人员"); - this.winGridViewPager1.DisplayColumns = "DBID,DEPLOYTIME,DESCIRPTION,FINISHTIME,STREET,TASKSTATE,USERNAME"; + this.winGridViewPager1.DisplayColumns = "任务编号,创建时间,任务描述,完成时间,任务执行区域,任务状态,任务执行人员"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -464,8 +464,8 @@ { int dbID = 0; int taskStateInt = 0; - dbID = Convert.ToInt32(row.Cells["DBID"].Value); - string taskState = row.Cells["TASKSTATE"].Value.ToString(); + dbID = Convert.ToInt32(row.Cells["任务编号"].Value); + string taskState = row.Cells["任务状态"].Value.ToString(); if (taskState.Equals("开始任务")) { taskStateInt = 1; @@ -534,9 +534,10 @@ private string GetSql() { - string sqlCount = "select count(*) from taskinfo t where 1=1'"; + string sqlCount = "select count(*) from taskinfo t where 1=1"; - string sqlData = "select dbid,deploytime,descirption,finishtime,street,taskstate,username " + + 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"; @@ -550,9 +551,9 @@ int minPage = (pageIndex - 1) * maxPageIndex + 1; int maxPage = pageIndex * maxPageIndex; string sqlCount = "select count(*) from taskinfo t where 1=1"; - string sqlData = "select dbid,deploytime,descirption,finishtime,street,taskstate,username " + - "from (select t.*,rownum row_num from taskinfo t order by DBID desc)b " + - " where(b.row_num between " + minPage + " and " + maxPage + ")"; + 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"; if (!String.IsNullOrEmpty(comboBox_userName.Text.Trim()) && !comboBox_userName.Text.Trim().Equals("不限")) { @@ -581,6 +582,8 @@ sqlCount += "and street='" + combo_street.Text + "' "; sqlData += "and street='" + combo_street.Text + "' "; } + sqlData += " order by DBID desc)b " + + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index e65a4bd..58f5342 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -73,13 +73,13 @@ //控制表格显示的列，以及每一列要显示的列名 this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - this.winGridViewPager1.AddColumnAlias("FILENAME", "文档名称"); - this.winGridViewPager1.AddColumnAlias("DBID", "编号"); - this.winGridViewPager1.AddColumnAlias("TITLE", "文档标题"); - this.winGridViewPager1.AddColumnAlias("FILETYPE", "文档类型"); - this.winGridViewPager1.AddColumnAlias("UPDAY", "上传日期"); - this.winGridViewPager1.AddColumnAlias("WRITER", "上传人"); - this.winGridViewPager1.DisplayColumns = "FILENAME,TITLE,FILETYPE,UPDAY,WRITER"; + this.winGridViewPager1.AddColumnAlias("文档名称", "文档名称"); + this.winGridViewPager1.AddColumnAlias("编号", "编号"); + this.winGridViewPager1.AddColumnAlias("文档标题", "文档标题"); + this.winGridViewPager1.AddColumnAlias("文档类型", "文档类型"); + this.winGridViewPager1.AddColumnAlias("上传日期", "上传日期"); + this.winGridViewPager1.AddColumnAlias("上传人", "上传人"); + this.winGridViewPager1.DisplayColumns = "文档名称,文档标题,文档类型,上传日期,上传人"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -167,7 +167,7 @@ if (grid != null) { DataGridViewRow row = grid.SelectedRows[0]; - string dbid = row.Cells["dbid"].Value.ToString(); + string dbid = row.Cells["编号"].Value.ToString(); try { if (MessageBox.Show("确认删除吗？", "确认", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) @@ -212,7 +212,8 @@ { string sqlCount = "select count(*) from casic_userdocument where sysname = 'EMS'"; - string sqlData = "select filename,dbid,title,filetype,upday,writer " + + string sqlData = "select filename as 文档名称,dbid as 编号,title as 文档标题," + + "filetype as 文档类型,upday as 上传日期,writer as 上传人 " + "from (select t.*,rownum row_num from casic_userdocument t order by DBID desc)b " + " where sysname = 'EMS'"; @@ -226,9 +227,9 @@ int minPage = (pageIndex - 1) * maxPageIndex + 1; int maxPage = pageIndex * maxPageIndex; string sqlCount = "select count(*) from casic_userdocument where sysname = 'EMS'"; - string sqlData = "select filename,dbid,title,filetype,upday,writer " + - "from (select t.*,rownum row_num from casic_userdocument t where sysname = 'EMS' order by DBID desc)b " + - " where(b.row_num between " + minPage + " and " + maxPage + ")"; + string sqlData = "select filename as 文档名称,dbid as 编号,title as 文档标题,"+ + "filetype as 文档类型,upday as 上传日期,writer as 上传人 " + + "from (select t.*,rownum row_num from casic_userdocument t where sysname = 'EMS'"; string txtTitleText = null; string comboFileType = null; @@ -278,7 +279,8 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - + sqlData += " order by DBID desc)b " + + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; @@ -437,7 +439,7 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - string filename = row.Cells["filename"].Value.ToString(); + string filename = row.Cells["文档名称"].Value.ToString(); string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; string file = System.Environment.CurrentDirectory + "\\download\\" + filename; int result = DownloadFile(url, file, progressBar1); @@ -515,7 +517,7 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - string filename = row.Cells["filename"].Value.ToString(); + string filename = row.Cells["文档名称"].Value.ToString(); string ext = Path.GetExtension(filename); SaveFileDialog dlg = new SaveFileDialog(); dlg.Filter = "保存文档|*" + ext + ";"; diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 1d1201b..3902629 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -748,6 +748,7 @@ this.Name = "FrmAddSinMark"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "单个标识器添加"; + this.TopMost = true; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmAddSinMark_FormClosing); this.Load += new System.EventHandler(this.FrmAddSinMark_Load); this.groupPanel1.ResumeLayout(false); diff --git a/FrmEquipmentManage.cs b/FrmEquipmentManage.cs index 90bfdb2..a3cf55c 100644 --- a/FrmEquipmentManage.cs +++ b/FrmEquipmentManage.cs @@ -74,13 +74,13 @@ //控制表格显示的列，以及每一列要显示的列名 this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - this.winGridViewPager1.AddColumnAlias("DESCIRPTION", "设备描述"); - this.winGridViewPager1.AddColumnAlias("DBID", "编号"); - this.winGridViewPager1.AddColumnAlias("MACID", "MAC地址"); - this.winGridViewPager1.AddColumnAlias("OWNER", "设备所有人"); - this.winGridViewPager1.AddColumnAlias("STATUS", "设备状态"); + this.winGridViewPager1.AddColumnAlias("设备描述", "设备描述"); + this.winGridViewPager1.AddColumnAlias("编号", "编号"); + this.winGridViewPager1.AddColumnAlias("MAC地址", "MAC地址"); + this.winGridViewPager1.AddColumnAlias("设备所有人", "设备所有人"); + this.winGridViewPager1.AddColumnAlias("设备状态", "设备状态"); - this.winGridViewPager1.DisplayColumns = "DESCIRPTION,MACID,OWNER,STATUS"; + this.winGridViewPager1.DisplayColumns = "设备描述,MAC地址,设备所有人,设备状态"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -146,10 +146,10 @@ DataGridViewRow row = grid.SelectedRows[0]; try { - long dbid = long.Parse(row.Cells["DBID"].Value.ToString()); - String macId = row.Cells["MACID"].Value.ToString(); - String username = row.Cells["OWNER"].Value.ToString(); - String descn = row.Cells["DESCIRPTION"].Value.ToString(); + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); + String macId = row.Cells["MAC地址"].Value.ToString(); + String username = row.Cells["设备所有人"].Value.ToString(); + String descn = row.Cells["设备状态"].Value.ToString(); FrmEquipmentEdit frm = new FrmEquipmentEdit(dbid.ToString(), macId, username, descn); frm.reloadGrid += new ReloadEquipmentGrid(LoadData); frm.ShowDialog(); @@ -179,7 +179,7 @@ { return; } - String macId = row.Cells["MACID"].Value.ToString(); + String macId = row.Cells["MAC地址"].Value.ToString(); FrmLog frm = new FrmLog(macId); frm.Show(); } @@ -201,7 +201,7 @@ if (grid != null) { DataGridViewRow row = grid.SelectedRows[0]; - long dbid = long.Parse(row.Cells["DBID"].Value.ToString()); + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); try { if (MessageBox.Show("确定删除？", "确认", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) @@ -243,7 +243,8 @@ { string sqlCount = "select count(*) from equipment where status = 'USING'"; - string sqlData = "select descirption,DBID,macid,owner,case when status = 'USING' then '可用' when status = 'DAMAGE' then '损坏' end as status " + + string sqlData = "select descirption as 设备描述,DBID as 编号,macid as MAC地址,owner as 设备所有人,"+ + "case when status = 'USING' then '可用' when status = 'DAMAGE' then '损坏' end as 设备状态 " + "from (select t.*,rownum row_num from equipment t where status = 'USING' order by dbid desc)b " + " where 1=1"; @@ -258,16 +259,17 @@ int maxPage = pageIndex * maxPageIndex; string sqlCount = "select count(*) from equipment where status = 'USING' "; - string sqlData = "select descirption,DBID,macid,owner,case when status = 'USING' then '可用' when status = 'DAMAGE' then '损坏' end as status " + - "from (select t.*,rownum row_num from equipment t where status = 'USING' order by DBID desc)b " + - " where(b.row_num between " + minPage + " and " + maxPage + ")"; + string sqlData = "select descirption as 设备描述,DBID as 编号,macid as MAC地址,owner as 设备所有人," + + "case when status = 'USING' then '可用' when status = 'DAMAGE' then '损坏' end as 设备状态 " + + "from (select t.*,rownum row_num from equipment t where status = 'USING'"; if (!String.IsNullOrEmpty(txtMacId.Text.Trim())) { sqlData += " and macid like '%" + txtMacId.Text.Trim() + "%'"; sqlCount += " and macid like '%" + txtMacId.Text.Trim() + "%'"; } - + sqlData += " order by DBID desc)b " + + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; @@ -299,76 +301,6 @@ } } - //public void reloadGrid(int pageIndex) - //{ - // if (pageIndex <= 0) - // { - // pageIndex = 1; - // currentpage = 1; - // } - // String sqlrows = "select * from (select rownum as rowno,dbid,descirption,macid,owner,case when status = 'USING' then '可用' when status = 'DAMAGE' then '损坏' end as status,'编辑' as btnEdit,'删除' as btnDel from equipment t where status = 'USING' "; - // string sqlcount = "select count(*) from equipment where status = 'USING' "; - // if (!String.IsNullOrEmpty(txtMacId.Text.Trim())) - // { - // sqlrows += " and macid like '%" + txtMacId.Text.Trim() + "%'"; - // sqlcount += " and macid like '%" + txtMacId.Text.Trim() + "%'"; - // } - // sqlrows += " and rownum<=" + (pagesize * pageIndex) + ") table_alias where table_alias.rowno>=" + ((pageIndex - 1) * pagesize + 1); - - // int rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlcount).ToString()); - // int pages = 0; - // if (rows % pagesize == 0) - // { - // pages = rows / pagesize; - // } - // else - // { - // pages = rows / pagesize + 1; - // } - - // lastpage = pages; - - // lab_page_msg.Text = "共" + rows + "条记录，每页" + pagesize + "条，第" + pageIndex + "页，共" + pages + "页"; - // combo_page_num.Items.Clear(); - // for (int i = 1; i <= pages; i++) - // { - // combo_page_num.Items.Add(new ComboBoxItem(i.ToString(), i.ToString())); - // } - - // if (lastpage == 1) - // { - // btn_page_first.Enabled = false; - // btn_page_pre.Enabled = false; - // btn_page_last.Enabled = false; - // btn_page_next.Enabled = false; - // } - // else if (currentpage == 1) - // { - // btn_page_first.Enabled = false; - // btn_page_pre.Enabled = false; - // btn_page_last.Enabled = true; - // btn_page_next.Enabled = true; - // } - // else if (currentpage == lastpage) - // { - // btn_page_first.Enabled = true; - // btn_page_pre.Enabled = true; - // btn_page_last.Enabled = false; - // btn_page_next.Enabled = false; - // } - // else - // { - // btn_page_first.Enabled = true; - // btn_page_pre.Enabled = true; - // btn_page_last.Enabled = true; - // btn_page_next.Enabled = true; - // } - - // DataTable table = OracleUtils.ExecuteDataset(OracleUtils.ConnectionString, CommandType.Text, sqlrows).Tables[0]; - // dataGridViewX1.DataSource = table; - - //} - private void FrmEquipmentManage_FormClosing(object sender, FormClosingEventArgs e) diff --git a/FrmFlagDetail.Designer.cs b/FrmFlagDetail.Designer.cs new file mode 100644 index 0000000..982bfc6 --- /dev/null +++ b/FrmFlagDetail.Designer.cs @@ -0,0 +1,103 @@ +namespace Cyberpipe +{ + partial class FrmFlagDetail + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); + this.dataGridViewX_markDetail = new DevComponents.DotNetBar.Controls.DataGridViewX(); + this.对象类型 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.对象编号 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.对象名称 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX_markDetail)).BeginInit(); + this.SuspendLayout(); + // + // dataGridViewX_markDetail + // + this.dataGridViewX_markDetail.AllowUserToAddRows = false; + this.dataGridViewX_markDetail.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; + this.dataGridViewX_markDetail.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dataGridViewX_markDetail.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.对象类型, + this.对象编号, + this.对象名称}); + dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle3.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dataGridViewX_markDetail.DefaultCellStyle = dataGridViewCellStyle3; + this.dataGridViewX_markDetail.Dock = System.Windows.Forms.DockStyle.Fill; + this.dataGridViewX_markDetail.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(170)))), ((int)(((byte)(170)))), ((int)(((byte)(170))))); + this.dataGridViewX_markDetail.Location = new System.Drawing.Point(0, 0); + this.dataGridViewX_markDetail.Name = "dataGridViewX_markDetail"; + this.dataGridViewX_markDetail.RowTemplate.Height = 23; + this.dataGridViewX_markDetail.Size = new System.Drawing.Size(508, 321); + this.dataGridViewX_markDetail.TabIndex = 0; + // + // 对象类型 + // + this.对象类型.HeaderText = "对象类型"; + this.对象类型.Name = "对象类型"; + // + // 对象编号 + // + this.对象编号.HeaderText = "对象编号"; + this.对象编号.Name = "对象编号"; + // + // 对象名称 + // + this.对象名称.HeaderText = "对象名称"; + this.对象名称.Name = "对象名称"; + // + // FrmFlagDetail + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(508, 321); + this.Controls.Add(this.dataGridViewX_markDetail); + this.Name = "FrmFlagDetail"; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; + this.Text = "标识对象信息"; + this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmFlagDetail_FormClosing); + this.Load += new System.EventHandler(this.FrmFlagDetail_Load); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX_markDetail)).EndInit(); + this.ResumeLayout(false); + + } + + #endregion + + private DevComponents.DotNetBar.Controls.DataGridViewX dataGridViewX_markDetail; + private System.Windows.Forms.DataGridViewTextBoxColumn 对象类型; + private System.Windows.Forms.DataGridViewTextBoxColumn 对象编号; + private System.Windows.Forms.DataGridViewTextBoxColumn 对象名称; + + } +} \ No newline at end of file diff --git a/FrmFlagDetail.cs b/FrmFlagDetail.cs new file mode 100644 index 0000000..81de974 --- /dev/null +++ b/FrmFlagDetail.cs @@ -0,0 +1,77 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Windows.Forms; +using GeoScene.Globe; +using System.Data.OracleClient; + +namespace Cyberpipe +{ + public partial class FrmFlagDetail : Form + { + DataTable dt = new DataTable(); + private GSOGlobeControl globeControl1; + + public delegate void Handle(); + public event Handle showParentForm; + String markId; + + public FrmFlagDetail(GSOGlobeControl globeControl1, String id) + { + InitializeComponent(); + this.markId = id; + } + + private void FrmFlagDetail_FormClosing(object sender, FormClosingEventArgs e) + { + showParentForm(); + } + + private void FrmFlagDetail_Load(object sender, EventArgs e) + { + string objectIds = ""; + string objectTypeCodes = ""; + string sql = "select t.对象编号,t.对象类型 from 标识器 t where t.编号='" + markId + "'"; + using (OracleDataReader reader = OracleUtils.ExecuteReader(OracleUtils.ConnectionString, CommandType.Text, sql)) + { + while (reader.Read()) + { + objectIds = reader.GetString(0); + objectTypeCodes = reader.GetString(1); + } + } + + string[] codeTypes = objectTypeCodes.Split(','); + string[] codeIds = objectIds.Split(','); + int length = 0; + if (codeTypes.Length <= codeIds.Length) + { + length = codeTypes.Length; + } + else + { + length = codeIds.Length; + } + for (int n = 0; n < length; n++) + { + for (int i = 0; i < Utility1.listPipelineType.Count; i++) + { + if (Utility1.listPipelineType[i].code == codeTypes[n]) + { + //string objectId = codeIds[i]; + //string objectType = Utility1.listPipelineType[i].type; + //string objectName = Utility1.listPipelineType[i].name; + int index = this.dataGridViewX_markDetail.Rows.Add(); + this.dataGridViewX_markDetail.Rows[index].Cells[0].Value = Utility1.listPipelineType[i].type; + this.dataGridViewX_markDetail.Rows[index].Cells[1].Value = codeIds[n].ToString(); + this.dataGridViewX_markDetail.Rows[index].Cells[2].Value = Utility1.listPipelineType[i].name; + } + } + } + } + } +} diff --git a/Cyberpipe.csproj b/Cyberpipe.csproj index fe600e5..501fd09 100644 --- a/Cyberpipe.csproj +++ b/Cyberpipe.csproj @@ -246,6 +246,12 @@ Form_TaskManager.cs + + Form + + + FrmFlagDetail.cs + Form @@ -1368,6 +1374,9 @@ Form_TaskManager.cs + + FrmFlagDetail.cs + FormDocumentManager.cs diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 537b4c3..1acf22a 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 7d5dd95..3f178cb 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -90,20 +90,20 @@ this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - - this.winGridViewPager1.AddColumnAlias("ACCIDENTTIME", "上报时间"); - this.winGridViewPager1.AddColumnAlias("DBID", "编号"); - this.winGridViewPager1.AddColumnAlias("DESCRIBE", "事件描述"); - this.winGridViewPager1.AddColumnAlias("LATITUDE", "纬度"); - this.winGridViewPager1.AddColumnAlias("LOCALE", "事件地点"); - this.winGridViewPager1.AddColumnAlias("LONGITUDE", "经度"); - this.winGridViewPager1.AddColumnAlias("PATROLERNAME", "上报人员"); - this.winGridViewPager1.AddColumnAlias("PATROLER_ID", "人员ID"); - this.winGridViewPager1.AddColumnAlias("TASK_ID", "任务编号"); - this.winGridViewPager1.AddColumnAlias("RESULT", "处理结果"); - this.winGridViewPager1.AddColumnAlias("STATE", "处理状态"); - this.winGridViewPager1.DisplayColumns = "ACCIDENTTIME,DESCRIBE,LOCALE,PATROLERNAME,TASK_ID,RESULT,STATE"; + this.winGridViewPager1.AddColumnAlias("上报时间", "上报时间"); + this.winGridViewPager1.AddColumnAlias("编号", "编号"); + this.winGridViewPager1.AddColumnAlias("事件描述", "事件描述"); + this.winGridViewPager1.AddColumnAlias("纬度", "纬度"); + this.winGridViewPager1.AddColumnAlias("事件地点", "事件地点"); + this.winGridViewPager1.AddColumnAlias("经度", "经度"); + this.winGridViewPager1.AddColumnAlias("上报人员", "上报人员"); + this.winGridViewPager1.AddColumnAlias("人员ID", "人员ID"); + this.winGridViewPager1.AddColumnAlias("任务编号", "任务编号"); + this.winGridViewPager1.AddColumnAlias("处理结果", "处理结果"); + this.winGridViewPager1.AddColumnAlias("处理状态", "处理状态"); + + this.winGridViewPager1.DisplayColumns = "上报时间,事件描述,事件地点,上报人员,任务编号,处理结果,处理状态"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -114,8 +114,8 @@ winGridViewPager1.dataGridView1.ContextMenuStrip.Items[5].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[6].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[7].Visible = false; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[1].Text = "查看位置"; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "结果编辑"; + winGridViewPager1.dataGridView1.ContextMenuStrip.Items[1].Text = "结果编辑"; + winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "查看位置"; //右键菜单宽度 winGridViewPager1.dataGridView1.ContextMenuStrip.AutoSize = false; @@ -160,13 +160,12 @@ this.WindowState = FormWindowState.Minimized; globeControl1.Globe.MemoryLayer.RemoveAllFeature(); this.WindowState = FormWindowState.Minimized; - double x = Convert.ToDouble(row.Cells["LONGITUDE"].Value); - double y = Convert.ToDouble(row.Cells["LATITUDE"].Value); - - string username = Convert.ToString(row.Cells["PATROLERNAME"].Value); - string Atime = Convert.ToString(row.Cells["ACCIDENTTIME"].Value); - string location = Convert.ToString(row.Cells["LOCALE"].Value); - string descp = Convert.ToString(row.Cells["DESCRIBE"].Value); + double x = Convert.ToDouble(row.Cells["经度"].Value); + double y = Convert.ToDouble(row.Cells["纬度"].Value); + string username = Convert.ToString(row.Cells["上报人员"].Value); + string Atime = Convert.ToString(row.Cells["上报时间"].Value); + string location = Convert.ToString(row.Cells["事件地点"].Value); + string descp = Convert.ToString(row.Cells["事件描述"].Value); /////////////////////////////////////// /*******设置飞行与创建模型******/ @@ -228,8 +227,8 @@ DataGridViewRow row = grid.SelectedRows[0]; try { - int dbId = Convert.ToInt32(row.Cells["DBID"].Value); - string result = Convert.ToString(row.Cells["RESULT"].Value); + int dbId = Convert.ToInt32(row.Cells["编号"].Value); + string result = Convert.ToString(row.Cells["处理结果"].Value); EMS_Forms.Form_EventResult form = new Form_EventResult(dbId, result); form.refresh += new Form_EventResult.Handle(LoadData);//改变值的事件 form.ShowDialog(); @@ -276,9 +275,9 @@ } for (int i = 0; i < table.Rows.Count; i++) { - if (winGridViewPager1.dataGridView1.Rows[i].Cells["RESULT"].Value != null && !(winGridViewPager1.dataGridView1.Rows[i].Cells["RESULT"].Value.ToString().Trim().Equals(""))) + if (winGridViewPager1.dataGridView1.Rows[i].Cells["处理结果"].Value != null && !(winGridViewPager1.dataGridView1.Rows[i].Cells["处理结果"].Value.ToString().Trim().Equals(""))) { - winGridViewPager1.dataGridView1.Rows[i].Cells["STATE"].Value = "已处理"; + winGridViewPager1.dataGridView1.Rows[i].Cells["处理状态"].Value = "已处理"; } } @@ -307,9 +306,9 @@ } for (int i = 0; i < table.Rows.Count; i++) { - if (winGridViewPager1.dataGridView1.Rows[i].Cells["RESULT"].Value != null && !(winGridViewPager1.dataGridView1.Rows[i].Cells["RESULT"].Value.ToString().Trim().Equals(""))) + if (winGridViewPager1.dataGridView1.Rows[i].Cells["处理结果"].Value != null && !(winGridViewPager1.dataGridView1.Rows[i].Cells["处理结果"].Value.ToString().Trim().Equals(""))) { - winGridViewPager1.dataGridView1.Rows[i].Cells["STATE"].Value = "已处理"; + winGridViewPager1.dataGridView1.Rows[i].Cells["处理状态"].Value = "已处理"; } } @@ -320,10 +319,12 @@ { string sqlCount = "select count(*) from ACCIDENT where 1=1"; - string sqlData = "select ACCIDENTTIME,DBID,DESCRIBE,LATITUDE,LOCALE,LONGITUDE,PATROLERNAME,PATROLER_ID,TASK_ID,RESULT,'' as STATE " + + string sqlData = "select ACCIDENTTIME as 上报时间,DBID as 编号,DESCRIBE as 事件描述,"+ + "LATITUDE as 纬度,LOCALE as 事件地点,LONGITUDE as 经度,PATROLERNAME 上报人员,"+ + "PATROLER_ID as 人员ID,TASK_ID as 任务编号,RESULT as 处理结果,'' as 处理状态 " + "from (select t.*,rownum row_num from ACCIDENT t order by DBID)b " + " where 1=1"; - + rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; @@ -340,9 +341,10 @@ string sqlCount = "select count(*) from ACCIDENT where 1=1"; - string sqlData = "select ACCIDENTTIME,DBID,DESCRIBE,LATITUDE,LOCALE,LONGITUDE,PATROLERNAME,PATROLER_ID,TASK_ID,RESULT,'' as STATE " + - "from (select t.*,rownum row_num from ACCIDENT t order by DBID)b " + - " where(b.row_num between " + minPage + " and " + maxPage + ")"; + string sqlData = "select ACCIDENTTIME as 上报时间,DBID as 编号,DESCRIBE as 事件描述," + + "LATITUDE as 纬度,LOCALE as 事件地点,LONGITUDE as 经度,PATROLERNAME 上报人员," + + "PATROLER_ID as 人员ID,TASK_ID as 任务编号,RESULT as 处理结果,'' as 处理状态 " + + "from (select t.*,rownum row_num from ACCIDENT t where 1=1"; if (!String.IsNullOrEmpty(comboBox_name.Text.Trim())) { @@ -361,7 +363,8 @@ sqlCount += "and ACCIDENTTIME<=to_date('" + time.ToShortDateString() + "','yyyy-MM-dd') "; sqlData += "and ACCIDENTTIME<=to_date('" + time.ToShortDateString() + "','yyyy-MM-dd') "; } - + sqlData += " order by DBID desc)b " + + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 225c8d7..8bd9e48 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -120,8 +120,8 @@ private void flyToTask(DataGridViewRow row, int taskState) { int dbID = 0; - dbID = Convert.ToInt32(row.Cells["DBID"].Value); - string userName = Convert.ToString(row.Cells["USERNAME"].Value); + dbID = Convert.ToInt32(row.Cells["任务编号"].Value); + string userName = Convert.ToString(row.Cells["任务执行人员"].Value); System.DateTime t = new DateTime(); try { @@ -392,15 +392,15 @@ //控制表格显示的列，以及每一列要显示的列名 this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - this.winGridViewPager1.AddColumnAlias("DBID", "任务编号"); - this.winGridViewPager1.AddColumnAlias("DEPLOYTIME", "创建时间"); - this.winGridViewPager1.AddColumnAlias("DESCIRPTION", "任务描述"); - this.winGridViewPager1.AddColumnAlias("FINISHTIME", "完成时间"); - this.winGridViewPager1.AddColumnAlias("STREET", "任务执行区域"); - this.winGridViewPager1.AddColumnAlias("TASKSTATE", "任务状态"); - this.winGridViewPager1.AddColumnAlias("USERNAME", "任务执行人员"); + this.winGridViewPager1.AddColumnAlias("任务编号", "任务编号"); + this.winGridViewPager1.AddColumnAlias("创建时间", "创建时间"); + this.winGridViewPager1.AddColumnAlias("任务描述", "任务描述"); + this.winGridViewPager1.AddColumnAlias("完成时间", "完成时间"); + this.winGridViewPager1.AddColumnAlias("任务执行区域", "任务执行区域"); + this.winGridViewPager1.AddColumnAlias("任务状态", "任务状态"); + this.winGridViewPager1.AddColumnAlias("任务执行人员", "任务执行人员"); - this.winGridViewPager1.DisplayColumns = "DBID,DEPLOYTIME,DESCIRPTION,FINISHTIME,STREET,TASKSTATE,USERNAME"; + this.winGridViewPager1.DisplayColumns = "任务编号,创建时间,任务描述,完成时间,任务执行区域,任务状态,任务执行人员"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -464,8 +464,8 @@ { int dbID = 0; int taskStateInt = 0; - dbID = Convert.ToInt32(row.Cells["DBID"].Value); - string taskState = row.Cells["TASKSTATE"].Value.ToString(); + dbID = Convert.ToInt32(row.Cells["任务编号"].Value); + string taskState = row.Cells["任务状态"].Value.ToString(); if (taskState.Equals("开始任务")) { taskStateInt = 1; @@ -534,9 +534,10 @@ private string GetSql() { - string sqlCount = "select count(*) from taskinfo t where 1=1'"; + string sqlCount = "select count(*) from taskinfo t where 1=1"; - string sqlData = "select dbid,deploytime,descirption,finishtime,street,taskstate,username " + + 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"; @@ -550,9 +551,9 @@ int minPage = (pageIndex - 1) * maxPageIndex + 1; int maxPage = pageIndex * maxPageIndex; string sqlCount = "select count(*) from taskinfo t where 1=1"; - string sqlData = "select dbid,deploytime,descirption,finishtime,street,taskstate,username " + - "from (select t.*,rownum row_num from taskinfo t order by DBID desc)b " + - " where(b.row_num between " + minPage + " and " + maxPage + ")"; + 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"; if (!String.IsNullOrEmpty(comboBox_userName.Text.Trim()) && !comboBox_userName.Text.Trim().Equals("不限")) { @@ -581,6 +582,8 @@ sqlCount += "and street='" + combo_street.Text + "' "; sqlData += "and street='" + combo_street.Text + "' "; } + sqlData += " order by DBID desc)b " + + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index e65a4bd..58f5342 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -73,13 +73,13 @@ //控制表格显示的列，以及每一列要显示的列名 this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - this.winGridViewPager1.AddColumnAlias("FILENAME", "文档名称"); - this.winGridViewPager1.AddColumnAlias("DBID", "编号"); - this.winGridViewPager1.AddColumnAlias("TITLE", "文档标题"); - this.winGridViewPager1.AddColumnAlias("FILETYPE", "文档类型"); - this.winGridViewPager1.AddColumnAlias("UPDAY", "上传日期"); - this.winGridViewPager1.AddColumnAlias("WRITER", "上传人"); - this.winGridViewPager1.DisplayColumns = "FILENAME,TITLE,FILETYPE,UPDAY,WRITER"; + this.winGridViewPager1.AddColumnAlias("文档名称", "文档名称"); + this.winGridViewPager1.AddColumnAlias("编号", "编号"); + this.winGridViewPager1.AddColumnAlias("文档标题", "文档标题"); + this.winGridViewPager1.AddColumnAlias("文档类型", "文档类型"); + this.winGridViewPager1.AddColumnAlias("上传日期", "上传日期"); + this.winGridViewPager1.AddColumnAlias("上传人", "上传人"); + this.winGridViewPager1.DisplayColumns = "文档名称,文档标题,文档类型,上传日期,上传人"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -167,7 +167,7 @@ if (grid != null) { DataGridViewRow row = grid.SelectedRows[0]; - string dbid = row.Cells["dbid"].Value.ToString(); + string dbid = row.Cells["编号"].Value.ToString(); try { if (MessageBox.Show("确认删除吗？", "确认", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) @@ -212,7 +212,8 @@ { string sqlCount = "select count(*) from casic_userdocument where sysname = 'EMS'"; - string sqlData = "select filename,dbid,title,filetype,upday,writer " + + string sqlData = "select filename as 文档名称,dbid as 编号,title as 文档标题," + + "filetype as 文档类型,upday as 上传日期,writer as 上传人 " + "from (select t.*,rownum row_num from casic_userdocument t order by DBID desc)b " + " where sysname = 'EMS'"; @@ -226,9 +227,9 @@ int minPage = (pageIndex - 1) * maxPageIndex + 1; int maxPage = pageIndex * maxPageIndex; string sqlCount = "select count(*) from casic_userdocument where sysname = 'EMS'"; - string sqlData = "select filename,dbid,title,filetype,upday,writer " + - "from (select t.*,rownum row_num from casic_userdocument t where sysname = 'EMS' order by DBID desc)b " + - " where(b.row_num between " + minPage + " and " + maxPage + ")"; + string sqlData = "select filename as 文档名称,dbid as 编号,title as 文档标题,"+ + "filetype as 文档类型,upday as 上传日期,writer as 上传人 " + + "from (select t.*,rownum row_num from casic_userdocument t where sysname = 'EMS'"; string txtTitleText = null; string comboFileType = null; @@ -278,7 +279,8 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - + sqlData += " order by DBID desc)b " + + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; @@ -437,7 +439,7 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - string filename = row.Cells["filename"].Value.ToString(); + string filename = row.Cells["文档名称"].Value.ToString(); string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; string file = System.Environment.CurrentDirectory + "\\download\\" + filename; int result = DownloadFile(url, file, progressBar1); @@ -515,7 +517,7 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - string filename = row.Cells["filename"].Value.ToString(); + string filename = row.Cells["文档名称"].Value.ToString(); string ext = Path.GetExtension(filename); SaveFileDialog dlg = new SaveFileDialog(); dlg.Filter = "保存文档|*" + ext + ";"; diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 1d1201b..3902629 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -748,6 +748,7 @@ this.Name = "FrmAddSinMark"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "单个标识器添加"; + this.TopMost = true; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmAddSinMark_FormClosing); this.Load += new System.EventHandler(this.FrmAddSinMark_Load); this.groupPanel1.ResumeLayout(false); diff --git a/FrmEquipmentManage.cs b/FrmEquipmentManage.cs index 90bfdb2..a3cf55c 100644 --- a/FrmEquipmentManage.cs +++ b/FrmEquipmentManage.cs @@ -74,13 +74,13 @@ //控制表格显示的列，以及每一列要显示的列名 this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - this.winGridViewPager1.AddColumnAlias("DESCIRPTION", "设备描述"); - this.winGridViewPager1.AddColumnAlias("DBID", "编号"); - this.winGridViewPager1.AddColumnAlias("MACID", "MAC地址"); - this.winGridViewPager1.AddColumnAlias("OWNER", "设备所有人"); - this.winGridViewPager1.AddColumnAlias("STATUS", "设备状态"); + this.winGridViewPager1.AddColumnAlias("设备描述", "设备描述"); + this.winGridViewPager1.AddColumnAlias("编号", "编号"); + this.winGridViewPager1.AddColumnAlias("MAC地址", "MAC地址"); + this.winGridViewPager1.AddColumnAlias("设备所有人", "设备所有人"); + this.winGridViewPager1.AddColumnAlias("设备状态", "设备状态"); - this.winGridViewPager1.DisplayColumns = "DESCIRPTION,MACID,OWNER,STATUS"; + this.winGridViewPager1.DisplayColumns = "设备描述,MAC地址,设备所有人,设备状态"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -146,10 +146,10 @@ DataGridViewRow row = grid.SelectedRows[0]; try { - long dbid = long.Parse(row.Cells["DBID"].Value.ToString()); - String macId = row.Cells["MACID"].Value.ToString(); - String username = row.Cells["OWNER"].Value.ToString(); - String descn = row.Cells["DESCIRPTION"].Value.ToString(); + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); + String macId = row.Cells["MAC地址"].Value.ToString(); + String username = row.Cells["设备所有人"].Value.ToString(); + String descn = row.Cells["设备状态"].Value.ToString(); FrmEquipmentEdit frm = new FrmEquipmentEdit(dbid.ToString(), macId, username, descn); frm.reloadGrid += new ReloadEquipmentGrid(LoadData); frm.ShowDialog(); @@ -179,7 +179,7 @@ { return; } - String macId = row.Cells["MACID"].Value.ToString(); + String macId = row.Cells["MAC地址"].Value.ToString(); FrmLog frm = new FrmLog(macId); frm.Show(); } @@ -201,7 +201,7 @@ if (grid != null) { DataGridViewRow row = grid.SelectedRows[0]; - long dbid = long.Parse(row.Cells["DBID"].Value.ToString()); + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); try { if (MessageBox.Show("确定删除？", "确认", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) @@ -243,7 +243,8 @@ { string sqlCount = "select count(*) from equipment where status = 'USING'"; - string sqlData = "select descirption,DBID,macid,owner,case when status = 'USING' then '可用' when status = 'DAMAGE' then '损坏' end as status " + + string sqlData = "select descirption as 设备描述,DBID as 编号,macid as MAC地址,owner as 设备所有人,"+ + "case when status = 'USING' then '可用' when status = 'DAMAGE' then '损坏' end as 设备状态 " + "from (select t.*,rownum row_num from equipment t where status = 'USING' order by dbid desc)b " + " where 1=1"; @@ -258,16 +259,17 @@ int maxPage = pageIndex * maxPageIndex; string sqlCount = "select count(*) from equipment where status = 'USING' "; - string sqlData = "select descirption,DBID,macid,owner,case when status = 'USING' then '可用' when status = 'DAMAGE' then '损坏' end as status " + - "from (select t.*,rownum row_num from equipment t where status = 'USING' order by DBID desc)b " + - " where(b.row_num between " + minPage + " and " + maxPage + ")"; + string sqlData = "select descirption as 设备描述,DBID as 编号,macid as MAC地址,owner as 设备所有人," + + "case when status = 'USING' then '可用' when status = 'DAMAGE' then '损坏' end as 设备状态 " + + "from (select t.*,rownum row_num from equipment t where status = 'USING'"; if (!String.IsNullOrEmpty(txtMacId.Text.Trim())) { sqlData += " and macid like '%" + txtMacId.Text.Trim() + "%'"; sqlCount += " and macid like '%" + txtMacId.Text.Trim() + "%'"; } - + sqlData += " order by DBID desc)b " + + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; @@ -299,76 +301,6 @@ } } - //public void reloadGrid(int pageIndex) - //{ - // if (pageIndex <= 0) - // { - // pageIndex = 1; - // currentpage = 1; - // } - // String sqlrows = "select * from (select rownum as rowno,dbid,descirption,macid,owner,case when status = 'USING' then '可用' when status = 'DAMAGE' then '损坏' end as status,'编辑' as btnEdit,'删除' as btnDel from equipment t where status = 'USING' "; - // string sqlcount = "select count(*) from equipment where status = 'USING' "; - // if (!String.IsNullOrEmpty(txtMacId.Text.Trim())) - // { - // sqlrows += " and macid like '%" + txtMacId.Text.Trim() + "%'"; - // sqlcount += " and macid like '%" + txtMacId.Text.Trim() + "%'"; - // } - // sqlrows += " and rownum<=" + (pagesize * pageIndex) + ") table_alias where table_alias.rowno>=" + ((pageIndex - 1) * pagesize + 1); - - // int rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlcount).ToString()); - // int pages = 0; - // if (rows % pagesize == 0) - // { - // pages = rows / pagesize; - // } - // else - // { - // pages = rows / pagesize + 1; - // } - - // lastpage = pages; - - // lab_page_msg.Text = "共" + rows + "条记录，每页" + pagesize + "条，第" + pageIndex + "页，共" + pages + "页"; - // combo_page_num.Items.Clear(); - // for (int i = 1; i <= pages; i++) - // { - // combo_page_num.Items.Add(new ComboBoxItem(i.ToString(), i.ToString())); - // } - - // if (lastpage == 1) - // { - // btn_page_first.Enabled = false; - // btn_page_pre.Enabled = false; - // btn_page_last.Enabled = false; - // btn_page_next.Enabled = false; - // } - // else if (currentpage == 1) - // { - // btn_page_first.Enabled = false; - // btn_page_pre.Enabled = false; - // btn_page_last.Enabled = true; - // btn_page_next.Enabled = true; - // } - // else if (currentpage == lastpage) - // { - // btn_page_first.Enabled = true; - // btn_page_pre.Enabled = true; - // btn_page_last.Enabled = false; - // btn_page_next.Enabled = false; - // } - // else - // { - // btn_page_first.Enabled = true; - // btn_page_pre.Enabled = true; - // btn_page_last.Enabled = true; - // btn_page_next.Enabled = true; - // } - - // DataTable table = OracleUtils.ExecuteDataset(OracleUtils.ConnectionString, CommandType.Text, sqlrows).Tables[0]; - // dataGridViewX1.DataSource = table; - - //} - private void FrmEquipmentManage_FormClosing(object sender, FormClosingEventArgs e) diff --git a/FrmFlagDetail.Designer.cs b/FrmFlagDetail.Designer.cs new file mode 100644 index 0000000..982bfc6 --- /dev/null +++ b/FrmFlagDetail.Designer.cs @@ -0,0 +1,103 @@ +namespace Cyberpipe +{ + partial class FrmFlagDetail + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); + this.dataGridViewX_markDetail = new DevComponents.DotNetBar.Controls.DataGridViewX(); + this.对象类型 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.对象编号 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.对象名称 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX_markDetail)).BeginInit(); + this.SuspendLayout(); + // + // dataGridViewX_markDetail + // + this.dataGridViewX_markDetail.AllowUserToAddRows = false; + this.dataGridViewX_markDetail.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; + this.dataGridViewX_markDetail.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dataGridViewX_markDetail.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.对象类型, + this.对象编号, + this.对象名称}); + dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle3.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dataGridViewX_markDetail.DefaultCellStyle = dataGridViewCellStyle3; + this.dataGridViewX_markDetail.Dock = System.Windows.Forms.DockStyle.Fill; + this.dataGridViewX_markDetail.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(170)))), ((int)(((byte)(170)))), ((int)(((byte)(170))))); + this.dataGridViewX_markDetail.Location = new System.Drawing.Point(0, 0); + this.dataGridViewX_markDetail.Name = "dataGridViewX_markDetail"; + this.dataGridViewX_markDetail.RowTemplate.Height = 23; + this.dataGridViewX_markDetail.Size = new System.Drawing.Size(508, 321); + this.dataGridViewX_markDetail.TabIndex = 0; + // + // 对象类型 + // + this.对象类型.HeaderText = "对象类型"; + this.对象类型.Name = "对象类型"; + // + // 对象编号 + // + this.对象编号.HeaderText = "对象编号"; + this.对象编号.Name = "对象编号"; + // + // 对象名称 + // + this.对象名称.HeaderText = "对象名称"; + this.对象名称.Name = "对象名称"; + // + // FrmFlagDetail + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(508, 321); + this.Controls.Add(this.dataGridViewX_markDetail); + this.Name = "FrmFlagDetail"; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; + this.Text = "标识对象信息"; + this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmFlagDetail_FormClosing); + this.Load += new System.EventHandler(this.FrmFlagDetail_Load); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX_markDetail)).EndInit(); + this.ResumeLayout(false); + + } + + #endregion + + private DevComponents.DotNetBar.Controls.DataGridViewX dataGridViewX_markDetail; + private System.Windows.Forms.DataGridViewTextBoxColumn 对象类型; + private System.Windows.Forms.DataGridViewTextBoxColumn 对象编号; + private System.Windows.Forms.DataGridViewTextBoxColumn 对象名称; + + } +} \ No newline at end of file diff --git a/FrmFlagDetail.cs b/FrmFlagDetail.cs new file mode 100644 index 0000000..81de974 --- /dev/null +++ b/FrmFlagDetail.cs @@ -0,0 +1,77 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Windows.Forms; +using GeoScene.Globe; +using System.Data.OracleClient; + +namespace Cyberpipe +{ + public partial class FrmFlagDetail : Form + { + DataTable dt = new DataTable(); + private GSOGlobeControl globeControl1; + + public delegate void Handle(); + public event Handle showParentForm; + String markId; + + public FrmFlagDetail(GSOGlobeControl globeControl1, String id) + { + InitializeComponent(); + this.markId = id; + } + + private void FrmFlagDetail_FormClosing(object sender, FormClosingEventArgs e) + { + showParentForm(); + } + + private void FrmFlagDetail_Load(object sender, EventArgs e) + { + string objectIds = ""; + string objectTypeCodes = ""; + string sql = "select t.对象编号,t.对象类型 from 标识器 t where t.编号='" + markId + "'"; + using (OracleDataReader reader = OracleUtils.ExecuteReader(OracleUtils.ConnectionString, CommandType.Text, sql)) + { + while (reader.Read()) + { + objectIds = reader.GetString(0); + objectTypeCodes = reader.GetString(1); + } + } + + string[] codeTypes = objectTypeCodes.Split(','); + string[] codeIds = objectIds.Split(','); + int length = 0; + if (codeTypes.Length <= codeIds.Length) + { + length = codeTypes.Length; + } + else + { + length = codeIds.Length; + } + for (int n = 0; n < length; n++) + { + for (int i = 0; i < Utility1.listPipelineType.Count; i++) + { + if (Utility1.listPipelineType[i].code == codeTypes[n]) + { + //string objectId = codeIds[i]; + //string objectType = Utility1.listPipelineType[i].type; + //string objectName = Utility1.listPipelineType[i].name; + int index = this.dataGridViewX_markDetail.Rows.Add(); + this.dataGridViewX_markDetail.Rows[index].Cells[0].Value = Utility1.listPipelineType[i].type; + this.dataGridViewX_markDetail.Rows[index].Cells[1].Value = codeIds[n].ToString(); + this.dataGridViewX_markDetail.Rows[index].Cells[2].Value = Utility1.listPipelineType[i].name; + } + } + } + } + } +} diff --git a/FrmFlagDetail.resx b/FrmFlagDetail.resx new file mode 100644 index 0000000..e98a8fe --- /dev/null +++ b/FrmFlagDetail.resx @@ -0,0 +1,129 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + True + + + True + + + True + + \ No newline at end of file diff --git a/Cyberpipe.csproj b/Cyberpipe.csproj index fe600e5..501fd09 100644 --- a/Cyberpipe.csproj +++ b/Cyberpipe.csproj @@ -246,6 +246,12 @@ Form_TaskManager.cs + + Form + + + FrmFlagDetail.cs + Form @@ -1368,6 +1374,9 @@ Form_TaskManager.cs + + FrmFlagDetail.cs + FormDocumentManager.cs diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 537b4c3..1acf22a 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 7d5dd95..3f178cb 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -90,20 +90,20 @@ this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - - this.winGridViewPager1.AddColumnAlias("ACCIDENTTIME", "上报时间"); - this.winGridViewPager1.AddColumnAlias("DBID", "编号"); - this.winGridViewPager1.AddColumnAlias("DESCRIBE", "事件描述"); - this.winGridViewPager1.AddColumnAlias("LATITUDE", "纬度"); - this.winGridViewPager1.AddColumnAlias("LOCALE", "事件地点"); - this.winGridViewPager1.AddColumnAlias("LONGITUDE", "经度"); - this.winGridViewPager1.AddColumnAlias("PATROLERNAME", "上报人员"); - this.winGridViewPager1.AddColumnAlias("PATROLER_ID", "人员ID"); - this.winGridViewPager1.AddColumnAlias("TASK_ID", "任务编号"); - this.winGridViewPager1.AddColumnAlias("RESULT", "处理结果"); - this.winGridViewPager1.AddColumnAlias("STATE", "处理状态"); - this.winGridViewPager1.DisplayColumns = "ACCIDENTTIME,DESCRIBE,LOCALE,PATROLERNAME,TASK_ID,RESULT,STATE"; + this.winGridViewPager1.AddColumnAlias("上报时间", "上报时间"); + this.winGridViewPager1.AddColumnAlias("编号", "编号"); + this.winGridViewPager1.AddColumnAlias("事件描述", "事件描述"); + this.winGridViewPager1.AddColumnAlias("纬度", "纬度"); + this.winGridViewPager1.AddColumnAlias("事件地点", "事件地点"); + this.winGridViewPager1.AddColumnAlias("经度", "经度"); + this.winGridViewPager1.AddColumnAlias("上报人员", "上报人员"); + this.winGridViewPager1.AddColumnAlias("人员ID", "人员ID"); + this.winGridViewPager1.AddColumnAlias("任务编号", "任务编号"); + this.winGridViewPager1.AddColumnAlias("处理结果", "处理结果"); + this.winGridViewPager1.AddColumnAlias("处理状态", "处理状态"); + + this.winGridViewPager1.DisplayColumns = "上报时间,事件描述,事件地点,上报人员,任务编号,处理结果,处理状态"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -114,8 +114,8 @@ winGridViewPager1.dataGridView1.ContextMenuStrip.Items[5].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[6].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[7].Visible = false; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[1].Text = "查看位置"; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "结果编辑"; + winGridViewPager1.dataGridView1.ContextMenuStrip.Items[1].Text = "结果编辑"; + winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "查看位置"; //右键菜单宽度 winGridViewPager1.dataGridView1.ContextMenuStrip.AutoSize = false; @@ -160,13 +160,12 @@ this.WindowState = FormWindowState.Minimized; globeControl1.Globe.MemoryLayer.RemoveAllFeature(); this.WindowState = FormWindowState.Minimized; - double x = Convert.ToDouble(row.Cells["LONGITUDE"].Value); - double y = Convert.ToDouble(row.Cells["LATITUDE"].Value); - - string username = Convert.ToString(row.Cells["PATROLERNAME"].Value); - string Atime = Convert.ToString(row.Cells["ACCIDENTTIME"].Value); - string location = Convert.ToString(row.Cells["LOCALE"].Value); - string descp = Convert.ToString(row.Cells["DESCRIBE"].Value); + double x = Convert.ToDouble(row.Cells["经度"].Value); + double y = Convert.ToDouble(row.Cells["纬度"].Value); + string username = Convert.ToString(row.Cells["上报人员"].Value); + string Atime = Convert.ToString(row.Cells["上报时间"].Value); + string location = Convert.ToString(row.Cells["事件地点"].Value); + string descp = Convert.ToString(row.Cells["事件描述"].Value); /////////////////////////////////////// /*******设置飞行与创建模型******/ @@ -228,8 +227,8 @@ DataGridViewRow row = grid.SelectedRows[0]; try { - int dbId = Convert.ToInt32(row.Cells["DBID"].Value); - string result = Convert.ToString(row.Cells["RESULT"].Value); + int dbId = Convert.ToInt32(row.Cells["编号"].Value); + string result = Convert.ToString(row.Cells["处理结果"].Value); EMS_Forms.Form_EventResult form = new Form_EventResult(dbId, result); form.refresh += new Form_EventResult.Handle(LoadData);//改变值的事件 form.ShowDialog(); @@ -276,9 +275,9 @@ } for (int i = 0; i < table.Rows.Count; i++) { - if (winGridViewPager1.dataGridView1.Rows[i].Cells["RESULT"].Value != null && !(winGridViewPager1.dataGridView1.Rows[i].Cells["RESULT"].Value.ToString().Trim().Equals(""))) + if (winGridViewPager1.dataGridView1.Rows[i].Cells["处理结果"].Value != null && !(winGridViewPager1.dataGridView1.Rows[i].Cells["处理结果"].Value.ToString().Trim().Equals(""))) { - winGridViewPager1.dataGridView1.Rows[i].Cells["STATE"].Value = "已处理"; + winGridViewPager1.dataGridView1.Rows[i].Cells["处理状态"].Value = "已处理"; } } @@ -307,9 +306,9 @@ } for (int i = 0; i < table.Rows.Count; i++) { - if (winGridViewPager1.dataGridView1.Rows[i].Cells["RESULT"].Value != null && !(winGridViewPager1.dataGridView1.Rows[i].Cells["RESULT"].Value.ToString().Trim().Equals(""))) + if (winGridViewPager1.dataGridView1.Rows[i].Cells["处理结果"].Value != null && !(winGridViewPager1.dataGridView1.Rows[i].Cells["处理结果"].Value.ToString().Trim().Equals(""))) { - winGridViewPager1.dataGridView1.Rows[i].Cells["STATE"].Value = "已处理"; + winGridViewPager1.dataGridView1.Rows[i].Cells["处理状态"].Value = "已处理"; } } @@ -320,10 +319,12 @@ { string sqlCount = "select count(*) from ACCIDENT where 1=1"; - string sqlData = "select ACCIDENTTIME,DBID,DESCRIBE,LATITUDE,LOCALE,LONGITUDE,PATROLERNAME,PATROLER_ID,TASK_ID,RESULT,'' as STATE " + + string sqlData = "select ACCIDENTTIME as 上报时间,DBID as 编号,DESCRIBE as 事件描述,"+ + "LATITUDE as 纬度,LOCALE as 事件地点,LONGITUDE as 经度,PATROLERNAME 上报人员,"+ + "PATROLER_ID as 人员ID,TASK_ID as 任务编号,RESULT as 处理结果,'' as 处理状态 " + "from (select t.*,rownum row_num from ACCIDENT t order by DBID)b " + " where 1=1"; - + rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; @@ -340,9 +341,10 @@ string sqlCount = "select count(*) from ACCIDENT where 1=1"; - string sqlData = "select ACCIDENTTIME,DBID,DESCRIBE,LATITUDE,LOCALE,LONGITUDE,PATROLERNAME,PATROLER_ID,TASK_ID,RESULT,'' as STATE " + - "from (select t.*,rownum row_num from ACCIDENT t order by DBID)b " + - " where(b.row_num between " + minPage + " and " + maxPage + ")"; + string sqlData = "select ACCIDENTTIME as 上报时间,DBID as 编号,DESCRIBE as 事件描述," + + "LATITUDE as 纬度,LOCALE as 事件地点,LONGITUDE as 经度,PATROLERNAME 上报人员," + + "PATROLER_ID as 人员ID,TASK_ID as 任务编号,RESULT as 处理结果,'' as 处理状态 " + + "from (select t.*,rownum row_num from ACCIDENT t where 1=1"; if (!String.IsNullOrEmpty(comboBox_name.Text.Trim())) { @@ -361,7 +363,8 @@ sqlCount += "and ACCIDENTTIME<=to_date('" + time.ToShortDateString() + "','yyyy-MM-dd') "; sqlData += "and ACCIDENTTIME<=to_date('" + time.ToShortDateString() + "','yyyy-MM-dd') "; } - + sqlData += " order by DBID desc)b " + + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 225c8d7..8bd9e48 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -120,8 +120,8 @@ private void flyToTask(DataGridViewRow row, int taskState) { int dbID = 0; - dbID = Convert.ToInt32(row.Cells["DBID"].Value); - string userName = Convert.ToString(row.Cells["USERNAME"].Value); + dbID = Convert.ToInt32(row.Cells["任务编号"].Value); + string userName = Convert.ToString(row.Cells["任务执行人员"].Value); System.DateTime t = new DateTime(); try { @@ -392,15 +392,15 @@ //控制表格显示的列，以及每一列要显示的列名 this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - this.winGridViewPager1.AddColumnAlias("DBID", "任务编号"); - this.winGridViewPager1.AddColumnAlias("DEPLOYTIME", "创建时间"); - this.winGridViewPager1.AddColumnAlias("DESCIRPTION", "任务描述"); - this.winGridViewPager1.AddColumnAlias("FINISHTIME", "完成时间"); - this.winGridViewPager1.AddColumnAlias("STREET", "任务执行区域"); - this.winGridViewPager1.AddColumnAlias("TASKSTATE", "任务状态"); - this.winGridViewPager1.AddColumnAlias("USERNAME", "任务执行人员"); + this.winGridViewPager1.AddColumnAlias("任务编号", "任务编号"); + this.winGridViewPager1.AddColumnAlias("创建时间", "创建时间"); + this.winGridViewPager1.AddColumnAlias("任务描述", "任务描述"); + this.winGridViewPager1.AddColumnAlias("完成时间", "完成时间"); + this.winGridViewPager1.AddColumnAlias("任务执行区域", "任务执行区域"); + this.winGridViewPager1.AddColumnAlias("任务状态", "任务状态"); + this.winGridViewPager1.AddColumnAlias("任务执行人员", "任务执行人员"); - this.winGridViewPager1.DisplayColumns = "DBID,DEPLOYTIME,DESCIRPTION,FINISHTIME,STREET,TASKSTATE,USERNAME"; + this.winGridViewPager1.DisplayColumns = "任务编号,创建时间,任务描述,完成时间,任务执行区域,任务状态,任务执行人员"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -464,8 +464,8 @@ { int dbID = 0; int taskStateInt = 0; - dbID = Convert.ToInt32(row.Cells["DBID"].Value); - string taskState = row.Cells["TASKSTATE"].Value.ToString(); + dbID = Convert.ToInt32(row.Cells["任务编号"].Value); + string taskState = row.Cells["任务状态"].Value.ToString(); if (taskState.Equals("开始任务")) { taskStateInt = 1; @@ -534,9 +534,10 @@ private string GetSql() { - string sqlCount = "select count(*) from taskinfo t where 1=1'"; + string sqlCount = "select count(*) from taskinfo t where 1=1"; - string sqlData = "select dbid,deploytime,descirption,finishtime,street,taskstate,username " + + 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"; @@ -550,9 +551,9 @@ int minPage = (pageIndex - 1) * maxPageIndex + 1; int maxPage = pageIndex * maxPageIndex; string sqlCount = "select count(*) from taskinfo t where 1=1"; - string sqlData = "select dbid,deploytime,descirption,finishtime,street,taskstate,username " + - "from (select t.*,rownum row_num from taskinfo t order by DBID desc)b " + - " where(b.row_num between " + minPage + " and " + maxPage + ")"; + 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"; if (!String.IsNullOrEmpty(comboBox_userName.Text.Trim()) && !comboBox_userName.Text.Trim().Equals("不限")) { @@ -581,6 +582,8 @@ sqlCount += "and street='" + combo_street.Text + "' "; sqlData += "and street='" + combo_street.Text + "' "; } + sqlData += " order by DBID desc)b " + + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index e65a4bd..58f5342 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -73,13 +73,13 @@ //控制表格显示的列，以及每一列要显示的列名 this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - this.winGridViewPager1.AddColumnAlias("FILENAME", "文档名称"); - this.winGridViewPager1.AddColumnAlias("DBID", "编号"); - this.winGridViewPager1.AddColumnAlias("TITLE", "文档标题"); - this.winGridViewPager1.AddColumnAlias("FILETYPE", "文档类型"); - this.winGridViewPager1.AddColumnAlias("UPDAY", "上传日期"); - this.winGridViewPager1.AddColumnAlias("WRITER", "上传人"); - this.winGridViewPager1.DisplayColumns = "FILENAME,TITLE,FILETYPE,UPDAY,WRITER"; + this.winGridViewPager1.AddColumnAlias("文档名称", "文档名称"); + this.winGridViewPager1.AddColumnAlias("编号", "编号"); + this.winGridViewPager1.AddColumnAlias("文档标题", "文档标题"); + this.winGridViewPager1.AddColumnAlias("文档类型", "文档类型"); + this.winGridViewPager1.AddColumnAlias("上传日期", "上传日期"); + this.winGridViewPager1.AddColumnAlias("上传人", "上传人"); + this.winGridViewPager1.DisplayColumns = "文档名称,文档标题,文档类型,上传日期,上传人"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -167,7 +167,7 @@ if (grid != null) { DataGridViewRow row = grid.SelectedRows[0]; - string dbid = row.Cells["dbid"].Value.ToString(); + string dbid = row.Cells["编号"].Value.ToString(); try { if (MessageBox.Show("确认删除吗？", "确认", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) @@ -212,7 +212,8 @@ { string sqlCount = "select count(*) from casic_userdocument where sysname = 'EMS'"; - string sqlData = "select filename,dbid,title,filetype,upday,writer " + + string sqlData = "select filename as 文档名称,dbid as 编号,title as 文档标题," + + "filetype as 文档类型,upday as 上传日期,writer as 上传人 " + "from (select t.*,rownum row_num from casic_userdocument t order by DBID desc)b " + " where sysname = 'EMS'"; @@ -226,9 +227,9 @@ int minPage = (pageIndex - 1) * maxPageIndex + 1; int maxPage = pageIndex * maxPageIndex; string sqlCount = "select count(*) from casic_userdocument where sysname = 'EMS'"; - string sqlData = "select filename,dbid,title,filetype,upday,writer " + - "from (select t.*,rownum row_num from casic_userdocument t where sysname = 'EMS' order by DBID desc)b " + - " where(b.row_num between " + minPage + " and " + maxPage + ")"; + string sqlData = "select filename as 文档名称,dbid as 编号,title as 文档标题,"+ + "filetype as 文档类型,upday as 上传日期,writer as 上传人 " + + "from (select t.*,rownum row_num from casic_userdocument t where sysname = 'EMS'"; string txtTitleText = null; string comboFileType = null; @@ -278,7 +279,8 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - + sqlData += " order by DBID desc)b " + + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; @@ -437,7 +439,7 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - string filename = row.Cells["filename"].Value.ToString(); + string filename = row.Cells["文档名称"].Value.ToString(); string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; string file = System.Environment.CurrentDirectory + "\\download\\" + filename; int result = DownloadFile(url, file, progressBar1); @@ -515,7 +517,7 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - string filename = row.Cells["filename"].Value.ToString(); + string filename = row.Cells["文档名称"].Value.ToString(); string ext = Path.GetExtension(filename); SaveFileDialog dlg = new SaveFileDialog(); dlg.Filter = "保存文档|*" + ext + ";"; diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 1d1201b..3902629 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -748,6 +748,7 @@ this.Name = "FrmAddSinMark"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "单个标识器添加"; + this.TopMost = true; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmAddSinMark_FormClosing); this.Load += new System.EventHandler(this.FrmAddSinMark_Load); this.groupPanel1.ResumeLayout(false); diff --git a/FrmEquipmentManage.cs b/FrmEquipmentManage.cs index 90bfdb2..a3cf55c 100644 --- a/FrmEquipmentManage.cs +++ b/FrmEquipmentManage.cs @@ -74,13 +74,13 @@ //控制表格显示的列，以及每一列要显示的列名 this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - this.winGridViewPager1.AddColumnAlias("DESCIRPTION", "设备描述"); - this.winGridViewPager1.AddColumnAlias("DBID", "编号"); - this.winGridViewPager1.AddColumnAlias("MACID", "MAC地址"); - this.winGridViewPager1.AddColumnAlias("OWNER", "设备所有人"); - this.winGridViewPager1.AddColumnAlias("STATUS", "设备状态"); + this.winGridViewPager1.AddColumnAlias("设备描述", "设备描述"); + this.winGridViewPager1.AddColumnAlias("编号", "编号"); + this.winGridViewPager1.AddColumnAlias("MAC地址", "MAC地址"); + this.winGridViewPager1.AddColumnAlias("设备所有人", "设备所有人"); + this.winGridViewPager1.AddColumnAlias("设备状态", "设备状态"); - this.winGridViewPager1.DisplayColumns = "DESCIRPTION,MACID,OWNER,STATUS"; + this.winGridViewPager1.DisplayColumns = "设备描述,MAC地址,设备所有人,设备状态"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -146,10 +146,10 @@ DataGridViewRow row = grid.SelectedRows[0]; try { - long dbid = long.Parse(row.Cells["DBID"].Value.ToString()); - String macId = row.Cells["MACID"].Value.ToString(); - String username = row.Cells["OWNER"].Value.ToString(); - String descn = row.Cells["DESCIRPTION"].Value.ToString(); + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); + String macId = row.Cells["MAC地址"].Value.ToString(); + String username = row.Cells["设备所有人"].Value.ToString(); + String descn = row.Cells["设备状态"].Value.ToString(); FrmEquipmentEdit frm = new FrmEquipmentEdit(dbid.ToString(), macId, username, descn); frm.reloadGrid += new ReloadEquipmentGrid(LoadData); frm.ShowDialog(); @@ -179,7 +179,7 @@ { return; } - String macId = row.Cells["MACID"].Value.ToString(); + String macId = row.Cells["MAC地址"].Value.ToString(); FrmLog frm = new FrmLog(macId); frm.Show(); } @@ -201,7 +201,7 @@ if (grid != null) { DataGridViewRow row = grid.SelectedRows[0]; - long dbid = long.Parse(row.Cells["DBID"].Value.ToString()); + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); try { if (MessageBox.Show("确定删除？", "确认", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) @@ -243,7 +243,8 @@ { string sqlCount = "select count(*) from equipment where status = 'USING'"; - string sqlData = "select descirption,DBID,macid,owner,case when status = 'USING' then '可用' when status = 'DAMAGE' then '损坏' end as status " + + string sqlData = "select descirption as 设备描述,DBID as 编号,macid as MAC地址,owner as 设备所有人,"+ + "case when status = 'USING' then '可用' when status = 'DAMAGE' then '损坏' end as 设备状态 " + "from (select t.*,rownum row_num from equipment t where status = 'USING' order by dbid desc)b " + " where 1=1"; @@ -258,16 +259,17 @@ int maxPage = pageIndex * maxPageIndex; string sqlCount = "select count(*) from equipment where status = 'USING' "; - string sqlData = "select descirption,DBID,macid,owner,case when status = 'USING' then '可用' when status = 'DAMAGE' then '损坏' end as status " + - "from (select t.*,rownum row_num from equipment t where status = 'USING' order by DBID desc)b " + - " where(b.row_num between " + minPage + " and " + maxPage + ")"; + string sqlData = "select descirption as 设备描述,DBID as 编号,macid as MAC地址,owner as 设备所有人," + + "case when status = 'USING' then '可用' when status = 'DAMAGE' then '损坏' end as 设备状态 " + + "from (select t.*,rownum row_num from equipment t where status = 'USING'"; if (!String.IsNullOrEmpty(txtMacId.Text.Trim())) { sqlData += " and macid like '%" + txtMacId.Text.Trim() + "%'"; sqlCount += " and macid like '%" + txtMacId.Text.Trim() + "%'"; } - + sqlData += " order by DBID desc)b " + + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; @@ -299,76 +301,6 @@ } } - //public void reloadGrid(int pageIndex) - //{ - // if (pageIndex <= 0) - // { - // pageIndex = 1; - // currentpage = 1; - // } - // String sqlrows = "select * from (select rownum as rowno,dbid,descirption,macid,owner,case when status = 'USING' then '可用' when status = 'DAMAGE' then '损坏' end as status,'编辑' as btnEdit,'删除' as btnDel from equipment t where status = 'USING' "; - // string sqlcount = "select count(*) from equipment where status = 'USING' "; - // if (!String.IsNullOrEmpty(txtMacId.Text.Trim())) - // { - // sqlrows += " and macid like '%" + txtMacId.Text.Trim() + "%'"; - // sqlcount += " and macid like '%" + txtMacId.Text.Trim() + "%'"; - // } - // sqlrows += " and rownum<=" + (pagesize * pageIndex) + ") table_alias where table_alias.rowno>=" + ((pageIndex - 1) * pagesize + 1); - - // int rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlcount).ToString()); - // int pages = 0; - // if (rows % pagesize == 0) - // { - // pages = rows / pagesize; - // } - // else - // { - // pages = rows / pagesize + 1; - // } - - // lastpage = pages; - - // lab_page_msg.Text = "共" + rows + "条记录，每页" + pagesize + "条，第" + pageIndex + "页，共" + pages + "页"; - // combo_page_num.Items.Clear(); - // for (int i = 1; i <= pages; i++) - // { - // combo_page_num.Items.Add(new ComboBoxItem(i.ToString(), i.ToString())); - // } - - // if (lastpage == 1) - // { - // btn_page_first.Enabled = false; - // btn_page_pre.Enabled = false; - // btn_page_last.Enabled = false; - // btn_page_next.Enabled = false; - // } - // else if (currentpage == 1) - // { - // btn_page_first.Enabled = false; - // btn_page_pre.Enabled = false; - // btn_page_last.Enabled = true; - // btn_page_next.Enabled = true; - // } - // else if (currentpage == lastpage) - // { - // btn_page_first.Enabled = true; - // btn_page_pre.Enabled = true; - // btn_page_last.Enabled = false; - // btn_page_next.Enabled = false; - // } - // else - // { - // btn_page_first.Enabled = true; - // btn_page_pre.Enabled = true; - // btn_page_last.Enabled = true; - // btn_page_next.Enabled = true; - // } - - // DataTable table = OracleUtils.ExecuteDataset(OracleUtils.ConnectionString, CommandType.Text, sqlrows).Tables[0]; - // dataGridViewX1.DataSource = table; - - //} - private void FrmEquipmentManage_FormClosing(object sender, FormClosingEventArgs e) diff --git a/FrmFlagDetail.Designer.cs b/FrmFlagDetail.Designer.cs new file mode 100644 index 0000000..982bfc6 --- /dev/null +++ b/FrmFlagDetail.Designer.cs @@ -0,0 +1,103 @@ +namespace Cyberpipe +{ + partial class FrmFlagDetail + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); + this.dataGridViewX_markDetail = new DevComponents.DotNetBar.Controls.DataGridViewX(); + this.对象类型 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.对象编号 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.对象名称 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX_markDetail)).BeginInit(); + this.SuspendLayout(); + // + // dataGridViewX_markDetail + // + this.dataGridViewX_markDetail.AllowUserToAddRows = false; + this.dataGridViewX_markDetail.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; + this.dataGridViewX_markDetail.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dataGridViewX_markDetail.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.对象类型, + this.对象编号, + this.对象名称}); + dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle3.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dataGridViewX_markDetail.DefaultCellStyle = dataGridViewCellStyle3; + this.dataGridViewX_markDetail.Dock = System.Windows.Forms.DockStyle.Fill; + this.dataGridViewX_markDetail.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(170)))), ((int)(((byte)(170)))), ((int)(((byte)(170))))); + this.dataGridViewX_markDetail.Location = new System.Drawing.Point(0, 0); + this.dataGridViewX_markDetail.Name = "dataGridViewX_markDetail"; + this.dataGridViewX_markDetail.RowTemplate.Height = 23; + this.dataGridViewX_markDetail.Size = new System.Drawing.Size(508, 321); + this.dataGridViewX_markDetail.TabIndex = 0; + // + // 对象类型 + // + this.对象类型.HeaderText = "对象类型"; + this.对象类型.Name = "对象类型"; + // + // 对象编号 + // + this.对象编号.HeaderText = "对象编号"; + this.对象编号.Name = "对象编号"; + // + // 对象名称 + // + this.对象名称.HeaderText = "对象名称"; + this.对象名称.Name = "对象名称"; + // + // FrmFlagDetail + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(508, 321); + this.Controls.Add(this.dataGridViewX_markDetail); + this.Name = "FrmFlagDetail"; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; + this.Text = "标识对象信息"; + this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmFlagDetail_FormClosing); + this.Load += new System.EventHandler(this.FrmFlagDetail_Load); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX_markDetail)).EndInit(); + this.ResumeLayout(false); + + } + + #endregion + + private DevComponents.DotNetBar.Controls.DataGridViewX dataGridViewX_markDetail; + private System.Windows.Forms.DataGridViewTextBoxColumn 对象类型; + private System.Windows.Forms.DataGridViewTextBoxColumn 对象编号; + private System.Windows.Forms.DataGridViewTextBoxColumn 对象名称; + + } +} \ No newline at end of file diff --git a/FrmFlagDetail.cs b/FrmFlagDetail.cs new file mode 100644 index 0000000..81de974 --- /dev/null +++ b/FrmFlagDetail.cs @@ -0,0 +1,77 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Windows.Forms; +using GeoScene.Globe; +using System.Data.OracleClient; + +namespace Cyberpipe +{ + public partial class FrmFlagDetail : Form + { + DataTable dt = new DataTable(); + private GSOGlobeControl globeControl1; + + public delegate void Handle(); + public event Handle showParentForm; + String markId; + + public FrmFlagDetail(GSOGlobeControl globeControl1, String id) + { + InitializeComponent(); + this.markId = id; + } + + private void FrmFlagDetail_FormClosing(object sender, FormClosingEventArgs e) + { + showParentForm(); + } + + private void FrmFlagDetail_Load(object sender, EventArgs e) + { + string objectIds = ""; + string objectTypeCodes = ""; + string sql = "select t.对象编号,t.对象类型 from 标识器 t where t.编号='" + markId + "'"; + using (OracleDataReader reader = OracleUtils.ExecuteReader(OracleUtils.ConnectionString, CommandType.Text, sql)) + { + while (reader.Read()) + { + objectIds = reader.GetString(0); + objectTypeCodes = reader.GetString(1); + } + } + + string[] codeTypes = objectTypeCodes.Split(','); + string[] codeIds = objectIds.Split(','); + int length = 0; + if (codeTypes.Length <= codeIds.Length) + { + length = codeTypes.Length; + } + else + { + length = codeIds.Length; + } + for (int n = 0; n < length; n++) + { + for (int i = 0; i < Utility1.listPipelineType.Count; i++) + { + if (Utility1.listPipelineType[i].code == codeTypes[n]) + { + //string objectId = codeIds[i]; + //string objectType = Utility1.listPipelineType[i].type; + //string objectName = Utility1.listPipelineType[i].name; + int index = this.dataGridViewX_markDetail.Rows.Add(); + this.dataGridViewX_markDetail.Rows[index].Cells[0].Value = Utility1.listPipelineType[i].type; + this.dataGridViewX_markDetail.Rows[index].Cells[1].Value = codeIds[n].ToString(); + this.dataGridViewX_markDetail.Rows[index].Cells[2].Value = Utility1.listPipelineType[i].name; + } + } + } + } + } +} diff --git a/FrmFlagDetail.resx b/FrmFlagDetail.resx new file mode 100644 index 0000000..e98a8fe --- /dev/null +++ b/FrmFlagDetail.resx @@ -0,0 +1,129 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + True + + + True + + + True + + \ No newline at end of file diff --git a/FrmFlagManagers.Designer.cs b/FrmFlagManagers.Designer.cs index d7e2f60..9fe14fb 100644 --- a/FrmFlagManagers.Designer.cs +++ b/FrmFlagManagers.Designer.cs @@ -28,8 +28,10 @@ /// private void InitializeComponent() { - this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); - this.winGridViewPager1 = new WHC.Pager.WinControl.WinGridViewPager(); + this.components = new System.ComponentModel.Container(); + this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components); + this.标识对象ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripMenuItem2 = new System.Windows.Forms.ToolStripMenuItem(); this.bar1 = new DevComponents.DotNetBar.Bar(); this.labelItem1 = new DevComponents.DotNetBar.LabelItem(); this.txt_no = new DevComponents.DotNetBar.TextBoxItem(); @@ -38,45 +40,37 @@ this.btn_query = new DevComponents.DotNetBar.ButtonItem(); this.btn_add_batch = new DevComponents.DotNetBar.ButtonItem(); this.btn_add_menu = new DevComponents.DotNetBar.ButtonItem(); - this.btn_db = new DevComponents.DotNetBar.ButtonItem(); - this.tableLayoutPanel1.SuspendLayout(); + this.winGridViewPager1 = new WHC.Pager.WinControl.WinGridViewPager(); + this.contextMenuStrip1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.bar1)).BeginInit(); this.SuspendLayout(); // - // tableLayoutPanel1 + // contextMenuStrip1 // - this.tableLayoutPanel1.ColumnCount = 1; - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel1.Controls.Add(this.winGridViewPager1, 0, 1); - this.tableLayoutPanel1.Controls.Add(this.bar1, 0, 0); - this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 0); - this.tableLayoutPanel1.Name = "tableLayoutPanel1"; - this.tableLayoutPanel1.RowCount = 2; - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 32F)); - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel1.Size = new System.Drawing.Size(881, 474); - this.tableLayoutPanel1.TabIndex = 6; + this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.标识对象ToolStripMenuItem, + this.toolStripMenuItem2}); + this.contextMenuStrip1.Name = "contextMenuStrip1"; + this.contextMenuStrip1.Size = new System.Drawing.Size(125, 48); // - // winGridViewPager1 + // 标识对象ToolStripMenuItem // - this.winGridViewPager1.AppendedMenu = null; - this.winGridViewPager1.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; - this.winGridViewPager1.DataSource = null; - this.winGridViewPager1.DisplayColumns = ""; - this.winGridViewPager1.Dock = System.Windows.Forms.DockStyle.Fill; - this.winGridViewPager1.Location = new System.Drawing.Point(3, 35); - this.winGridViewPager1.MinimumSize = new System.Drawing.Size(540, 0); - this.winGridViewPager1.Name = "winGridViewPager1"; - this.winGridViewPager1.PrintTitle = ""; - this.winGridViewPager1.Size = new System.Drawing.Size(875, 436); - this.winGridViewPager1.TabIndex = 5; + this.标识对象ToolStripMenuItem.Name = "标识对象ToolStripMenuItem"; + this.标识对象ToolStripMenuItem.Size = new System.Drawing.Size(124, 22); + this.标识对象ToolStripMenuItem.Text = "标识对象"; + this.标识对象ToolStripMenuItem.Click += new System.EventHandler(this.标识对象ToolStripMenuItem_Click); + // + // toolStripMenuItem2 + // + this.toolStripMenuItem2.Name = "toolStripMenuItem2"; + this.toolStripMenuItem2.Size = new System.Drawing.Size(152, 22); + this.toolStripMenuItem2.Text = "查看位置"; + this.toolStripMenuItem2.Click += new System.EventHandler(this.toolStripMenuItem2_Click); // // bar1 // this.bar1.AntiAlias = true; this.bar1.Dock = System.Windows.Forms.DockStyle.Top; - this.bar1.DockSide = DevComponents.DotNetBar.eDockSide.Document; this.bar1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.labelItem1, this.txt_no, @@ -84,14 +78,13 @@ this.combo_street, this.btn_query, this.btn_add_batch, - this.btn_add_menu, - this.btn_db}); - this.bar1.Location = new System.Drawing.Point(3, 3); + this.btn_add_menu}); + this.bar1.Location = new System.Drawing.Point(0, 0); this.bar1.Name = "bar1"; - this.bar1.Size = new System.Drawing.Size(875, 28); + this.bar1.Size = new System.Drawing.Size(881, 28); this.bar1.Stretch = true; this.bar1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.bar1.TabIndex = 1; + this.bar1.TabIndex = 8; this.bar1.TabStop = false; this.bar1.Text = "bar1"; // @@ -136,24 +129,34 @@ this.btn_add_menu.Text = "手工添加"; this.btn_add_menu.Click += new System.EventHandler(this.btn_add_menu_Click); // - // btn_db + // winGridViewPager1 // - this.btn_db.Name = "btn_db"; - this.btn_db.Text = "数据导出"; + this.winGridViewPager1.AppendedMenu = null; + this.winGridViewPager1.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; + this.winGridViewPager1.DataSource = null; + this.winGridViewPager1.DisplayColumns = ""; + this.winGridViewPager1.Dock = System.Windows.Forms.DockStyle.Fill; + this.winGridViewPager1.Location = new System.Drawing.Point(0, 28); + this.winGridViewPager1.MinimumSize = new System.Drawing.Size(540, 0); + this.winGridViewPager1.Name = "winGridViewPager1"; + this.winGridViewPager1.PrintTitle = ""; + this.winGridViewPager1.Size = new System.Drawing.Size(881, 446); + this.winGridViewPager1.TabIndex = 9; // // FrmFlagManagers // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(881, 474); - this.Controls.Add(this.tableLayoutPanel1); + this.Controls.Add(this.winGridViewPager1); + this.Controls.Add(this.bar1); this.DoubleBuffered = true; this.Name = "FrmFlagManagers"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "标识器管理"; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmFlagManagers_FormClosing); this.Load += new System.EventHandler(this.FrmFlagManagers_Load); - this.tableLayoutPanel1.ResumeLayout(false); + this.contextMenuStrip1.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.bar1)).EndInit(); this.ResumeLayout(false); @@ -161,8 +164,8 @@ #endregion - private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1; - private WHC.Pager.WinControl.WinGridViewPager winGridViewPager1; + private System.Windows.Forms.ContextMenuStrip contextMenuStrip1; + private System.Windows.Forms.ToolStripMenuItem 标识对象ToolStripMenuItem; private DevComponents.DotNetBar.Bar bar1; private DevComponents.DotNetBar.LabelItem labelItem1; private DevComponents.DotNetBar.TextBoxItem txt_no; @@ -171,6 +174,7 @@ private DevComponents.DotNetBar.ButtonItem btn_query; private DevComponents.DotNetBar.ButtonItem btn_add_batch; private DevComponents.DotNetBar.ButtonItem btn_add_menu; - private DevComponents.DotNetBar.ButtonItem btn_db; + private WHC.Pager.WinControl.WinGridViewPager winGridViewPager1; + private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem2; } } \ No newline at end of file diff --git a/Cyberpipe.csproj b/Cyberpipe.csproj index fe600e5..501fd09 100644 --- a/Cyberpipe.csproj +++ b/Cyberpipe.csproj @@ -246,6 +246,12 @@ Form_TaskManager.cs + + Form + + + FrmFlagDetail.cs + Form @@ -1368,6 +1374,9 @@ Form_TaskManager.cs + + FrmFlagDetail.cs + FormDocumentManager.cs diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 537b4c3..1acf22a 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 7d5dd95..3f178cb 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -90,20 +90,20 @@ this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - - this.winGridViewPager1.AddColumnAlias("ACCIDENTTIME", "上报时间"); - this.winGridViewPager1.AddColumnAlias("DBID", "编号"); - this.winGridViewPager1.AddColumnAlias("DESCRIBE", "事件描述"); - this.winGridViewPager1.AddColumnAlias("LATITUDE", "纬度"); - this.winGridViewPager1.AddColumnAlias("LOCALE", "事件地点"); - this.winGridViewPager1.AddColumnAlias("LONGITUDE", "经度"); - this.winGridViewPager1.AddColumnAlias("PATROLERNAME", "上报人员"); - this.winGridViewPager1.AddColumnAlias("PATROLER_ID", "人员ID"); - this.winGridViewPager1.AddColumnAlias("TASK_ID", "任务编号"); - this.winGridViewPager1.AddColumnAlias("RESULT", "处理结果"); - this.winGridViewPager1.AddColumnAlias("STATE", "处理状态"); - this.winGridViewPager1.DisplayColumns = "ACCIDENTTIME,DESCRIBE,LOCALE,PATROLERNAME,TASK_ID,RESULT,STATE"; + this.winGridViewPager1.AddColumnAlias("上报时间", "上报时间"); + this.winGridViewPager1.AddColumnAlias("编号", "编号"); + this.winGridViewPager1.AddColumnAlias("事件描述", "事件描述"); + this.winGridViewPager1.AddColumnAlias("纬度", "纬度"); + this.winGridViewPager1.AddColumnAlias("事件地点", "事件地点"); + this.winGridViewPager1.AddColumnAlias("经度", "经度"); + this.winGridViewPager1.AddColumnAlias("上报人员", "上报人员"); + this.winGridViewPager1.AddColumnAlias("人员ID", "人员ID"); + this.winGridViewPager1.AddColumnAlias("任务编号", "任务编号"); + this.winGridViewPager1.AddColumnAlias("处理结果", "处理结果"); + this.winGridViewPager1.AddColumnAlias("处理状态", "处理状态"); + + this.winGridViewPager1.DisplayColumns = "上报时间,事件描述,事件地点,上报人员,任务编号,处理结果,处理状态"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -114,8 +114,8 @@ winGridViewPager1.dataGridView1.ContextMenuStrip.Items[5].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[6].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[7].Visible = false; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[1].Text = "查看位置"; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "结果编辑"; + winGridViewPager1.dataGridView1.ContextMenuStrip.Items[1].Text = "结果编辑"; + winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "查看位置"; //右键菜单宽度 winGridViewPager1.dataGridView1.ContextMenuStrip.AutoSize = false; @@ -160,13 +160,12 @@ this.WindowState = FormWindowState.Minimized; globeControl1.Globe.MemoryLayer.RemoveAllFeature(); this.WindowState = FormWindowState.Minimized; - double x = Convert.ToDouble(row.Cells["LONGITUDE"].Value); - double y = Convert.ToDouble(row.Cells["LATITUDE"].Value); - - string username = Convert.ToString(row.Cells["PATROLERNAME"].Value); - string Atime = Convert.ToString(row.Cells["ACCIDENTTIME"].Value); - string location = Convert.ToString(row.Cells["LOCALE"].Value); - string descp = Convert.ToString(row.Cells["DESCRIBE"].Value); + double x = Convert.ToDouble(row.Cells["经度"].Value); + double y = Convert.ToDouble(row.Cells["纬度"].Value); + string username = Convert.ToString(row.Cells["上报人员"].Value); + string Atime = Convert.ToString(row.Cells["上报时间"].Value); + string location = Convert.ToString(row.Cells["事件地点"].Value); + string descp = Convert.ToString(row.Cells["事件描述"].Value); /////////////////////////////////////// /*******设置飞行与创建模型******/ @@ -228,8 +227,8 @@ DataGridViewRow row = grid.SelectedRows[0]; try { - int dbId = Convert.ToInt32(row.Cells["DBID"].Value); - string result = Convert.ToString(row.Cells["RESULT"].Value); + int dbId = Convert.ToInt32(row.Cells["编号"].Value); + string result = Convert.ToString(row.Cells["处理结果"].Value); EMS_Forms.Form_EventResult form = new Form_EventResult(dbId, result); form.refresh += new Form_EventResult.Handle(LoadData);//改变值的事件 form.ShowDialog(); @@ -276,9 +275,9 @@ } for (int i = 0; i < table.Rows.Count; i++) { - if (winGridViewPager1.dataGridView1.Rows[i].Cells["RESULT"].Value != null && !(winGridViewPager1.dataGridView1.Rows[i].Cells["RESULT"].Value.ToString().Trim().Equals(""))) + if (winGridViewPager1.dataGridView1.Rows[i].Cells["处理结果"].Value != null && !(winGridViewPager1.dataGridView1.Rows[i].Cells["处理结果"].Value.ToString().Trim().Equals(""))) { - winGridViewPager1.dataGridView1.Rows[i].Cells["STATE"].Value = "已处理"; + winGridViewPager1.dataGridView1.Rows[i].Cells["处理状态"].Value = "已处理"; } } @@ -307,9 +306,9 @@ } for (int i = 0; i < table.Rows.Count; i++) { - if (winGridViewPager1.dataGridView1.Rows[i].Cells["RESULT"].Value != null && !(winGridViewPager1.dataGridView1.Rows[i].Cells["RESULT"].Value.ToString().Trim().Equals(""))) + if (winGridViewPager1.dataGridView1.Rows[i].Cells["处理结果"].Value != null && !(winGridViewPager1.dataGridView1.Rows[i].Cells["处理结果"].Value.ToString().Trim().Equals(""))) { - winGridViewPager1.dataGridView1.Rows[i].Cells["STATE"].Value = "已处理"; + winGridViewPager1.dataGridView1.Rows[i].Cells["处理状态"].Value = "已处理"; } } @@ -320,10 +319,12 @@ { string sqlCount = "select count(*) from ACCIDENT where 1=1"; - string sqlData = "select ACCIDENTTIME,DBID,DESCRIBE,LATITUDE,LOCALE,LONGITUDE,PATROLERNAME,PATROLER_ID,TASK_ID,RESULT,'' as STATE " + + string sqlData = "select ACCIDENTTIME as 上报时间,DBID as 编号,DESCRIBE as 事件描述,"+ + "LATITUDE as 纬度,LOCALE as 事件地点,LONGITUDE as 经度,PATROLERNAME 上报人员,"+ + "PATROLER_ID as 人员ID,TASK_ID as 任务编号,RESULT as 处理结果,'' as 处理状态 " + "from (select t.*,rownum row_num from ACCIDENT t order by DBID)b " + " where 1=1"; - + rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; @@ -340,9 +341,10 @@ string sqlCount = "select count(*) from ACCIDENT where 1=1"; - string sqlData = "select ACCIDENTTIME,DBID,DESCRIBE,LATITUDE,LOCALE,LONGITUDE,PATROLERNAME,PATROLER_ID,TASK_ID,RESULT,'' as STATE " + - "from (select t.*,rownum row_num from ACCIDENT t order by DBID)b " + - " where(b.row_num between " + minPage + " and " + maxPage + ")"; + string sqlData = "select ACCIDENTTIME as 上报时间,DBID as 编号,DESCRIBE as 事件描述," + + "LATITUDE as 纬度,LOCALE as 事件地点,LONGITUDE as 经度,PATROLERNAME 上报人员," + + "PATROLER_ID as 人员ID,TASK_ID as 任务编号,RESULT as 处理结果,'' as 处理状态 " + + "from (select t.*,rownum row_num from ACCIDENT t where 1=1"; if (!String.IsNullOrEmpty(comboBox_name.Text.Trim())) { @@ -361,7 +363,8 @@ sqlCount += "and ACCIDENTTIME<=to_date('" + time.ToShortDateString() + "','yyyy-MM-dd') "; sqlData += "and ACCIDENTTIME<=to_date('" + time.ToShortDateString() + "','yyyy-MM-dd') "; } - + sqlData += " order by DBID desc)b " + + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 225c8d7..8bd9e48 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -120,8 +120,8 @@ private void flyToTask(DataGridViewRow row, int taskState) { int dbID = 0; - dbID = Convert.ToInt32(row.Cells["DBID"].Value); - string userName = Convert.ToString(row.Cells["USERNAME"].Value); + dbID = Convert.ToInt32(row.Cells["任务编号"].Value); + string userName = Convert.ToString(row.Cells["任务执行人员"].Value); System.DateTime t = new DateTime(); try { @@ -392,15 +392,15 @@ //控制表格显示的列，以及每一列要显示的列名 this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - this.winGridViewPager1.AddColumnAlias("DBID", "任务编号"); - this.winGridViewPager1.AddColumnAlias("DEPLOYTIME", "创建时间"); - this.winGridViewPager1.AddColumnAlias("DESCIRPTION", "任务描述"); - this.winGridViewPager1.AddColumnAlias("FINISHTIME", "完成时间"); - this.winGridViewPager1.AddColumnAlias("STREET", "任务执行区域"); - this.winGridViewPager1.AddColumnAlias("TASKSTATE", "任务状态"); - this.winGridViewPager1.AddColumnAlias("USERNAME", "任务执行人员"); + this.winGridViewPager1.AddColumnAlias("任务编号", "任务编号"); + this.winGridViewPager1.AddColumnAlias("创建时间", "创建时间"); + this.winGridViewPager1.AddColumnAlias("任务描述", "任务描述"); + this.winGridViewPager1.AddColumnAlias("完成时间", "完成时间"); + this.winGridViewPager1.AddColumnAlias("任务执行区域", "任务执行区域"); + this.winGridViewPager1.AddColumnAlias("任务状态", "任务状态"); + this.winGridViewPager1.AddColumnAlias("任务执行人员", "任务执行人员"); - this.winGridViewPager1.DisplayColumns = "DBID,DEPLOYTIME,DESCIRPTION,FINISHTIME,STREET,TASKSTATE,USERNAME"; + this.winGridViewPager1.DisplayColumns = "任务编号,创建时间,任务描述,完成时间,任务执行区域,任务状态,任务执行人员"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -464,8 +464,8 @@ { int dbID = 0; int taskStateInt = 0; - dbID = Convert.ToInt32(row.Cells["DBID"].Value); - string taskState = row.Cells["TASKSTATE"].Value.ToString(); + dbID = Convert.ToInt32(row.Cells["任务编号"].Value); + string taskState = row.Cells["任务状态"].Value.ToString(); if (taskState.Equals("开始任务")) { taskStateInt = 1; @@ -534,9 +534,10 @@ private string GetSql() { - string sqlCount = "select count(*) from taskinfo t where 1=1'"; + string sqlCount = "select count(*) from taskinfo t where 1=1"; - string sqlData = "select dbid,deploytime,descirption,finishtime,street,taskstate,username " + + 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"; @@ -550,9 +551,9 @@ int minPage = (pageIndex - 1) * maxPageIndex + 1; int maxPage = pageIndex * maxPageIndex; string sqlCount = "select count(*) from taskinfo t where 1=1"; - string sqlData = "select dbid,deploytime,descirption,finishtime,street,taskstate,username " + - "from (select t.*,rownum row_num from taskinfo t order by DBID desc)b " + - " where(b.row_num between " + minPage + " and " + maxPage + ")"; + 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"; if (!String.IsNullOrEmpty(comboBox_userName.Text.Trim()) && !comboBox_userName.Text.Trim().Equals("不限")) { @@ -581,6 +582,8 @@ sqlCount += "and street='" + combo_street.Text + "' "; sqlData += "and street='" + combo_street.Text + "' "; } + sqlData += " order by DBID desc)b " + + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index e65a4bd..58f5342 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -73,13 +73,13 @@ //控制表格显示的列，以及每一列要显示的列名 this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - this.winGridViewPager1.AddColumnAlias("FILENAME", "文档名称"); - this.winGridViewPager1.AddColumnAlias("DBID", "编号"); - this.winGridViewPager1.AddColumnAlias("TITLE", "文档标题"); - this.winGridViewPager1.AddColumnAlias("FILETYPE", "文档类型"); - this.winGridViewPager1.AddColumnAlias("UPDAY", "上传日期"); - this.winGridViewPager1.AddColumnAlias("WRITER", "上传人"); - this.winGridViewPager1.DisplayColumns = "FILENAME,TITLE,FILETYPE,UPDAY,WRITER"; + this.winGridViewPager1.AddColumnAlias("文档名称", "文档名称"); + this.winGridViewPager1.AddColumnAlias("编号", "编号"); + this.winGridViewPager1.AddColumnAlias("文档标题", "文档标题"); + this.winGridViewPager1.AddColumnAlias("文档类型", "文档类型"); + this.winGridViewPager1.AddColumnAlias("上传日期", "上传日期"); + this.winGridViewPager1.AddColumnAlias("上传人", "上传人"); + this.winGridViewPager1.DisplayColumns = "文档名称,文档标题,文档类型,上传日期,上传人"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -167,7 +167,7 @@ if (grid != null) { DataGridViewRow row = grid.SelectedRows[0]; - string dbid = row.Cells["dbid"].Value.ToString(); + string dbid = row.Cells["编号"].Value.ToString(); try { if (MessageBox.Show("确认删除吗？", "确认", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) @@ -212,7 +212,8 @@ { string sqlCount = "select count(*) from casic_userdocument where sysname = 'EMS'"; - string sqlData = "select filename,dbid,title,filetype,upday,writer " + + string sqlData = "select filename as 文档名称,dbid as 编号,title as 文档标题," + + "filetype as 文档类型,upday as 上传日期,writer as 上传人 " + "from (select t.*,rownum row_num from casic_userdocument t order by DBID desc)b " + " where sysname = 'EMS'"; @@ -226,9 +227,9 @@ int minPage = (pageIndex - 1) * maxPageIndex + 1; int maxPage = pageIndex * maxPageIndex; string sqlCount = "select count(*) from casic_userdocument where sysname = 'EMS'"; - string sqlData = "select filename,dbid,title,filetype,upday,writer " + - "from (select t.*,rownum row_num from casic_userdocument t where sysname = 'EMS' order by DBID desc)b " + - " where(b.row_num between " + minPage + " and " + maxPage + ")"; + string sqlData = "select filename as 文档名称,dbid as 编号,title as 文档标题,"+ + "filetype as 文档类型,upday as 上传日期,writer as 上传人 " + + "from (select t.*,rownum row_num from casic_userdocument t where sysname = 'EMS'"; string txtTitleText = null; string comboFileType = null; @@ -278,7 +279,8 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - + sqlData += " order by DBID desc)b " + + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; @@ -437,7 +439,7 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - string filename = row.Cells["filename"].Value.ToString(); + string filename = row.Cells["文档名称"].Value.ToString(); string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; string file = System.Environment.CurrentDirectory + "\\download\\" + filename; int result = DownloadFile(url, file, progressBar1); @@ -515,7 +517,7 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - string filename = row.Cells["filename"].Value.ToString(); + string filename = row.Cells["文档名称"].Value.ToString(); string ext = Path.GetExtension(filename); SaveFileDialog dlg = new SaveFileDialog(); dlg.Filter = "保存文档|*" + ext + ";"; diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 1d1201b..3902629 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -748,6 +748,7 @@ this.Name = "FrmAddSinMark"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "单个标识器添加"; + this.TopMost = true; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmAddSinMark_FormClosing); this.Load += new System.EventHandler(this.FrmAddSinMark_Load); this.groupPanel1.ResumeLayout(false); diff --git a/FrmEquipmentManage.cs b/FrmEquipmentManage.cs index 90bfdb2..a3cf55c 100644 --- a/FrmEquipmentManage.cs +++ b/FrmEquipmentManage.cs @@ -74,13 +74,13 @@ //控制表格显示的列，以及每一列要显示的列名 this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - this.winGridViewPager1.AddColumnAlias("DESCIRPTION", "设备描述"); - this.winGridViewPager1.AddColumnAlias("DBID", "编号"); - this.winGridViewPager1.AddColumnAlias("MACID", "MAC地址"); - this.winGridViewPager1.AddColumnAlias("OWNER", "设备所有人"); - this.winGridViewPager1.AddColumnAlias("STATUS", "设备状态"); + this.winGridViewPager1.AddColumnAlias("设备描述", "设备描述"); + this.winGridViewPager1.AddColumnAlias("编号", "编号"); + this.winGridViewPager1.AddColumnAlias("MAC地址", "MAC地址"); + this.winGridViewPager1.AddColumnAlias("设备所有人", "设备所有人"); + this.winGridViewPager1.AddColumnAlias("设备状态", "设备状态"); - this.winGridViewPager1.DisplayColumns = "DESCIRPTION,MACID,OWNER,STATUS"; + this.winGridViewPager1.DisplayColumns = "设备描述,MAC地址,设备所有人,设备状态"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -146,10 +146,10 @@ DataGridViewRow row = grid.SelectedRows[0]; try { - long dbid = long.Parse(row.Cells["DBID"].Value.ToString()); - String macId = row.Cells["MACID"].Value.ToString(); - String username = row.Cells["OWNER"].Value.ToString(); - String descn = row.Cells["DESCIRPTION"].Value.ToString(); + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); + String macId = row.Cells["MAC地址"].Value.ToString(); + String username = row.Cells["设备所有人"].Value.ToString(); + String descn = row.Cells["设备状态"].Value.ToString(); FrmEquipmentEdit frm = new FrmEquipmentEdit(dbid.ToString(), macId, username, descn); frm.reloadGrid += new ReloadEquipmentGrid(LoadData); frm.ShowDialog(); @@ -179,7 +179,7 @@ { return; } - String macId = row.Cells["MACID"].Value.ToString(); + String macId = row.Cells["MAC地址"].Value.ToString(); FrmLog frm = new FrmLog(macId); frm.Show(); } @@ -201,7 +201,7 @@ if (grid != null) { DataGridViewRow row = grid.SelectedRows[0]; - long dbid = long.Parse(row.Cells["DBID"].Value.ToString()); + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); try { if (MessageBox.Show("确定删除？", "确认", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) @@ -243,7 +243,8 @@ { string sqlCount = "select count(*) from equipment where status = 'USING'"; - string sqlData = "select descirption,DBID,macid,owner,case when status = 'USING' then '可用' when status = 'DAMAGE' then '损坏' end as status " + + string sqlData = "select descirption as 设备描述,DBID as 编号,macid as MAC地址,owner as 设备所有人,"+ + "case when status = 'USING' then '可用' when status = 'DAMAGE' then '损坏' end as 设备状态 " + "from (select t.*,rownum row_num from equipment t where status = 'USING' order by dbid desc)b " + " where 1=1"; @@ -258,16 +259,17 @@ int maxPage = pageIndex * maxPageIndex; string sqlCount = "select count(*) from equipment where status = 'USING' "; - string sqlData = "select descirption,DBID,macid,owner,case when status = 'USING' then '可用' when status = 'DAMAGE' then '损坏' end as status " + - "from (select t.*,rownum row_num from equipment t where status = 'USING' order by DBID desc)b " + - " where(b.row_num between " + minPage + " and " + maxPage + ")"; + string sqlData = "select descirption as 设备描述,DBID as 编号,macid as MAC地址,owner as 设备所有人," + + "case when status = 'USING' then '可用' when status = 'DAMAGE' then '损坏' end as 设备状态 " + + "from (select t.*,rownum row_num from equipment t where status = 'USING'"; if (!String.IsNullOrEmpty(txtMacId.Text.Trim())) { sqlData += " and macid like '%" + txtMacId.Text.Trim() + "%'"; sqlCount += " and macid like '%" + txtMacId.Text.Trim() + "%'"; } - + sqlData += " order by DBID desc)b " + + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; @@ -299,76 +301,6 @@ } } - //public void reloadGrid(int pageIndex) - //{ - // if (pageIndex <= 0) - // { - // pageIndex = 1; - // currentpage = 1; - // } - // String sqlrows = "select * from (select rownum as rowno,dbid,descirption,macid,owner,case when status = 'USING' then '可用' when status = 'DAMAGE' then '损坏' end as status,'编辑' as btnEdit,'删除' as btnDel from equipment t where status = 'USING' "; - // string sqlcount = "select count(*) from equipment where status = 'USING' "; - // if (!String.IsNullOrEmpty(txtMacId.Text.Trim())) - // { - // sqlrows += " and macid like '%" + txtMacId.Text.Trim() + "%'"; - // sqlcount += " and macid like '%" + txtMacId.Text.Trim() + "%'"; - // } - // sqlrows += " and rownum<=" + (pagesize * pageIndex) + ") table_alias where table_alias.rowno>=" + ((pageIndex - 1) * pagesize + 1); - - // int rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlcount).ToString()); - // int pages = 0; - // if (rows % pagesize == 0) - // { - // pages = rows / pagesize; - // } - // else - // { - // pages = rows / pagesize + 1; - // } - - // lastpage = pages; - - // lab_page_msg.Text = "共" + rows + "条记录，每页" + pagesize + "条，第" + pageIndex + "页，共" + pages + "页"; - // combo_page_num.Items.Clear(); - // for (int i = 1; i <= pages; i++) - // { - // combo_page_num.Items.Add(new ComboBoxItem(i.ToString(), i.ToString())); - // } - - // if (lastpage == 1) - // { - // btn_page_first.Enabled = false; - // btn_page_pre.Enabled = false; - // btn_page_last.Enabled = false; - // btn_page_next.Enabled = false; - // } - // else if (currentpage == 1) - // { - // btn_page_first.Enabled = false; - // btn_page_pre.Enabled = false; - // btn_page_last.Enabled = true; - // btn_page_next.Enabled = true; - // } - // else if (currentpage == lastpage) - // { - // btn_page_first.Enabled = true; - // btn_page_pre.Enabled = true; - // btn_page_last.Enabled = false; - // btn_page_next.Enabled = false; - // } - // else - // { - // btn_page_first.Enabled = true; - // btn_page_pre.Enabled = true; - // btn_page_last.Enabled = true; - // btn_page_next.Enabled = true; - // } - - // DataTable table = OracleUtils.ExecuteDataset(OracleUtils.ConnectionString, CommandType.Text, sqlrows).Tables[0]; - // dataGridViewX1.DataSource = table; - - //} - private void FrmEquipmentManage_FormClosing(object sender, FormClosingEventArgs e) diff --git a/FrmFlagDetail.Designer.cs b/FrmFlagDetail.Designer.cs new file mode 100644 index 0000000..982bfc6 --- /dev/null +++ b/FrmFlagDetail.Designer.cs @@ -0,0 +1,103 @@ +namespace Cyberpipe +{ + partial class FrmFlagDetail + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); + this.dataGridViewX_markDetail = new DevComponents.DotNetBar.Controls.DataGridViewX(); + this.对象类型 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.对象编号 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.对象名称 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX_markDetail)).BeginInit(); + this.SuspendLayout(); + // + // dataGridViewX_markDetail + // + this.dataGridViewX_markDetail.AllowUserToAddRows = false; + this.dataGridViewX_markDetail.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; + this.dataGridViewX_markDetail.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dataGridViewX_markDetail.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.对象类型, + this.对象编号, + this.对象名称}); + dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle3.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dataGridViewX_markDetail.DefaultCellStyle = dataGridViewCellStyle3; + this.dataGridViewX_markDetail.Dock = System.Windows.Forms.DockStyle.Fill; + this.dataGridViewX_markDetail.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(170)))), ((int)(((byte)(170)))), ((int)(((byte)(170))))); + this.dataGridViewX_markDetail.Location = new System.Drawing.Point(0, 0); + this.dataGridViewX_markDetail.Name = "dataGridViewX_markDetail"; + this.dataGridViewX_markDetail.RowTemplate.Height = 23; + this.dataGridViewX_markDetail.Size = new System.Drawing.Size(508, 321); + this.dataGridViewX_markDetail.TabIndex = 0; + // + // 对象类型 + // + this.对象类型.HeaderText = "对象类型"; + this.对象类型.Name = "对象类型"; + // + // 对象编号 + // + this.对象编号.HeaderText = "对象编号"; + this.对象编号.Name = "对象编号"; + // + // 对象名称 + // + this.对象名称.HeaderText = "对象名称"; + this.对象名称.Name = "对象名称"; + // + // FrmFlagDetail + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(508, 321); + this.Controls.Add(this.dataGridViewX_markDetail); + this.Name = "FrmFlagDetail"; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; + this.Text = "标识对象信息"; + this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmFlagDetail_FormClosing); + this.Load += new System.EventHandler(this.FrmFlagDetail_Load); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX_markDetail)).EndInit(); + this.ResumeLayout(false); + + } + + #endregion + + private DevComponents.DotNetBar.Controls.DataGridViewX dataGridViewX_markDetail; + private System.Windows.Forms.DataGridViewTextBoxColumn 对象类型; + private System.Windows.Forms.DataGridViewTextBoxColumn 对象编号; + private System.Windows.Forms.DataGridViewTextBoxColumn 对象名称; + + } +} \ No newline at end of file diff --git a/FrmFlagDetail.cs b/FrmFlagDetail.cs new file mode 100644 index 0000000..81de974 --- /dev/null +++ b/FrmFlagDetail.cs @@ -0,0 +1,77 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Windows.Forms; +using GeoScene.Globe; +using System.Data.OracleClient; + +namespace Cyberpipe +{ + public partial class FrmFlagDetail : Form + { + DataTable dt = new DataTable(); + private GSOGlobeControl globeControl1; + + public delegate void Handle(); + public event Handle showParentForm; + String markId; + + public FrmFlagDetail(GSOGlobeControl globeControl1, String id) + { + InitializeComponent(); + this.markId = id; + } + + private void FrmFlagDetail_FormClosing(object sender, FormClosingEventArgs e) + { + showParentForm(); + } + + private void FrmFlagDetail_Load(object sender, EventArgs e) + { + string objectIds = ""; + string objectTypeCodes = ""; + string sql = "select t.对象编号,t.对象类型 from 标识器 t where t.编号='" + markId + "'"; + using (OracleDataReader reader = OracleUtils.ExecuteReader(OracleUtils.ConnectionString, CommandType.Text, sql)) + { + while (reader.Read()) + { + objectIds = reader.GetString(0); + objectTypeCodes = reader.GetString(1); + } + } + + string[] codeTypes = objectTypeCodes.Split(','); + string[] codeIds = objectIds.Split(','); + int length = 0; + if (codeTypes.Length <= codeIds.Length) + { + length = codeTypes.Length; + } + else + { + length = codeIds.Length; + } + for (int n = 0; n < length; n++) + { + for (int i = 0; i < Utility1.listPipelineType.Count; i++) + { + if (Utility1.listPipelineType[i].code == codeTypes[n]) + { + //string objectId = codeIds[i]; + //string objectType = Utility1.listPipelineType[i].type; + //string objectName = Utility1.listPipelineType[i].name; + int index = this.dataGridViewX_markDetail.Rows.Add(); + this.dataGridViewX_markDetail.Rows[index].Cells[0].Value = Utility1.listPipelineType[i].type; + this.dataGridViewX_markDetail.Rows[index].Cells[1].Value = codeIds[n].ToString(); + this.dataGridViewX_markDetail.Rows[index].Cells[2].Value = Utility1.listPipelineType[i].name; + } + } + } + } + } +} diff --git a/FrmFlagDetail.resx b/FrmFlagDetail.resx new file mode 100644 index 0000000..e98a8fe --- /dev/null +++ b/FrmFlagDetail.resx @@ -0,0 +1,129 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + True + + + True + + + True + + \ No newline at end of file diff --git a/FrmFlagManagers.Designer.cs b/FrmFlagManagers.Designer.cs index d7e2f60..9fe14fb 100644 --- a/FrmFlagManagers.Designer.cs +++ b/FrmFlagManagers.Designer.cs @@ -28,8 +28,10 @@ /// private void InitializeComponent() { - this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); - this.winGridViewPager1 = new WHC.Pager.WinControl.WinGridViewPager(); + this.components = new System.ComponentModel.Container(); + this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components); + this.标识对象ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripMenuItem2 = new System.Windows.Forms.ToolStripMenuItem(); this.bar1 = new DevComponents.DotNetBar.Bar(); this.labelItem1 = new DevComponents.DotNetBar.LabelItem(); this.txt_no = new DevComponents.DotNetBar.TextBoxItem(); @@ -38,45 +40,37 @@ this.btn_query = new DevComponents.DotNetBar.ButtonItem(); this.btn_add_batch = new DevComponents.DotNetBar.ButtonItem(); this.btn_add_menu = new DevComponents.DotNetBar.ButtonItem(); - this.btn_db = new DevComponents.DotNetBar.ButtonItem(); - this.tableLayoutPanel1.SuspendLayout(); + this.winGridViewPager1 = new WHC.Pager.WinControl.WinGridViewPager(); + this.contextMenuStrip1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.bar1)).BeginInit(); this.SuspendLayout(); // - // tableLayoutPanel1 + // contextMenuStrip1 // - this.tableLayoutPanel1.ColumnCount = 1; - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel1.Controls.Add(this.winGridViewPager1, 0, 1); - this.tableLayoutPanel1.Controls.Add(this.bar1, 0, 0); - this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 0); - this.tableLayoutPanel1.Name = "tableLayoutPanel1"; - this.tableLayoutPanel1.RowCount = 2; - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 32F)); - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel1.Size = new System.Drawing.Size(881, 474); - this.tableLayoutPanel1.TabIndex = 6; + this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.标识对象ToolStripMenuItem, + this.toolStripMenuItem2}); + this.contextMenuStrip1.Name = "contextMenuStrip1"; + this.contextMenuStrip1.Size = new System.Drawing.Size(125, 48); // - // winGridViewPager1 + // 标识对象ToolStripMenuItem // - this.winGridViewPager1.AppendedMenu = null; - this.winGridViewPager1.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; - this.winGridViewPager1.DataSource = null; - this.winGridViewPager1.DisplayColumns = ""; - this.winGridViewPager1.Dock = System.Windows.Forms.DockStyle.Fill; - this.winGridViewPager1.Location = new System.Drawing.Point(3, 35); - this.winGridViewPager1.MinimumSize = new System.Drawing.Size(540, 0); - this.winGridViewPager1.Name = "winGridViewPager1"; - this.winGridViewPager1.PrintTitle = ""; - this.winGridViewPager1.Size = new System.Drawing.Size(875, 436); - this.winGridViewPager1.TabIndex = 5; + this.标识对象ToolStripMenuItem.Name = "标识对象ToolStripMenuItem"; + this.标识对象ToolStripMenuItem.Size = new System.Drawing.Size(124, 22); + this.标识对象ToolStripMenuItem.Text = "标识对象"; + this.标识对象ToolStripMenuItem.Click += new System.EventHandler(this.标识对象ToolStripMenuItem_Click); + // + // toolStripMenuItem2 + // + this.toolStripMenuItem2.Name = "toolStripMenuItem2"; + this.toolStripMenuItem2.Size = new System.Drawing.Size(152, 22); + this.toolStripMenuItem2.Text = "查看位置"; + this.toolStripMenuItem2.Click += new System.EventHandler(this.toolStripMenuItem2_Click); // // bar1 // this.bar1.AntiAlias = true; this.bar1.Dock = System.Windows.Forms.DockStyle.Top; - this.bar1.DockSide = DevComponents.DotNetBar.eDockSide.Document; this.bar1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.labelItem1, this.txt_no, @@ -84,14 +78,13 @@ this.combo_street, this.btn_query, this.btn_add_batch, - this.btn_add_menu, - this.btn_db}); - this.bar1.Location = new System.Drawing.Point(3, 3); + this.btn_add_menu}); + this.bar1.Location = new System.Drawing.Point(0, 0); this.bar1.Name = "bar1"; - this.bar1.Size = new System.Drawing.Size(875, 28); + this.bar1.Size = new System.Drawing.Size(881, 28); this.bar1.Stretch = true; this.bar1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.bar1.TabIndex = 1; + this.bar1.TabIndex = 8; this.bar1.TabStop = false; this.bar1.Text = "bar1"; // @@ -136,24 +129,34 @@ this.btn_add_menu.Text = "手工添加"; this.btn_add_menu.Click += new System.EventHandler(this.btn_add_menu_Click); // - // btn_db + // winGridViewPager1 // - this.btn_db.Name = "btn_db"; - this.btn_db.Text = "数据导出"; + this.winGridViewPager1.AppendedMenu = null; + this.winGridViewPager1.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; + this.winGridViewPager1.DataSource = null; + this.winGridViewPager1.DisplayColumns = ""; + this.winGridViewPager1.Dock = System.Windows.Forms.DockStyle.Fill; + this.winGridViewPager1.Location = new System.Drawing.Point(0, 28); + this.winGridViewPager1.MinimumSize = new System.Drawing.Size(540, 0); + this.winGridViewPager1.Name = "winGridViewPager1"; + this.winGridViewPager1.PrintTitle = ""; + this.winGridViewPager1.Size = new System.Drawing.Size(881, 446); + this.winGridViewPager1.TabIndex = 9; // // FrmFlagManagers // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(881, 474); - this.Controls.Add(this.tableLayoutPanel1); + this.Controls.Add(this.winGridViewPager1); + this.Controls.Add(this.bar1); this.DoubleBuffered = true; this.Name = "FrmFlagManagers"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "标识器管理"; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmFlagManagers_FormClosing); this.Load += new System.EventHandler(this.FrmFlagManagers_Load); - this.tableLayoutPanel1.ResumeLayout(false); + this.contextMenuStrip1.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.bar1)).EndInit(); this.ResumeLayout(false); @@ -161,8 +164,8 @@ #endregion - private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1; - private WHC.Pager.WinControl.WinGridViewPager winGridViewPager1; + private System.Windows.Forms.ContextMenuStrip contextMenuStrip1; + private System.Windows.Forms.ToolStripMenuItem 标识对象ToolStripMenuItem; private DevComponents.DotNetBar.Bar bar1; private DevComponents.DotNetBar.LabelItem labelItem1; private DevComponents.DotNetBar.TextBoxItem txt_no; @@ -171,6 +174,7 @@ private DevComponents.DotNetBar.ButtonItem btn_query; private DevComponents.DotNetBar.ButtonItem btn_add_batch; private DevComponents.DotNetBar.ButtonItem btn_add_menu; - private DevComponents.DotNetBar.ButtonItem btn_db; + private WHC.Pager.WinControl.WinGridViewPager winGridViewPager1; + private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem2; } } \ No newline at end of file diff --git a/FrmFlagManagers.cs b/FrmFlagManagers.cs index 38d4927..9bf9734 100644 --- a/FrmFlagManagers.cs +++ b/FrmFlagManagers.cs @@ -33,15 +33,13 @@ { this.globeControl1 = _globeControl1; InitializeComponent(); - winGridViewPager1.OnPageChanged += new EventHandler(winGridViewPager1_OnPageChanged); - this.winGridViewPager1.OnAddNew += new EventHandler(winGridViewPager1_OnAddNew); //右键定位 + winGridViewPager1.OnPageChanged += new EventHandler(winGridViewPager1_OnPageChanged); this.winGridViewPager1.OnEditSelected += new EventHandler(winGridViewPager1_OnEditSelected);//属性编辑 this.winGridViewPager1.OnDeleteSelected += new EventHandler(winGridViewPager1_OnDeleteSelected);//标识器报废 + this.winGridViewPager1.OnStartExport += new EventHandler(pager1_OnStartExport); this.winGridViewPager1.OnEndExport += new EventHandler(pager1_OnEndExport); - //this.winGridViewPager1.ExportCurrent += new ExportCurrentEventHandler(pager1_ExportCurrent); - //this.winGridViewPager1.ExportAll += new ExportAllEventHandler(pager1_ExportAll); winGridViewPager1.dataGridView1.MultiSelect = false; @@ -76,26 +74,25 @@ this.winGridViewPager1.AddColumnAlias("标识器型号", "标识器型号"); this.winGridViewPager1.AddColumnAlias("地面高程", "地面高程"); this.winGridViewPager1.AddColumnAlias("标识器埋深", "标识器埋深"); - this.winGridViewPager1.AddColumnAlias("对象编号", "对象编号"); - this.winGridViewPager1.AddColumnAlias("对象类型", "对象类型"); this.winGridViewPager1.AddColumnAlias("所属道路", "所属道路"); this.winGridViewPager1.AddColumnAlias("使用状态", "使用状态"); - this.winGridViewPager1.DisplayColumns = "编号,标识器ID号,标识器型号,地面高程,标识器埋深,对象编号,对象类型,所属道路,使用状态"; + this.winGridViewPager1.DisplayColumns = "编号,标识器ID号,标识器型号,地面高程,标识器埋深,所属道路,使用状态"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 //隐藏右键功能按钮 //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[1].Visible = false; - //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[4].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[5].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[6].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[7].Visible = false; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[1].Text = "定位查看"; + //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[1].Text = "定位查看"; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "属性编辑"; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Text = "标识器报废"; + winGridViewPager1.AppendedMenu = this.contextMenuStrip1; + //右键菜单宽度 winGridViewPager1.dataGridView1.ContextMenuStrip.AutoSize = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Width = 150; @@ -153,7 +150,7 @@ } /// - /// 右键定位 + /// 对象查看 /// /// /// @@ -306,20 +303,10 @@ string sqlCount = "select count(*) from 标识器 where 使用状态 = '使用中'"; - string sqlData = "select 编号,标识器ID号,标识器型号,地面高程,标识器埋深,对象编号,对象类型,所属道路,LSSYS_ID,X坐标,Y坐标,使用状态 " + + string sqlData = "select 编号,标识器ID号,标识器型号,地面高程,标识器埋深,所属道路,LSSYS_ID,X坐标,Y坐标,使用状态 " + "from (select t.*,rownum row_num from 标识器 t where 使用状态 = '使用中' order by 编号)b " + " where 1=1"; - if (!String.IsNullOrEmpty(txt_no.Text.Trim())) - { - sqlCount += " and 编号 like '%" + txt_no.Text.Trim() + "%'"; - sqlData += " and 编号 like '%" + txt_no.Text.Trim() + "%'"; - } - if (null != combo_street.SelectedItem && !String.IsNullOrEmpty(combo_street.SelectedItem.ToString().Trim())) - { - sqlData += " and 所属道路='" + combo_street.SelectedItem.ToString().Trim() + "'"; - sqlCount += " and 所属道路='" + combo_street.SelectedItem.ToString().Trim() + "'"; - } rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -332,9 +319,8 @@ int maxPage = pageIndex * maxPageIndex; string sqlCount = "select count(*) from 标识器 where 使用状态 = '使用中'"; - string sqlData = "select 编号,标识器ID号,标识器型号,地面高程,标识器埋深,对象编号,对象类型,所属道路,LSSYS_ID,X坐标,Y坐标,使用状态 " + - "from (select t.*,rownum row_num from 标识器 t where 使用状态 = '使用中' order by 编号)b "+ - " where(b.row_num between " + minPage + " and " + maxPage + ")"; + string sqlData = "select 编号,标识器ID号,标识器型号,地面高程,标识器埋深,所属道路,LSSYS_ID,X坐标,Y坐标,使用状态 " + + "from (select t.*,rownum row_num from 标识器 t where 使用状态 = '使用中'"; if (!String.IsNullOrEmpty(txt_no.Text.Trim())) { @@ -347,6 +333,8 @@ sqlCount += " and 所属道路='" + combo_street.SelectedItem.ToString().Trim() + "'"; } + sqlData += " order by 编号)b " + + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; @@ -372,9 +360,10 @@ private void FrmFlagManagers_FormClosing(object sender, FormClosingEventArgs e) { IS_OPEN = false; - Thread downloadJob = new Thread(new ParameterizedThreadStart(doSave)); - downloadJob.IsBackground = true; - downloadJob.Start(e); + //Thread downloadJob = new Thread(new ParameterizedThreadStart(doSave)); + //downloadJob.IsBackground = true; + //downloadJob.Start(e); + globeControl1.Globe.Layers["标识器"].Save(); globeControl1.Globe.MemoryLayer.RemoveAllFeature(); foreach (GSOFeature f in Features) { @@ -480,10 +469,88 @@ if (null != globeControl1) { FrmAddSinMark frm = new FrmAddSinMark(globeControl1); - frm.ShowDialog(); + frm.Show(); } } + private void 标识对象ToolStripMenuItem_Click(object sender, EventArgs e) + { + if (winGridViewPager1 != null && winGridViewPager1.dataGridView1 != null) + { + DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; + try + { + this.Hide(); + string id = row.Cells["编号"].Value.ToString(); + FrmFlagDetail p = new FrmFlagDetail(globeControl1, id); + p.showParentForm += new FrmFlagDetail.Handle(showThisForm);//改变值的事件 + p.Show(); + } + catch (Exception ex) + { + MessageBox.Show("失败:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } + + private void showThisForm() + { + this.Show(); + } + + private void toolStripMenuItem2_Click(object sender, EventArgs e) + { + if (winGridViewPager1 != null && winGridViewPager1.dataGridView1 != null) + { + DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; + try + { + this.WindowState = FormWindowState.Minimized; + string id = row.Cells["LSSYS_ID"].Value.ToString(); + string flagno = row.Cells["编号"].Value.ToString(); + string flagstreet = row.Cells["所属道路"].Value.ToString(); + double x = Convert.ToDouble(row.Cells["X坐标"].Value); + double y = Convert.ToDouble(row.Cells["Y坐标"].Value); + GSOFeature flagFeature = globeControl1.Globe.Layers.GetLayerByCaption("标识器").GetFeatureByID(int.Parse(id)); + + string type = ""; + string pipe = ""; + string sql = "select t.标识器型号,t.对象编号 from 标识器 t where t.编号='" + flagno + "'"; + using (OracleDataReader reader = OracleUtils.ExecuteReader(OracleUtils.ConnectionString, CommandType.Text, sql)) + { + while (reader.Read()) + { + type = reader.GetString(0); + pipe = reader.GetString(1); + } + } + + GSOLabel label = new GSOLabel(); + label.Text = "标识器编号：" + flagno + "\r\n" + + "标识器类型:" + type + "\r\n" + + //"标识对象编号:" + pipe + "\r\n" + + "所属道路:" + flagstreet; + label.Style = new GSOLabelStyle(); + label.Style.TextStyle.FontSize = 18; + label.Style.TextStyle.ForeColor = Color.FromArgb(0, 0, 0, 255); + label.Style.Opaque = 0.8; //设置标注的透明度，取值区间是0-1 + label.Style.TracktionLineType = EnumTracktionLineType.Solid; + label.Style.TextStyle.FontHeight = 10; + label.Style.TextStyle.FontName = "黑体"; + label.Style.TractionLineEndPos = new GSOPoint2d(80, 60); + + flagFeature.Label = label; + Features.Add(flagFeature); + globeControl1.Globe.JumpToFeature(flagFeature, 20); + this.globeControl1.Refresh(); + + } + catch (Exception ex) + { + MessageBox.Show("标识器定位失败:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } } diff --git a/Cyberpipe.csproj b/Cyberpipe.csproj index fe600e5..501fd09 100644 --- a/Cyberpipe.csproj +++ b/Cyberpipe.csproj @@ -246,6 +246,12 @@ Form_TaskManager.cs + + Form + + + FrmFlagDetail.cs + Form @@ -1368,6 +1374,9 @@ Form_TaskManager.cs + + FrmFlagDetail.cs + FormDocumentManager.cs diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 537b4c3..1acf22a 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 7d5dd95..3f178cb 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -90,20 +90,20 @@ this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - - this.winGridViewPager1.AddColumnAlias("ACCIDENTTIME", "上报时间"); - this.winGridViewPager1.AddColumnAlias("DBID", "编号"); - this.winGridViewPager1.AddColumnAlias("DESCRIBE", "事件描述"); - this.winGridViewPager1.AddColumnAlias("LATITUDE", "纬度"); - this.winGridViewPager1.AddColumnAlias("LOCALE", "事件地点"); - this.winGridViewPager1.AddColumnAlias("LONGITUDE", "经度"); - this.winGridViewPager1.AddColumnAlias("PATROLERNAME", "上报人员"); - this.winGridViewPager1.AddColumnAlias("PATROLER_ID", "人员ID"); - this.winGridViewPager1.AddColumnAlias("TASK_ID", "任务编号"); - this.winGridViewPager1.AddColumnAlias("RESULT", "处理结果"); - this.winGridViewPager1.AddColumnAlias("STATE", "处理状态"); - this.winGridViewPager1.DisplayColumns = "ACCIDENTTIME,DESCRIBE,LOCALE,PATROLERNAME,TASK_ID,RESULT,STATE"; + this.winGridViewPager1.AddColumnAlias("上报时间", "上报时间"); + this.winGridViewPager1.AddColumnAlias("编号", "编号"); + this.winGridViewPager1.AddColumnAlias("事件描述", "事件描述"); + this.winGridViewPager1.AddColumnAlias("纬度", "纬度"); + this.winGridViewPager1.AddColumnAlias("事件地点", "事件地点"); + this.winGridViewPager1.AddColumnAlias("经度", "经度"); + this.winGridViewPager1.AddColumnAlias("上报人员", "上报人员"); + this.winGridViewPager1.AddColumnAlias("人员ID", "人员ID"); + this.winGridViewPager1.AddColumnAlias("任务编号", "任务编号"); + this.winGridViewPager1.AddColumnAlias("处理结果", "处理结果"); + this.winGridViewPager1.AddColumnAlias("处理状态", "处理状态"); + + this.winGridViewPager1.DisplayColumns = "上报时间,事件描述,事件地点,上报人员,任务编号,处理结果,处理状态"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -114,8 +114,8 @@ winGridViewPager1.dataGridView1.ContextMenuStrip.Items[5].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[6].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[7].Visible = false; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[1].Text = "查看位置"; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "结果编辑"; + winGridViewPager1.dataGridView1.ContextMenuStrip.Items[1].Text = "结果编辑"; + winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "查看位置"; //右键菜单宽度 winGridViewPager1.dataGridView1.ContextMenuStrip.AutoSize = false; @@ -160,13 +160,12 @@ this.WindowState = FormWindowState.Minimized; globeControl1.Globe.MemoryLayer.RemoveAllFeature(); this.WindowState = FormWindowState.Minimized; - double x = Convert.ToDouble(row.Cells["LONGITUDE"].Value); - double y = Convert.ToDouble(row.Cells["LATITUDE"].Value); - - string username = Convert.ToString(row.Cells["PATROLERNAME"].Value); - string Atime = Convert.ToString(row.Cells["ACCIDENTTIME"].Value); - string location = Convert.ToString(row.Cells["LOCALE"].Value); - string descp = Convert.ToString(row.Cells["DESCRIBE"].Value); + double x = Convert.ToDouble(row.Cells["经度"].Value); + double y = Convert.ToDouble(row.Cells["纬度"].Value); + string username = Convert.ToString(row.Cells["上报人员"].Value); + string Atime = Convert.ToString(row.Cells["上报时间"].Value); + string location = Convert.ToString(row.Cells["事件地点"].Value); + string descp = Convert.ToString(row.Cells["事件描述"].Value); /////////////////////////////////////// /*******设置飞行与创建模型******/ @@ -228,8 +227,8 @@ DataGridViewRow row = grid.SelectedRows[0]; try { - int dbId = Convert.ToInt32(row.Cells["DBID"].Value); - string result = Convert.ToString(row.Cells["RESULT"].Value); + int dbId = Convert.ToInt32(row.Cells["编号"].Value); + string result = Convert.ToString(row.Cells["处理结果"].Value); EMS_Forms.Form_EventResult form = new Form_EventResult(dbId, result); form.refresh += new Form_EventResult.Handle(LoadData);//改变值的事件 form.ShowDialog(); @@ -276,9 +275,9 @@ } for (int i = 0; i < table.Rows.Count; i++) { - if (winGridViewPager1.dataGridView1.Rows[i].Cells["RESULT"].Value != null && !(winGridViewPager1.dataGridView1.Rows[i].Cells["RESULT"].Value.ToString().Trim().Equals(""))) + if (winGridViewPager1.dataGridView1.Rows[i].Cells["处理结果"].Value != null && !(winGridViewPager1.dataGridView1.Rows[i].Cells["处理结果"].Value.ToString().Trim().Equals(""))) { - winGridViewPager1.dataGridView1.Rows[i].Cells["STATE"].Value = "已处理"; + winGridViewPager1.dataGridView1.Rows[i].Cells["处理状态"].Value = "已处理"; } } @@ -307,9 +306,9 @@ } for (int i = 0; i < table.Rows.Count; i++) { - if (winGridViewPager1.dataGridView1.Rows[i].Cells["RESULT"].Value != null && !(winGridViewPager1.dataGridView1.Rows[i].Cells["RESULT"].Value.ToString().Trim().Equals(""))) + if (winGridViewPager1.dataGridView1.Rows[i].Cells["处理结果"].Value != null && !(winGridViewPager1.dataGridView1.Rows[i].Cells["处理结果"].Value.ToString().Trim().Equals(""))) { - winGridViewPager1.dataGridView1.Rows[i].Cells["STATE"].Value = "已处理"; + winGridViewPager1.dataGridView1.Rows[i].Cells["处理状态"].Value = "已处理"; } } @@ -320,10 +319,12 @@ { string sqlCount = "select count(*) from ACCIDENT where 1=1"; - string sqlData = "select ACCIDENTTIME,DBID,DESCRIBE,LATITUDE,LOCALE,LONGITUDE,PATROLERNAME,PATROLER_ID,TASK_ID,RESULT,'' as STATE " + + string sqlData = "select ACCIDENTTIME as 上报时间,DBID as 编号,DESCRIBE as 事件描述,"+ + "LATITUDE as 纬度,LOCALE as 事件地点,LONGITUDE as 经度,PATROLERNAME 上报人员,"+ + "PATROLER_ID as 人员ID,TASK_ID as 任务编号,RESULT as 处理结果,'' as 处理状态 " + "from (select t.*,rownum row_num from ACCIDENT t order by DBID)b " + " where 1=1"; - + rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; @@ -340,9 +341,10 @@ string sqlCount = "select count(*) from ACCIDENT where 1=1"; - string sqlData = "select ACCIDENTTIME,DBID,DESCRIBE,LATITUDE,LOCALE,LONGITUDE,PATROLERNAME,PATROLER_ID,TASK_ID,RESULT,'' as STATE " + - "from (select t.*,rownum row_num from ACCIDENT t order by DBID)b " + - " where(b.row_num between " + minPage + " and " + maxPage + ")"; + string sqlData = "select ACCIDENTTIME as 上报时间,DBID as 编号,DESCRIBE as 事件描述," + + "LATITUDE as 纬度,LOCALE as 事件地点,LONGITUDE as 经度,PATROLERNAME 上报人员," + + "PATROLER_ID as 人员ID,TASK_ID as 任务编号,RESULT as 处理结果,'' as 处理状态 " + + "from (select t.*,rownum row_num from ACCIDENT t where 1=1"; if (!String.IsNullOrEmpty(comboBox_name.Text.Trim())) { @@ -361,7 +363,8 @@ sqlCount += "and ACCIDENTTIME<=to_date('" + time.ToShortDateString() + "','yyyy-MM-dd') "; sqlData += "and ACCIDENTTIME<=to_date('" + time.ToShortDateString() + "','yyyy-MM-dd') "; } - + sqlData += " order by DBID desc)b " + + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 225c8d7..8bd9e48 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -120,8 +120,8 @@ private void flyToTask(DataGridViewRow row, int taskState) { int dbID = 0; - dbID = Convert.ToInt32(row.Cells["DBID"].Value); - string userName = Convert.ToString(row.Cells["USERNAME"].Value); + dbID = Convert.ToInt32(row.Cells["任务编号"].Value); + string userName = Convert.ToString(row.Cells["任务执行人员"].Value); System.DateTime t = new DateTime(); try { @@ -392,15 +392,15 @@ //控制表格显示的列，以及每一列要显示的列名 this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - this.winGridViewPager1.AddColumnAlias("DBID", "任务编号"); - this.winGridViewPager1.AddColumnAlias("DEPLOYTIME", "创建时间"); - this.winGridViewPager1.AddColumnAlias("DESCIRPTION", "任务描述"); - this.winGridViewPager1.AddColumnAlias("FINISHTIME", "完成时间"); - this.winGridViewPager1.AddColumnAlias("STREET", "任务执行区域"); - this.winGridViewPager1.AddColumnAlias("TASKSTATE", "任务状态"); - this.winGridViewPager1.AddColumnAlias("USERNAME", "任务执行人员"); + this.winGridViewPager1.AddColumnAlias("任务编号", "任务编号"); + this.winGridViewPager1.AddColumnAlias("创建时间", "创建时间"); + this.winGridViewPager1.AddColumnAlias("任务描述", "任务描述"); + this.winGridViewPager1.AddColumnAlias("完成时间", "完成时间"); + this.winGridViewPager1.AddColumnAlias("任务执行区域", "任务执行区域"); + this.winGridViewPager1.AddColumnAlias("任务状态", "任务状态"); + this.winGridViewPager1.AddColumnAlias("任务执行人员", "任务执行人员"); - this.winGridViewPager1.DisplayColumns = "DBID,DEPLOYTIME,DESCIRPTION,FINISHTIME,STREET,TASKSTATE,USERNAME"; + this.winGridViewPager1.DisplayColumns = "任务编号,创建时间,任务描述,完成时间,任务执行区域,任务状态,任务执行人员"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -464,8 +464,8 @@ { int dbID = 0; int taskStateInt = 0; - dbID = Convert.ToInt32(row.Cells["DBID"].Value); - string taskState = row.Cells["TASKSTATE"].Value.ToString(); + dbID = Convert.ToInt32(row.Cells["任务编号"].Value); + string taskState = row.Cells["任务状态"].Value.ToString(); if (taskState.Equals("开始任务")) { taskStateInt = 1; @@ -534,9 +534,10 @@ private string GetSql() { - string sqlCount = "select count(*) from taskinfo t where 1=1'"; + string sqlCount = "select count(*) from taskinfo t where 1=1"; - string sqlData = "select dbid,deploytime,descirption,finishtime,street,taskstate,username " + + 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"; @@ -550,9 +551,9 @@ int minPage = (pageIndex - 1) * maxPageIndex + 1; int maxPage = pageIndex * maxPageIndex; string sqlCount = "select count(*) from taskinfo t where 1=1"; - string sqlData = "select dbid,deploytime,descirption,finishtime,street,taskstate,username " + - "from (select t.*,rownum row_num from taskinfo t order by DBID desc)b " + - " where(b.row_num between " + minPage + " and " + maxPage + ")"; + 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"; if (!String.IsNullOrEmpty(comboBox_userName.Text.Trim()) && !comboBox_userName.Text.Trim().Equals("不限")) { @@ -581,6 +582,8 @@ sqlCount += "and street='" + combo_street.Text + "' "; sqlData += "and street='" + combo_street.Text + "' "; } + sqlData += " order by DBID desc)b " + + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index e65a4bd..58f5342 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -73,13 +73,13 @@ //控制表格显示的列，以及每一列要显示的列名 this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - this.winGridViewPager1.AddColumnAlias("FILENAME", "文档名称"); - this.winGridViewPager1.AddColumnAlias("DBID", "编号"); - this.winGridViewPager1.AddColumnAlias("TITLE", "文档标题"); - this.winGridViewPager1.AddColumnAlias("FILETYPE", "文档类型"); - this.winGridViewPager1.AddColumnAlias("UPDAY", "上传日期"); - this.winGridViewPager1.AddColumnAlias("WRITER", "上传人"); - this.winGridViewPager1.DisplayColumns = "FILENAME,TITLE,FILETYPE,UPDAY,WRITER"; + this.winGridViewPager1.AddColumnAlias("文档名称", "文档名称"); + this.winGridViewPager1.AddColumnAlias("编号", "编号"); + this.winGridViewPager1.AddColumnAlias("文档标题", "文档标题"); + this.winGridViewPager1.AddColumnAlias("文档类型", "文档类型"); + this.winGridViewPager1.AddColumnAlias("上传日期", "上传日期"); + this.winGridViewPager1.AddColumnAlias("上传人", "上传人"); + this.winGridViewPager1.DisplayColumns = "文档名称,文档标题,文档类型,上传日期,上传人"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -167,7 +167,7 @@ if (grid != null) { DataGridViewRow row = grid.SelectedRows[0]; - string dbid = row.Cells["dbid"].Value.ToString(); + string dbid = row.Cells["编号"].Value.ToString(); try { if (MessageBox.Show("确认删除吗？", "确认", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) @@ -212,7 +212,8 @@ { string sqlCount = "select count(*) from casic_userdocument where sysname = 'EMS'"; - string sqlData = "select filename,dbid,title,filetype,upday,writer " + + string sqlData = "select filename as 文档名称,dbid as 编号,title as 文档标题," + + "filetype as 文档类型,upday as 上传日期,writer as 上传人 " + "from (select t.*,rownum row_num from casic_userdocument t order by DBID desc)b " + " where sysname = 'EMS'"; @@ -226,9 +227,9 @@ int minPage = (pageIndex - 1) * maxPageIndex + 1; int maxPage = pageIndex * maxPageIndex; string sqlCount = "select count(*) from casic_userdocument where sysname = 'EMS'"; - string sqlData = "select filename,dbid,title,filetype,upday,writer " + - "from (select t.*,rownum row_num from casic_userdocument t where sysname = 'EMS' order by DBID desc)b " + - " where(b.row_num between " + minPage + " and " + maxPage + ")"; + string sqlData = "select filename as 文档名称,dbid as 编号,title as 文档标题,"+ + "filetype as 文档类型,upday as 上传日期,writer as 上传人 " + + "from (select t.*,rownum row_num from casic_userdocument t where sysname = 'EMS'"; string txtTitleText = null; string comboFileType = null; @@ -278,7 +279,8 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - + sqlData += " order by DBID desc)b " + + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; @@ -437,7 +439,7 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - string filename = row.Cells["filename"].Value.ToString(); + string filename = row.Cells["文档名称"].Value.ToString(); string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; string file = System.Environment.CurrentDirectory + "\\download\\" + filename; int result = DownloadFile(url, file, progressBar1); @@ -515,7 +517,7 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - string filename = row.Cells["filename"].Value.ToString(); + string filename = row.Cells["文档名称"].Value.ToString(); string ext = Path.GetExtension(filename); SaveFileDialog dlg = new SaveFileDialog(); dlg.Filter = "保存文档|*" + ext + ";"; diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 1d1201b..3902629 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -748,6 +748,7 @@ this.Name = "FrmAddSinMark"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "单个标识器添加"; + this.TopMost = true; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmAddSinMark_FormClosing); this.Load += new System.EventHandler(this.FrmAddSinMark_Load); this.groupPanel1.ResumeLayout(false); diff --git a/FrmEquipmentManage.cs b/FrmEquipmentManage.cs index 90bfdb2..a3cf55c 100644 --- a/FrmEquipmentManage.cs +++ b/FrmEquipmentManage.cs @@ -74,13 +74,13 @@ //控制表格显示的列，以及每一列要显示的列名 this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - this.winGridViewPager1.AddColumnAlias("DESCIRPTION", "设备描述"); - this.winGridViewPager1.AddColumnAlias("DBID", "编号"); - this.winGridViewPager1.AddColumnAlias("MACID", "MAC地址"); - this.winGridViewPager1.AddColumnAlias("OWNER", "设备所有人"); - this.winGridViewPager1.AddColumnAlias("STATUS", "设备状态"); + this.winGridViewPager1.AddColumnAlias("设备描述", "设备描述"); + this.winGridViewPager1.AddColumnAlias("编号", "编号"); + this.winGridViewPager1.AddColumnAlias("MAC地址", "MAC地址"); + this.winGridViewPager1.AddColumnAlias("设备所有人", "设备所有人"); + this.winGridViewPager1.AddColumnAlias("设备状态", "设备状态"); - this.winGridViewPager1.DisplayColumns = "DESCIRPTION,MACID,OWNER,STATUS"; + this.winGridViewPager1.DisplayColumns = "设备描述,MAC地址,设备所有人,设备状态"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -146,10 +146,10 @@ DataGridViewRow row = grid.SelectedRows[0]; try { - long dbid = long.Parse(row.Cells["DBID"].Value.ToString()); - String macId = row.Cells["MACID"].Value.ToString(); - String username = row.Cells["OWNER"].Value.ToString(); - String descn = row.Cells["DESCIRPTION"].Value.ToString(); + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); + String macId = row.Cells["MAC地址"].Value.ToString(); + String username = row.Cells["设备所有人"].Value.ToString(); + String descn = row.Cells["设备状态"].Value.ToString(); FrmEquipmentEdit frm = new FrmEquipmentEdit(dbid.ToString(), macId, username, descn); frm.reloadGrid += new ReloadEquipmentGrid(LoadData); frm.ShowDialog(); @@ -179,7 +179,7 @@ { return; } - String macId = row.Cells["MACID"].Value.ToString(); + String macId = row.Cells["MAC地址"].Value.ToString(); FrmLog frm = new FrmLog(macId); frm.Show(); } @@ -201,7 +201,7 @@ if (grid != null) { DataGridViewRow row = grid.SelectedRows[0]; - long dbid = long.Parse(row.Cells["DBID"].Value.ToString()); + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); try { if (MessageBox.Show("确定删除？", "确认", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) @@ -243,7 +243,8 @@ { string sqlCount = "select count(*) from equipment where status = 'USING'"; - string sqlData = "select descirption,DBID,macid,owner,case when status = 'USING' then '可用' when status = 'DAMAGE' then '损坏' end as status " + + string sqlData = "select descirption as 设备描述,DBID as 编号,macid as MAC地址,owner as 设备所有人,"+ + "case when status = 'USING' then '可用' when status = 'DAMAGE' then '损坏' end as 设备状态 " + "from (select t.*,rownum row_num from equipment t where status = 'USING' order by dbid desc)b " + " where 1=1"; @@ -258,16 +259,17 @@ int maxPage = pageIndex * maxPageIndex; string sqlCount = "select count(*) from equipment where status = 'USING' "; - string sqlData = "select descirption,DBID,macid,owner,case when status = 'USING' then '可用' when status = 'DAMAGE' then '损坏' end as status " + - "from (select t.*,rownum row_num from equipment t where status = 'USING' order by DBID desc)b " + - " where(b.row_num between " + minPage + " and " + maxPage + ")"; + string sqlData = "select descirption as 设备描述,DBID as 编号,macid as MAC地址,owner as 设备所有人," + + "case when status = 'USING' then '可用' when status = 'DAMAGE' then '损坏' end as 设备状态 " + + "from (select t.*,rownum row_num from equipment t where status = 'USING'"; if (!String.IsNullOrEmpty(txtMacId.Text.Trim())) { sqlData += " and macid like '%" + txtMacId.Text.Trim() + "%'"; sqlCount += " and macid like '%" + txtMacId.Text.Trim() + "%'"; } - + sqlData += " order by DBID desc)b " + + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; @@ -299,76 +301,6 @@ } } - //public void reloadGrid(int pageIndex) - //{ - // if (pageIndex <= 0) - // { - // pageIndex = 1; - // currentpage = 1; - // } - // String sqlrows = "select * from (select rownum as rowno,dbid,descirption,macid,owner,case when status = 'USING' then '可用' when status = 'DAMAGE' then '损坏' end as status,'编辑' as btnEdit,'删除' as btnDel from equipment t where status = 'USING' "; - // string sqlcount = "select count(*) from equipment where status = 'USING' "; - // if (!String.IsNullOrEmpty(txtMacId.Text.Trim())) - // { - // sqlrows += " and macid like '%" + txtMacId.Text.Trim() + "%'"; - // sqlcount += " and macid like '%" + txtMacId.Text.Trim() + "%'"; - // } - // sqlrows += " and rownum<=" + (pagesize * pageIndex) + ") table_alias where table_alias.rowno>=" + ((pageIndex - 1) * pagesize + 1); - - // int rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlcount).ToString()); - // int pages = 0; - // if (rows % pagesize == 0) - // { - // pages = rows / pagesize; - // } - // else - // { - // pages = rows / pagesize + 1; - // } - - // lastpage = pages; - - // lab_page_msg.Text = "共" + rows + "条记录，每页" + pagesize + "条，第" + pageIndex + "页，共" + pages + "页"; - // combo_page_num.Items.Clear(); - // for (int i = 1; i <= pages; i++) - // { - // combo_page_num.Items.Add(new ComboBoxItem(i.ToString(), i.ToString())); - // } - - // if (lastpage == 1) - // { - // btn_page_first.Enabled = false; - // btn_page_pre.Enabled = false; - // btn_page_last.Enabled = false; - // btn_page_next.Enabled = false; - // } - // else if (currentpage == 1) - // { - // btn_page_first.Enabled = false; - // btn_page_pre.Enabled = false; - // btn_page_last.Enabled = true; - // btn_page_next.Enabled = true; - // } - // else if (currentpage == lastpage) - // { - // btn_page_first.Enabled = true; - // btn_page_pre.Enabled = true; - // btn_page_last.Enabled = false; - // btn_page_next.Enabled = false; - // } - // else - // { - // btn_page_first.Enabled = true; - // btn_page_pre.Enabled = true; - // btn_page_last.Enabled = true; - // btn_page_next.Enabled = true; - // } - - // DataTable table = OracleUtils.ExecuteDataset(OracleUtils.ConnectionString, CommandType.Text, sqlrows).Tables[0]; - // dataGridViewX1.DataSource = table; - - //} - private void FrmEquipmentManage_FormClosing(object sender, FormClosingEventArgs e) diff --git a/FrmFlagDetail.Designer.cs b/FrmFlagDetail.Designer.cs new file mode 100644 index 0000000..982bfc6 --- /dev/null +++ b/FrmFlagDetail.Designer.cs @@ -0,0 +1,103 @@ +namespace Cyberpipe +{ + partial class FrmFlagDetail + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); + this.dataGridViewX_markDetail = new DevComponents.DotNetBar.Controls.DataGridViewX(); + this.对象类型 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.对象编号 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.对象名称 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX_markDetail)).BeginInit(); + this.SuspendLayout(); + // + // dataGridViewX_markDetail + // + this.dataGridViewX_markDetail.AllowUserToAddRows = false; + this.dataGridViewX_markDetail.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; + this.dataGridViewX_markDetail.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dataGridViewX_markDetail.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.对象类型, + this.对象编号, + this.对象名称}); + dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle3.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dataGridViewX_markDetail.DefaultCellStyle = dataGridViewCellStyle3; + this.dataGridViewX_markDetail.Dock = System.Windows.Forms.DockStyle.Fill; + this.dataGridViewX_markDetail.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(170)))), ((int)(((byte)(170)))), ((int)(((byte)(170))))); + this.dataGridViewX_markDetail.Location = new System.Drawing.Point(0, 0); + this.dataGridViewX_markDetail.Name = "dataGridViewX_markDetail"; + this.dataGridViewX_markDetail.RowTemplate.Height = 23; + this.dataGridViewX_markDetail.Size = new System.Drawing.Size(508, 321); + this.dataGridViewX_markDetail.TabIndex = 0; + // + // 对象类型 + // + this.对象类型.HeaderText = "对象类型"; + this.对象类型.Name = "对象类型"; + // + // 对象编号 + // + this.对象编号.HeaderText = "对象编号"; + this.对象编号.Name = "对象编号"; + // + // 对象名称 + // + this.对象名称.HeaderText = "对象名称"; + this.对象名称.Name = "对象名称"; + // + // FrmFlagDetail + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(508, 321); + this.Controls.Add(this.dataGridViewX_markDetail); + this.Name = "FrmFlagDetail"; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; + this.Text = "标识对象信息"; + this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmFlagDetail_FormClosing); + this.Load += new System.EventHandler(this.FrmFlagDetail_Load); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX_markDetail)).EndInit(); + this.ResumeLayout(false); + + } + + #endregion + + private DevComponents.DotNetBar.Controls.DataGridViewX dataGridViewX_markDetail; + private System.Windows.Forms.DataGridViewTextBoxColumn 对象类型; + private System.Windows.Forms.DataGridViewTextBoxColumn 对象编号; + private System.Windows.Forms.DataGridViewTextBoxColumn 对象名称; + + } +} \ No newline at end of file diff --git a/FrmFlagDetail.cs b/FrmFlagDetail.cs new file mode 100644 index 0000000..81de974 --- /dev/null +++ b/FrmFlagDetail.cs @@ -0,0 +1,77 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Windows.Forms; +using GeoScene.Globe; +using System.Data.OracleClient; + +namespace Cyberpipe +{ + public partial class FrmFlagDetail : Form + { + DataTable dt = new DataTable(); + private GSOGlobeControl globeControl1; + + public delegate void Handle(); + public event Handle showParentForm; + String markId; + + public FrmFlagDetail(GSOGlobeControl globeControl1, String id) + { + InitializeComponent(); + this.markId = id; + } + + private void FrmFlagDetail_FormClosing(object sender, FormClosingEventArgs e) + { + showParentForm(); + } + + private void FrmFlagDetail_Load(object sender, EventArgs e) + { + string objectIds = ""; + string objectTypeCodes = ""; + string sql = "select t.对象编号,t.对象类型 from 标识器 t where t.编号='" + markId + "'"; + using (OracleDataReader reader = OracleUtils.ExecuteReader(OracleUtils.ConnectionString, CommandType.Text, sql)) + { + while (reader.Read()) + { + objectIds = reader.GetString(0); + objectTypeCodes = reader.GetString(1); + } + } + + string[] codeTypes = objectTypeCodes.Split(','); + string[] codeIds = objectIds.Split(','); + int length = 0; + if (codeTypes.Length <= codeIds.Length) + { + length = codeTypes.Length; + } + else + { + length = codeIds.Length; + } + for (int n = 0; n < length; n++) + { + for (int i = 0; i < Utility1.listPipelineType.Count; i++) + { + if (Utility1.listPipelineType[i].code == codeTypes[n]) + { + //string objectId = codeIds[i]; + //string objectType = Utility1.listPipelineType[i].type; + //string objectName = Utility1.listPipelineType[i].name; + int index = this.dataGridViewX_markDetail.Rows.Add(); + this.dataGridViewX_markDetail.Rows[index].Cells[0].Value = Utility1.listPipelineType[i].type; + this.dataGridViewX_markDetail.Rows[index].Cells[1].Value = codeIds[n].ToString(); + this.dataGridViewX_markDetail.Rows[index].Cells[2].Value = Utility1.listPipelineType[i].name; + } + } + } + } + } +} diff --git a/FrmFlagDetail.resx b/FrmFlagDetail.resx new file mode 100644 index 0000000..e98a8fe --- /dev/null +++ b/FrmFlagDetail.resx @@ -0,0 +1,129 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + True + + + True + + + True + + \ No newline at end of file diff --git a/FrmFlagManagers.Designer.cs b/FrmFlagManagers.Designer.cs index d7e2f60..9fe14fb 100644 --- a/FrmFlagManagers.Designer.cs +++ b/FrmFlagManagers.Designer.cs @@ -28,8 +28,10 @@ /// private void InitializeComponent() { - this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); - this.winGridViewPager1 = new WHC.Pager.WinControl.WinGridViewPager(); + this.components = new System.ComponentModel.Container(); + this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components); + this.标识对象ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripMenuItem2 = new System.Windows.Forms.ToolStripMenuItem(); this.bar1 = new DevComponents.DotNetBar.Bar(); this.labelItem1 = new DevComponents.DotNetBar.LabelItem(); this.txt_no = new DevComponents.DotNetBar.TextBoxItem(); @@ -38,45 +40,37 @@ this.btn_query = new DevComponents.DotNetBar.ButtonItem(); this.btn_add_batch = new DevComponents.DotNetBar.ButtonItem(); this.btn_add_menu = new DevComponents.DotNetBar.ButtonItem(); - this.btn_db = new DevComponents.DotNetBar.ButtonItem(); - this.tableLayoutPanel1.SuspendLayout(); + this.winGridViewPager1 = new WHC.Pager.WinControl.WinGridViewPager(); + this.contextMenuStrip1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.bar1)).BeginInit(); this.SuspendLayout(); // - // tableLayoutPanel1 + // contextMenuStrip1 // - this.tableLayoutPanel1.ColumnCount = 1; - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel1.Controls.Add(this.winGridViewPager1, 0, 1); - this.tableLayoutPanel1.Controls.Add(this.bar1, 0, 0); - this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 0); - this.tableLayoutPanel1.Name = "tableLayoutPanel1"; - this.tableLayoutPanel1.RowCount = 2; - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 32F)); - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel1.Size = new System.Drawing.Size(881, 474); - this.tableLayoutPanel1.TabIndex = 6; + this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.标识对象ToolStripMenuItem, + this.toolStripMenuItem2}); + this.contextMenuStrip1.Name = "contextMenuStrip1"; + this.contextMenuStrip1.Size = new System.Drawing.Size(125, 48); // - // winGridViewPager1 + // 标识对象ToolStripMenuItem // - this.winGridViewPager1.AppendedMenu = null; - this.winGridViewPager1.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; - this.winGridViewPager1.DataSource = null; - this.winGridViewPager1.DisplayColumns = ""; - this.winGridViewPager1.Dock = System.Windows.Forms.DockStyle.Fill; - this.winGridViewPager1.Location = new System.Drawing.Point(3, 35); - this.winGridViewPager1.MinimumSize = new System.Drawing.Size(540, 0); - this.winGridViewPager1.Name = "winGridViewPager1"; - this.winGridViewPager1.PrintTitle = ""; - this.winGridViewPager1.Size = new System.Drawing.Size(875, 436); - this.winGridViewPager1.TabIndex = 5; + this.标识对象ToolStripMenuItem.Name = "标识对象ToolStripMenuItem"; + this.标识对象ToolStripMenuItem.Size = new System.Drawing.Size(124, 22); + this.标识对象ToolStripMenuItem.Text = "标识对象"; + this.标识对象ToolStripMenuItem.Click += new System.EventHandler(this.标识对象ToolStripMenuItem_Click); + // + // toolStripMenuItem2 + // + this.toolStripMenuItem2.Name = "toolStripMenuItem2"; + this.toolStripMenuItem2.Size = new System.Drawing.Size(152, 22); + this.toolStripMenuItem2.Text = "查看位置"; + this.toolStripMenuItem2.Click += new System.EventHandler(this.toolStripMenuItem2_Click); // // bar1 // this.bar1.AntiAlias = true; this.bar1.Dock = System.Windows.Forms.DockStyle.Top; - this.bar1.DockSide = DevComponents.DotNetBar.eDockSide.Document; this.bar1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.labelItem1, this.txt_no, @@ -84,14 +78,13 @@ this.combo_street, this.btn_query, this.btn_add_batch, - this.btn_add_menu, - this.btn_db}); - this.bar1.Location = new System.Drawing.Point(3, 3); + this.btn_add_menu}); + this.bar1.Location = new System.Drawing.Point(0, 0); this.bar1.Name = "bar1"; - this.bar1.Size = new System.Drawing.Size(875, 28); + this.bar1.Size = new System.Drawing.Size(881, 28); this.bar1.Stretch = true; this.bar1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.bar1.TabIndex = 1; + this.bar1.TabIndex = 8; this.bar1.TabStop = false; this.bar1.Text = "bar1"; // @@ -136,24 +129,34 @@ this.btn_add_menu.Text = "手工添加"; this.btn_add_menu.Click += new System.EventHandler(this.btn_add_menu_Click); // - // btn_db + // winGridViewPager1 // - this.btn_db.Name = "btn_db"; - this.btn_db.Text = "数据导出"; + this.winGridViewPager1.AppendedMenu = null; + this.winGridViewPager1.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; + this.winGridViewPager1.DataSource = null; + this.winGridViewPager1.DisplayColumns = ""; + this.winGridViewPager1.Dock = System.Windows.Forms.DockStyle.Fill; + this.winGridViewPager1.Location = new System.Drawing.Point(0, 28); + this.winGridViewPager1.MinimumSize = new System.Drawing.Size(540, 0); + this.winGridViewPager1.Name = "winGridViewPager1"; + this.winGridViewPager1.PrintTitle = ""; + this.winGridViewPager1.Size = new System.Drawing.Size(881, 446); + this.winGridViewPager1.TabIndex = 9; // // FrmFlagManagers // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(881, 474); - this.Controls.Add(this.tableLayoutPanel1); + this.Controls.Add(this.winGridViewPager1); + this.Controls.Add(this.bar1); this.DoubleBuffered = true; this.Name = "FrmFlagManagers"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "标识器管理"; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmFlagManagers_FormClosing); this.Load += new System.EventHandler(this.FrmFlagManagers_Load); - this.tableLayoutPanel1.ResumeLayout(false); + this.contextMenuStrip1.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.bar1)).EndInit(); this.ResumeLayout(false); @@ -161,8 +164,8 @@ #endregion - private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1; - private WHC.Pager.WinControl.WinGridViewPager winGridViewPager1; + private System.Windows.Forms.ContextMenuStrip contextMenuStrip1; + private System.Windows.Forms.ToolStripMenuItem 标识对象ToolStripMenuItem; private DevComponents.DotNetBar.Bar bar1; private DevComponents.DotNetBar.LabelItem labelItem1; private DevComponents.DotNetBar.TextBoxItem txt_no; @@ -171,6 +174,7 @@ private DevComponents.DotNetBar.ButtonItem btn_query; private DevComponents.DotNetBar.ButtonItem btn_add_batch; private DevComponents.DotNetBar.ButtonItem btn_add_menu; - private DevComponents.DotNetBar.ButtonItem btn_db; + private WHC.Pager.WinControl.WinGridViewPager winGridViewPager1; + private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem2; } } \ No newline at end of file diff --git a/FrmFlagManagers.cs b/FrmFlagManagers.cs index 38d4927..9bf9734 100644 --- a/FrmFlagManagers.cs +++ b/FrmFlagManagers.cs @@ -33,15 +33,13 @@ { this.globeControl1 = _globeControl1; InitializeComponent(); - winGridViewPager1.OnPageChanged += new EventHandler(winGridViewPager1_OnPageChanged); - this.winGridViewPager1.OnAddNew += new EventHandler(winGridViewPager1_OnAddNew); //右键定位 + winGridViewPager1.OnPageChanged += new EventHandler(winGridViewPager1_OnPageChanged); this.winGridViewPager1.OnEditSelected += new EventHandler(winGridViewPager1_OnEditSelected);//属性编辑 this.winGridViewPager1.OnDeleteSelected += new EventHandler(winGridViewPager1_OnDeleteSelected);//标识器报废 + this.winGridViewPager1.OnStartExport += new EventHandler(pager1_OnStartExport); this.winGridViewPager1.OnEndExport += new EventHandler(pager1_OnEndExport); - //this.winGridViewPager1.ExportCurrent += new ExportCurrentEventHandler(pager1_ExportCurrent); - //this.winGridViewPager1.ExportAll += new ExportAllEventHandler(pager1_ExportAll); winGridViewPager1.dataGridView1.MultiSelect = false; @@ -76,26 +74,25 @@ this.winGridViewPager1.AddColumnAlias("标识器型号", "标识器型号"); this.winGridViewPager1.AddColumnAlias("地面高程", "地面高程"); this.winGridViewPager1.AddColumnAlias("标识器埋深", "标识器埋深"); - this.winGridViewPager1.AddColumnAlias("对象编号", "对象编号"); - this.winGridViewPager1.AddColumnAlias("对象类型", "对象类型"); this.winGridViewPager1.AddColumnAlias("所属道路", "所属道路"); this.winGridViewPager1.AddColumnAlias("使用状态", "使用状态"); - this.winGridViewPager1.DisplayColumns = "编号,标识器ID号,标识器型号,地面高程,标识器埋深,对象编号,对象类型,所属道路,使用状态"; + this.winGridViewPager1.DisplayColumns = "编号,标识器ID号,标识器型号,地面高程,标识器埋深,所属道路,使用状态"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 //隐藏右键功能按钮 //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[1].Visible = false; - //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[4].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[5].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[6].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[7].Visible = false; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[1].Text = "定位查看"; + //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[1].Text = "定位查看"; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "属性编辑"; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Text = "标识器报废"; + winGridViewPager1.AppendedMenu = this.contextMenuStrip1; + //右键菜单宽度 winGridViewPager1.dataGridView1.ContextMenuStrip.AutoSize = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Width = 150; @@ -153,7 +150,7 @@ } /// - /// 右键定位 + /// 对象查看 /// /// /// @@ -306,20 +303,10 @@ string sqlCount = "select count(*) from 标识器 where 使用状态 = '使用中'"; - string sqlData = "select 编号,标识器ID号,标识器型号,地面高程,标识器埋深,对象编号,对象类型,所属道路,LSSYS_ID,X坐标,Y坐标,使用状态 " + + string sqlData = "select 编号,标识器ID号,标识器型号,地面高程,标识器埋深,所属道路,LSSYS_ID,X坐标,Y坐标,使用状态 " + "from (select t.*,rownum row_num from 标识器 t where 使用状态 = '使用中' order by 编号)b " + " where 1=1"; - if (!String.IsNullOrEmpty(txt_no.Text.Trim())) - { - sqlCount += " and 编号 like '%" + txt_no.Text.Trim() + "%'"; - sqlData += " and 编号 like '%" + txt_no.Text.Trim() + "%'"; - } - if (null != combo_street.SelectedItem && !String.IsNullOrEmpty(combo_street.SelectedItem.ToString().Trim())) - { - sqlData += " and 所属道路='" + combo_street.SelectedItem.ToString().Trim() + "'"; - sqlCount += " and 所属道路='" + combo_street.SelectedItem.ToString().Trim() + "'"; - } rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -332,9 +319,8 @@ int maxPage = pageIndex * maxPageIndex; string sqlCount = "select count(*) from 标识器 where 使用状态 = '使用中'"; - string sqlData = "select 编号,标识器ID号,标识器型号,地面高程,标识器埋深,对象编号,对象类型,所属道路,LSSYS_ID,X坐标,Y坐标,使用状态 " + - "from (select t.*,rownum row_num from 标识器 t where 使用状态 = '使用中' order by 编号)b "+ - " where(b.row_num between " + minPage + " and " + maxPage + ")"; + string sqlData = "select 编号,标识器ID号,标识器型号,地面高程,标识器埋深,所属道路,LSSYS_ID,X坐标,Y坐标,使用状态 " + + "from (select t.*,rownum row_num from 标识器 t where 使用状态 = '使用中'"; if (!String.IsNullOrEmpty(txt_no.Text.Trim())) { @@ -347,6 +333,8 @@ sqlCount += " and 所属道路='" + combo_street.SelectedItem.ToString().Trim() + "'"; } + sqlData += " order by 编号)b " + + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; @@ -372,9 +360,10 @@ private void FrmFlagManagers_FormClosing(object sender, FormClosingEventArgs e) { IS_OPEN = false; - Thread downloadJob = new Thread(new ParameterizedThreadStart(doSave)); - downloadJob.IsBackground = true; - downloadJob.Start(e); + //Thread downloadJob = new Thread(new ParameterizedThreadStart(doSave)); + //downloadJob.IsBackground = true; + //downloadJob.Start(e); + globeControl1.Globe.Layers["标识器"].Save(); globeControl1.Globe.MemoryLayer.RemoveAllFeature(); foreach (GSOFeature f in Features) { @@ -480,10 +469,88 @@ if (null != globeControl1) { FrmAddSinMark frm = new FrmAddSinMark(globeControl1); - frm.ShowDialog(); + frm.Show(); } } + private void 标识对象ToolStripMenuItem_Click(object sender, EventArgs e) + { + if (winGridViewPager1 != null && winGridViewPager1.dataGridView1 != null) + { + DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; + try + { + this.Hide(); + string id = row.Cells["编号"].Value.ToString(); + FrmFlagDetail p = new FrmFlagDetail(globeControl1, id); + p.showParentForm += new FrmFlagDetail.Handle(showThisForm);//改变值的事件 + p.Show(); + } + catch (Exception ex) + { + MessageBox.Show("失败:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } + + private void showThisForm() + { + this.Show(); + } + + private void toolStripMenuItem2_Click(object sender, EventArgs e) + { + if (winGridViewPager1 != null && winGridViewPager1.dataGridView1 != null) + { + DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; + try + { + this.WindowState = FormWindowState.Minimized; + string id = row.Cells["LSSYS_ID"].Value.ToString(); + string flagno = row.Cells["编号"].Value.ToString(); + string flagstreet = row.Cells["所属道路"].Value.ToString(); + double x = Convert.ToDouble(row.Cells["X坐标"].Value); + double y = Convert.ToDouble(row.Cells["Y坐标"].Value); + GSOFeature flagFeature = globeControl1.Globe.Layers.GetLayerByCaption("标识器").GetFeatureByID(int.Parse(id)); + + string type = ""; + string pipe = ""; + string sql = "select t.标识器型号,t.对象编号 from 标识器 t where t.编号='" + flagno + "'"; + using (OracleDataReader reader = OracleUtils.ExecuteReader(OracleUtils.ConnectionString, CommandType.Text, sql)) + { + while (reader.Read()) + { + type = reader.GetString(0); + pipe = reader.GetString(1); + } + } + + GSOLabel label = new GSOLabel(); + label.Text = "标识器编号：" + flagno + "\r\n" + + "标识器类型:" + type + "\r\n" + + //"标识对象编号:" + pipe + "\r\n" + + "所属道路:" + flagstreet; + label.Style = new GSOLabelStyle(); + label.Style.TextStyle.FontSize = 18; + label.Style.TextStyle.ForeColor = Color.FromArgb(0, 0, 0, 255); + label.Style.Opaque = 0.8; //设置标注的透明度，取值区间是0-1 + label.Style.TracktionLineType = EnumTracktionLineType.Solid; + label.Style.TextStyle.FontHeight = 10; + label.Style.TextStyle.FontName = "黑体"; + label.Style.TractionLineEndPos = new GSOPoint2d(80, 60); + + flagFeature.Label = label; + Features.Add(flagFeature); + globeControl1.Globe.JumpToFeature(flagFeature, 20); + this.globeControl1.Refresh(); + + } + catch (Exception ex) + { + MessageBox.Show("标识器定位失败:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } } diff --git a/FrmFlagManagers.resx b/FrmFlagManagers.resx index 1af7de1..ad53752 100644 --- a/FrmFlagManagers.resx +++ b/FrmFlagManagers.resx @@ -117,4 +117,7 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 17, 17 + \ No newline at end of file diff --git a/Cyberpipe.csproj b/Cyberpipe.csproj index fe600e5..501fd09 100644 --- a/Cyberpipe.csproj +++ b/Cyberpipe.csproj @@ -246,6 +246,12 @@ Form_TaskManager.cs + + Form + + + FrmFlagDetail.cs + Form @@ -1368,6 +1374,9 @@ Form_TaskManager.cs + + FrmFlagDetail.cs + FormDocumentManager.cs diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 537b4c3..1acf22a 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 7d5dd95..3f178cb 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -90,20 +90,20 @@ this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - - this.winGridViewPager1.AddColumnAlias("ACCIDENTTIME", "上报时间"); - this.winGridViewPager1.AddColumnAlias("DBID", "编号"); - this.winGridViewPager1.AddColumnAlias("DESCRIBE", "事件描述"); - this.winGridViewPager1.AddColumnAlias("LATITUDE", "纬度"); - this.winGridViewPager1.AddColumnAlias("LOCALE", "事件地点"); - this.winGridViewPager1.AddColumnAlias("LONGITUDE", "经度"); - this.winGridViewPager1.AddColumnAlias("PATROLERNAME", "上报人员"); - this.winGridViewPager1.AddColumnAlias("PATROLER_ID", "人员ID"); - this.winGridViewPager1.AddColumnAlias("TASK_ID", "任务编号"); - this.winGridViewPager1.AddColumnAlias("RESULT", "处理结果"); - this.winGridViewPager1.AddColumnAlias("STATE", "处理状态"); - this.winGridViewPager1.DisplayColumns = "ACCIDENTTIME,DESCRIBE,LOCALE,PATROLERNAME,TASK_ID,RESULT,STATE"; + this.winGridViewPager1.AddColumnAlias("上报时间", "上报时间"); + this.winGridViewPager1.AddColumnAlias("编号", "编号"); + this.winGridViewPager1.AddColumnAlias("事件描述", "事件描述"); + this.winGridViewPager1.AddColumnAlias("纬度", "纬度"); + this.winGridViewPager1.AddColumnAlias("事件地点", "事件地点"); + this.winGridViewPager1.AddColumnAlias("经度", "经度"); + this.winGridViewPager1.AddColumnAlias("上报人员", "上报人员"); + this.winGridViewPager1.AddColumnAlias("人员ID", "人员ID"); + this.winGridViewPager1.AddColumnAlias("任务编号", "任务编号"); + this.winGridViewPager1.AddColumnAlias("处理结果", "处理结果"); + this.winGridViewPager1.AddColumnAlias("处理状态", "处理状态"); + + this.winGridViewPager1.DisplayColumns = "上报时间,事件描述,事件地点,上报人员,任务编号,处理结果,处理状态"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -114,8 +114,8 @@ winGridViewPager1.dataGridView1.ContextMenuStrip.Items[5].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[6].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[7].Visible = false; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[1].Text = "查看位置"; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "结果编辑"; + winGridViewPager1.dataGridView1.ContextMenuStrip.Items[1].Text = "结果编辑"; + winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "查看位置"; //右键菜单宽度 winGridViewPager1.dataGridView1.ContextMenuStrip.AutoSize = false; @@ -160,13 +160,12 @@ this.WindowState = FormWindowState.Minimized; globeControl1.Globe.MemoryLayer.RemoveAllFeature(); this.WindowState = FormWindowState.Minimized; - double x = Convert.ToDouble(row.Cells["LONGITUDE"].Value); - double y = Convert.ToDouble(row.Cells["LATITUDE"].Value); - - string username = Convert.ToString(row.Cells["PATROLERNAME"].Value); - string Atime = Convert.ToString(row.Cells["ACCIDENTTIME"].Value); - string location = Convert.ToString(row.Cells["LOCALE"].Value); - string descp = Convert.ToString(row.Cells["DESCRIBE"].Value); + double x = Convert.ToDouble(row.Cells["经度"].Value); + double y = Convert.ToDouble(row.Cells["纬度"].Value); + string username = Convert.ToString(row.Cells["上报人员"].Value); + string Atime = Convert.ToString(row.Cells["上报时间"].Value); + string location = Convert.ToString(row.Cells["事件地点"].Value); + string descp = Convert.ToString(row.Cells["事件描述"].Value); /////////////////////////////////////// /*******设置飞行与创建模型******/ @@ -228,8 +227,8 @@ DataGridViewRow row = grid.SelectedRows[0]; try { - int dbId = Convert.ToInt32(row.Cells["DBID"].Value); - string result = Convert.ToString(row.Cells["RESULT"].Value); + int dbId = Convert.ToInt32(row.Cells["编号"].Value); + string result = Convert.ToString(row.Cells["处理结果"].Value); EMS_Forms.Form_EventResult form = new Form_EventResult(dbId, result); form.refresh += new Form_EventResult.Handle(LoadData);//改变值的事件 form.ShowDialog(); @@ -276,9 +275,9 @@ } for (int i = 0; i < table.Rows.Count; i++) { - if (winGridViewPager1.dataGridView1.Rows[i].Cells["RESULT"].Value != null && !(winGridViewPager1.dataGridView1.Rows[i].Cells["RESULT"].Value.ToString().Trim().Equals(""))) + if (winGridViewPager1.dataGridView1.Rows[i].Cells["处理结果"].Value != null && !(winGridViewPager1.dataGridView1.Rows[i].Cells["处理结果"].Value.ToString().Trim().Equals(""))) { - winGridViewPager1.dataGridView1.Rows[i].Cells["STATE"].Value = "已处理"; + winGridViewPager1.dataGridView1.Rows[i].Cells["处理状态"].Value = "已处理"; } } @@ -307,9 +306,9 @@ } for (int i = 0; i < table.Rows.Count; i++) { - if (winGridViewPager1.dataGridView1.Rows[i].Cells["RESULT"].Value != null && !(winGridViewPager1.dataGridView1.Rows[i].Cells["RESULT"].Value.ToString().Trim().Equals(""))) + if (winGridViewPager1.dataGridView1.Rows[i].Cells["处理结果"].Value != null && !(winGridViewPager1.dataGridView1.Rows[i].Cells["处理结果"].Value.ToString().Trim().Equals(""))) { - winGridViewPager1.dataGridView1.Rows[i].Cells["STATE"].Value = "已处理"; + winGridViewPager1.dataGridView1.Rows[i].Cells["处理状态"].Value = "已处理"; } } @@ -320,10 +319,12 @@ { string sqlCount = "select count(*) from ACCIDENT where 1=1"; - string sqlData = "select ACCIDENTTIME,DBID,DESCRIBE,LATITUDE,LOCALE,LONGITUDE,PATROLERNAME,PATROLER_ID,TASK_ID,RESULT,'' as STATE " + + string sqlData = "select ACCIDENTTIME as 上报时间,DBID as 编号,DESCRIBE as 事件描述,"+ + "LATITUDE as 纬度,LOCALE as 事件地点,LONGITUDE as 经度,PATROLERNAME 上报人员,"+ + "PATROLER_ID as 人员ID,TASK_ID as 任务编号,RESULT as 处理结果,'' as 处理状态 " + "from (select t.*,rownum row_num from ACCIDENT t order by DBID)b " + " where 1=1"; - + rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; @@ -340,9 +341,10 @@ string sqlCount = "select count(*) from ACCIDENT where 1=1"; - string sqlData = "select ACCIDENTTIME,DBID,DESCRIBE,LATITUDE,LOCALE,LONGITUDE,PATROLERNAME,PATROLER_ID,TASK_ID,RESULT,'' as STATE " + - "from (select t.*,rownum row_num from ACCIDENT t order by DBID)b " + - " where(b.row_num between " + minPage + " and " + maxPage + ")"; + string sqlData = "select ACCIDENTTIME as 上报时间,DBID as 编号,DESCRIBE as 事件描述," + + "LATITUDE as 纬度,LOCALE as 事件地点,LONGITUDE as 经度,PATROLERNAME 上报人员," + + "PATROLER_ID as 人员ID,TASK_ID as 任务编号,RESULT as 处理结果,'' as 处理状态 " + + "from (select t.*,rownum row_num from ACCIDENT t where 1=1"; if (!String.IsNullOrEmpty(comboBox_name.Text.Trim())) { @@ -361,7 +363,8 @@ sqlCount += "and ACCIDENTTIME<=to_date('" + time.ToShortDateString() + "','yyyy-MM-dd') "; sqlData += "and ACCIDENTTIME<=to_date('" + time.ToShortDateString() + "','yyyy-MM-dd') "; } - + sqlData += " order by DBID desc)b " + + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 225c8d7..8bd9e48 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -120,8 +120,8 @@ private void flyToTask(DataGridViewRow row, int taskState) { int dbID = 0; - dbID = Convert.ToInt32(row.Cells["DBID"].Value); - string userName = Convert.ToString(row.Cells["USERNAME"].Value); + dbID = Convert.ToInt32(row.Cells["任务编号"].Value); + string userName = Convert.ToString(row.Cells["任务执行人员"].Value); System.DateTime t = new DateTime(); try { @@ -392,15 +392,15 @@ //控制表格显示的列，以及每一列要显示的列名 this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - this.winGridViewPager1.AddColumnAlias("DBID", "任务编号"); - this.winGridViewPager1.AddColumnAlias("DEPLOYTIME", "创建时间"); - this.winGridViewPager1.AddColumnAlias("DESCIRPTION", "任务描述"); - this.winGridViewPager1.AddColumnAlias("FINISHTIME", "完成时间"); - this.winGridViewPager1.AddColumnAlias("STREET", "任务执行区域"); - this.winGridViewPager1.AddColumnAlias("TASKSTATE", "任务状态"); - this.winGridViewPager1.AddColumnAlias("USERNAME", "任务执行人员"); + this.winGridViewPager1.AddColumnAlias("任务编号", "任务编号"); + this.winGridViewPager1.AddColumnAlias("创建时间", "创建时间"); + this.winGridViewPager1.AddColumnAlias("任务描述", "任务描述"); + this.winGridViewPager1.AddColumnAlias("完成时间", "完成时间"); + this.winGridViewPager1.AddColumnAlias("任务执行区域", "任务执行区域"); + this.winGridViewPager1.AddColumnAlias("任务状态", "任务状态"); + this.winGridViewPager1.AddColumnAlias("任务执行人员", "任务执行人员"); - this.winGridViewPager1.DisplayColumns = "DBID,DEPLOYTIME,DESCIRPTION,FINISHTIME,STREET,TASKSTATE,USERNAME"; + this.winGridViewPager1.DisplayColumns = "任务编号,创建时间,任务描述,完成时间,任务执行区域,任务状态,任务执行人员"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -464,8 +464,8 @@ { int dbID = 0; int taskStateInt = 0; - dbID = Convert.ToInt32(row.Cells["DBID"].Value); - string taskState = row.Cells["TASKSTATE"].Value.ToString(); + dbID = Convert.ToInt32(row.Cells["任务编号"].Value); + string taskState = row.Cells["任务状态"].Value.ToString(); if (taskState.Equals("开始任务")) { taskStateInt = 1; @@ -534,9 +534,10 @@ private string GetSql() { - string sqlCount = "select count(*) from taskinfo t where 1=1'"; + string sqlCount = "select count(*) from taskinfo t where 1=1"; - string sqlData = "select dbid,deploytime,descirption,finishtime,street,taskstate,username " + + 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"; @@ -550,9 +551,9 @@ int minPage = (pageIndex - 1) * maxPageIndex + 1; int maxPage = pageIndex * maxPageIndex; string sqlCount = "select count(*) from taskinfo t where 1=1"; - string sqlData = "select dbid,deploytime,descirption,finishtime,street,taskstate,username " + - "from (select t.*,rownum row_num from taskinfo t order by DBID desc)b " + - " where(b.row_num between " + minPage + " and " + maxPage + ")"; + 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"; if (!String.IsNullOrEmpty(comboBox_userName.Text.Trim()) && !comboBox_userName.Text.Trim().Equals("不限")) { @@ -581,6 +582,8 @@ sqlCount += "and street='" + combo_street.Text + "' "; sqlData += "and street='" + combo_street.Text + "' "; } + sqlData += " order by DBID desc)b " + + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index e65a4bd..58f5342 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -73,13 +73,13 @@ //控制表格显示的列，以及每一列要显示的列名 this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - this.winGridViewPager1.AddColumnAlias("FILENAME", "文档名称"); - this.winGridViewPager1.AddColumnAlias("DBID", "编号"); - this.winGridViewPager1.AddColumnAlias("TITLE", "文档标题"); - this.winGridViewPager1.AddColumnAlias("FILETYPE", "文档类型"); - this.winGridViewPager1.AddColumnAlias("UPDAY", "上传日期"); - this.winGridViewPager1.AddColumnAlias("WRITER", "上传人"); - this.winGridViewPager1.DisplayColumns = "FILENAME,TITLE,FILETYPE,UPDAY,WRITER"; + this.winGridViewPager1.AddColumnAlias("文档名称", "文档名称"); + this.winGridViewPager1.AddColumnAlias("编号", "编号"); + this.winGridViewPager1.AddColumnAlias("文档标题", "文档标题"); + this.winGridViewPager1.AddColumnAlias("文档类型", "文档类型"); + this.winGridViewPager1.AddColumnAlias("上传日期", "上传日期"); + this.winGridViewPager1.AddColumnAlias("上传人", "上传人"); + this.winGridViewPager1.DisplayColumns = "文档名称,文档标题,文档类型,上传日期,上传人"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -167,7 +167,7 @@ if (grid != null) { DataGridViewRow row = grid.SelectedRows[0]; - string dbid = row.Cells["dbid"].Value.ToString(); + string dbid = row.Cells["编号"].Value.ToString(); try { if (MessageBox.Show("确认删除吗？", "确认", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) @@ -212,7 +212,8 @@ { string sqlCount = "select count(*) from casic_userdocument where sysname = 'EMS'"; - string sqlData = "select filename,dbid,title,filetype,upday,writer " + + string sqlData = "select filename as 文档名称,dbid as 编号,title as 文档标题," + + "filetype as 文档类型,upday as 上传日期,writer as 上传人 " + "from (select t.*,rownum row_num from casic_userdocument t order by DBID desc)b " + " where sysname = 'EMS'"; @@ -226,9 +227,9 @@ int minPage = (pageIndex - 1) * maxPageIndex + 1; int maxPage = pageIndex * maxPageIndex; string sqlCount = "select count(*) from casic_userdocument where sysname = 'EMS'"; - string sqlData = "select filename,dbid,title,filetype,upday,writer " + - "from (select t.*,rownum row_num from casic_userdocument t where sysname = 'EMS' order by DBID desc)b " + - " where(b.row_num between " + minPage + " and " + maxPage + ")"; + string sqlData = "select filename as 文档名称,dbid as 编号,title as 文档标题,"+ + "filetype as 文档类型,upday as 上传日期,writer as 上传人 " + + "from (select t.*,rownum row_num from casic_userdocument t where sysname = 'EMS'"; string txtTitleText = null; string comboFileType = null; @@ -278,7 +279,8 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - + sqlData += " order by DBID desc)b " + + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; @@ -437,7 +439,7 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - string filename = row.Cells["filename"].Value.ToString(); + string filename = row.Cells["文档名称"].Value.ToString(); string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; string file = System.Environment.CurrentDirectory + "\\download\\" + filename; int result = DownloadFile(url, file, progressBar1); @@ -515,7 +517,7 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - string filename = row.Cells["filename"].Value.ToString(); + string filename = row.Cells["文档名称"].Value.ToString(); string ext = Path.GetExtension(filename); SaveFileDialog dlg = new SaveFileDialog(); dlg.Filter = "保存文档|*" + ext + ";"; diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 1d1201b..3902629 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -748,6 +748,7 @@ this.Name = "FrmAddSinMark"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "单个标识器添加"; + this.TopMost = true; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmAddSinMark_FormClosing); this.Load += new System.EventHandler(this.FrmAddSinMark_Load); this.groupPanel1.ResumeLayout(false); diff --git a/FrmEquipmentManage.cs b/FrmEquipmentManage.cs index 90bfdb2..a3cf55c 100644 --- a/FrmEquipmentManage.cs +++ b/FrmEquipmentManage.cs @@ -74,13 +74,13 @@ //控制表格显示的列，以及每一列要显示的列名 this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - this.winGridViewPager1.AddColumnAlias("DESCIRPTION", "设备描述"); - this.winGridViewPager1.AddColumnAlias("DBID", "编号"); - this.winGridViewPager1.AddColumnAlias("MACID", "MAC地址"); - this.winGridViewPager1.AddColumnAlias("OWNER", "设备所有人"); - this.winGridViewPager1.AddColumnAlias("STATUS", "设备状态"); + this.winGridViewPager1.AddColumnAlias("设备描述", "设备描述"); + this.winGridViewPager1.AddColumnAlias("编号", "编号"); + this.winGridViewPager1.AddColumnAlias("MAC地址", "MAC地址"); + this.winGridViewPager1.AddColumnAlias("设备所有人", "设备所有人"); + this.winGridViewPager1.AddColumnAlias("设备状态", "设备状态"); - this.winGridViewPager1.DisplayColumns = "DESCIRPTION,MACID,OWNER,STATUS"; + this.winGridViewPager1.DisplayColumns = "设备描述,MAC地址,设备所有人,设备状态"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -146,10 +146,10 @@ DataGridViewRow row = grid.SelectedRows[0]; try { - long dbid = long.Parse(row.Cells["DBID"].Value.ToString()); - String macId = row.Cells["MACID"].Value.ToString(); - String username = row.Cells["OWNER"].Value.ToString(); - String descn = row.Cells["DESCIRPTION"].Value.ToString(); + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); + String macId = row.Cells["MAC地址"].Value.ToString(); + String username = row.Cells["设备所有人"].Value.ToString(); + String descn = row.Cells["设备状态"].Value.ToString(); FrmEquipmentEdit frm = new FrmEquipmentEdit(dbid.ToString(), macId, username, descn); frm.reloadGrid += new ReloadEquipmentGrid(LoadData); frm.ShowDialog(); @@ -179,7 +179,7 @@ { return; } - String macId = row.Cells["MACID"].Value.ToString(); + String macId = row.Cells["MAC地址"].Value.ToString(); FrmLog frm = new FrmLog(macId); frm.Show(); } @@ -201,7 +201,7 @@ if (grid != null) { DataGridViewRow row = grid.SelectedRows[0]; - long dbid = long.Parse(row.Cells["DBID"].Value.ToString()); + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); try { if (MessageBox.Show("确定删除？", "确认", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) @@ -243,7 +243,8 @@ { string sqlCount = "select count(*) from equipment where status = 'USING'"; - string sqlData = "select descirption,DBID,macid,owner,case when status = 'USING' then '可用' when status = 'DAMAGE' then '损坏' end as status " + + string sqlData = "select descirption as 设备描述,DBID as 编号,macid as MAC地址,owner as 设备所有人,"+ + "case when status = 'USING' then '可用' when status = 'DAMAGE' then '损坏' end as 设备状态 " + "from (select t.*,rownum row_num from equipment t where status = 'USING' order by dbid desc)b " + " where 1=1"; @@ -258,16 +259,17 @@ int maxPage = pageIndex * maxPageIndex; string sqlCount = "select count(*) from equipment where status = 'USING' "; - string sqlData = "select descirption,DBID,macid,owner,case when status = 'USING' then '可用' when status = 'DAMAGE' then '损坏' end as status " + - "from (select t.*,rownum row_num from equipment t where status = 'USING' order by DBID desc)b " + - " where(b.row_num between " + minPage + " and " + maxPage + ")"; + string sqlData = "select descirption as 设备描述,DBID as 编号,macid as MAC地址,owner as 设备所有人," + + "case when status = 'USING' then '可用' when status = 'DAMAGE' then '损坏' end as 设备状态 " + + "from (select t.*,rownum row_num from equipment t where status = 'USING'"; if (!String.IsNullOrEmpty(txtMacId.Text.Trim())) { sqlData += " and macid like '%" + txtMacId.Text.Trim() + "%'"; sqlCount += " and macid like '%" + txtMacId.Text.Trim() + "%'"; } - + sqlData += " order by DBID desc)b " + + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; @@ -299,76 +301,6 @@ } } - //public void reloadGrid(int pageIndex) - //{ - // if (pageIndex <= 0) - // { - // pageIndex = 1; - // currentpage = 1; - // } - // String sqlrows = "select * from (select rownum as rowno,dbid,descirption,macid,owner,case when status = 'USING' then '可用' when status = 'DAMAGE' then '损坏' end as status,'编辑' as btnEdit,'删除' as btnDel from equipment t where status = 'USING' "; - // string sqlcount = "select count(*) from equipment where status = 'USING' "; - // if (!String.IsNullOrEmpty(txtMacId.Text.Trim())) - // { - // sqlrows += " and macid like '%" + txtMacId.Text.Trim() + "%'"; - // sqlcount += " and macid like '%" + txtMacId.Text.Trim() + "%'"; - // } - // sqlrows += " and rownum<=" + (pagesize * pageIndex) + ") table_alias where table_alias.rowno>=" + ((pageIndex - 1) * pagesize + 1); - - // int rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlcount).ToString()); - // int pages = 0; - // if (rows % pagesize == 0) - // { - // pages = rows / pagesize; - // } - // else - // { - // pages = rows / pagesize + 1; - // } - - // lastpage = pages; - - // lab_page_msg.Text = "共" + rows + "条记录，每页" + pagesize + "条，第" + pageIndex + "页，共" + pages + "页"; - // combo_page_num.Items.Clear(); - // for (int i = 1; i <= pages; i++) - // { - // combo_page_num.Items.Add(new ComboBoxItem(i.ToString(), i.ToString())); - // } - - // if (lastpage == 1) - // { - // btn_page_first.Enabled = false; - // btn_page_pre.Enabled = false; - // btn_page_last.Enabled = false; - // btn_page_next.Enabled = false; - // } - // else if (currentpage == 1) - // { - // btn_page_first.Enabled = false; - // btn_page_pre.Enabled = false; - // btn_page_last.Enabled = true; - // btn_page_next.Enabled = true; - // } - // else if (currentpage == lastpage) - // { - // btn_page_first.Enabled = true; - // btn_page_pre.Enabled = true; - // btn_page_last.Enabled = false; - // btn_page_next.Enabled = false; - // } - // else - // { - // btn_page_first.Enabled = true; - // btn_page_pre.Enabled = true; - // btn_page_last.Enabled = true; - // btn_page_next.Enabled = true; - // } - - // DataTable table = OracleUtils.ExecuteDataset(OracleUtils.ConnectionString, CommandType.Text, sqlrows).Tables[0]; - // dataGridViewX1.DataSource = table; - - //} - private void FrmEquipmentManage_FormClosing(object sender, FormClosingEventArgs e) diff --git a/FrmFlagDetail.Designer.cs b/FrmFlagDetail.Designer.cs new file mode 100644 index 0000000..982bfc6 --- /dev/null +++ b/FrmFlagDetail.Designer.cs @@ -0,0 +1,103 @@ +namespace Cyberpipe +{ + partial class FrmFlagDetail + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); + this.dataGridViewX_markDetail = new DevComponents.DotNetBar.Controls.DataGridViewX(); + this.对象类型 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.对象编号 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.对象名称 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX_markDetail)).BeginInit(); + this.SuspendLayout(); + // + // dataGridViewX_markDetail + // + this.dataGridViewX_markDetail.AllowUserToAddRows = false; + this.dataGridViewX_markDetail.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; + this.dataGridViewX_markDetail.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dataGridViewX_markDetail.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.对象类型, + this.对象编号, + this.对象名称}); + dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle3.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dataGridViewX_markDetail.DefaultCellStyle = dataGridViewCellStyle3; + this.dataGridViewX_markDetail.Dock = System.Windows.Forms.DockStyle.Fill; + this.dataGridViewX_markDetail.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(170)))), ((int)(((byte)(170)))), ((int)(((byte)(170))))); + this.dataGridViewX_markDetail.Location = new System.Drawing.Point(0, 0); + this.dataGridViewX_markDetail.Name = "dataGridViewX_markDetail"; + this.dataGridViewX_markDetail.RowTemplate.Height = 23; + this.dataGridViewX_markDetail.Size = new System.Drawing.Size(508, 321); + this.dataGridViewX_markDetail.TabIndex = 0; + // + // 对象类型 + // + this.对象类型.HeaderText = "对象类型"; + this.对象类型.Name = "对象类型"; + // + // 对象编号 + // + this.对象编号.HeaderText = "对象编号"; + this.对象编号.Name = "对象编号"; + // + // 对象名称 + // + this.对象名称.HeaderText = "对象名称"; + this.对象名称.Name = "对象名称"; + // + // FrmFlagDetail + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(508, 321); + this.Controls.Add(this.dataGridViewX_markDetail); + this.Name = "FrmFlagDetail"; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; + this.Text = "标识对象信息"; + this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmFlagDetail_FormClosing); + this.Load += new System.EventHandler(this.FrmFlagDetail_Load); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX_markDetail)).EndInit(); + this.ResumeLayout(false); + + } + + #endregion + + private DevComponents.DotNetBar.Controls.DataGridViewX dataGridViewX_markDetail; + private System.Windows.Forms.DataGridViewTextBoxColumn 对象类型; + private System.Windows.Forms.DataGridViewTextBoxColumn 对象编号; + private System.Windows.Forms.DataGridViewTextBoxColumn 对象名称; + + } +} \ No newline at end of file diff --git a/FrmFlagDetail.cs b/FrmFlagDetail.cs new file mode 100644 index 0000000..81de974 --- /dev/null +++ b/FrmFlagDetail.cs @@ -0,0 +1,77 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Windows.Forms; +using GeoScene.Globe; +using System.Data.OracleClient; + +namespace Cyberpipe +{ + public partial class FrmFlagDetail : Form + { + DataTable dt = new DataTable(); + private GSOGlobeControl globeControl1; + + public delegate void Handle(); + public event Handle showParentForm; + String markId; + + public FrmFlagDetail(GSOGlobeControl globeControl1, String id) + { + InitializeComponent(); + this.markId = id; + } + + private void FrmFlagDetail_FormClosing(object sender, FormClosingEventArgs e) + { + showParentForm(); + } + + private void FrmFlagDetail_Load(object sender, EventArgs e) + { + string objectIds = ""; + string objectTypeCodes = ""; + string sql = "select t.对象编号,t.对象类型 from 标识器 t where t.编号='" + markId + "'"; + using (OracleDataReader reader = OracleUtils.ExecuteReader(OracleUtils.ConnectionString, CommandType.Text, sql)) + { + while (reader.Read()) + { + objectIds = reader.GetString(0); + objectTypeCodes = reader.GetString(1); + } + } + + string[] codeTypes = objectTypeCodes.Split(','); + string[] codeIds = objectIds.Split(','); + int length = 0; + if (codeTypes.Length <= codeIds.Length) + { + length = codeTypes.Length; + } + else + { + length = codeIds.Length; + } + for (int n = 0; n < length; n++) + { + for (int i = 0; i < Utility1.listPipelineType.Count; i++) + { + if (Utility1.listPipelineType[i].code == codeTypes[n]) + { + //string objectId = codeIds[i]; + //string objectType = Utility1.listPipelineType[i].type; + //string objectName = Utility1.listPipelineType[i].name; + int index = this.dataGridViewX_markDetail.Rows.Add(); + this.dataGridViewX_markDetail.Rows[index].Cells[0].Value = Utility1.listPipelineType[i].type; + this.dataGridViewX_markDetail.Rows[index].Cells[1].Value = codeIds[n].ToString(); + this.dataGridViewX_markDetail.Rows[index].Cells[2].Value = Utility1.listPipelineType[i].name; + } + } + } + } + } +} diff --git a/FrmFlagDetail.resx b/FrmFlagDetail.resx new file mode 100644 index 0000000..e98a8fe --- /dev/null +++ b/FrmFlagDetail.resx @@ -0,0 +1,129 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + True + + + True + + + True + + \ No newline at end of file diff --git a/FrmFlagManagers.Designer.cs b/FrmFlagManagers.Designer.cs index d7e2f60..9fe14fb 100644 --- a/FrmFlagManagers.Designer.cs +++ b/FrmFlagManagers.Designer.cs @@ -28,8 +28,10 @@ /// private void InitializeComponent() { - this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); - this.winGridViewPager1 = new WHC.Pager.WinControl.WinGridViewPager(); + this.components = new System.ComponentModel.Container(); + this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components); + this.标识对象ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripMenuItem2 = new System.Windows.Forms.ToolStripMenuItem(); this.bar1 = new DevComponents.DotNetBar.Bar(); this.labelItem1 = new DevComponents.DotNetBar.LabelItem(); this.txt_no = new DevComponents.DotNetBar.TextBoxItem(); @@ -38,45 +40,37 @@ this.btn_query = new DevComponents.DotNetBar.ButtonItem(); this.btn_add_batch = new DevComponents.DotNetBar.ButtonItem(); this.btn_add_menu = new DevComponents.DotNetBar.ButtonItem(); - this.btn_db = new DevComponents.DotNetBar.ButtonItem(); - this.tableLayoutPanel1.SuspendLayout(); + this.winGridViewPager1 = new WHC.Pager.WinControl.WinGridViewPager(); + this.contextMenuStrip1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.bar1)).BeginInit(); this.SuspendLayout(); // - // tableLayoutPanel1 + // contextMenuStrip1 // - this.tableLayoutPanel1.ColumnCount = 1; - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel1.Controls.Add(this.winGridViewPager1, 0, 1); - this.tableLayoutPanel1.Controls.Add(this.bar1, 0, 0); - this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 0); - this.tableLayoutPanel1.Name = "tableLayoutPanel1"; - this.tableLayoutPanel1.RowCount = 2; - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 32F)); - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel1.Size = new System.Drawing.Size(881, 474); - this.tableLayoutPanel1.TabIndex = 6; + this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.标识对象ToolStripMenuItem, + this.toolStripMenuItem2}); + this.contextMenuStrip1.Name = "contextMenuStrip1"; + this.contextMenuStrip1.Size = new System.Drawing.Size(125, 48); // - // winGridViewPager1 + // 标识对象ToolStripMenuItem // - this.winGridViewPager1.AppendedMenu = null; - this.winGridViewPager1.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; - this.winGridViewPager1.DataSource = null; - this.winGridViewPager1.DisplayColumns = ""; - this.winGridViewPager1.Dock = System.Windows.Forms.DockStyle.Fill; - this.winGridViewPager1.Location = new System.Drawing.Point(3, 35); - this.winGridViewPager1.MinimumSize = new System.Drawing.Size(540, 0); - this.winGridViewPager1.Name = "winGridViewPager1"; - this.winGridViewPager1.PrintTitle = ""; - this.winGridViewPager1.Size = new System.Drawing.Size(875, 436); - this.winGridViewPager1.TabIndex = 5; + this.标识对象ToolStripMenuItem.Name = "标识对象ToolStripMenuItem"; + this.标识对象ToolStripMenuItem.Size = new System.Drawing.Size(124, 22); + this.标识对象ToolStripMenuItem.Text = "标识对象"; + this.标识对象ToolStripMenuItem.Click += new System.EventHandler(this.标识对象ToolStripMenuItem_Click); + // + // toolStripMenuItem2 + // + this.toolStripMenuItem2.Name = "toolStripMenuItem2"; + this.toolStripMenuItem2.Size = new System.Drawing.Size(152, 22); + this.toolStripMenuItem2.Text = "查看位置"; + this.toolStripMenuItem2.Click += new System.EventHandler(this.toolStripMenuItem2_Click); // // bar1 // this.bar1.AntiAlias = true; this.bar1.Dock = System.Windows.Forms.DockStyle.Top; - this.bar1.DockSide = DevComponents.DotNetBar.eDockSide.Document; this.bar1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.labelItem1, this.txt_no, @@ -84,14 +78,13 @@ this.combo_street, this.btn_query, this.btn_add_batch, - this.btn_add_menu, - this.btn_db}); - this.bar1.Location = new System.Drawing.Point(3, 3); + this.btn_add_menu}); + this.bar1.Location = new System.Drawing.Point(0, 0); this.bar1.Name = "bar1"; - this.bar1.Size = new System.Drawing.Size(875, 28); + this.bar1.Size = new System.Drawing.Size(881, 28); this.bar1.Stretch = true; this.bar1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.bar1.TabIndex = 1; + this.bar1.TabIndex = 8; this.bar1.TabStop = false; this.bar1.Text = "bar1"; // @@ -136,24 +129,34 @@ this.btn_add_menu.Text = "手工添加"; this.btn_add_menu.Click += new System.EventHandler(this.btn_add_menu_Click); // - // btn_db + // winGridViewPager1 // - this.btn_db.Name = "btn_db"; - this.btn_db.Text = "数据导出"; + this.winGridViewPager1.AppendedMenu = null; + this.winGridViewPager1.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; + this.winGridViewPager1.DataSource = null; + this.winGridViewPager1.DisplayColumns = ""; + this.winGridViewPager1.Dock = System.Windows.Forms.DockStyle.Fill; + this.winGridViewPager1.Location = new System.Drawing.Point(0, 28); + this.winGridViewPager1.MinimumSize = new System.Drawing.Size(540, 0); + this.winGridViewPager1.Name = "winGridViewPager1"; + this.winGridViewPager1.PrintTitle = ""; + this.winGridViewPager1.Size = new System.Drawing.Size(881, 446); + this.winGridViewPager1.TabIndex = 9; // // FrmFlagManagers // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(881, 474); - this.Controls.Add(this.tableLayoutPanel1); + this.Controls.Add(this.winGridViewPager1); + this.Controls.Add(this.bar1); this.DoubleBuffered = true; this.Name = "FrmFlagManagers"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "标识器管理"; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmFlagManagers_FormClosing); this.Load += new System.EventHandler(this.FrmFlagManagers_Load); - this.tableLayoutPanel1.ResumeLayout(false); + this.contextMenuStrip1.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.bar1)).EndInit(); this.ResumeLayout(false); @@ -161,8 +164,8 @@ #endregion - private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1; - private WHC.Pager.WinControl.WinGridViewPager winGridViewPager1; + private System.Windows.Forms.ContextMenuStrip contextMenuStrip1; + private System.Windows.Forms.ToolStripMenuItem 标识对象ToolStripMenuItem; private DevComponents.DotNetBar.Bar bar1; private DevComponents.DotNetBar.LabelItem labelItem1; private DevComponents.DotNetBar.TextBoxItem txt_no; @@ -171,6 +174,7 @@ private DevComponents.DotNetBar.ButtonItem btn_query; private DevComponents.DotNetBar.ButtonItem btn_add_batch; private DevComponents.DotNetBar.ButtonItem btn_add_menu; - private DevComponents.DotNetBar.ButtonItem btn_db; + private WHC.Pager.WinControl.WinGridViewPager winGridViewPager1; + private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem2; } } \ No newline at end of file diff --git a/FrmFlagManagers.cs b/FrmFlagManagers.cs index 38d4927..9bf9734 100644 --- a/FrmFlagManagers.cs +++ b/FrmFlagManagers.cs @@ -33,15 +33,13 @@ { this.globeControl1 = _globeControl1; InitializeComponent(); - winGridViewPager1.OnPageChanged += new EventHandler(winGridViewPager1_OnPageChanged); - this.winGridViewPager1.OnAddNew += new EventHandler(winGridViewPager1_OnAddNew); //右键定位 + winGridViewPager1.OnPageChanged += new EventHandler(winGridViewPager1_OnPageChanged); this.winGridViewPager1.OnEditSelected += new EventHandler(winGridViewPager1_OnEditSelected);//属性编辑 this.winGridViewPager1.OnDeleteSelected += new EventHandler(winGridViewPager1_OnDeleteSelected);//标识器报废 + this.winGridViewPager1.OnStartExport += new EventHandler(pager1_OnStartExport); this.winGridViewPager1.OnEndExport += new EventHandler(pager1_OnEndExport); - //this.winGridViewPager1.ExportCurrent += new ExportCurrentEventHandler(pager1_ExportCurrent); - //this.winGridViewPager1.ExportAll += new ExportAllEventHandler(pager1_ExportAll); winGridViewPager1.dataGridView1.MultiSelect = false; @@ -76,26 +74,25 @@ this.winGridViewPager1.AddColumnAlias("标识器型号", "标识器型号"); this.winGridViewPager1.AddColumnAlias("地面高程", "地面高程"); this.winGridViewPager1.AddColumnAlias("标识器埋深", "标识器埋深"); - this.winGridViewPager1.AddColumnAlias("对象编号", "对象编号"); - this.winGridViewPager1.AddColumnAlias("对象类型", "对象类型"); this.winGridViewPager1.AddColumnAlias("所属道路", "所属道路"); this.winGridViewPager1.AddColumnAlias("使用状态", "使用状态"); - this.winGridViewPager1.DisplayColumns = "编号,标识器ID号,标识器型号,地面高程,标识器埋深,对象编号,对象类型,所属道路,使用状态"; + this.winGridViewPager1.DisplayColumns = "编号,标识器ID号,标识器型号,地面高程,标识器埋深,所属道路,使用状态"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 //隐藏右键功能按钮 //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[1].Visible = false; - //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[4].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[5].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[6].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[7].Visible = false; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[1].Text = "定位查看"; + //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[1].Text = "定位查看"; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "属性编辑"; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Text = "标识器报废"; + winGridViewPager1.AppendedMenu = this.contextMenuStrip1; + //右键菜单宽度 winGridViewPager1.dataGridView1.ContextMenuStrip.AutoSize = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Width = 150; @@ -153,7 +150,7 @@ } /// - /// 右键定位 + /// 对象查看 /// /// /// @@ -306,20 +303,10 @@ string sqlCount = "select count(*) from 标识器 where 使用状态 = '使用中'"; - string sqlData = "select 编号,标识器ID号,标识器型号,地面高程,标识器埋深,对象编号,对象类型,所属道路,LSSYS_ID,X坐标,Y坐标,使用状态 " + + string sqlData = "select 编号,标识器ID号,标识器型号,地面高程,标识器埋深,所属道路,LSSYS_ID,X坐标,Y坐标,使用状态 " + "from (select t.*,rownum row_num from 标识器 t where 使用状态 = '使用中' order by 编号)b " + " where 1=1"; - if (!String.IsNullOrEmpty(txt_no.Text.Trim())) - { - sqlCount += " and 编号 like '%" + txt_no.Text.Trim() + "%'"; - sqlData += " and 编号 like '%" + txt_no.Text.Trim() + "%'"; - } - if (null != combo_street.SelectedItem && !String.IsNullOrEmpty(combo_street.SelectedItem.ToString().Trim())) - { - sqlData += " and 所属道路='" + combo_street.SelectedItem.ToString().Trim() + "'"; - sqlCount += " and 所属道路='" + combo_street.SelectedItem.ToString().Trim() + "'"; - } rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -332,9 +319,8 @@ int maxPage = pageIndex * maxPageIndex; string sqlCount = "select count(*) from 标识器 where 使用状态 = '使用中'"; - string sqlData = "select 编号,标识器ID号,标识器型号,地面高程,标识器埋深,对象编号,对象类型,所属道路,LSSYS_ID,X坐标,Y坐标,使用状态 " + - "from (select t.*,rownum row_num from 标识器 t where 使用状态 = '使用中' order by 编号)b "+ - " where(b.row_num between " + minPage + " and " + maxPage + ")"; + string sqlData = "select 编号,标识器ID号,标识器型号,地面高程,标识器埋深,所属道路,LSSYS_ID,X坐标,Y坐标,使用状态 " + + "from (select t.*,rownum row_num from 标识器 t where 使用状态 = '使用中'"; if (!String.IsNullOrEmpty(txt_no.Text.Trim())) { @@ -347,6 +333,8 @@ sqlCount += " and 所属道路='" + combo_street.SelectedItem.ToString().Trim() + "'"; } + sqlData += " order by 编号)b " + + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; @@ -372,9 +360,10 @@ private void FrmFlagManagers_FormClosing(object sender, FormClosingEventArgs e) { IS_OPEN = false; - Thread downloadJob = new Thread(new ParameterizedThreadStart(doSave)); - downloadJob.IsBackground = true; - downloadJob.Start(e); + //Thread downloadJob = new Thread(new ParameterizedThreadStart(doSave)); + //downloadJob.IsBackground = true; + //downloadJob.Start(e); + globeControl1.Globe.Layers["标识器"].Save(); globeControl1.Globe.MemoryLayer.RemoveAllFeature(); foreach (GSOFeature f in Features) { @@ -480,10 +469,88 @@ if (null != globeControl1) { FrmAddSinMark frm = new FrmAddSinMark(globeControl1); - frm.ShowDialog(); + frm.Show(); } } + private void 标识对象ToolStripMenuItem_Click(object sender, EventArgs e) + { + if (winGridViewPager1 != null && winGridViewPager1.dataGridView1 != null) + { + DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; + try + { + this.Hide(); + string id = row.Cells["编号"].Value.ToString(); + FrmFlagDetail p = new FrmFlagDetail(globeControl1, id); + p.showParentForm += new FrmFlagDetail.Handle(showThisForm);//改变值的事件 + p.Show(); + } + catch (Exception ex) + { + MessageBox.Show("失败:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } + + private void showThisForm() + { + this.Show(); + } + + private void toolStripMenuItem2_Click(object sender, EventArgs e) + { + if (winGridViewPager1 != null && winGridViewPager1.dataGridView1 != null) + { + DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; + try + { + this.WindowState = FormWindowState.Minimized; + string id = row.Cells["LSSYS_ID"].Value.ToString(); + string flagno = row.Cells["编号"].Value.ToString(); + string flagstreet = row.Cells["所属道路"].Value.ToString(); + double x = Convert.ToDouble(row.Cells["X坐标"].Value); + double y = Convert.ToDouble(row.Cells["Y坐标"].Value); + GSOFeature flagFeature = globeControl1.Globe.Layers.GetLayerByCaption("标识器").GetFeatureByID(int.Parse(id)); + + string type = ""; + string pipe = ""; + string sql = "select t.标识器型号,t.对象编号 from 标识器 t where t.编号='" + flagno + "'"; + using (OracleDataReader reader = OracleUtils.ExecuteReader(OracleUtils.ConnectionString, CommandType.Text, sql)) + { + while (reader.Read()) + { + type = reader.GetString(0); + pipe = reader.GetString(1); + } + } + + GSOLabel label = new GSOLabel(); + label.Text = "标识器编号：" + flagno + "\r\n" + + "标识器类型:" + type + "\r\n" + + //"标识对象编号:" + pipe + "\r\n" + + "所属道路:" + flagstreet; + label.Style = new GSOLabelStyle(); + label.Style.TextStyle.FontSize = 18; + label.Style.TextStyle.ForeColor = Color.FromArgb(0, 0, 0, 255); + label.Style.Opaque = 0.8; //设置标注的透明度，取值区间是0-1 + label.Style.TracktionLineType = EnumTracktionLineType.Solid; + label.Style.TextStyle.FontHeight = 10; + label.Style.TextStyle.FontName = "黑体"; + label.Style.TractionLineEndPos = new GSOPoint2d(80, 60); + + flagFeature.Label = label; + Features.Add(flagFeature); + globeControl1.Globe.JumpToFeature(flagFeature, 20); + this.globeControl1.Refresh(); + + } + catch (Exception ex) + { + MessageBox.Show("标识器定位失败:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } } diff --git a/FrmFlagManagers.resx b/FrmFlagManagers.resx index 1af7de1..ad53752 100644 --- a/FrmFlagManagers.resx +++ b/FrmFlagManagers.resx @@ -117,4 +117,7 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 17, 17 + \ No newline at end of file diff --git a/FrmPatrolerEdit.cs b/FrmPatrolerEdit.cs index dbd4fec..f45b5ae 100644 --- a/FrmPatrolerEdit.cs +++ b/FrmPatrolerEdit.cs @@ -46,7 +46,7 @@ txt_name.Focus(); return; } - if (String.IsNullOrEmpty(combo_sex.SelectedItem.ToString())) + if (combo_sex.SelectedItem == null ||String.IsNullOrEmpty(combo_sex.SelectedItem.ToString())) { MessageBox.Show("性别不能为空！", "警告", MessageBoxButtons.OK, MessageBoxIcon.Warning); combo_sex.Focus(); diff --git a/Cyberpipe.csproj b/Cyberpipe.csproj index fe600e5..501fd09 100644 --- a/Cyberpipe.csproj +++ b/Cyberpipe.csproj @@ -246,6 +246,12 @@ Form_TaskManager.cs + + Form + + + FrmFlagDetail.cs + Form @@ -1368,6 +1374,9 @@ Form_TaskManager.cs + + FrmFlagDetail.cs + FormDocumentManager.cs diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 537b4c3..1acf22a 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 7d5dd95..3f178cb 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -90,20 +90,20 @@ this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - - this.winGridViewPager1.AddColumnAlias("ACCIDENTTIME", "上报时间"); - this.winGridViewPager1.AddColumnAlias("DBID", "编号"); - this.winGridViewPager1.AddColumnAlias("DESCRIBE", "事件描述"); - this.winGridViewPager1.AddColumnAlias("LATITUDE", "纬度"); - this.winGridViewPager1.AddColumnAlias("LOCALE", "事件地点"); - this.winGridViewPager1.AddColumnAlias("LONGITUDE", "经度"); - this.winGridViewPager1.AddColumnAlias("PATROLERNAME", "上报人员"); - this.winGridViewPager1.AddColumnAlias("PATROLER_ID", "人员ID"); - this.winGridViewPager1.AddColumnAlias("TASK_ID", "任务编号"); - this.winGridViewPager1.AddColumnAlias("RESULT", "处理结果"); - this.winGridViewPager1.AddColumnAlias("STATE", "处理状态"); - this.winGridViewPager1.DisplayColumns = "ACCIDENTTIME,DESCRIBE,LOCALE,PATROLERNAME,TASK_ID,RESULT,STATE"; + this.winGridViewPager1.AddColumnAlias("上报时间", "上报时间"); + this.winGridViewPager1.AddColumnAlias("编号", "编号"); + this.winGridViewPager1.AddColumnAlias("事件描述", "事件描述"); + this.winGridViewPager1.AddColumnAlias("纬度", "纬度"); + this.winGridViewPager1.AddColumnAlias("事件地点", "事件地点"); + this.winGridViewPager1.AddColumnAlias("经度", "经度"); + this.winGridViewPager1.AddColumnAlias("上报人员", "上报人员"); + this.winGridViewPager1.AddColumnAlias("人员ID", "人员ID"); + this.winGridViewPager1.AddColumnAlias("任务编号", "任务编号"); + this.winGridViewPager1.AddColumnAlias("处理结果", "处理结果"); + this.winGridViewPager1.AddColumnAlias("处理状态", "处理状态"); + + this.winGridViewPager1.DisplayColumns = "上报时间,事件描述,事件地点,上报人员,任务编号,处理结果,处理状态"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -114,8 +114,8 @@ winGridViewPager1.dataGridView1.ContextMenuStrip.Items[5].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[6].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[7].Visible = false; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[1].Text = "查看位置"; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "结果编辑"; + winGridViewPager1.dataGridView1.ContextMenuStrip.Items[1].Text = "结果编辑"; + winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "查看位置"; //右键菜单宽度 winGridViewPager1.dataGridView1.ContextMenuStrip.AutoSize = false; @@ -160,13 +160,12 @@ this.WindowState = FormWindowState.Minimized; globeControl1.Globe.MemoryLayer.RemoveAllFeature(); this.WindowState = FormWindowState.Minimized; - double x = Convert.ToDouble(row.Cells["LONGITUDE"].Value); - double y = Convert.ToDouble(row.Cells["LATITUDE"].Value); - - string username = Convert.ToString(row.Cells["PATROLERNAME"].Value); - string Atime = Convert.ToString(row.Cells["ACCIDENTTIME"].Value); - string location = Convert.ToString(row.Cells["LOCALE"].Value); - string descp = Convert.ToString(row.Cells["DESCRIBE"].Value); + double x = Convert.ToDouble(row.Cells["经度"].Value); + double y = Convert.ToDouble(row.Cells["纬度"].Value); + string username = Convert.ToString(row.Cells["上报人员"].Value); + string Atime = Convert.ToString(row.Cells["上报时间"].Value); + string location = Convert.ToString(row.Cells["事件地点"].Value); + string descp = Convert.ToString(row.Cells["事件描述"].Value); /////////////////////////////////////// /*******设置飞行与创建模型******/ @@ -228,8 +227,8 @@ DataGridViewRow row = grid.SelectedRows[0]; try { - int dbId = Convert.ToInt32(row.Cells["DBID"].Value); - string result = Convert.ToString(row.Cells["RESULT"].Value); + int dbId = Convert.ToInt32(row.Cells["编号"].Value); + string result = Convert.ToString(row.Cells["处理结果"].Value); EMS_Forms.Form_EventResult form = new Form_EventResult(dbId, result); form.refresh += new Form_EventResult.Handle(LoadData);//改变值的事件 form.ShowDialog(); @@ -276,9 +275,9 @@ } for (int i = 0; i < table.Rows.Count; i++) { - if (winGridViewPager1.dataGridView1.Rows[i].Cells["RESULT"].Value != null && !(winGridViewPager1.dataGridView1.Rows[i].Cells["RESULT"].Value.ToString().Trim().Equals(""))) + if (winGridViewPager1.dataGridView1.Rows[i].Cells["处理结果"].Value != null && !(winGridViewPager1.dataGridView1.Rows[i].Cells["处理结果"].Value.ToString().Trim().Equals(""))) { - winGridViewPager1.dataGridView1.Rows[i].Cells["STATE"].Value = "已处理"; + winGridViewPager1.dataGridView1.Rows[i].Cells["处理状态"].Value = "已处理"; } } @@ -307,9 +306,9 @@ } for (int i = 0; i < table.Rows.Count; i++) { - if (winGridViewPager1.dataGridView1.Rows[i].Cells["RESULT"].Value != null && !(winGridViewPager1.dataGridView1.Rows[i].Cells["RESULT"].Value.ToString().Trim().Equals(""))) + if (winGridViewPager1.dataGridView1.Rows[i].Cells["处理结果"].Value != null && !(winGridViewPager1.dataGridView1.Rows[i].Cells["处理结果"].Value.ToString().Trim().Equals(""))) { - winGridViewPager1.dataGridView1.Rows[i].Cells["STATE"].Value = "已处理"; + winGridViewPager1.dataGridView1.Rows[i].Cells["处理状态"].Value = "已处理"; } } @@ -320,10 +319,12 @@ { string sqlCount = "select count(*) from ACCIDENT where 1=1"; - string sqlData = "select ACCIDENTTIME,DBID,DESCRIBE,LATITUDE,LOCALE,LONGITUDE,PATROLERNAME,PATROLER_ID,TASK_ID,RESULT,'' as STATE " + + string sqlData = "select ACCIDENTTIME as 上报时间,DBID as 编号,DESCRIBE as 事件描述,"+ + "LATITUDE as 纬度,LOCALE as 事件地点,LONGITUDE as 经度,PATROLERNAME 上报人员,"+ + "PATROLER_ID as 人员ID,TASK_ID as 任务编号,RESULT as 处理结果,'' as 处理状态 " + "from (select t.*,rownum row_num from ACCIDENT t order by DBID)b " + " where 1=1"; - + rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; @@ -340,9 +341,10 @@ string sqlCount = "select count(*) from ACCIDENT where 1=1"; - string sqlData = "select ACCIDENTTIME,DBID,DESCRIBE,LATITUDE,LOCALE,LONGITUDE,PATROLERNAME,PATROLER_ID,TASK_ID,RESULT,'' as STATE " + - "from (select t.*,rownum row_num from ACCIDENT t order by DBID)b " + - " where(b.row_num between " + minPage + " and " + maxPage + ")"; + string sqlData = "select ACCIDENTTIME as 上报时间,DBID as 编号,DESCRIBE as 事件描述," + + "LATITUDE as 纬度,LOCALE as 事件地点,LONGITUDE as 经度,PATROLERNAME 上报人员," + + "PATROLER_ID as 人员ID,TASK_ID as 任务编号,RESULT as 处理结果,'' as 处理状态 " + + "from (select t.*,rownum row_num from ACCIDENT t where 1=1"; if (!String.IsNullOrEmpty(comboBox_name.Text.Trim())) { @@ -361,7 +363,8 @@ sqlCount += "and ACCIDENTTIME<=to_date('" + time.ToShortDateString() + "','yyyy-MM-dd') "; sqlData += "and ACCIDENTTIME<=to_date('" + time.ToShortDateString() + "','yyyy-MM-dd') "; } - + sqlData += " order by DBID desc)b " + + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 225c8d7..8bd9e48 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -120,8 +120,8 @@ private void flyToTask(DataGridViewRow row, int taskState) { int dbID = 0; - dbID = Convert.ToInt32(row.Cells["DBID"].Value); - string userName = Convert.ToString(row.Cells["USERNAME"].Value); + dbID = Convert.ToInt32(row.Cells["任务编号"].Value); + string userName = Convert.ToString(row.Cells["任务执行人员"].Value); System.DateTime t = new DateTime(); try { @@ -392,15 +392,15 @@ //控制表格显示的列，以及每一列要显示的列名 this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - this.winGridViewPager1.AddColumnAlias("DBID", "任务编号"); - this.winGridViewPager1.AddColumnAlias("DEPLOYTIME", "创建时间"); - this.winGridViewPager1.AddColumnAlias("DESCIRPTION", "任务描述"); - this.winGridViewPager1.AddColumnAlias("FINISHTIME", "完成时间"); - this.winGridViewPager1.AddColumnAlias("STREET", "任务执行区域"); - this.winGridViewPager1.AddColumnAlias("TASKSTATE", "任务状态"); - this.winGridViewPager1.AddColumnAlias("USERNAME", "任务执行人员"); + this.winGridViewPager1.AddColumnAlias("任务编号", "任务编号"); + this.winGridViewPager1.AddColumnAlias("创建时间", "创建时间"); + this.winGridViewPager1.AddColumnAlias("任务描述", "任务描述"); + this.winGridViewPager1.AddColumnAlias("完成时间", "完成时间"); + this.winGridViewPager1.AddColumnAlias("任务执行区域", "任务执行区域"); + this.winGridViewPager1.AddColumnAlias("任务状态", "任务状态"); + this.winGridViewPager1.AddColumnAlias("任务执行人员", "任务执行人员"); - this.winGridViewPager1.DisplayColumns = "DBID,DEPLOYTIME,DESCIRPTION,FINISHTIME,STREET,TASKSTATE,USERNAME"; + this.winGridViewPager1.DisplayColumns = "任务编号,创建时间,任务描述,完成时间,任务执行区域,任务状态,任务执行人员"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -464,8 +464,8 @@ { int dbID = 0; int taskStateInt = 0; - dbID = Convert.ToInt32(row.Cells["DBID"].Value); - string taskState = row.Cells["TASKSTATE"].Value.ToString(); + dbID = Convert.ToInt32(row.Cells["任务编号"].Value); + string taskState = row.Cells["任务状态"].Value.ToString(); if (taskState.Equals("开始任务")) { taskStateInt = 1; @@ -534,9 +534,10 @@ private string GetSql() { - string sqlCount = "select count(*) from taskinfo t where 1=1'"; + string sqlCount = "select count(*) from taskinfo t where 1=1"; - string sqlData = "select dbid,deploytime,descirption,finishtime,street,taskstate,username " + + 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"; @@ -550,9 +551,9 @@ int minPage = (pageIndex - 1) * maxPageIndex + 1; int maxPage = pageIndex * maxPageIndex; string sqlCount = "select count(*) from taskinfo t where 1=1"; - string sqlData = "select dbid,deploytime,descirption,finishtime,street,taskstate,username " + - "from (select t.*,rownum row_num from taskinfo t order by DBID desc)b " + - " where(b.row_num between " + minPage + " and " + maxPage + ")"; + 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"; if (!String.IsNullOrEmpty(comboBox_userName.Text.Trim()) && !comboBox_userName.Text.Trim().Equals("不限")) { @@ -581,6 +582,8 @@ sqlCount += "and street='" + combo_street.Text + "' "; sqlData += "and street='" + combo_street.Text + "' "; } + sqlData += " order by DBID desc)b " + + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index e65a4bd..58f5342 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -73,13 +73,13 @@ //控制表格显示的列，以及每一列要显示的列名 this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - this.winGridViewPager1.AddColumnAlias("FILENAME", "文档名称"); - this.winGridViewPager1.AddColumnAlias("DBID", "编号"); - this.winGridViewPager1.AddColumnAlias("TITLE", "文档标题"); - this.winGridViewPager1.AddColumnAlias("FILETYPE", "文档类型"); - this.winGridViewPager1.AddColumnAlias("UPDAY", "上传日期"); - this.winGridViewPager1.AddColumnAlias("WRITER", "上传人"); - this.winGridViewPager1.DisplayColumns = "FILENAME,TITLE,FILETYPE,UPDAY,WRITER"; + this.winGridViewPager1.AddColumnAlias("文档名称", "文档名称"); + this.winGridViewPager1.AddColumnAlias("编号", "编号"); + this.winGridViewPager1.AddColumnAlias("文档标题", "文档标题"); + this.winGridViewPager1.AddColumnAlias("文档类型", "文档类型"); + this.winGridViewPager1.AddColumnAlias("上传日期", "上传日期"); + this.winGridViewPager1.AddColumnAlias("上传人", "上传人"); + this.winGridViewPager1.DisplayColumns = "文档名称,文档标题,文档类型,上传日期,上传人"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -167,7 +167,7 @@ if (grid != null) { DataGridViewRow row = grid.SelectedRows[0]; - string dbid = row.Cells["dbid"].Value.ToString(); + string dbid = row.Cells["编号"].Value.ToString(); try { if (MessageBox.Show("确认删除吗？", "确认", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) @@ -212,7 +212,8 @@ { string sqlCount = "select count(*) from casic_userdocument where sysname = 'EMS'"; - string sqlData = "select filename,dbid,title,filetype,upday,writer " + + string sqlData = "select filename as 文档名称,dbid as 编号,title as 文档标题," + + "filetype as 文档类型,upday as 上传日期,writer as 上传人 " + "from (select t.*,rownum row_num from casic_userdocument t order by DBID desc)b " + " where sysname = 'EMS'"; @@ -226,9 +227,9 @@ int minPage = (pageIndex - 1) * maxPageIndex + 1; int maxPage = pageIndex * maxPageIndex; string sqlCount = "select count(*) from casic_userdocument where sysname = 'EMS'"; - string sqlData = "select filename,dbid,title,filetype,upday,writer " + - "from (select t.*,rownum row_num from casic_userdocument t where sysname = 'EMS' order by DBID desc)b " + - " where(b.row_num between " + minPage + " and " + maxPage + ")"; + string sqlData = "select filename as 文档名称,dbid as 编号,title as 文档标题,"+ + "filetype as 文档类型,upday as 上传日期,writer as 上传人 " + + "from (select t.*,rownum row_num from casic_userdocument t where sysname = 'EMS'"; string txtTitleText = null; string comboFileType = null; @@ -278,7 +279,8 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - + sqlData += " order by DBID desc)b " + + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; @@ -437,7 +439,7 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - string filename = row.Cells["filename"].Value.ToString(); + string filename = row.Cells["文档名称"].Value.ToString(); string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; string file = System.Environment.CurrentDirectory + "\\download\\" + filename; int result = DownloadFile(url, file, progressBar1); @@ -515,7 +517,7 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - string filename = row.Cells["filename"].Value.ToString(); + string filename = row.Cells["文档名称"].Value.ToString(); string ext = Path.GetExtension(filename); SaveFileDialog dlg = new SaveFileDialog(); dlg.Filter = "保存文档|*" + ext + ";"; diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 1d1201b..3902629 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -748,6 +748,7 @@ this.Name = "FrmAddSinMark"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "单个标识器添加"; + this.TopMost = true; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmAddSinMark_FormClosing); this.Load += new System.EventHandler(this.FrmAddSinMark_Load); this.groupPanel1.ResumeLayout(false); diff --git a/FrmEquipmentManage.cs b/FrmEquipmentManage.cs index 90bfdb2..a3cf55c 100644 --- a/FrmEquipmentManage.cs +++ b/FrmEquipmentManage.cs @@ -74,13 +74,13 @@ //控制表格显示的列，以及每一列要显示的列名 this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - this.winGridViewPager1.AddColumnAlias("DESCIRPTION", "设备描述"); - this.winGridViewPager1.AddColumnAlias("DBID", "编号"); - this.winGridViewPager1.AddColumnAlias("MACID", "MAC地址"); - this.winGridViewPager1.AddColumnAlias("OWNER", "设备所有人"); - this.winGridViewPager1.AddColumnAlias("STATUS", "设备状态"); + this.winGridViewPager1.AddColumnAlias("设备描述", "设备描述"); + this.winGridViewPager1.AddColumnAlias("编号", "编号"); + this.winGridViewPager1.AddColumnAlias("MAC地址", "MAC地址"); + this.winGridViewPager1.AddColumnAlias("设备所有人", "设备所有人"); + this.winGridViewPager1.AddColumnAlias("设备状态", "设备状态"); - this.winGridViewPager1.DisplayColumns = "DESCIRPTION,MACID,OWNER,STATUS"; + this.winGridViewPager1.DisplayColumns = "设备描述,MAC地址,设备所有人,设备状态"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -146,10 +146,10 @@ DataGridViewRow row = grid.SelectedRows[0]; try { - long dbid = long.Parse(row.Cells["DBID"].Value.ToString()); - String macId = row.Cells["MACID"].Value.ToString(); - String username = row.Cells["OWNER"].Value.ToString(); - String descn = row.Cells["DESCIRPTION"].Value.ToString(); + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); + String macId = row.Cells["MAC地址"].Value.ToString(); + String username = row.Cells["设备所有人"].Value.ToString(); + String descn = row.Cells["设备状态"].Value.ToString(); FrmEquipmentEdit frm = new FrmEquipmentEdit(dbid.ToString(), macId, username, descn); frm.reloadGrid += new ReloadEquipmentGrid(LoadData); frm.ShowDialog(); @@ -179,7 +179,7 @@ { return; } - String macId = row.Cells["MACID"].Value.ToString(); + String macId = row.Cells["MAC地址"].Value.ToString(); FrmLog frm = new FrmLog(macId); frm.Show(); } @@ -201,7 +201,7 @@ if (grid != null) { DataGridViewRow row = grid.SelectedRows[0]; - long dbid = long.Parse(row.Cells["DBID"].Value.ToString()); + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); try { if (MessageBox.Show("确定删除？", "确认", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) @@ -243,7 +243,8 @@ { string sqlCount = "select count(*) from equipment where status = 'USING'"; - string sqlData = "select descirption,DBID,macid,owner,case when status = 'USING' then '可用' when status = 'DAMAGE' then '损坏' end as status " + + string sqlData = "select descirption as 设备描述,DBID as 编号,macid as MAC地址,owner as 设备所有人,"+ + "case when status = 'USING' then '可用' when status = 'DAMAGE' then '损坏' end as 设备状态 " + "from (select t.*,rownum row_num from equipment t where status = 'USING' order by dbid desc)b " + " where 1=1"; @@ -258,16 +259,17 @@ int maxPage = pageIndex * maxPageIndex; string sqlCount = "select count(*) from equipment where status = 'USING' "; - string sqlData = "select descirption,DBID,macid,owner,case when status = 'USING' then '可用' when status = 'DAMAGE' then '损坏' end as status " + - "from (select t.*,rownum row_num from equipment t where status = 'USING' order by DBID desc)b " + - " where(b.row_num between " + minPage + " and " + maxPage + ")"; + string sqlData = "select descirption as 设备描述,DBID as 编号,macid as MAC地址,owner as 设备所有人," + + "case when status = 'USING' then '可用' when status = 'DAMAGE' then '损坏' end as 设备状态 " + + "from (select t.*,rownum row_num from equipment t where status = 'USING'"; if (!String.IsNullOrEmpty(txtMacId.Text.Trim())) { sqlData += " and macid like '%" + txtMacId.Text.Trim() + "%'"; sqlCount += " and macid like '%" + txtMacId.Text.Trim() + "%'"; } - + sqlData += " order by DBID desc)b " + + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; @@ -299,76 +301,6 @@ } } - //public void reloadGrid(int pageIndex) - //{ - // if (pageIndex <= 0) - // { - // pageIndex = 1; - // currentpage = 1; - // } - // String sqlrows = "select * from (select rownum as rowno,dbid,descirption,macid,owner,case when status = 'USING' then '可用' when status = 'DAMAGE' then '损坏' end as status,'编辑' as btnEdit,'删除' as btnDel from equipment t where status = 'USING' "; - // string sqlcount = "select count(*) from equipment where status = 'USING' "; - // if (!String.IsNullOrEmpty(txtMacId.Text.Trim())) - // { - // sqlrows += " and macid like '%" + txtMacId.Text.Trim() + "%'"; - // sqlcount += " and macid like '%" + txtMacId.Text.Trim() + "%'"; - // } - // sqlrows += " and rownum<=" + (pagesize * pageIndex) + ") table_alias where table_alias.rowno>=" + ((pageIndex - 1) * pagesize + 1); - - // int rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlcount).ToString()); - // int pages = 0; - // if (rows % pagesize == 0) - // { - // pages = rows / pagesize; - // } - // else - // { - // pages = rows / pagesize + 1; - // } - - // lastpage = pages; - - // lab_page_msg.Text = "共" + rows + "条记录，每页" + pagesize + "条，第" + pageIndex + "页，共" + pages + "页"; - // combo_page_num.Items.Clear(); - // for (int i = 1; i <= pages; i++) - // { - // combo_page_num.Items.Add(new ComboBoxItem(i.ToString(), i.ToString())); - // } - - // if (lastpage == 1) - // { - // btn_page_first.Enabled = false; - // btn_page_pre.Enabled = false; - // btn_page_last.Enabled = false; - // btn_page_next.Enabled = false; - // } - // else if (currentpage == 1) - // { - // btn_page_first.Enabled = false; - // btn_page_pre.Enabled = false; - // btn_page_last.Enabled = true; - // btn_page_next.Enabled = true; - // } - // else if (currentpage == lastpage) - // { - // btn_page_first.Enabled = true; - // btn_page_pre.Enabled = true; - // btn_page_last.Enabled = false; - // btn_page_next.Enabled = false; - // } - // else - // { - // btn_page_first.Enabled = true; - // btn_page_pre.Enabled = true; - // btn_page_last.Enabled = true; - // btn_page_next.Enabled = true; - // } - - // DataTable table = OracleUtils.ExecuteDataset(OracleUtils.ConnectionString, CommandType.Text, sqlrows).Tables[0]; - // dataGridViewX1.DataSource = table; - - //} - private void FrmEquipmentManage_FormClosing(object sender, FormClosingEventArgs e) diff --git a/FrmFlagDetail.Designer.cs b/FrmFlagDetail.Designer.cs new file mode 100644 index 0000000..982bfc6 --- /dev/null +++ b/FrmFlagDetail.Designer.cs @@ -0,0 +1,103 @@ +namespace Cyberpipe +{ + partial class FrmFlagDetail + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); + this.dataGridViewX_markDetail = new DevComponents.DotNetBar.Controls.DataGridViewX(); + this.对象类型 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.对象编号 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.对象名称 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX_markDetail)).BeginInit(); + this.SuspendLayout(); + // + // dataGridViewX_markDetail + // + this.dataGridViewX_markDetail.AllowUserToAddRows = false; + this.dataGridViewX_markDetail.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; + this.dataGridViewX_markDetail.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dataGridViewX_markDetail.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.对象类型, + this.对象编号, + this.对象名称}); + dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle3.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dataGridViewX_markDetail.DefaultCellStyle = dataGridViewCellStyle3; + this.dataGridViewX_markDetail.Dock = System.Windows.Forms.DockStyle.Fill; + this.dataGridViewX_markDetail.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(170)))), ((int)(((byte)(170)))), ((int)(((byte)(170))))); + this.dataGridViewX_markDetail.Location = new System.Drawing.Point(0, 0); + this.dataGridViewX_markDetail.Name = "dataGridViewX_markDetail"; + this.dataGridViewX_markDetail.RowTemplate.Height = 23; + this.dataGridViewX_markDetail.Size = new System.Drawing.Size(508, 321); + this.dataGridViewX_markDetail.TabIndex = 0; + // + // 对象类型 + // + this.对象类型.HeaderText = "对象类型"; + this.对象类型.Name = "对象类型"; + // + // 对象编号 + // + this.对象编号.HeaderText = "对象编号"; + this.对象编号.Name = "对象编号"; + // + // 对象名称 + // + this.对象名称.HeaderText = "对象名称"; + this.对象名称.Name = "对象名称"; + // + // FrmFlagDetail + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(508, 321); + this.Controls.Add(this.dataGridViewX_markDetail); + this.Name = "FrmFlagDetail"; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; + this.Text = "标识对象信息"; + this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmFlagDetail_FormClosing); + this.Load += new System.EventHandler(this.FrmFlagDetail_Load); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX_markDetail)).EndInit(); + this.ResumeLayout(false); + + } + + #endregion + + private DevComponents.DotNetBar.Controls.DataGridViewX dataGridViewX_markDetail; + private System.Windows.Forms.DataGridViewTextBoxColumn 对象类型; + private System.Windows.Forms.DataGridViewTextBoxColumn 对象编号; + private System.Windows.Forms.DataGridViewTextBoxColumn 对象名称; + + } +} \ No newline at end of file diff --git a/FrmFlagDetail.cs b/FrmFlagDetail.cs new file mode 100644 index 0000000..81de974 --- /dev/null +++ b/FrmFlagDetail.cs @@ -0,0 +1,77 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Windows.Forms; +using GeoScene.Globe; +using System.Data.OracleClient; + +namespace Cyberpipe +{ + public partial class FrmFlagDetail : Form + { + DataTable dt = new DataTable(); + private GSOGlobeControl globeControl1; + + public delegate void Handle(); + public event Handle showParentForm; + String markId; + + public FrmFlagDetail(GSOGlobeControl globeControl1, String id) + { + InitializeComponent(); + this.markId = id; + } + + private void FrmFlagDetail_FormClosing(object sender, FormClosingEventArgs e) + { + showParentForm(); + } + + private void FrmFlagDetail_Load(object sender, EventArgs e) + { + string objectIds = ""; + string objectTypeCodes = ""; + string sql = "select t.对象编号,t.对象类型 from 标识器 t where t.编号='" + markId + "'"; + using (OracleDataReader reader = OracleUtils.ExecuteReader(OracleUtils.ConnectionString, CommandType.Text, sql)) + { + while (reader.Read()) + { + objectIds = reader.GetString(0); + objectTypeCodes = reader.GetString(1); + } + } + + string[] codeTypes = objectTypeCodes.Split(','); + string[] codeIds = objectIds.Split(','); + int length = 0; + if (codeTypes.Length <= codeIds.Length) + { + length = codeTypes.Length; + } + else + { + length = codeIds.Length; + } + for (int n = 0; n < length; n++) + { + for (int i = 0; i < Utility1.listPipelineType.Count; i++) + { + if (Utility1.listPipelineType[i].code == codeTypes[n]) + { + //string objectId = codeIds[i]; + //string objectType = Utility1.listPipelineType[i].type; + //string objectName = Utility1.listPipelineType[i].name; + int index = this.dataGridViewX_markDetail.Rows.Add(); + this.dataGridViewX_markDetail.Rows[index].Cells[0].Value = Utility1.listPipelineType[i].type; + this.dataGridViewX_markDetail.Rows[index].Cells[1].Value = codeIds[n].ToString(); + this.dataGridViewX_markDetail.Rows[index].Cells[2].Value = Utility1.listPipelineType[i].name; + } + } + } + } + } +} diff --git a/FrmFlagDetail.resx b/FrmFlagDetail.resx new file mode 100644 index 0000000..e98a8fe --- /dev/null +++ b/FrmFlagDetail.resx @@ -0,0 +1,129 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + True + + + True + + + True + + \ No newline at end of file diff --git a/FrmFlagManagers.Designer.cs b/FrmFlagManagers.Designer.cs index d7e2f60..9fe14fb 100644 --- a/FrmFlagManagers.Designer.cs +++ b/FrmFlagManagers.Designer.cs @@ -28,8 +28,10 @@ /// private void InitializeComponent() { - this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); - this.winGridViewPager1 = new WHC.Pager.WinControl.WinGridViewPager(); + this.components = new System.ComponentModel.Container(); + this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components); + this.标识对象ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripMenuItem2 = new System.Windows.Forms.ToolStripMenuItem(); this.bar1 = new DevComponents.DotNetBar.Bar(); this.labelItem1 = new DevComponents.DotNetBar.LabelItem(); this.txt_no = new DevComponents.DotNetBar.TextBoxItem(); @@ -38,45 +40,37 @@ this.btn_query = new DevComponents.DotNetBar.ButtonItem(); this.btn_add_batch = new DevComponents.DotNetBar.ButtonItem(); this.btn_add_menu = new DevComponents.DotNetBar.ButtonItem(); - this.btn_db = new DevComponents.DotNetBar.ButtonItem(); - this.tableLayoutPanel1.SuspendLayout(); + this.winGridViewPager1 = new WHC.Pager.WinControl.WinGridViewPager(); + this.contextMenuStrip1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.bar1)).BeginInit(); this.SuspendLayout(); // - // tableLayoutPanel1 + // contextMenuStrip1 // - this.tableLayoutPanel1.ColumnCount = 1; - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel1.Controls.Add(this.winGridViewPager1, 0, 1); - this.tableLayoutPanel1.Controls.Add(this.bar1, 0, 0); - this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 0); - this.tableLayoutPanel1.Name = "tableLayoutPanel1"; - this.tableLayoutPanel1.RowCount = 2; - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 32F)); - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel1.Size = new System.Drawing.Size(881, 474); - this.tableLayoutPanel1.TabIndex = 6; + this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.标识对象ToolStripMenuItem, + this.toolStripMenuItem2}); + this.contextMenuStrip1.Name = "contextMenuStrip1"; + this.contextMenuStrip1.Size = new System.Drawing.Size(125, 48); // - // winGridViewPager1 + // 标识对象ToolStripMenuItem // - this.winGridViewPager1.AppendedMenu = null; - this.winGridViewPager1.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; - this.winGridViewPager1.DataSource = null; - this.winGridViewPager1.DisplayColumns = ""; - this.winGridViewPager1.Dock = System.Windows.Forms.DockStyle.Fill; - this.winGridViewPager1.Location = new System.Drawing.Point(3, 35); - this.winGridViewPager1.MinimumSize = new System.Drawing.Size(540, 0); - this.winGridViewPager1.Name = "winGridViewPager1"; - this.winGridViewPager1.PrintTitle = ""; - this.winGridViewPager1.Size = new System.Drawing.Size(875, 436); - this.winGridViewPager1.TabIndex = 5; + this.标识对象ToolStripMenuItem.Name = "标识对象ToolStripMenuItem"; + this.标识对象ToolStripMenuItem.Size = new System.Drawing.Size(124, 22); + this.标识对象ToolStripMenuItem.Text = "标识对象"; + this.标识对象ToolStripMenuItem.Click += new System.EventHandler(this.标识对象ToolStripMenuItem_Click); + // + // toolStripMenuItem2 + // + this.toolStripMenuItem2.Name = "toolStripMenuItem2"; + this.toolStripMenuItem2.Size = new System.Drawing.Size(152, 22); + this.toolStripMenuItem2.Text = "查看位置"; + this.toolStripMenuItem2.Click += new System.EventHandler(this.toolStripMenuItem2_Click); // // bar1 // this.bar1.AntiAlias = true; this.bar1.Dock = System.Windows.Forms.DockStyle.Top; - this.bar1.DockSide = DevComponents.DotNetBar.eDockSide.Document; this.bar1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.labelItem1, this.txt_no, @@ -84,14 +78,13 @@ this.combo_street, this.btn_query, this.btn_add_batch, - this.btn_add_menu, - this.btn_db}); - this.bar1.Location = new System.Drawing.Point(3, 3); + this.btn_add_menu}); + this.bar1.Location = new System.Drawing.Point(0, 0); this.bar1.Name = "bar1"; - this.bar1.Size = new System.Drawing.Size(875, 28); + this.bar1.Size = new System.Drawing.Size(881, 28); this.bar1.Stretch = true; this.bar1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.bar1.TabIndex = 1; + this.bar1.TabIndex = 8; this.bar1.TabStop = false; this.bar1.Text = "bar1"; // @@ -136,24 +129,34 @@ this.btn_add_menu.Text = "手工添加"; this.btn_add_menu.Click += new System.EventHandler(this.btn_add_menu_Click); // - // btn_db + // winGridViewPager1 // - this.btn_db.Name = "btn_db"; - this.btn_db.Text = "数据导出"; + this.winGridViewPager1.AppendedMenu = null; + this.winGridViewPager1.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; + this.winGridViewPager1.DataSource = null; + this.winGridViewPager1.DisplayColumns = ""; + this.winGridViewPager1.Dock = System.Windows.Forms.DockStyle.Fill; + this.winGridViewPager1.Location = new System.Drawing.Point(0, 28); + this.winGridViewPager1.MinimumSize = new System.Drawing.Size(540, 0); + this.winGridViewPager1.Name = "winGridViewPager1"; + this.winGridViewPager1.PrintTitle = ""; + this.winGridViewPager1.Size = new System.Drawing.Size(881, 446); + this.winGridViewPager1.TabIndex = 9; // // FrmFlagManagers // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(881, 474); - this.Controls.Add(this.tableLayoutPanel1); + this.Controls.Add(this.winGridViewPager1); + this.Controls.Add(this.bar1); this.DoubleBuffered = true; this.Name = "FrmFlagManagers"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "标识器管理"; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmFlagManagers_FormClosing); this.Load += new System.EventHandler(this.FrmFlagManagers_Load); - this.tableLayoutPanel1.ResumeLayout(false); + this.contextMenuStrip1.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.bar1)).EndInit(); this.ResumeLayout(false); @@ -161,8 +164,8 @@ #endregion - private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1; - private WHC.Pager.WinControl.WinGridViewPager winGridViewPager1; + private System.Windows.Forms.ContextMenuStrip contextMenuStrip1; + private System.Windows.Forms.ToolStripMenuItem 标识对象ToolStripMenuItem; private DevComponents.DotNetBar.Bar bar1; private DevComponents.DotNetBar.LabelItem labelItem1; private DevComponents.DotNetBar.TextBoxItem txt_no; @@ -171,6 +174,7 @@ private DevComponents.DotNetBar.ButtonItem btn_query; private DevComponents.DotNetBar.ButtonItem btn_add_batch; private DevComponents.DotNetBar.ButtonItem btn_add_menu; - private DevComponents.DotNetBar.ButtonItem btn_db; + private WHC.Pager.WinControl.WinGridViewPager winGridViewPager1; + private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem2; } } \ No newline at end of file diff --git a/FrmFlagManagers.cs b/FrmFlagManagers.cs index 38d4927..9bf9734 100644 --- a/FrmFlagManagers.cs +++ b/FrmFlagManagers.cs @@ -33,15 +33,13 @@ { this.globeControl1 = _globeControl1; InitializeComponent(); - winGridViewPager1.OnPageChanged += new EventHandler(winGridViewPager1_OnPageChanged); - this.winGridViewPager1.OnAddNew += new EventHandler(winGridViewPager1_OnAddNew); //右键定位 + winGridViewPager1.OnPageChanged += new EventHandler(winGridViewPager1_OnPageChanged); this.winGridViewPager1.OnEditSelected += new EventHandler(winGridViewPager1_OnEditSelected);//属性编辑 this.winGridViewPager1.OnDeleteSelected += new EventHandler(winGridViewPager1_OnDeleteSelected);//标识器报废 + this.winGridViewPager1.OnStartExport += new EventHandler(pager1_OnStartExport); this.winGridViewPager1.OnEndExport += new EventHandler(pager1_OnEndExport); - //this.winGridViewPager1.ExportCurrent += new ExportCurrentEventHandler(pager1_ExportCurrent); - //this.winGridViewPager1.ExportAll += new ExportAllEventHandler(pager1_ExportAll); winGridViewPager1.dataGridView1.MultiSelect = false; @@ -76,26 +74,25 @@ this.winGridViewPager1.AddColumnAlias("标识器型号", "标识器型号"); this.winGridViewPager1.AddColumnAlias("地面高程", "地面高程"); this.winGridViewPager1.AddColumnAlias("标识器埋深", "标识器埋深"); - this.winGridViewPager1.AddColumnAlias("对象编号", "对象编号"); - this.winGridViewPager1.AddColumnAlias("对象类型", "对象类型"); this.winGridViewPager1.AddColumnAlias("所属道路", "所属道路"); this.winGridViewPager1.AddColumnAlias("使用状态", "使用状态"); - this.winGridViewPager1.DisplayColumns = "编号,标识器ID号,标识器型号,地面高程,标识器埋深,对象编号,对象类型,所属道路,使用状态"; + this.winGridViewPager1.DisplayColumns = "编号,标识器ID号,标识器型号,地面高程,标识器埋深,所属道路,使用状态"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 //隐藏右键功能按钮 //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[1].Visible = false; - //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[4].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[5].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[6].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[7].Visible = false; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[1].Text = "定位查看"; + //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[1].Text = "定位查看"; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "属性编辑"; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Text = "标识器报废"; + winGridViewPager1.AppendedMenu = this.contextMenuStrip1; + //右键菜单宽度 winGridViewPager1.dataGridView1.ContextMenuStrip.AutoSize = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Width = 150; @@ -153,7 +150,7 @@ } /// - /// 右键定位 + /// 对象查看 /// /// /// @@ -306,20 +303,10 @@ string sqlCount = "select count(*) from 标识器 where 使用状态 = '使用中'"; - string sqlData = "select 编号,标识器ID号,标识器型号,地面高程,标识器埋深,对象编号,对象类型,所属道路,LSSYS_ID,X坐标,Y坐标,使用状态 " + + string sqlData = "select 编号,标识器ID号,标识器型号,地面高程,标识器埋深,所属道路,LSSYS_ID,X坐标,Y坐标,使用状态 " + "from (select t.*,rownum row_num from 标识器 t where 使用状态 = '使用中' order by 编号)b " + " where 1=1"; - if (!String.IsNullOrEmpty(txt_no.Text.Trim())) - { - sqlCount += " and 编号 like '%" + txt_no.Text.Trim() + "%'"; - sqlData += " and 编号 like '%" + txt_no.Text.Trim() + "%'"; - } - if (null != combo_street.SelectedItem && !String.IsNullOrEmpty(combo_street.SelectedItem.ToString().Trim())) - { - sqlData += " and 所属道路='" + combo_street.SelectedItem.ToString().Trim() + "'"; - sqlCount += " and 所属道路='" + combo_street.SelectedItem.ToString().Trim() + "'"; - } rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -332,9 +319,8 @@ int maxPage = pageIndex * maxPageIndex; string sqlCount = "select count(*) from 标识器 where 使用状态 = '使用中'"; - string sqlData = "select 编号,标识器ID号,标识器型号,地面高程,标识器埋深,对象编号,对象类型,所属道路,LSSYS_ID,X坐标,Y坐标,使用状态 " + - "from (select t.*,rownum row_num from 标识器 t where 使用状态 = '使用中' order by 编号)b "+ - " where(b.row_num between " + minPage + " and " + maxPage + ")"; + string sqlData = "select 编号,标识器ID号,标识器型号,地面高程,标识器埋深,所属道路,LSSYS_ID,X坐标,Y坐标,使用状态 " + + "from (select t.*,rownum row_num from 标识器 t where 使用状态 = '使用中'"; if (!String.IsNullOrEmpty(txt_no.Text.Trim())) { @@ -347,6 +333,8 @@ sqlCount += " and 所属道路='" + combo_street.SelectedItem.ToString().Trim() + "'"; } + sqlData += " order by 编号)b " + + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; @@ -372,9 +360,10 @@ private void FrmFlagManagers_FormClosing(object sender, FormClosingEventArgs e) { IS_OPEN = false; - Thread downloadJob = new Thread(new ParameterizedThreadStart(doSave)); - downloadJob.IsBackground = true; - downloadJob.Start(e); + //Thread downloadJob = new Thread(new ParameterizedThreadStart(doSave)); + //downloadJob.IsBackground = true; + //downloadJob.Start(e); + globeControl1.Globe.Layers["标识器"].Save(); globeControl1.Globe.MemoryLayer.RemoveAllFeature(); foreach (GSOFeature f in Features) { @@ -480,10 +469,88 @@ if (null != globeControl1) { FrmAddSinMark frm = new FrmAddSinMark(globeControl1); - frm.ShowDialog(); + frm.Show(); } } + private void 标识对象ToolStripMenuItem_Click(object sender, EventArgs e) + { + if (winGridViewPager1 != null && winGridViewPager1.dataGridView1 != null) + { + DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; + try + { + this.Hide(); + string id = row.Cells["编号"].Value.ToString(); + FrmFlagDetail p = new FrmFlagDetail(globeControl1, id); + p.showParentForm += new FrmFlagDetail.Handle(showThisForm);//改变值的事件 + p.Show(); + } + catch (Exception ex) + { + MessageBox.Show("失败:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } + + private void showThisForm() + { + this.Show(); + } + + private void toolStripMenuItem2_Click(object sender, EventArgs e) + { + if (winGridViewPager1 != null && winGridViewPager1.dataGridView1 != null) + { + DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; + try + { + this.WindowState = FormWindowState.Minimized; + string id = row.Cells["LSSYS_ID"].Value.ToString(); + string flagno = row.Cells["编号"].Value.ToString(); + string flagstreet = row.Cells["所属道路"].Value.ToString(); + double x = Convert.ToDouble(row.Cells["X坐标"].Value); + double y = Convert.ToDouble(row.Cells["Y坐标"].Value); + GSOFeature flagFeature = globeControl1.Globe.Layers.GetLayerByCaption("标识器").GetFeatureByID(int.Parse(id)); + + string type = ""; + string pipe = ""; + string sql = "select t.标识器型号,t.对象编号 from 标识器 t where t.编号='" + flagno + "'"; + using (OracleDataReader reader = OracleUtils.ExecuteReader(OracleUtils.ConnectionString, CommandType.Text, sql)) + { + while (reader.Read()) + { + type = reader.GetString(0); + pipe = reader.GetString(1); + } + } + + GSOLabel label = new GSOLabel(); + label.Text = "标识器编号：" + flagno + "\r\n" + + "标识器类型:" + type + "\r\n" + + //"标识对象编号:" + pipe + "\r\n" + + "所属道路:" + flagstreet; + label.Style = new GSOLabelStyle(); + label.Style.TextStyle.FontSize = 18; + label.Style.TextStyle.ForeColor = Color.FromArgb(0, 0, 0, 255); + label.Style.Opaque = 0.8; //设置标注的透明度，取值区间是0-1 + label.Style.TracktionLineType = EnumTracktionLineType.Solid; + label.Style.TextStyle.FontHeight = 10; + label.Style.TextStyle.FontName = "黑体"; + label.Style.TractionLineEndPos = new GSOPoint2d(80, 60); + + flagFeature.Label = label; + Features.Add(flagFeature); + globeControl1.Globe.JumpToFeature(flagFeature, 20); + this.globeControl1.Refresh(); + + } + catch (Exception ex) + { + MessageBox.Show("标识器定位失败:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } } diff --git a/FrmFlagManagers.resx b/FrmFlagManagers.resx index 1af7de1..ad53752 100644 --- a/FrmFlagManagers.resx +++ b/FrmFlagManagers.resx @@ -117,4 +117,7 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 17, 17 + \ No newline at end of file diff --git a/FrmPatrolerEdit.cs b/FrmPatrolerEdit.cs index dbd4fec..f45b5ae 100644 --- a/FrmPatrolerEdit.cs +++ b/FrmPatrolerEdit.cs @@ -46,7 +46,7 @@ txt_name.Focus(); return; } - if (String.IsNullOrEmpty(combo_sex.SelectedItem.ToString())) + if (combo_sex.SelectedItem == null ||String.IsNullOrEmpty(combo_sex.SelectedItem.ToString())) { MessageBox.Show("性别不能为空！", "警告", MessageBoxButtons.OK, MessageBoxIcon.Warning); combo_sex.Focus(); diff --git a/FrmPatrolerManager.Designer.cs b/FrmPatrolerManager.Designer.cs index bb8e5fb..10fac22 100644 --- a/FrmPatrolerManager.Designer.cs +++ b/FrmPatrolerManager.Designer.cs @@ -47,11 +47,13 @@ this.注销 = new DevComponents.Editors.ComboItem(); this.btn_query_person = new DevComponents.DotNetBar.ButtonItem(); this.btn_add_person = new DevComponents.DotNetBar.ButtonItem(); - this.winGridViewPager1 = new WHC.Pager.WinControl.WinGridViewPager(); this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components); this.日志ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.任务ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.定位ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.winGridViewPager1 = new WHC.Pager.WinControl.WinGridViewPager(); + this.编辑ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.注销ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); ((System.ComponentModel.ISupportInitialize)(this.bar1)).BeginInit(); this.contextMenuStrip1.SuspendLayout(); this.SuspendLayout(); @@ -173,9 +175,42 @@ this.btn_add_person.Text = "新增"; this.btn_add_person.Click += new System.EventHandler(this.btn_add_person_Click); // + // contextMenuStrip1 + // + this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.日志ToolStripMenuItem, + this.任务ToolStripMenuItem, + this.定位ToolStripMenuItem, + this.编辑ToolStripMenuItem, + this.注销ToolStripMenuItem}); + this.contextMenuStrip1.Name = "contextMenuStrip1"; + this.contextMenuStrip1.Size = new System.Drawing.Size(153, 136); + // + // 日志ToolStripMenuItem + // + this.日志ToolStripMenuItem.Name = "日志ToolStripMenuItem"; + this.日志ToolStripMenuItem.Size = new System.Drawing.Size(100, 22); + this.日志ToolStripMenuItem.Text = "日志"; + this.日志ToolStripMenuItem.Click += new System.EventHandler(this.日志ToolStripMenuItem_Click); + // + // 任务ToolStripMenuItem + // + this.任务ToolStripMenuItem.Name = "任务ToolStripMenuItem"; + this.任务ToolStripMenuItem.Size = new System.Drawing.Size(100, 22); + this.任务ToolStripMenuItem.Text = "任务"; + this.任务ToolStripMenuItem.Click += new System.EventHandler(this.任务ToolStripMenuItem_Click); + // + // 定位ToolStripMenuItem + // + this.定位ToolStripMenuItem.Name = "定位ToolStripMenuItem"; + this.定位ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.定位ToolStripMenuItem.Text = "定位"; + this.定位ToolStripMenuItem.Click += new System.EventHandler(this.定位ToolStripMenuItem_Click); + // // winGridViewPager1 // this.winGridViewPager1.AppendedMenu = null; + this.winGridViewPager1.ContextMenuStrip = this.contextMenuStrip1; this.winGridViewPager1.DataSource = null; this.winGridViewPager1.DisplayColumns = ""; this.winGridViewPager1.Dock = System.Windows.Forms.DockStyle.Fill; @@ -186,35 +221,19 @@ this.winGridViewPager1.Size = new System.Drawing.Size(756, 309); this.winGridViewPager1.TabIndex = 3; // - // contextMenuStrip1 + // 编辑ToolStripMenuItem // - this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.日志ToolStripMenuItem, - this.任务ToolStripMenuItem, - this.定位ToolStripMenuItem}); - this.contextMenuStrip1.Name = "contextMenuStrip1"; - this.contextMenuStrip1.Size = new System.Drawing.Size(101, 70); + this.编辑ToolStripMenuItem.Name = "编辑ToolStripMenuItem"; + this.编辑ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.编辑ToolStripMenuItem.Text = "编辑"; + this.编辑ToolStripMenuItem.Click += new System.EventHandler(this.编辑ToolStripMenuItem_Click); // - // 日志ToolStripMenuItem + // 注销ToolStripMenuItem // - this.日志ToolStripMenuItem.Name = "日志ToolStripMenuItem"; - this.日志ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); - this.日志ToolStripMenuItem.Text = "日志"; - this.日志ToolStripMenuItem.Click += new System.EventHandler(this.日志ToolStripMenuItem_Click); - // - // 任务ToolStripMenuItem - // - this.任务ToolStripMenuItem.Name = "任务ToolStripMenuItem"; - this.任务ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); - this.任务ToolStripMenuItem.Text = "任务"; - this.任务ToolStripMenuItem.Click += new System.EventHandler(this.任务ToolStripMenuItem_Click); - // - // 定位ToolStripMenuItem - // - this.定位ToolStripMenuItem.Name = "定位ToolStripMenuItem"; - this.定位ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); - this.定位ToolStripMenuItem.Text = "定位"; - this.定位ToolStripMenuItem.Click += new System.EventHandler(this.定位ToolStripMenuItem_Click); + this.注销ToolStripMenuItem.Name = "注销ToolStripMenuItem"; + this.注销ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.注销ToolStripMenuItem.Text = "注销"; + this.注销ToolStripMenuItem.Click += new System.EventHandler(this.注销ToolStripMenuItem_Click); // // FrmPatrolerManager // @@ -229,7 +248,7 @@ this.MinimizeBox = false; this.Name = "FrmPatrolerManager"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; - this.Text = "巡检人员维护"; + this.Text = "定位人员维护"; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmPatrolerManager_FormClosing); this.Load += new System.EventHandler(this.FrmPatrolerManager_Load); ((System.ComponentModel.ISupportInitialize)(this.bar1)).EndInit(); @@ -258,10 +277,12 @@ private DevComponents.Editors.ComboItem 注销; private DevComponents.Editors.ComboItem comboItem1; private DevComponents.Editors.ComboItem 不限; - private WHC.Pager.WinControl.WinGridViewPager winGridViewPager1; private System.Windows.Forms.ContextMenuStrip contextMenuStrip1; private System.Windows.Forms.ToolStripMenuItem 日志ToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem 任务ToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem 定位ToolStripMenuItem; + private WHC.Pager.WinControl.WinGridViewPager winGridViewPager1; + private System.Windows.Forms.ToolStripMenuItem 编辑ToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem 注销ToolStripMenuItem; } } \ No newline at end of file diff --git a/Cyberpipe.csproj b/Cyberpipe.csproj index fe600e5..501fd09 100644 --- a/Cyberpipe.csproj +++ b/Cyberpipe.csproj @@ -246,6 +246,12 @@ Form_TaskManager.cs + + Form + + + FrmFlagDetail.cs + Form @@ -1368,6 +1374,9 @@ Form_TaskManager.cs + + FrmFlagDetail.cs + FormDocumentManager.cs diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 537b4c3..1acf22a 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 7d5dd95..3f178cb 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -90,20 +90,20 @@ this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - - this.winGridViewPager1.AddColumnAlias("ACCIDENTTIME", "上报时间"); - this.winGridViewPager1.AddColumnAlias("DBID", "编号"); - this.winGridViewPager1.AddColumnAlias("DESCRIBE", "事件描述"); - this.winGridViewPager1.AddColumnAlias("LATITUDE", "纬度"); - this.winGridViewPager1.AddColumnAlias("LOCALE", "事件地点"); - this.winGridViewPager1.AddColumnAlias("LONGITUDE", "经度"); - this.winGridViewPager1.AddColumnAlias("PATROLERNAME", "上报人员"); - this.winGridViewPager1.AddColumnAlias("PATROLER_ID", "人员ID"); - this.winGridViewPager1.AddColumnAlias("TASK_ID", "任务编号"); - this.winGridViewPager1.AddColumnAlias("RESULT", "处理结果"); - this.winGridViewPager1.AddColumnAlias("STATE", "处理状态"); - this.winGridViewPager1.DisplayColumns = "ACCIDENTTIME,DESCRIBE,LOCALE,PATROLERNAME,TASK_ID,RESULT,STATE"; + this.winGridViewPager1.AddColumnAlias("上报时间", "上报时间"); + this.winGridViewPager1.AddColumnAlias("编号", "编号"); + this.winGridViewPager1.AddColumnAlias("事件描述", "事件描述"); + this.winGridViewPager1.AddColumnAlias("纬度", "纬度"); + this.winGridViewPager1.AddColumnAlias("事件地点", "事件地点"); + this.winGridViewPager1.AddColumnAlias("经度", "经度"); + this.winGridViewPager1.AddColumnAlias("上报人员", "上报人员"); + this.winGridViewPager1.AddColumnAlias("人员ID", "人员ID"); + this.winGridViewPager1.AddColumnAlias("任务编号", "任务编号"); + this.winGridViewPager1.AddColumnAlias("处理结果", "处理结果"); + this.winGridViewPager1.AddColumnAlias("处理状态", "处理状态"); + + this.winGridViewPager1.DisplayColumns = "上报时间,事件描述,事件地点,上报人员,任务编号,处理结果,处理状态"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -114,8 +114,8 @@ winGridViewPager1.dataGridView1.ContextMenuStrip.Items[5].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[6].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[7].Visible = false; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[1].Text = "查看位置"; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "结果编辑"; + winGridViewPager1.dataGridView1.ContextMenuStrip.Items[1].Text = "结果编辑"; + winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "查看位置"; //右键菜单宽度 winGridViewPager1.dataGridView1.ContextMenuStrip.AutoSize = false; @@ -160,13 +160,12 @@ this.WindowState = FormWindowState.Minimized; globeControl1.Globe.MemoryLayer.RemoveAllFeature(); this.WindowState = FormWindowState.Minimized; - double x = Convert.ToDouble(row.Cells["LONGITUDE"].Value); - double y = Convert.ToDouble(row.Cells["LATITUDE"].Value); - - string username = Convert.ToString(row.Cells["PATROLERNAME"].Value); - string Atime = Convert.ToString(row.Cells["ACCIDENTTIME"].Value); - string location = Convert.ToString(row.Cells["LOCALE"].Value); - string descp = Convert.ToString(row.Cells["DESCRIBE"].Value); + double x = Convert.ToDouble(row.Cells["经度"].Value); + double y = Convert.ToDouble(row.Cells["纬度"].Value); + string username = Convert.ToString(row.Cells["上报人员"].Value); + string Atime = Convert.ToString(row.Cells["上报时间"].Value); + string location = Convert.ToString(row.Cells["事件地点"].Value); + string descp = Convert.ToString(row.Cells["事件描述"].Value); /////////////////////////////////////// /*******设置飞行与创建模型******/ @@ -228,8 +227,8 @@ DataGridViewRow row = grid.SelectedRows[0]; try { - int dbId = Convert.ToInt32(row.Cells["DBID"].Value); - string result = Convert.ToString(row.Cells["RESULT"].Value); + int dbId = Convert.ToInt32(row.Cells["编号"].Value); + string result = Convert.ToString(row.Cells["处理结果"].Value); EMS_Forms.Form_EventResult form = new Form_EventResult(dbId, result); form.refresh += new Form_EventResult.Handle(LoadData);//改变值的事件 form.ShowDialog(); @@ -276,9 +275,9 @@ } for (int i = 0; i < table.Rows.Count; i++) { - if (winGridViewPager1.dataGridView1.Rows[i].Cells["RESULT"].Value != null && !(winGridViewPager1.dataGridView1.Rows[i].Cells["RESULT"].Value.ToString().Trim().Equals(""))) + if (winGridViewPager1.dataGridView1.Rows[i].Cells["处理结果"].Value != null && !(winGridViewPager1.dataGridView1.Rows[i].Cells["处理结果"].Value.ToString().Trim().Equals(""))) { - winGridViewPager1.dataGridView1.Rows[i].Cells["STATE"].Value = "已处理"; + winGridViewPager1.dataGridView1.Rows[i].Cells["处理状态"].Value = "已处理"; } } @@ -307,9 +306,9 @@ } for (int i = 0; i < table.Rows.Count; i++) { - if (winGridViewPager1.dataGridView1.Rows[i].Cells["RESULT"].Value != null && !(winGridViewPager1.dataGridView1.Rows[i].Cells["RESULT"].Value.ToString().Trim().Equals(""))) + if (winGridViewPager1.dataGridView1.Rows[i].Cells["处理结果"].Value != null && !(winGridViewPager1.dataGridView1.Rows[i].Cells["处理结果"].Value.ToString().Trim().Equals(""))) { - winGridViewPager1.dataGridView1.Rows[i].Cells["STATE"].Value = "已处理"; + winGridViewPager1.dataGridView1.Rows[i].Cells["处理状态"].Value = "已处理"; } } @@ -320,10 +319,12 @@ { string sqlCount = "select count(*) from ACCIDENT where 1=1"; - string sqlData = "select ACCIDENTTIME,DBID,DESCRIBE,LATITUDE,LOCALE,LONGITUDE,PATROLERNAME,PATROLER_ID,TASK_ID,RESULT,'' as STATE " + + string sqlData = "select ACCIDENTTIME as 上报时间,DBID as 编号,DESCRIBE as 事件描述,"+ + "LATITUDE as 纬度,LOCALE as 事件地点,LONGITUDE as 经度,PATROLERNAME 上报人员,"+ + "PATROLER_ID as 人员ID,TASK_ID as 任务编号,RESULT as 处理结果,'' as 处理状态 " + "from (select t.*,rownum row_num from ACCIDENT t order by DBID)b " + " where 1=1"; - + rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; @@ -340,9 +341,10 @@ string sqlCount = "select count(*) from ACCIDENT where 1=1"; - string sqlData = "select ACCIDENTTIME,DBID,DESCRIBE,LATITUDE,LOCALE,LONGITUDE,PATROLERNAME,PATROLER_ID,TASK_ID,RESULT,'' as STATE " + - "from (select t.*,rownum row_num from ACCIDENT t order by DBID)b " + - " where(b.row_num between " + minPage + " and " + maxPage + ")"; + string sqlData = "select ACCIDENTTIME as 上报时间,DBID as 编号,DESCRIBE as 事件描述," + + "LATITUDE as 纬度,LOCALE as 事件地点,LONGITUDE as 经度,PATROLERNAME 上报人员," + + "PATROLER_ID as 人员ID,TASK_ID as 任务编号,RESULT as 处理结果,'' as 处理状态 " + + "from (select t.*,rownum row_num from ACCIDENT t where 1=1"; if (!String.IsNullOrEmpty(comboBox_name.Text.Trim())) { @@ -361,7 +363,8 @@ sqlCount += "and ACCIDENTTIME<=to_date('" + time.ToShortDateString() + "','yyyy-MM-dd') "; sqlData += "and ACCIDENTTIME<=to_date('" + time.ToShortDateString() + "','yyyy-MM-dd') "; } - + sqlData += " order by DBID desc)b " + + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 225c8d7..8bd9e48 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -120,8 +120,8 @@ private void flyToTask(DataGridViewRow row, int taskState) { int dbID = 0; - dbID = Convert.ToInt32(row.Cells["DBID"].Value); - string userName = Convert.ToString(row.Cells["USERNAME"].Value); + dbID = Convert.ToInt32(row.Cells["任务编号"].Value); + string userName = Convert.ToString(row.Cells["任务执行人员"].Value); System.DateTime t = new DateTime(); try { @@ -392,15 +392,15 @@ //控制表格显示的列，以及每一列要显示的列名 this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - this.winGridViewPager1.AddColumnAlias("DBID", "任务编号"); - this.winGridViewPager1.AddColumnAlias("DEPLOYTIME", "创建时间"); - this.winGridViewPager1.AddColumnAlias("DESCIRPTION", "任务描述"); - this.winGridViewPager1.AddColumnAlias("FINISHTIME", "完成时间"); - this.winGridViewPager1.AddColumnAlias("STREET", "任务执行区域"); - this.winGridViewPager1.AddColumnAlias("TASKSTATE", "任务状态"); - this.winGridViewPager1.AddColumnAlias("USERNAME", "任务执行人员"); + this.winGridViewPager1.AddColumnAlias("任务编号", "任务编号"); + this.winGridViewPager1.AddColumnAlias("创建时间", "创建时间"); + this.winGridViewPager1.AddColumnAlias("任务描述", "任务描述"); + this.winGridViewPager1.AddColumnAlias("完成时间", "完成时间"); + this.winGridViewPager1.AddColumnAlias("任务执行区域", "任务执行区域"); + this.winGridViewPager1.AddColumnAlias("任务状态", "任务状态"); + this.winGridViewPager1.AddColumnAlias("任务执行人员", "任务执行人员"); - this.winGridViewPager1.DisplayColumns = "DBID,DEPLOYTIME,DESCIRPTION,FINISHTIME,STREET,TASKSTATE,USERNAME"; + this.winGridViewPager1.DisplayColumns = "任务编号,创建时间,任务描述,完成时间,任务执行区域,任务状态,任务执行人员"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -464,8 +464,8 @@ { int dbID = 0; int taskStateInt = 0; - dbID = Convert.ToInt32(row.Cells["DBID"].Value); - string taskState = row.Cells["TASKSTATE"].Value.ToString(); + dbID = Convert.ToInt32(row.Cells["任务编号"].Value); + string taskState = row.Cells["任务状态"].Value.ToString(); if (taskState.Equals("开始任务")) { taskStateInt = 1; @@ -534,9 +534,10 @@ private string GetSql() { - string sqlCount = "select count(*) from taskinfo t where 1=1'"; + string sqlCount = "select count(*) from taskinfo t where 1=1"; - string sqlData = "select dbid,deploytime,descirption,finishtime,street,taskstate,username " + + 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"; @@ -550,9 +551,9 @@ int minPage = (pageIndex - 1) * maxPageIndex + 1; int maxPage = pageIndex * maxPageIndex; string sqlCount = "select count(*) from taskinfo t where 1=1"; - string sqlData = "select dbid,deploytime,descirption,finishtime,street,taskstate,username " + - "from (select t.*,rownum row_num from taskinfo t order by DBID desc)b " + - " where(b.row_num between " + minPage + " and " + maxPage + ")"; + 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"; if (!String.IsNullOrEmpty(comboBox_userName.Text.Trim()) && !comboBox_userName.Text.Trim().Equals("不限")) { @@ -581,6 +582,8 @@ sqlCount += "and street='" + combo_street.Text + "' "; sqlData += "and street='" + combo_street.Text + "' "; } + sqlData += " order by DBID desc)b " + + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index e65a4bd..58f5342 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -73,13 +73,13 @@ //控制表格显示的列，以及每一列要显示的列名 this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - this.winGridViewPager1.AddColumnAlias("FILENAME", "文档名称"); - this.winGridViewPager1.AddColumnAlias("DBID", "编号"); - this.winGridViewPager1.AddColumnAlias("TITLE", "文档标题"); - this.winGridViewPager1.AddColumnAlias("FILETYPE", "文档类型"); - this.winGridViewPager1.AddColumnAlias("UPDAY", "上传日期"); - this.winGridViewPager1.AddColumnAlias("WRITER", "上传人"); - this.winGridViewPager1.DisplayColumns = "FILENAME,TITLE,FILETYPE,UPDAY,WRITER"; + this.winGridViewPager1.AddColumnAlias("文档名称", "文档名称"); + this.winGridViewPager1.AddColumnAlias("编号", "编号"); + this.winGridViewPager1.AddColumnAlias("文档标题", "文档标题"); + this.winGridViewPager1.AddColumnAlias("文档类型", "文档类型"); + this.winGridViewPager1.AddColumnAlias("上传日期", "上传日期"); + this.winGridViewPager1.AddColumnAlias("上传人", "上传人"); + this.winGridViewPager1.DisplayColumns = "文档名称,文档标题,文档类型,上传日期,上传人"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -167,7 +167,7 @@ if (grid != null) { DataGridViewRow row = grid.SelectedRows[0]; - string dbid = row.Cells["dbid"].Value.ToString(); + string dbid = row.Cells["编号"].Value.ToString(); try { if (MessageBox.Show("确认删除吗？", "确认", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) @@ -212,7 +212,8 @@ { string sqlCount = "select count(*) from casic_userdocument where sysname = 'EMS'"; - string sqlData = "select filename,dbid,title,filetype,upday,writer " + + string sqlData = "select filename as 文档名称,dbid as 编号,title as 文档标题," + + "filetype as 文档类型,upday as 上传日期,writer as 上传人 " + "from (select t.*,rownum row_num from casic_userdocument t order by DBID desc)b " + " where sysname = 'EMS'"; @@ -226,9 +227,9 @@ int minPage = (pageIndex - 1) * maxPageIndex + 1; int maxPage = pageIndex * maxPageIndex; string sqlCount = "select count(*) from casic_userdocument where sysname = 'EMS'"; - string sqlData = "select filename,dbid,title,filetype,upday,writer " + - "from (select t.*,rownum row_num from casic_userdocument t where sysname = 'EMS' order by DBID desc)b " + - " where(b.row_num between " + minPage + " and " + maxPage + ")"; + string sqlData = "select filename as 文档名称,dbid as 编号,title as 文档标题,"+ + "filetype as 文档类型,upday as 上传日期,writer as 上传人 " + + "from (select t.*,rownum row_num from casic_userdocument t where sysname = 'EMS'"; string txtTitleText = null; string comboFileType = null; @@ -278,7 +279,8 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - + sqlData += " order by DBID desc)b " + + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; @@ -437,7 +439,7 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - string filename = row.Cells["filename"].Value.ToString(); + string filename = row.Cells["文档名称"].Value.ToString(); string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; string file = System.Environment.CurrentDirectory + "\\download\\" + filename; int result = DownloadFile(url, file, progressBar1); @@ -515,7 +517,7 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - string filename = row.Cells["filename"].Value.ToString(); + string filename = row.Cells["文档名称"].Value.ToString(); string ext = Path.GetExtension(filename); SaveFileDialog dlg = new SaveFileDialog(); dlg.Filter = "保存文档|*" + ext + ";"; diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 1d1201b..3902629 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -748,6 +748,7 @@ this.Name = "FrmAddSinMark"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "单个标识器添加"; + this.TopMost = true; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmAddSinMark_FormClosing); this.Load += new System.EventHandler(this.FrmAddSinMark_Load); this.groupPanel1.ResumeLayout(false); diff --git a/FrmEquipmentManage.cs b/FrmEquipmentManage.cs index 90bfdb2..a3cf55c 100644 --- a/FrmEquipmentManage.cs +++ b/FrmEquipmentManage.cs @@ -74,13 +74,13 @@ //控制表格显示的列，以及每一列要显示的列名 this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - this.winGridViewPager1.AddColumnAlias("DESCIRPTION", "设备描述"); - this.winGridViewPager1.AddColumnAlias("DBID", "编号"); - this.winGridViewPager1.AddColumnAlias("MACID", "MAC地址"); - this.winGridViewPager1.AddColumnAlias("OWNER", "设备所有人"); - this.winGridViewPager1.AddColumnAlias("STATUS", "设备状态"); + this.winGridViewPager1.AddColumnAlias("设备描述", "设备描述"); + this.winGridViewPager1.AddColumnAlias("编号", "编号"); + this.winGridViewPager1.AddColumnAlias("MAC地址", "MAC地址"); + this.winGridViewPager1.AddColumnAlias("设备所有人", "设备所有人"); + this.winGridViewPager1.AddColumnAlias("设备状态", "设备状态"); - this.winGridViewPager1.DisplayColumns = "DESCIRPTION,MACID,OWNER,STATUS"; + this.winGridViewPager1.DisplayColumns = "设备描述,MAC地址,设备所有人,设备状态"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -146,10 +146,10 @@ DataGridViewRow row = grid.SelectedRows[0]; try { - long dbid = long.Parse(row.Cells["DBID"].Value.ToString()); - String macId = row.Cells["MACID"].Value.ToString(); - String username = row.Cells["OWNER"].Value.ToString(); - String descn = row.Cells["DESCIRPTION"].Value.ToString(); + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); + String macId = row.Cells["MAC地址"].Value.ToString(); + String username = row.Cells["设备所有人"].Value.ToString(); + String descn = row.Cells["设备状态"].Value.ToString(); FrmEquipmentEdit frm = new FrmEquipmentEdit(dbid.ToString(), macId, username, descn); frm.reloadGrid += new ReloadEquipmentGrid(LoadData); frm.ShowDialog(); @@ -179,7 +179,7 @@ { return; } - String macId = row.Cells["MACID"].Value.ToString(); + String macId = row.Cells["MAC地址"].Value.ToString(); FrmLog frm = new FrmLog(macId); frm.Show(); } @@ -201,7 +201,7 @@ if (grid != null) { DataGridViewRow row = grid.SelectedRows[0]; - long dbid = long.Parse(row.Cells["DBID"].Value.ToString()); + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); try { if (MessageBox.Show("确定删除？", "确认", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) @@ -243,7 +243,8 @@ { string sqlCount = "select count(*) from equipment where status = 'USING'"; - string sqlData = "select descirption,DBID,macid,owner,case when status = 'USING' then '可用' when status = 'DAMAGE' then '损坏' end as status " + + string sqlData = "select descirption as 设备描述,DBID as 编号,macid as MAC地址,owner as 设备所有人,"+ + "case when status = 'USING' then '可用' when status = 'DAMAGE' then '损坏' end as 设备状态 " + "from (select t.*,rownum row_num from equipment t where status = 'USING' order by dbid desc)b " + " where 1=1"; @@ -258,16 +259,17 @@ int maxPage = pageIndex * maxPageIndex; string sqlCount = "select count(*) from equipment where status = 'USING' "; - string sqlData = "select descirption,DBID,macid,owner,case when status = 'USING' then '可用' when status = 'DAMAGE' then '损坏' end as status " + - "from (select t.*,rownum row_num from equipment t where status = 'USING' order by DBID desc)b " + - " where(b.row_num between " + minPage + " and " + maxPage + ")"; + string sqlData = "select descirption as 设备描述,DBID as 编号,macid as MAC地址,owner as 设备所有人," + + "case when status = 'USING' then '可用' when status = 'DAMAGE' then '损坏' end as 设备状态 " + + "from (select t.*,rownum row_num from equipment t where status = 'USING'"; if (!String.IsNullOrEmpty(txtMacId.Text.Trim())) { sqlData += " and macid like '%" + txtMacId.Text.Trim() + "%'"; sqlCount += " and macid like '%" + txtMacId.Text.Trim() + "%'"; } - + sqlData += " order by DBID desc)b " + + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; @@ -299,76 +301,6 @@ } } - //public void reloadGrid(int pageIndex) - //{ - // if (pageIndex <= 0) - // { - // pageIndex = 1; - // currentpage = 1; - // } - // String sqlrows = "select * from (select rownum as rowno,dbid,descirption,macid,owner,case when status = 'USING' then '可用' when status = 'DAMAGE' then '损坏' end as status,'编辑' as btnEdit,'删除' as btnDel from equipment t where status = 'USING' "; - // string sqlcount = "select count(*) from equipment where status = 'USING' "; - // if (!String.IsNullOrEmpty(txtMacId.Text.Trim())) - // { - // sqlrows += " and macid like '%" + txtMacId.Text.Trim() + "%'"; - // sqlcount += " and macid like '%" + txtMacId.Text.Trim() + "%'"; - // } - // sqlrows += " and rownum<=" + (pagesize * pageIndex) + ") table_alias where table_alias.rowno>=" + ((pageIndex - 1) * pagesize + 1); - - // int rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlcount).ToString()); - // int pages = 0; - // if (rows % pagesize == 0) - // { - // pages = rows / pagesize; - // } - // else - // { - // pages = rows / pagesize + 1; - // } - - // lastpage = pages; - - // lab_page_msg.Text = "共" + rows + "条记录，每页" + pagesize + "条，第" + pageIndex + "页，共" + pages + "页"; - // combo_page_num.Items.Clear(); - // for (int i = 1; i <= pages; i++) - // { - // combo_page_num.Items.Add(new ComboBoxItem(i.ToString(), i.ToString())); - // } - - // if (lastpage == 1) - // { - // btn_page_first.Enabled = false; - // btn_page_pre.Enabled = false; - // btn_page_last.Enabled = false; - // btn_page_next.Enabled = false; - // } - // else if (currentpage == 1) - // { - // btn_page_first.Enabled = false; - // btn_page_pre.Enabled = false; - // btn_page_last.Enabled = true; - // btn_page_next.Enabled = true; - // } - // else if (currentpage == lastpage) - // { - // btn_page_first.Enabled = true; - // btn_page_pre.Enabled = true; - // btn_page_last.Enabled = false; - // btn_page_next.Enabled = false; - // } - // else - // { - // btn_page_first.Enabled = true; - // btn_page_pre.Enabled = true; - // btn_page_last.Enabled = true; - // btn_page_next.Enabled = true; - // } - - // DataTable table = OracleUtils.ExecuteDataset(OracleUtils.ConnectionString, CommandType.Text, sqlrows).Tables[0]; - // dataGridViewX1.DataSource = table; - - //} - private void FrmEquipmentManage_FormClosing(object sender, FormClosingEventArgs e) diff --git a/FrmFlagDetail.Designer.cs b/FrmFlagDetail.Designer.cs new file mode 100644 index 0000000..982bfc6 --- /dev/null +++ b/FrmFlagDetail.Designer.cs @@ -0,0 +1,103 @@ +namespace Cyberpipe +{ + partial class FrmFlagDetail + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); + this.dataGridViewX_markDetail = new DevComponents.DotNetBar.Controls.DataGridViewX(); + this.对象类型 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.对象编号 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.对象名称 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX_markDetail)).BeginInit(); + this.SuspendLayout(); + // + // dataGridViewX_markDetail + // + this.dataGridViewX_markDetail.AllowUserToAddRows = false; + this.dataGridViewX_markDetail.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; + this.dataGridViewX_markDetail.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dataGridViewX_markDetail.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.对象类型, + this.对象编号, + this.对象名称}); + dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle3.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dataGridViewX_markDetail.DefaultCellStyle = dataGridViewCellStyle3; + this.dataGridViewX_markDetail.Dock = System.Windows.Forms.DockStyle.Fill; + this.dataGridViewX_markDetail.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(170)))), ((int)(((byte)(170)))), ((int)(((byte)(170))))); + this.dataGridViewX_markDetail.Location = new System.Drawing.Point(0, 0); + this.dataGridViewX_markDetail.Name = "dataGridViewX_markDetail"; + this.dataGridViewX_markDetail.RowTemplate.Height = 23; + this.dataGridViewX_markDetail.Size = new System.Drawing.Size(508, 321); + this.dataGridViewX_markDetail.TabIndex = 0; + // + // 对象类型 + // + this.对象类型.HeaderText = "对象类型"; + this.对象类型.Name = "对象类型"; + // + // 对象编号 + // + this.对象编号.HeaderText = "对象编号"; + this.对象编号.Name = "对象编号"; + // + // 对象名称 + // + this.对象名称.HeaderText = "对象名称"; + this.对象名称.Name = "对象名称"; + // + // FrmFlagDetail + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(508, 321); + this.Controls.Add(this.dataGridViewX_markDetail); + this.Name = "FrmFlagDetail"; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; + this.Text = "标识对象信息"; + this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmFlagDetail_FormClosing); + this.Load += new System.EventHandler(this.FrmFlagDetail_Load); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX_markDetail)).EndInit(); + this.ResumeLayout(false); + + } + + #endregion + + private DevComponents.DotNetBar.Controls.DataGridViewX dataGridViewX_markDetail; + private System.Windows.Forms.DataGridViewTextBoxColumn 对象类型; + private System.Windows.Forms.DataGridViewTextBoxColumn 对象编号; + private System.Windows.Forms.DataGridViewTextBoxColumn 对象名称; + + } +} \ No newline at end of file diff --git a/FrmFlagDetail.cs b/FrmFlagDetail.cs new file mode 100644 index 0000000..81de974 --- /dev/null +++ b/FrmFlagDetail.cs @@ -0,0 +1,77 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Windows.Forms; +using GeoScene.Globe; +using System.Data.OracleClient; + +namespace Cyberpipe +{ + public partial class FrmFlagDetail : Form + { + DataTable dt = new DataTable(); + private GSOGlobeControl globeControl1; + + public delegate void Handle(); + public event Handle showParentForm; + String markId; + + public FrmFlagDetail(GSOGlobeControl globeControl1, String id) + { + InitializeComponent(); + this.markId = id; + } + + private void FrmFlagDetail_FormClosing(object sender, FormClosingEventArgs e) + { + showParentForm(); + } + + private void FrmFlagDetail_Load(object sender, EventArgs e) + { + string objectIds = ""; + string objectTypeCodes = ""; + string sql = "select t.对象编号,t.对象类型 from 标识器 t where t.编号='" + markId + "'"; + using (OracleDataReader reader = OracleUtils.ExecuteReader(OracleUtils.ConnectionString, CommandType.Text, sql)) + { + while (reader.Read()) + { + objectIds = reader.GetString(0); + objectTypeCodes = reader.GetString(1); + } + } + + string[] codeTypes = objectTypeCodes.Split(','); + string[] codeIds = objectIds.Split(','); + int length = 0; + if (codeTypes.Length <= codeIds.Length) + { + length = codeTypes.Length; + } + else + { + length = codeIds.Length; + } + for (int n = 0; n < length; n++) + { + for (int i = 0; i < Utility1.listPipelineType.Count; i++) + { + if (Utility1.listPipelineType[i].code == codeTypes[n]) + { + //string objectId = codeIds[i]; + //string objectType = Utility1.listPipelineType[i].type; + //string objectName = Utility1.listPipelineType[i].name; + int index = this.dataGridViewX_markDetail.Rows.Add(); + this.dataGridViewX_markDetail.Rows[index].Cells[0].Value = Utility1.listPipelineType[i].type; + this.dataGridViewX_markDetail.Rows[index].Cells[1].Value = codeIds[n].ToString(); + this.dataGridViewX_markDetail.Rows[index].Cells[2].Value = Utility1.listPipelineType[i].name; + } + } + } + } + } +} diff --git a/FrmFlagDetail.resx b/FrmFlagDetail.resx new file mode 100644 index 0000000..e98a8fe --- /dev/null +++ b/FrmFlagDetail.resx @@ -0,0 +1,129 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + True + + + True + + + True + + \ No newline at end of file diff --git a/FrmFlagManagers.Designer.cs b/FrmFlagManagers.Designer.cs index d7e2f60..9fe14fb 100644 --- a/FrmFlagManagers.Designer.cs +++ b/FrmFlagManagers.Designer.cs @@ -28,8 +28,10 @@ /// private void InitializeComponent() { - this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); - this.winGridViewPager1 = new WHC.Pager.WinControl.WinGridViewPager(); + this.components = new System.ComponentModel.Container(); + this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components); + this.标识对象ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripMenuItem2 = new System.Windows.Forms.ToolStripMenuItem(); this.bar1 = new DevComponents.DotNetBar.Bar(); this.labelItem1 = new DevComponents.DotNetBar.LabelItem(); this.txt_no = new DevComponents.DotNetBar.TextBoxItem(); @@ -38,45 +40,37 @@ this.btn_query = new DevComponents.DotNetBar.ButtonItem(); this.btn_add_batch = new DevComponents.DotNetBar.ButtonItem(); this.btn_add_menu = new DevComponents.DotNetBar.ButtonItem(); - this.btn_db = new DevComponents.DotNetBar.ButtonItem(); - this.tableLayoutPanel1.SuspendLayout(); + this.winGridViewPager1 = new WHC.Pager.WinControl.WinGridViewPager(); + this.contextMenuStrip1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.bar1)).BeginInit(); this.SuspendLayout(); // - // tableLayoutPanel1 + // contextMenuStrip1 // - this.tableLayoutPanel1.ColumnCount = 1; - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel1.Controls.Add(this.winGridViewPager1, 0, 1); - this.tableLayoutPanel1.Controls.Add(this.bar1, 0, 0); - this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 0); - this.tableLayoutPanel1.Name = "tableLayoutPanel1"; - this.tableLayoutPanel1.RowCount = 2; - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 32F)); - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel1.Size = new System.Drawing.Size(881, 474); - this.tableLayoutPanel1.TabIndex = 6; + this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.标识对象ToolStripMenuItem, + this.toolStripMenuItem2}); + this.contextMenuStrip1.Name = "contextMenuStrip1"; + this.contextMenuStrip1.Size = new System.Drawing.Size(125, 48); // - // winGridViewPager1 + // 标识对象ToolStripMenuItem // - this.winGridViewPager1.AppendedMenu = null; - this.winGridViewPager1.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; - this.winGridViewPager1.DataSource = null; - this.winGridViewPager1.DisplayColumns = ""; - this.winGridViewPager1.Dock = System.Windows.Forms.DockStyle.Fill; - this.winGridViewPager1.Location = new System.Drawing.Point(3, 35); - this.winGridViewPager1.MinimumSize = new System.Drawing.Size(540, 0); - this.winGridViewPager1.Name = "winGridViewPager1"; - this.winGridViewPager1.PrintTitle = ""; - this.winGridViewPager1.Size = new System.Drawing.Size(875, 436); - this.winGridViewPager1.TabIndex = 5; + this.标识对象ToolStripMenuItem.Name = "标识对象ToolStripMenuItem"; + this.标识对象ToolStripMenuItem.Size = new System.Drawing.Size(124, 22); + this.标识对象ToolStripMenuItem.Text = "标识对象"; + this.标识对象ToolStripMenuItem.Click += new System.EventHandler(this.标识对象ToolStripMenuItem_Click); + // + // toolStripMenuItem2 + // + this.toolStripMenuItem2.Name = "toolStripMenuItem2"; + this.toolStripMenuItem2.Size = new System.Drawing.Size(152, 22); + this.toolStripMenuItem2.Text = "查看位置"; + this.toolStripMenuItem2.Click += new System.EventHandler(this.toolStripMenuItem2_Click); // // bar1 // this.bar1.AntiAlias = true; this.bar1.Dock = System.Windows.Forms.DockStyle.Top; - this.bar1.DockSide = DevComponents.DotNetBar.eDockSide.Document; this.bar1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.labelItem1, this.txt_no, @@ -84,14 +78,13 @@ this.combo_street, this.btn_query, this.btn_add_batch, - this.btn_add_menu, - this.btn_db}); - this.bar1.Location = new System.Drawing.Point(3, 3); + this.btn_add_menu}); + this.bar1.Location = new System.Drawing.Point(0, 0); this.bar1.Name = "bar1"; - this.bar1.Size = new System.Drawing.Size(875, 28); + this.bar1.Size = new System.Drawing.Size(881, 28); this.bar1.Stretch = true; this.bar1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.bar1.TabIndex = 1; + this.bar1.TabIndex = 8; this.bar1.TabStop = false; this.bar1.Text = "bar1"; // @@ -136,24 +129,34 @@ this.btn_add_menu.Text = "手工添加"; this.btn_add_menu.Click += new System.EventHandler(this.btn_add_menu_Click); // - // btn_db + // winGridViewPager1 // - this.btn_db.Name = "btn_db"; - this.btn_db.Text = "数据导出"; + this.winGridViewPager1.AppendedMenu = null; + this.winGridViewPager1.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; + this.winGridViewPager1.DataSource = null; + this.winGridViewPager1.DisplayColumns = ""; + this.winGridViewPager1.Dock = System.Windows.Forms.DockStyle.Fill; + this.winGridViewPager1.Location = new System.Drawing.Point(0, 28); + this.winGridViewPager1.MinimumSize = new System.Drawing.Size(540, 0); + this.winGridViewPager1.Name = "winGridViewPager1"; + this.winGridViewPager1.PrintTitle = ""; + this.winGridViewPager1.Size = new System.Drawing.Size(881, 446); + this.winGridViewPager1.TabIndex = 9; // // FrmFlagManagers // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(881, 474); - this.Controls.Add(this.tableLayoutPanel1); + this.Controls.Add(this.winGridViewPager1); + this.Controls.Add(this.bar1); this.DoubleBuffered = true; this.Name = "FrmFlagManagers"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "标识器管理"; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmFlagManagers_FormClosing); this.Load += new System.EventHandler(this.FrmFlagManagers_Load); - this.tableLayoutPanel1.ResumeLayout(false); + this.contextMenuStrip1.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.bar1)).EndInit(); this.ResumeLayout(false); @@ -161,8 +164,8 @@ #endregion - private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1; - private WHC.Pager.WinControl.WinGridViewPager winGridViewPager1; + private System.Windows.Forms.ContextMenuStrip contextMenuStrip1; + private System.Windows.Forms.ToolStripMenuItem 标识对象ToolStripMenuItem; private DevComponents.DotNetBar.Bar bar1; private DevComponents.DotNetBar.LabelItem labelItem1; private DevComponents.DotNetBar.TextBoxItem txt_no; @@ -171,6 +174,7 @@ private DevComponents.DotNetBar.ButtonItem btn_query; private DevComponents.DotNetBar.ButtonItem btn_add_batch; private DevComponents.DotNetBar.ButtonItem btn_add_menu; - private DevComponents.DotNetBar.ButtonItem btn_db; + private WHC.Pager.WinControl.WinGridViewPager winGridViewPager1; + private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem2; } } \ No newline at end of file diff --git a/FrmFlagManagers.cs b/FrmFlagManagers.cs index 38d4927..9bf9734 100644 --- a/FrmFlagManagers.cs +++ b/FrmFlagManagers.cs @@ -33,15 +33,13 @@ { this.globeControl1 = _globeControl1; InitializeComponent(); - winGridViewPager1.OnPageChanged += new EventHandler(winGridViewPager1_OnPageChanged); - this.winGridViewPager1.OnAddNew += new EventHandler(winGridViewPager1_OnAddNew); //右键定位 + winGridViewPager1.OnPageChanged += new EventHandler(winGridViewPager1_OnPageChanged); this.winGridViewPager1.OnEditSelected += new EventHandler(winGridViewPager1_OnEditSelected);//属性编辑 this.winGridViewPager1.OnDeleteSelected += new EventHandler(winGridViewPager1_OnDeleteSelected);//标识器报废 + this.winGridViewPager1.OnStartExport += new EventHandler(pager1_OnStartExport); this.winGridViewPager1.OnEndExport += new EventHandler(pager1_OnEndExport); - //this.winGridViewPager1.ExportCurrent += new ExportCurrentEventHandler(pager1_ExportCurrent); - //this.winGridViewPager1.ExportAll += new ExportAllEventHandler(pager1_ExportAll); winGridViewPager1.dataGridView1.MultiSelect = false; @@ -76,26 +74,25 @@ this.winGridViewPager1.AddColumnAlias("标识器型号", "标识器型号"); this.winGridViewPager1.AddColumnAlias("地面高程", "地面高程"); this.winGridViewPager1.AddColumnAlias("标识器埋深", "标识器埋深"); - this.winGridViewPager1.AddColumnAlias("对象编号", "对象编号"); - this.winGridViewPager1.AddColumnAlias("对象类型", "对象类型"); this.winGridViewPager1.AddColumnAlias("所属道路", "所属道路"); this.winGridViewPager1.AddColumnAlias("使用状态", "使用状态"); - this.winGridViewPager1.DisplayColumns = "编号,标识器ID号,标识器型号,地面高程,标识器埋深,对象编号,对象类型,所属道路,使用状态"; + this.winGridViewPager1.DisplayColumns = "编号,标识器ID号,标识器型号,地面高程,标识器埋深,所属道路,使用状态"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 //隐藏右键功能按钮 //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[1].Visible = false; - //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[4].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[5].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[6].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[7].Visible = false; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[1].Text = "定位查看"; + //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[1].Text = "定位查看"; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "属性编辑"; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Text = "标识器报废"; + winGridViewPager1.AppendedMenu = this.contextMenuStrip1; + //右键菜单宽度 winGridViewPager1.dataGridView1.ContextMenuStrip.AutoSize = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Width = 150; @@ -153,7 +150,7 @@ } /// - /// 右键定位 + /// 对象查看 /// /// /// @@ -306,20 +303,10 @@ string sqlCount = "select count(*) from 标识器 where 使用状态 = '使用中'"; - string sqlData = "select 编号,标识器ID号,标识器型号,地面高程,标识器埋深,对象编号,对象类型,所属道路,LSSYS_ID,X坐标,Y坐标,使用状态 " + + string sqlData = "select 编号,标识器ID号,标识器型号,地面高程,标识器埋深,所属道路,LSSYS_ID,X坐标,Y坐标,使用状态 " + "from (select t.*,rownum row_num from 标识器 t where 使用状态 = '使用中' order by 编号)b " + " where 1=1"; - if (!String.IsNullOrEmpty(txt_no.Text.Trim())) - { - sqlCount += " and 编号 like '%" + txt_no.Text.Trim() + "%'"; - sqlData += " and 编号 like '%" + txt_no.Text.Trim() + "%'"; - } - if (null != combo_street.SelectedItem && !String.IsNullOrEmpty(combo_street.SelectedItem.ToString().Trim())) - { - sqlData += " and 所属道路='" + combo_street.SelectedItem.ToString().Trim() + "'"; - sqlCount += " and 所属道路='" + combo_street.SelectedItem.ToString().Trim() + "'"; - } rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -332,9 +319,8 @@ int maxPage = pageIndex * maxPageIndex; string sqlCount = "select count(*) from 标识器 where 使用状态 = '使用中'"; - string sqlData = "select 编号,标识器ID号,标识器型号,地面高程,标识器埋深,对象编号,对象类型,所属道路,LSSYS_ID,X坐标,Y坐标,使用状态 " + - "from (select t.*,rownum row_num from 标识器 t where 使用状态 = '使用中' order by 编号)b "+ - " where(b.row_num between " + minPage + " and " + maxPage + ")"; + string sqlData = "select 编号,标识器ID号,标识器型号,地面高程,标识器埋深,所属道路,LSSYS_ID,X坐标,Y坐标,使用状态 " + + "from (select t.*,rownum row_num from 标识器 t where 使用状态 = '使用中'"; if (!String.IsNullOrEmpty(txt_no.Text.Trim())) { @@ -347,6 +333,8 @@ sqlCount += " and 所属道路='" + combo_street.SelectedItem.ToString().Trim() + "'"; } + sqlData += " order by 编号)b " + + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; @@ -372,9 +360,10 @@ private void FrmFlagManagers_FormClosing(object sender, FormClosingEventArgs e) { IS_OPEN = false; - Thread downloadJob = new Thread(new ParameterizedThreadStart(doSave)); - downloadJob.IsBackground = true; - downloadJob.Start(e); + //Thread downloadJob = new Thread(new ParameterizedThreadStart(doSave)); + //downloadJob.IsBackground = true; + //downloadJob.Start(e); + globeControl1.Globe.Layers["标识器"].Save(); globeControl1.Globe.MemoryLayer.RemoveAllFeature(); foreach (GSOFeature f in Features) { @@ -480,10 +469,88 @@ if (null != globeControl1) { FrmAddSinMark frm = new FrmAddSinMark(globeControl1); - frm.ShowDialog(); + frm.Show(); } } + private void 标识对象ToolStripMenuItem_Click(object sender, EventArgs e) + { + if (winGridViewPager1 != null && winGridViewPager1.dataGridView1 != null) + { + DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; + try + { + this.Hide(); + string id = row.Cells["编号"].Value.ToString(); + FrmFlagDetail p = new FrmFlagDetail(globeControl1, id); + p.showParentForm += new FrmFlagDetail.Handle(showThisForm);//改变值的事件 + p.Show(); + } + catch (Exception ex) + { + MessageBox.Show("失败:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } + + private void showThisForm() + { + this.Show(); + } + + private void toolStripMenuItem2_Click(object sender, EventArgs e) + { + if (winGridViewPager1 != null && winGridViewPager1.dataGridView1 != null) + { + DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; + try + { + this.WindowState = FormWindowState.Minimized; + string id = row.Cells["LSSYS_ID"].Value.ToString(); + string flagno = row.Cells["编号"].Value.ToString(); + string flagstreet = row.Cells["所属道路"].Value.ToString(); + double x = Convert.ToDouble(row.Cells["X坐标"].Value); + double y = Convert.ToDouble(row.Cells["Y坐标"].Value); + GSOFeature flagFeature = globeControl1.Globe.Layers.GetLayerByCaption("标识器").GetFeatureByID(int.Parse(id)); + + string type = ""; + string pipe = ""; + string sql = "select t.标识器型号,t.对象编号 from 标识器 t where t.编号='" + flagno + "'"; + using (OracleDataReader reader = OracleUtils.ExecuteReader(OracleUtils.ConnectionString, CommandType.Text, sql)) + { + while (reader.Read()) + { + type = reader.GetString(0); + pipe = reader.GetString(1); + } + } + + GSOLabel label = new GSOLabel(); + label.Text = "标识器编号：" + flagno + "\r\n" + + "标识器类型:" + type + "\r\n" + + //"标识对象编号:" + pipe + "\r\n" + + "所属道路:" + flagstreet; + label.Style = new GSOLabelStyle(); + label.Style.TextStyle.FontSize = 18; + label.Style.TextStyle.ForeColor = Color.FromArgb(0, 0, 0, 255); + label.Style.Opaque = 0.8; //设置标注的透明度，取值区间是0-1 + label.Style.TracktionLineType = EnumTracktionLineType.Solid; + label.Style.TextStyle.FontHeight = 10; + label.Style.TextStyle.FontName = "黑体"; + label.Style.TractionLineEndPos = new GSOPoint2d(80, 60); + + flagFeature.Label = label; + Features.Add(flagFeature); + globeControl1.Globe.JumpToFeature(flagFeature, 20); + this.globeControl1.Refresh(); + + } + catch (Exception ex) + { + MessageBox.Show("标识器定位失败:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } } diff --git a/FrmFlagManagers.resx b/FrmFlagManagers.resx index 1af7de1..ad53752 100644 --- a/FrmFlagManagers.resx +++ b/FrmFlagManagers.resx @@ -117,4 +117,7 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 17, 17 + \ No newline at end of file diff --git a/FrmPatrolerEdit.cs b/FrmPatrolerEdit.cs index dbd4fec..f45b5ae 100644 --- a/FrmPatrolerEdit.cs +++ b/FrmPatrolerEdit.cs @@ -46,7 +46,7 @@ txt_name.Focus(); return; } - if (String.IsNullOrEmpty(combo_sex.SelectedItem.ToString())) + if (combo_sex.SelectedItem == null ||String.IsNullOrEmpty(combo_sex.SelectedItem.ToString())) { MessageBox.Show("性别不能为空！", "警告", MessageBoxButtons.OK, MessageBoxIcon.Warning); combo_sex.Focus(); diff --git a/FrmPatrolerManager.Designer.cs b/FrmPatrolerManager.Designer.cs index bb8e5fb..10fac22 100644 --- a/FrmPatrolerManager.Designer.cs +++ b/FrmPatrolerManager.Designer.cs @@ -47,11 +47,13 @@ this.注销 = new DevComponents.Editors.ComboItem(); this.btn_query_person = new DevComponents.DotNetBar.ButtonItem(); this.btn_add_person = new DevComponents.DotNetBar.ButtonItem(); - this.winGridViewPager1 = new WHC.Pager.WinControl.WinGridViewPager(); this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components); this.日志ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.任务ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.定位ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.winGridViewPager1 = new WHC.Pager.WinControl.WinGridViewPager(); + this.编辑ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.注销ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); ((System.ComponentModel.ISupportInitialize)(this.bar1)).BeginInit(); this.contextMenuStrip1.SuspendLayout(); this.SuspendLayout(); @@ -173,9 +175,42 @@ this.btn_add_person.Text = "新增"; this.btn_add_person.Click += new System.EventHandler(this.btn_add_person_Click); // + // contextMenuStrip1 + // + this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.日志ToolStripMenuItem, + this.任务ToolStripMenuItem, + this.定位ToolStripMenuItem, + this.编辑ToolStripMenuItem, + this.注销ToolStripMenuItem}); + this.contextMenuStrip1.Name = "contextMenuStrip1"; + this.contextMenuStrip1.Size = new System.Drawing.Size(153, 136); + // + // 日志ToolStripMenuItem + // + this.日志ToolStripMenuItem.Name = "日志ToolStripMenuItem"; + this.日志ToolStripMenuItem.Size = new System.Drawing.Size(100, 22); + this.日志ToolStripMenuItem.Text = "日志"; + this.日志ToolStripMenuItem.Click += new System.EventHandler(this.日志ToolStripMenuItem_Click); + // + // 任务ToolStripMenuItem + // + this.任务ToolStripMenuItem.Name = "任务ToolStripMenuItem"; + this.任务ToolStripMenuItem.Size = new System.Drawing.Size(100, 22); + this.任务ToolStripMenuItem.Text = "任务"; + this.任务ToolStripMenuItem.Click += new System.EventHandler(this.任务ToolStripMenuItem_Click); + // + // 定位ToolStripMenuItem + // + this.定位ToolStripMenuItem.Name = "定位ToolStripMenuItem"; + this.定位ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.定位ToolStripMenuItem.Text = "定位"; + this.定位ToolStripMenuItem.Click += new System.EventHandler(this.定位ToolStripMenuItem_Click); + // // winGridViewPager1 // this.winGridViewPager1.AppendedMenu = null; + this.winGridViewPager1.ContextMenuStrip = this.contextMenuStrip1; this.winGridViewPager1.DataSource = null; this.winGridViewPager1.DisplayColumns = ""; this.winGridViewPager1.Dock = System.Windows.Forms.DockStyle.Fill; @@ -186,35 +221,19 @@ this.winGridViewPager1.Size = new System.Drawing.Size(756, 309); this.winGridViewPager1.TabIndex = 3; // - // contextMenuStrip1 + // 编辑ToolStripMenuItem // - this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.日志ToolStripMenuItem, - this.任务ToolStripMenuItem, - this.定位ToolStripMenuItem}); - this.contextMenuStrip1.Name = "contextMenuStrip1"; - this.contextMenuStrip1.Size = new System.Drawing.Size(101, 70); + this.编辑ToolStripMenuItem.Name = "编辑ToolStripMenuItem"; + this.编辑ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.编辑ToolStripMenuItem.Text = "编辑"; + this.编辑ToolStripMenuItem.Click += new System.EventHandler(this.编辑ToolStripMenuItem_Click); // - // 日志ToolStripMenuItem + // 注销ToolStripMenuItem // - this.日志ToolStripMenuItem.Name = "日志ToolStripMenuItem"; - this.日志ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); - this.日志ToolStripMenuItem.Text = "日志"; - this.日志ToolStripMenuItem.Click += new System.EventHandler(this.日志ToolStripMenuItem_Click); - // - // 任务ToolStripMenuItem - // - this.任务ToolStripMenuItem.Name = "任务ToolStripMenuItem"; - this.任务ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); - this.任务ToolStripMenuItem.Text = "任务"; - this.任务ToolStripMenuItem.Click += new System.EventHandler(this.任务ToolStripMenuItem_Click); - // - // 定位ToolStripMenuItem - // - this.定位ToolStripMenuItem.Name = "定位ToolStripMenuItem"; - this.定位ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); - this.定位ToolStripMenuItem.Text = "定位"; - this.定位ToolStripMenuItem.Click += new System.EventHandler(this.定位ToolStripMenuItem_Click); + this.注销ToolStripMenuItem.Name = "注销ToolStripMenuItem"; + this.注销ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.注销ToolStripMenuItem.Text = "注销"; + this.注销ToolStripMenuItem.Click += new System.EventHandler(this.注销ToolStripMenuItem_Click); // // FrmPatrolerManager // @@ -229,7 +248,7 @@ this.MinimizeBox = false; this.Name = "FrmPatrolerManager"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; - this.Text = "巡检人员维护"; + this.Text = "定位人员维护"; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmPatrolerManager_FormClosing); this.Load += new System.EventHandler(this.FrmPatrolerManager_Load); ((System.ComponentModel.ISupportInitialize)(this.bar1)).EndInit(); @@ -258,10 +277,12 @@ private DevComponents.Editors.ComboItem 注销; private DevComponents.Editors.ComboItem comboItem1; private DevComponents.Editors.ComboItem 不限; - private WHC.Pager.WinControl.WinGridViewPager winGridViewPager1; private System.Windows.Forms.ContextMenuStrip contextMenuStrip1; private System.Windows.Forms.ToolStripMenuItem 日志ToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem 任务ToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem 定位ToolStripMenuItem; + private WHC.Pager.WinControl.WinGridViewPager winGridViewPager1; + private System.Windows.Forms.ToolStripMenuItem 编辑ToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem 注销ToolStripMenuItem; } } \ No newline at end of file diff --git a/FrmPatrolerManager.cs b/FrmPatrolerManager.cs index 255a076..9c32f54 100644 --- a/FrmPatrolerManager.cs +++ b/FrmPatrolerManager.cs @@ -29,9 +29,7 @@ this.globeControl1 = globeControl1; winGridViewPager1.OnPageChanged += new EventHandler(winGridViewPager1_OnPageChanged); - this.winGridViewPager1.OnEditSelected += new EventHandler(winGridViewPager1_OnEditSelected);//编辑 - this.winGridViewPager1.OnDeleteSelected += new EventHandler(winGridViewPager1_OnDeleteSelected);//删除 - + this.winGridViewPager1.OnStartExport += new EventHandler(pager1_OnStartExport); this.winGridViewPager1.OnEndExport += new EventHandler(pager1_OnEndExport); @@ -47,26 +45,31 @@ //控制表格显示的列，以及每一列要显示的列名 this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - this.winGridViewPager1.AddColumnAlias("USERNAME", "姓名"); - this.winGridViewPager1.AddColumnAlias("DBID", "编号"); - this.winGridViewPager1.AddColumnAlias("SEX", "性别"); - this.winGridViewPager1.AddColumnAlias("AGE", "年龄"); - this.winGridViewPager1.AddColumnAlias("PHONENUM", "电话"); - this.winGridViewPager1.AddColumnAlias("ACCOUNTSTATE", "状态"); - this.winGridViewPager1.DisplayColumns = "USERNAME,SEX,AGE,PHONENUM,ACCOUNTSTATE"; + this.winGridViewPager1.AddColumnAlias("姓名", "姓名"); + this.winGridViewPager1.AddColumnAlias("编号", "编号"); + this.winGridViewPager1.AddColumnAlias("性别", "性别"); + this.winGridViewPager1.AddColumnAlias("年龄", "年龄"); + this.winGridViewPager1.AddColumnAlias("电话", "电话"); + this.winGridViewPager1.AddColumnAlias("状态", "状态"); + this.winGridViewPager1.DisplayColumns = "姓名,性别,年龄,电话,状态"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 + //隐藏右键功能按钮 //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[1].Visible = false; + winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Visible = false; + winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[4].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[5].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[6].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[7].Visible = false; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "编辑"; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Text = "注销"; + + //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "编辑"; + //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Text = "注销"; winGridViewPager1.AppendedMenu = this.contextMenuStrip1; + //右键菜单宽度 winGridViewPager1.dataGridView1.ContextMenuStrip.AutoSize = false; @@ -122,11 +125,11 @@ DataGridViewRow row = grid.SelectedRows[0]; try { - long dbid = long.Parse(row.Cells["dbid"].Value.ToString()); - String name = row.Cells["USERNAME"].Value.ToString(); - String sex = row.Cells["SEX"].Value.ToString(); - String age = row.Cells["AGE"].Value.ToString(); - string phone = row.Cells["PHONENUM"].Value.ToString(); + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); + String name = row.Cells["姓名"].Value.ToString(); + String sex = row.Cells["性别"].Value.ToString(); + String age = row.Cells["年龄"].Value.ToString(); + string phone = row.Cells["电话"].Value.ToString(); age = String.IsNullOrEmpty(age.ToString().Trim()) ? "1" : age.ToString().Trim(); FrmPatrolerEdit frm = new FrmPatrolerEdit(dbid.ToString(), name, age, sex, phone); frm.reloadGrid += new ReloadPatrolerGrid(LoadData); @@ -152,10 +155,10 @@ if (grid != null) { DataGridViewRow row = grid.SelectedRows[0]; - long dbid = long.Parse(row.Cells["DBID"].Value.ToString()); + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); try { - string state = row.Cells["ACCOUNTSTATE"].Value.ToString(); + string state = row.Cells["状态"].Value.ToString(); if ("在线".Equals(state)) { if (MessageBox.Show("确定注销？", "确认", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) @@ -180,60 +183,60 @@ { int pageIndex = winGridViewPager1.PagerInfo.CurrenetPageIndex; string sqlData = GetSql(pageIndex); - initlizeDatagrid(); + DataTable table = OracleUtils.ExecuteDataset(OracleUtils.ConnectionString, CommandType.Text, sqlData).Tables[0]; winGridViewPager1.DataSource = table.DefaultView; - for (int i = 0; i < winGridViewPager1.dataGridView1.Rows.Count; i++) - { - if (winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value.ToString() == "ONLINE") - { - winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value = "在线"; - } - else - { - if (winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value.ToString() == "OFFLINE") - { - winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value = "离线"; - } - else - { - if (winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value.ToString() == "LEAVER") - { - winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value = "注销"; - } - } - } - } + //for (int i = 0; i < winGridViewPager1.dataGridView1.Rows.Count; i++) + //{ + // if (winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value.ToString() == "ONLINE") + // { + // winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value = "在线"; + // } + // else + // { + // if (winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value.ToString() == "OFFLINE") + // { + // winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value = "离线"; + // } + // else + // { + // if (winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value.ToString() == "LEAVER") + // { + // winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value = "注销"; + // } + // } + // } + //} winGridViewPager1.Refresh(); } private void LoadData(int pageIndex) { string sqlData = GetSql(pageIndex); - initlizeDatagrid(); + DataTable table = OracleUtils.ExecuteDataset(OracleUtils.ConnectionString, CommandType.Text, sqlData).Tables[0]; winGridViewPager1.DataSource = table.DefaultView; - for (int i = 0; i < winGridViewPager1.dataGridView1.Rows.Count; i++) - { - if (winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value.ToString() == "ONLINE") - { - winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value = "在线"; - } - else - { - if (winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value.ToString() == "OFFLINE") - { - winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value = "离线"; - } - else - { - if (winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value.ToString() == "LEAVER") - { - winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value = "注销"; - } - } - } - } + //for (int i = 0; i < winGridViewPager1.dataGridView1.Rows.Count; i++) + //{ + // if (winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value.ToString() == "ONLINE") + // { + // winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value = "在线"; + // } + // else + // { + // if (winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value.ToString() == "OFFLINE") + // { + // winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value = "离线"; + // } + // else + // { + // if (winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value.ToString() == "LEAVER") + // { + // winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value = "注销"; + // } + // } + // } + //} winGridViewPager1.Refresh(); } @@ -241,7 +244,8 @@ { string sqlCount = "select count(*) from equipment where status = 'USING'"; - string sqlData = "select username,dbid,sex,age,phonenum,accountstate " + + string sqlData = "select username as 姓名,dbid as 编号,sex as 性别,age as 年龄,phonenum as 电话,"+ + "case when accountstate = 'ONLINE' then '在线' when accountstate = 'OFFLINE' then '离线' when accountstate = 'LEAVER' then '注销' end as 状态 " + "from (select t.*,rownum row_num from patroler t order by DBID desc)b " + " where 1=1"; @@ -255,9 +259,9 @@ int minPage = (pageIndex - 1) * maxPageIndex + 1; int maxPage = pageIndex * maxPageIndex; string sqlCount = "select count(*) from patroler where 1=1"; - string sqlData = "select username,dbid,sex,age,phonenum,accountstate " + - "from (select t.*,rownum row_num from patroler t order by DBID desc)b " + - " where(b.row_num between " + minPage + " and " + maxPage + ")"; + string sqlData = "select username as 姓名,dbid as 编号,sex as 性别,age as 年龄,phonenum as 电话,"+ + "case when accountstate = 'ONLINE' then '在线' when accountstate = 'OFFLINE' then '离线' when accountstate = 'LEAVER' then '注销' end as 状态 " + + "from (select t.*,rownum row_num from patroler t where 1=1"; if (!String.IsNullOrEmpty(txt_username.Text.Trim())) { @@ -281,7 +285,8 @@ sqlCount += " and accountstate='" + combo_stateText + "'"; sqlData += " and accountstate='" + combo_stateText + "'"; } - + sqlData += " order by DBID desc)b " + + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; @@ -291,6 +296,7 @@ { try { + initlizeDatagrid(); LoadData(); initForm(); IS_OPEN = true; @@ -310,11 +316,13 @@ } if (Utility.userRole.IndexOf("巡检员编辑") == -1) { - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Visible = false; + //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Visible = false; + 编辑ToolStripMenuItem.Visible = false; } if (Utility.userRole.IndexOf("巡检员注销") == -1) { - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Visible = false; + //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Visible = false; + 注销ToolStripMenuItem.Visible = false; } } @@ -376,7 +384,7 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - long dbid = long.Parse(row.Cells["dbid"].Value.ToString()); + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); Log p = new Log(dbid.ToString()); p.Show(); } @@ -395,8 +403,8 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - long dbid = long.Parse(row.Cells["dbid"].Value.ToString()); - String state = row.Cells["ACCOUNTSTATE"].Value.ToString(); + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); + String state = row.Cells["状态"].Value.ToString(); if ("在线".Equals(state)) { string sql = "select t.dbid " + @@ -435,8 +443,8 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - long dbid = long.Parse(row.Cells["dbid"].Value.ToString()); - String username = row.Cells["USERNAME"].Value.ToString(); + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); + String username = row.Cells["姓名"].Value.ToString(); string sql = "select t.latitude, t.longitude " + "from position t " + "where t.dbid = (select max(dbid) from position where patroler_id = " + dbid + ")"; @@ -489,6 +497,63 @@ } + private void 编辑ToolStripMenuItem_Click(object sender, EventArgs e) + { + if (winGridViewPager1 != null && winGridViewPager1.dataGridView1 != null) + { + DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; + try + { + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); + String name = row.Cells["姓名"].Value.ToString(); + String sex = row.Cells["性别"].Value.ToString(); + String age = row.Cells["年龄"].Value.ToString(); + string phone = row.Cells["电话"].Value.ToString(); + age = String.IsNullOrEmpty(age.ToString().Trim()) ? "1" : age.ToString().Trim(); + FrmPatrolerEdit frm = new FrmPatrolerEdit(dbid.ToString(), name, age, sex, phone); + frm.reloadGrid += new ReloadPatrolerGrid(LoadData); + frm.ShowDialog(); + winGridViewPager1.Refresh(); + } + catch (Exception ex) + { + MessageBox.Show("编辑失败:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } + + private void 注销ToolStripMenuItem_Click(object sender, EventArgs e) + { + if (winGridViewPager1 != null && winGridViewPager1.dataGridView1 != null) + { + DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); + try + { + if (MessageBox.Show("确定注销？", "确认", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) + { + String sql = "update patroler t set t.accountstate='LEAVER' where t.dbid=" + dbid; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + LoadData(); + MessageBox.Show("人员已注销", "信息", MessageBoxButtons.OK, MessageBoxIcon.Information); + } + //string state = row.Cells["状态"].Value.ToString(); + //if ("在线".Equals(state)) + //{ + + //} + //else + //{ + // MessageBox.Show("人员不在线，无法注销", "信息"); + //} + } + catch (Exception ex) + { + MessageBox.Show("人员注销失败:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } + } } diff --git a/Cyberpipe.csproj b/Cyberpipe.csproj index fe600e5..501fd09 100644 --- a/Cyberpipe.csproj +++ b/Cyberpipe.csproj @@ -246,6 +246,12 @@ Form_TaskManager.cs + + Form + + + FrmFlagDetail.cs + Form @@ -1368,6 +1374,9 @@ Form_TaskManager.cs + + FrmFlagDetail.cs + FormDocumentManager.cs diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 537b4c3..1acf22a 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 7d5dd95..3f178cb 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -90,20 +90,20 @@ this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - - this.winGridViewPager1.AddColumnAlias("ACCIDENTTIME", "上报时间"); - this.winGridViewPager1.AddColumnAlias("DBID", "编号"); - this.winGridViewPager1.AddColumnAlias("DESCRIBE", "事件描述"); - this.winGridViewPager1.AddColumnAlias("LATITUDE", "纬度"); - this.winGridViewPager1.AddColumnAlias("LOCALE", "事件地点"); - this.winGridViewPager1.AddColumnAlias("LONGITUDE", "经度"); - this.winGridViewPager1.AddColumnAlias("PATROLERNAME", "上报人员"); - this.winGridViewPager1.AddColumnAlias("PATROLER_ID", "人员ID"); - this.winGridViewPager1.AddColumnAlias("TASK_ID", "任务编号"); - this.winGridViewPager1.AddColumnAlias("RESULT", "处理结果"); - this.winGridViewPager1.AddColumnAlias("STATE", "处理状态"); - this.winGridViewPager1.DisplayColumns = "ACCIDENTTIME,DESCRIBE,LOCALE,PATROLERNAME,TASK_ID,RESULT,STATE"; + this.winGridViewPager1.AddColumnAlias("上报时间", "上报时间"); + this.winGridViewPager1.AddColumnAlias("编号", "编号"); + this.winGridViewPager1.AddColumnAlias("事件描述", "事件描述"); + this.winGridViewPager1.AddColumnAlias("纬度", "纬度"); + this.winGridViewPager1.AddColumnAlias("事件地点", "事件地点"); + this.winGridViewPager1.AddColumnAlias("经度", "经度"); + this.winGridViewPager1.AddColumnAlias("上报人员", "上报人员"); + this.winGridViewPager1.AddColumnAlias("人员ID", "人员ID"); + this.winGridViewPager1.AddColumnAlias("任务编号", "任务编号"); + this.winGridViewPager1.AddColumnAlias("处理结果", "处理结果"); + this.winGridViewPager1.AddColumnAlias("处理状态", "处理状态"); + + this.winGridViewPager1.DisplayColumns = "上报时间,事件描述,事件地点,上报人员,任务编号,处理结果,处理状态"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -114,8 +114,8 @@ winGridViewPager1.dataGridView1.ContextMenuStrip.Items[5].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[6].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[7].Visible = false; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[1].Text = "查看位置"; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "结果编辑"; + winGridViewPager1.dataGridView1.ContextMenuStrip.Items[1].Text = "结果编辑"; + winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "查看位置"; //右键菜单宽度 winGridViewPager1.dataGridView1.ContextMenuStrip.AutoSize = false; @@ -160,13 +160,12 @@ this.WindowState = FormWindowState.Minimized; globeControl1.Globe.MemoryLayer.RemoveAllFeature(); this.WindowState = FormWindowState.Minimized; - double x = Convert.ToDouble(row.Cells["LONGITUDE"].Value); - double y = Convert.ToDouble(row.Cells["LATITUDE"].Value); - - string username = Convert.ToString(row.Cells["PATROLERNAME"].Value); - string Atime = Convert.ToString(row.Cells["ACCIDENTTIME"].Value); - string location = Convert.ToString(row.Cells["LOCALE"].Value); - string descp = Convert.ToString(row.Cells["DESCRIBE"].Value); + double x = Convert.ToDouble(row.Cells["经度"].Value); + double y = Convert.ToDouble(row.Cells["纬度"].Value); + string username = Convert.ToString(row.Cells["上报人员"].Value); + string Atime = Convert.ToString(row.Cells["上报时间"].Value); + string location = Convert.ToString(row.Cells["事件地点"].Value); + string descp = Convert.ToString(row.Cells["事件描述"].Value); /////////////////////////////////////// /*******设置飞行与创建模型******/ @@ -228,8 +227,8 @@ DataGridViewRow row = grid.SelectedRows[0]; try { - int dbId = Convert.ToInt32(row.Cells["DBID"].Value); - string result = Convert.ToString(row.Cells["RESULT"].Value); + int dbId = Convert.ToInt32(row.Cells["编号"].Value); + string result = Convert.ToString(row.Cells["处理结果"].Value); EMS_Forms.Form_EventResult form = new Form_EventResult(dbId, result); form.refresh += new Form_EventResult.Handle(LoadData);//改变值的事件 form.ShowDialog(); @@ -276,9 +275,9 @@ } for (int i = 0; i < table.Rows.Count; i++) { - if (winGridViewPager1.dataGridView1.Rows[i].Cells["RESULT"].Value != null && !(winGridViewPager1.dataGridView1.Rows[i].Cells["RESULT"].Value.ToString().Trim().Equals(""))) + if (winGridViewPager1.dataGridView1.Rows[i].Cells["处理结果"].Value != null && !(winGridViewPager1.dataGridView1.Rows[i].Cells["处理结果"].Value.ToString().Trim().Equals(""))) { - winGridViewPager1.dataGridView1.Rows[i].Cells["STATE"].Value = "已处理"; + winGridViewPager1.dataGridView1.Rows[i].Cells["处理状态"].Value = "已处理"; } } @@ -307,9 +306,9 @@ } for (int i = 0; i < table.Rows.Count; i++) { - if (winGridViewPager1.dataGridView1.Rows[i].Cells["RESULT"].Value != null && !(winGridViewPager1.dataGridView1.Rows[i].Cells["RESULT"].Value.ToString().Trim().Equals(""))) + if (winGridViewPager1.dataGridView1.Rows[i].Cells["处理结果"].Value != null && !(winGridViewPager1.dataGridView1.Rows[i].Cells["处理结果"].Value.ToString().Trim().Equals(""))) { - winGridViewPager1.dataGridView1.Rows[i].Cells["STATE"].Value = "已处理"; + winGridViewPager1.dataGridView1.Rows[i].Cells["处理状态"].Value = "已处理"; } } @@ -320,10 +319,12 @@ { string sqlCount = "select count(*) from ACCIDENT where 1=1"; - string sqlData = "select ACCIDENTTIME,DBID,DESCRIBE,LATITUDE,LOCALE,LONGITUDE,PATROLERNAME,PATROLER_ID,TASK_ID,RESULT,'' as STATE " + + string sqlData = "select ACCIDENTTIME as 上报时间,DBID as 编号,DESCRIBE as 事件描述,"+ + "LATITUDE as 纬度,LOCALE as 事件地点,LONGITUDE as 经度,PATROLERNAME 上报人员,"+ + "PATROLER_ID as 人员ID,TASK_ID as 任务编号,RESULT as 处理结果,'' as 处理状态 " + "from (select t.*,rownum row_num from ACCIDENT t order by DBID)b " + " where 1=1"; - + rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; @@ -340,9 +341,10 @@ string sqlCount = "select count(*) from ACCIDENT where 1=1"; - string sqlData = "select ACCIDENTTIME,DBID,DESCRIBE,LATITUDE,LOCALE,LONGITUDE,PATROLERNAME,PATROLER_ID,TASK_ID,RESULT,'' as STATE " + - "from (select t.*,rownum row_num from ACCIDENT t order by DBID)b " + - " where(b.row_num between " + minPage + " and " + maxPage + ")"; + string sqlData = "select ACCIDENTTIME as 上报时间,DBID as 编号,DESCRIBE as 事件描述," + + "LATITUDE as 纬度,LOCALE as 事件地点,LONGITUDE as 经度,PATROLERNAME 上报人员," + + "PATROLER_ID as 人员ID,TASK_ID as 任务编号,RESULT as 处理结果,'' as 处理状态 " + + "from (select t.*,rownum row_num from ACCIDENT t where 1=1"; if (!String.IsNullOrEmpty(comboBox_name.Text.Trim())) { @@ -361,7 +363,8 @@ sqlCount += "and ACCIDENTTIME<=to_date('" + time.ToShortDateString() + "','yyyy-MM-dd') "; sqlData += "and ACCIDENTTIME<=to_date('" + time.ToShortDateString() + "','yyyy-MM-dd') "; } - + sqlData += " order by DBID desc)b " + + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 225c8d7..8bd9e48 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -120,8 +120,8 @@ private void flyToTask(DataGridViewRow row, int taskState) { int dbID = 0; - dbID = Convert.ToInt32(row.Cells["DBID"].Value); - string userName = Convert.ToString(row.Cells["USERNAME"].Value); + dbID = Convert.ToInt32(row.Cells["任务编号"].Value); + string userName = Convert.ToString(row.Cells["任务执行人员"].Value); System.DateTime t = new DateTime(); try { @@ -392,15 +392,15 @@ //控制表格显示的列，以及每一列要显示的列名 this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - this.winGridViewPager1.AddColumnAlias("DBID", "任务编号"); - this.winGridViewPager1.AddColumnAlias("DEPLOYTIME", "创建时间"); - this.winGridViewPager1.AddColumnAlias("DESCIRPTION", "任务描述"); - this.winGridViewPager1.AddColumnAlias("FINISHTIME", "完成时间"); - this.winGridViewPager1.AddColumnAlias("STREET", "任务执行区域"); - this.winGridViewPager1.AddColumnAlias("TASKSTATE", "任务状态"); - this.winGridViewPager1.AddColumnAlias("USERNAME", "任务执行人员"); + this.winGridViewPager1.AddColumnAlias("任务编号", "任务编号"); + this.winGridViewPager1.AddColumnAlias("创建时间", "创建时间"); + this.winGridViewPager1.AddColumnAlias("任务描述", "任务描述"); + this.winGridViewPager1.AddColumnAlias("完成时间", "完成时间"); + this.winGridViewPager1.AddColumnAlias("任务执行区域", "任务执行区域"); + this.winGridViewPager1.AddColumnAlias("任务状态", "任务状态"); + this.winGridViewPager1.AddColumnAlias("任务执行人员", "任务执行人员"); - this.winGridViewPager1.DisplayColumns = "DBID,DEPLOYTIME,DESCIRPTION,FINISHTIME,STREET,TASKSTATE,USERNAME"; + this.winGridViewPager1.DisplayColumns = "任务编号,创建时间,任务描述,完成时间,任务执行区域,任务状态,任务执行人员"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -464,8 +464,8 @@ { int dbID = 0; int taskStateInt = 0; - dbID = Convert.ToInt32(row.Cells["DBID"].Value); - string taskState = row.Cells["TASKSTATE"].Value.ToString(); + dbID = Convert.ToInt32(row.Cells["任务编号"].Value); + string taskState = row.Cells["任务状态"].Value.ToString(); if (taskState.Equals("开始任务")) { taskStateInt = 1; @@ -534,9 +534,10 @@ private string GetSql() { - string sqlCount = "select count(*) from taskinfo t where 1=1'"; + string sqlCount = "select count(*) from taskinfo t where 1=1"; - string sqlData = "select dbid,deploytime,descirption,finishtime,street,taskstate,username " + + 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"; @@ -550,9 +551,9 @@ int minPage = (pageIndex - 1) * maxPageIndex + 1; int maxPage = pageIndex * maxPageIndex; string sqlCount = "select count(*) from taskinfo t where 1=1"; - string sqlData = "select dbid,deploytime,descirption,finishtime,street,taskstate,username " + - "from (select t.*,rownum row_num from taskinfo t order by DBID desc)b " + - " where(b.row_num between " + minPage + " and " + maxPage + ")"; + 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"; if (!String.IsNullOrEmpty(comboBox_userName.Text.Trim()) && !comboBox_userName.Text.Trim().Equals("不限")) { @@ -581,6 +582,8 @@ sqlCount += "and street='" + combo_street.Text + "' "; sqlData += "and street='" + combo_street.Text + "' "; } + sqlData += " order by DBID desc)b " + + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index e65a4bd..58f5342 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -73,13 +73,13 @@ //控制表格显示的列，以及每一列要显示的列名 this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - this.winGridViewPager1.AddColumnAlias("FILENAME", "文档名称"); - this.winGridViewPager1.AddColumnAlias("DBID", "编号"); - this.winGridViewPager1.AddColumnAlias("TITLE", "文档标题"); - this.winGridViewPager1.AddColumnAlias("FILETYPE", "文档类型"); - this.winGridViewPager1.AddColumnAlias("UPDAY", "上传日期"); - this.winGridViewPager1.AddColumnAlias("WRITER", "上传人"); - this.winGridViewPager1.DisplayColumns = "FILENAME,TITLE,FILETYPE,UPDAY,WRITER"; + this.winGridViewPager1.AddColumnAlias("文档名称", "文档名称"); + this.winGridViewPager1.AddColumnAlias("编号", "编号"); + this.winGridViewPager1.AddColumnAlias("文档标题", "文档标题"); + this.winGridViewPager1.AddColumnAlias("文档类型", "文档类型"); + this.winGridViewPager1.AddColumnAlias("上传日期", "上传日期"); + this.winGridViewPager1.AddColumnAlias("上传人", "上传人"); + this.winGridViewPager1.DisplayColumns = "文档名称,文档标题,文档类型,上传日期,上传人"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -167,7 +167,7 @@ if (grid != null) { DataGridViewRow row = grid.SelectedRows[0]; - string dbid = row.Cells["dbid"].Value.ToString(); + string dbid = row.Cells["编号"].Value.ToString(); try { if (MessageBox.Show("确认删除吗？", "确认", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) @@ -212,7 +212,8 @@ { string sqlCount = "select count(*) from casic_userdocument where sysname = 'EMS'"; - string sqlData = "select filename,dbid,title,filetype,upday,writer " + + string sqlData = "select filename as 文档名称,dbid as 编号,title as 文档标题," + + "filetype as 文档类型,upday as 上传日期,writer as 上传人 " + "from (select t.*,rownum row_num from casic_userdocument t order by DBID desc)b " + " where sysname = 'EMS'"; @@ -226,9 +227,9 @@ int minPage = (pageIndex - 1) * maxPageIndex + 1; int maxPage = pageIndex * maxPageIndex; string sqlCount = "select count(*) from casic_userdocument where sysname = 'EMS'"; - string sqlData = "select filename,dbid,title,filetype,upday,writer " + - "from (select t.*,rownum row_num from casic_userdocument t where sysname = 'EMS' order by DBID desc)b " + - " where(b.row_num between " + minPage + " and " + maxPage + ")"; + string sqlData = "select filename as 文档名称,dbid as 编号,title as 文档标题,"+ + "filetype as 文档类型,upday as 上传日期,writer as 上传人 " + + "from (select t.*,rownum row_num from casic_userdocument t where sysname = 'EMS'"; string txtTitleText = null; string comboFileType = null; @@ -278,7 +279,8 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - + sqlData += " order by DBID desc)b " + + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; @@ -437,7 +439,7 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - string filename = row.Cells["filename"].Value.ToString(); + string filename = row.Cells["文档名称"].Value.ToString(); string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; string file = System.Environment.CurrentDirectory + "\\download\\" + filename; int result = DownloadFile(url, file, progressBar1); @@ -515,7 +517,7 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - string filename = row.Cells["filename"].Value.ToString(); + string filename = row.Cells["文档名称"].Value.ToString(); string ext = Path.GetExtension(filename); SaveFileDialog dlg = new SaveFileDialog(); dlg.Filter = "保存文档|*" + ext + ";"; diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 1d1201b..3902629 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -748,6 +748,7 @@ this.Name = "FrmAddSinMark"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "单个标识器添加"; + this.TopMost = true; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmAddSinMark_FormClosing); this.Load += new System.EventHandler(this.FrmAddSinMark_Load); this.groupPanel1.ResumeLayout(false); diff --git a/FrmEquipmentManage.cs b/FrmEquipmentManage.cs index 90bfdb2..a3cf55c 100644 --- a/FrmEquipmentManage.cs +++ b/FrmEquipmentManage.cs @@ -74,13 +74,13 @@ //控制表格显示的列，以及每一列要显示的列名 this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - this.winGridViewPager1.AddColumnAlias("DESCIRPTION", "设备描述"); - this.winGridViewPager1.AddColumnAlias("DBID", "编号"); - this.winGridViewPager1.AddColumnAlias("MACID", "MAC地址"); - this.winGridViewPager1.AddColumnAlias("OWNER", "设备所有人"); - this.winGridViewPager1.AddColumnAlias("STATUS", "设备状态"); + this.winGridViewPager1.AddColumnAlias("设备描述", "设备描述"); + this.winGridViewPager1.AddColumnAlias("编号", "编号"); + this.winGridViewPager1.AddColumnAlias("MAC地址", "MAC地址"); + this.winGridViewPager1.AddColumnAlias("设备所有人", "设备所有人"); + this.winGridViewPager1.AddColumnAlias("设备状态", "设备状态"); - this.winGridViewPager1.DisplayColumns = "DESCIRPTION,MACID,OWNER,STATUS"; + this.winGridViewPager1.DisplayColumns = "设备描述,MAC地址,设备所有人,设备状态"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -146,10 +146,10 @@ DataGridViewRow row = grid.SelectedRows[0]; try { - long dbid = long.Parse(row.Cells["DBID"].Value.ToString()); - String macId = row.Cells["MACID"].Value.ToString(); - String username = row.Cells["OWNER"].Value.ToString(); - String descn = row.Cells["DESCIRPTION"].Value.ToString(); + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); + String macId = row.Cells["MAC地址"].Value.ToString(); + String username = row.Cells["设备所有人"].Value.ToString(); + String descn = row.Cells["设备状态"].Value.ToString(); FrmEquipmentEdit frm = new FrmEquipmentEdit(dbid.ToString(), macId, username, descn); frm.reloadGrid += new ReloadEquipmentGrid(LoadData); frm.ShowDialog(); @@ -179,7 +179,7 @@ { return; } - String macId = row.Cells["MACID"].Value.ToString(); + String macId = row.Cells["MAC地址"].Value.ToString(); FrmLog frm = new FrmLog(macId); frm.Show(); } @@ -201,7 +201,7 @@ if (grid != null) { DataGridViewRow row = grid.SelectedRows[0]; - long dbid = long.Parse(row.Cells["DBID"].Value.ToString()); + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); try { if (MessageBox.Show("确定删除？", "确认", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) @@ -243,7 +243,8 @@ { string sqlCount = "select count(*) from equipment where status = 'USING'"; - string sqlData = "select descirption,DBID,macid,owner,case when status = 'USING' then '可用' when status = 'DAMAGE' then '损坏' end as status " + + string sqlData = "select descirption as 设备描述,DBID as 编号,macid as MAC地址,owner as 设备所有人,"+ + "case when status = 'USING' then '可用' when status = 'DAMAGE' then '损坏' end as 设备状态 " + "from (select t.*,rownum row_num from equipment t where status = 'USING' order by dbid desc)b " + " where 1=1"; @@ -258,16 +259,17 @@ int maxPage = pageIndex * maxPageIndex; string sqlCount = "select count(*) from equipment where status = 'USING' "; - string sqlData = "select descirption,DBID,macid,owner,case when status = 'USING' then '可用' when status = 'DAMAGE' then '损坏' end as status " + - "from (select t.*,rownum row_num from equipment t where status = 'USING' order by DBID desc)b " + - " where(b.row_num between " + minPage + " and " + maxPage + ")"; + string sqlData = "select descirption as 设备描述,DBID as 编号,macid as MAC地址,owner as 设备所有人," + + "case when status = 'USING' then '可用' when status = 'DAMAGE' then '损坏' end as 设备状态 " + + "from (select t.*,rownum row_num from equipment t where status = 'USING'"; if (!String.IsNullOrEmpty(txtMacId.Text.Trim())) { sqlData += " and macid like '%" + txtMacId.Text.Trim() + "%'"; sqlCount += " and macid like '%" + txtMacId.Text.Trim() + "%'"; } - + sqlData += " order by DBID desc)b " + + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; @@ -299,76 +301,6 @@ } } - //public void reloadGrid(int pageIndex) - //{ - // if (pageIndex <= 0) - // { - // pageIndex = 1; - // currentpage = 1; - // } - // String sqlrows = "select * from (select rownum as rowno,dbid,descirption,macid,owner,case when status = 'USING' then '可用' when status = 'DAMAGE' then '损坏' end as status,'编辑' as btnEdit,'删除' as btnDel from equipment t where status = 'USING' "; - // string sqlcount = "select count(*) from equipment where status = 'USING' "; - // if (!String.IsNullOrEmpty(txtMacId.Text.Trim())) - // { - // sqlrows += " and macid like '%" + txtMacId.Text.Trim() + "%'"; - // sqlcount += " and macid like '%" + txtMacId.Text.Trim() + "%'"; - // } - // sqlrows += " and rownum<=" + (pagesize * pageIndex) + ") table_alias where table_alias.rowno>=" + ((pageIndex - 1) * pagesize + 1); - - // int rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlcount).ToString()); - // int pages = 0; - // if (rows % pagesize == 0) - // { - // pages = rows / pagesize; - // } - // else - // { - // pages = rows / pagesize + 1; - // } - - // lastpage = pages; - - // lab_page_msg.Text = "共" + rows + "条记录，每页" + pagesize + "条，第" + pageIndex + "页，共" + pages + "页"; - // combo_page_num.Items.Clear(); - // for (int i = 1; i <= pages; i++) - // { - // combo_page_num.Items.Add(new ComboBoxItem(i.ToString(), i.ToString())); - // } - - // if (lastpage == 1) - // { - // btn_page_first.Enabled = false; - // btn_page_pre.Enabled = false; - // btn_page_last.Enabled = false; - // btn_page_next.Enabled = false; - // } - // else if (currentpage == 1) - // { - // btn_page_first.Enabled = false; - // btn_page_pre.Enabled = false; - // btn_page_last.Enabled = true; - // btn_page_next.Enabled = true; - // } - // else if (currentpage == lastpage) - // { - // btn_page_first.Enabled = true; - // btn_page_pre.Enabled = true; - // btn_page_last.Enabled = false; - // btn_page_next.Enabled = false; - // } - // else - // { - // btn_page_first.Enabled = true; - // btn_page_pre.Enabled = true; - // btn_page_last.Enabled = true; - // btn_page_next.Enabled = true; - // } - - // DataTable table = OracleUtils.ExecuteDataset(OracleUtils.ConnectionString, CommandType.Text, sqlrows).Tables[0]; - // dataGridViewX1.DataSource = table; - - //} - private void FrmEquipmentManage_FormClosing(object sender, FormClosingEventArgs e) diff --git a/FrmFlagDetail.Designer.cs b/FrmFlagDetail.Designer.cs new file mode 100644 index 0000000..982bfc6 --- /dev/null +++ b/FrmFlagDetail.Designer.cs @@ -0,0 +1,103 @@ +namespace Cyberpipe +{ + partial class FrmFlagDetail + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); + this.dataGridViewX_markDetail = new DevComponents.DotNetBar.Controls.DataGridViewX(); + this.对象类型 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.对象编号 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.对象名称 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX_markDetail)).BeginInit(); + this.SuspendLayout(); + // + // dataGridViewX_markDetail + // + this.dataGridViewX_markDetail.AllowUserToAddRows = false; + this.dataGridViewX_markDetail.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; + this.dataGridViewX_markDetail.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dataGridViewX_markDetail.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.对象类型, + this.对象编号, + this.对象名称}); + dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle3.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dataGridViewX_markDetail.DefaultCellStyle = dataGridViewCellStyle3; + this.dataGridViewX_markDetail.Dock = System.Windows.Forms.DockStyle.Fill; + this.dataGridViewX_markDetail.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(170)))), ((int)(((byte)(170)))), ((int)(((byte)(170))))); + this.dataGridViewX_markDetail.Location = new System.Drawing.Point(0, 0); + this.dataGridViewX_markDetail.Name = "dataGridViewX_markDetail"; + this.dataGridViewX_markDetail.RowTemplate.Height = 23; + this.dataGridViewX_markDetail.Size = new System.Drawing.Size(508, 321); + this.dataGridViewX_markDetail.TabIndex = 0; + // + // 对象类型 + // + this.对象类型.HeaderText = "对象类型"; + this.对象类型.Name = "对象类型"; + // + // 对象编号 + // + this.对象编号.HeaderText = "对象编号"; + this.对象编号.Name = "对象编号"; + // + // 对象名称 + // + this.对象名称.HeaderText = "对象名称"; + this.对象名称.Name = "对象名称"; + // + // FrmFlagDetail + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(508, 321); + this.Controls.Add(this.dataGridViewX_markDetail); + this.Name = "FrmFlagDetail"; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; + this.Text = "标识对象信息"; + this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmFlagDetail_FormClosing); + this.Load += new System.EventHandler(this.FrmFlagDetail_Load); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX_markDetail)).EndInit(); + this.ResumeLayout(false); + + } + + #endregion + + private DevComponents.DotNetBar.Controls.DataGridViewX dataGridViewX_markDetail; + private System.Windows.Forms.DataGridViewTextBoxColumn 对象类型; + private System.Windows.Forms.DataGridViewTextBoxColumn 对象编号; + private System.Windows.Forms.DataGridViewTextBoxColumn 对象名称; + + } +} \ No newline at end of file diff --git a/FrmFlagDetail.cs b/FrmFlagDetail.cs new file mode 100644 index 0000000..81de974 --- /dev/null +++ b/FrmFlagDetail.cs @@ -0,0 +1,77 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Windows.Forms; +using GeoScene.Globe; +using System.Data.OracleClient; + +namespace Cyberpipe +{ + public partial class FrmFlagDetail : Form + { + DataTable dt = new DataTable(); + private GSOGlobeControl globeControl1; + + public delegate void Handle(); + public event Handle showParentForm; + String markId; + + public FrmFlagDetail(GSOGlobeControl globeControl1, String id) + { + InitializeComponent(); + this.markId = id; + } + + private void FrmFlagDetail_FormClosing(object sender, FormClosingEventArgs e) + { + showParentForm(); + } + + private void FrmFlagDetail_Load(object sender, EventArgs e) + { + string objectIds = ""; + string objectTypeCodes = ""; + string sql = "select t.对象编号,t.对象类型 from 标识器 t where t.编号='" + markId + "'"; + using (OracleDataReader reader = OracleUtils.ExecuteReader(OracleUtils.ConnectionString, CommandType.Text, sql)) + { + while (reader.Read()) + { + objectIds = reader.GetString(0); + objectTypeCodes = reader.GetString(1); + } + } + + string[] codeTypes = objectTypeCodes.Split(','); + string[] codeIds = objectIds.Split(','); + int length = 0; + if (codeTypes.Length <= codeIds.Length) + { + length = codeTypes.Length; + } + else + { + length = codeIds.Length; + } + for (int n = 0; n < length; n++) + { + for (int i = 0; i < Utility1.listPipelineType.Count; i++) + { + if (Utility1.listPipelineType[i].code == codeTypes[n]) + { + //string objectId = codeIds[i]; + //string objectType = Utility1.listPipelineType[i].type; + //string objectName = Utility1.listPipelineType[i].name; + int index = this.dataGridViewX_markDetail.Rows.Add(); + this.dataGridViewX_markDetail.Rows[index].Cells[0].Value = Utility1.listPipelineType[i].type; + this.dataGridViewX_markDetail.Rows[index].Cells[1].Value = codeIds[n].ToString(); + this.dataGridViewX_markDetail.Rows[index].Cells[2].Value = Utility1.listPipelineType[i].name; + } + } + } + } + } +} diff --git a/FrmFlagDetail.resx b/FrmFlagDetail.resx new file mode 100644 index 0000000..e98a8fe --- /dev/null +++ b/FrmFlagDetail.resx @@ -0,0 +1,129 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + True + + + True + + + True + + \ No newline at end of file diff --git a/FrmFlagManagers.Designer.cs b/FrmFlagManagers.Designer.cs index d7e2f60..9fe14fb 100644 --- a/FrmFlagManagers.Designer.cs +++ b/FrmFlagManagers.Designer.cs @@ -28,8 +28,10 @@ /// private void InitializeComponent() { - this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); - this.winGridViewPager1 = new WHC.Pager.WinControl.WinGridViewPager(); + this.components = new System.ComponentModel.Container(); + this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components); + this.标识对象ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripMenuItem2 = new System.Windows.Forms.ToolStripMenuItem(); this.bar1 = new DevComponents.DotNetBar.Bar(); this.labelItem1 = new DevComponents.DotNetBar.LabelItem(); this.txt_no = new DevComponents.DotNetBar.TextBoxItem(); @@ -38,45 +40,37 @@ this.btn_query = new DevComponents.DotNetBar.ButtonItem(); this.btn_add_batch = new DevComponents.DotNetBar.ButtonItem(); this.btn_add_menu = new DevComponents.DotNetBar.ButtonItem(); - this.btn_db = new DevComponents.DotNetBar.ButtonItem(); - this.tableLayoutPanel1.SuspendLayout(); + this.winGridViewPager1 = new WHC.Pager.WinControl.WinGridViewPager(); + this.contextMenuStrip1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.bar1)).BeginInit(); this.SuspendLayout(); // - // tableLayoutPanel1 + // contextMenuStrip1 // - this.tableLayoutPanel1.ColumnCount = 1; - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel1.Controls.Add(this.winGridViewPager1, 0, 1); - this.tableLayoutPanel1.Controls.Add(this.bar1, 0, 0); - this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 0); - this.tableLayoutPanel1.Name = "tableLayoutPanel1"; - this.tableLayoutPanel1.RowCount = 2; - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 32F)); - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel1.Size = new System.Drawing.Size(881, 474); - this.tableLayoutPanel1.TabIndex = 6; + this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.标识对象ToolStripMenuItem, + this.toolStripMenuItem2}); + this.contextMenuStrip1.Name = "contextMenuStrip1"; + this.contextMenuStrip1.Size = new System.Drawing.Size(125, 48); // - // winGridViewPager1 + // 标识对象ToolStripMenuItem // - this.winGridViewPager1.AppendedMenu = null; - this.winGridViewPager1.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; - this.winGridViewPager1.DataSource = null; - this.winGridViewPager1.DisplayColumns = ""; - this.winGridViewPager1.Dock = System.Windows.Forms.DockStyle.Fill; - this.winGridViewPager1.Location = new System.Drawing.Point(3, 35); - this.winGridViewPager1.MinimumSize = new System.Drawing.Size(540, 0); - this.winGridViewPager1.Name = "winGridViewPager1"; - this.winGridViewPager1.PrintTitle = ""; - this.winGridViewPager1.Size = new System.Drawing.Size(875, 436); - this.winGridViewPager1.TabIndex = 5; + this.标识对象ToolStripMenuItem.Name = "标识对象ToolStripMenuItem"; + this.标识对象ToolStripMenuItem.Size = new System.Drawing.Size(124, 22); + this.标识对象ToolStripMenuItem.Text = "标识对象"; + this.标识对象ToolStripMenuItem.Click += new System.EventHandler(this.标识对象ToolStripMenuItem_Click); + // + // toolStripMenuItem2 + // + this.toolStripMenuItem2.Name = "toolStripMenuItem2"; + this.toolStripMenuItem2.Size = new System.Drawing.Size(152, 22); + this.toolStripMenuItem2.Text = "查看位置"; + this.toolStripMenuItem2.Click += new System.EventHandler(this.toolStripMenuItem2_Click); // // bar1 // this.bar1.AntiAlias = true; this.bar1.Dock = System.Windows.Forms.DockStyle.Top; - this.bar1.DockSide = DevComponents.DotNetBar.eDockSide.Document; this.bar1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.labelItem1, this.txt_no, @@ -84,14 +78,13 @@ this.combo_street, this.btn_query, this.btn_add_batch, - this.btn_add_menu, - this.btn_db}); - this.bar1.Location = new System.Drawing.Point(3, 3); + this.btn_add_menu}); + this.bar1.Location = new System.Drawing.Point(0, 0); this.bar1.Name = "bar1"; - this.bar1.Size = new System.Drawing.Size(875, 28); + this.bar1.Size = new System.Drawing.Size(881, 28); this.bar1.Stretch = true; this.bar1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.bar1.TabIndex = 1; + this.bar1.TabIndex = 8; this.bar1.TabStop = false; this.bar1.Text = "bar1"; // @@ -136,24 +129,34 @@ this.btn_add_menu.Text = "手工添加"; this.btn_add_menu.Click += new System.EventHandler(this.btn_add_menu_Click); // - // btn_db + // winGridViewPager1 // - this.btn_db.Name = "btn_db"; - this.btn_db.Text = "数据导出"; + this.winGridViewPager1.AppendedMenu = null; + this.winGridViewPager1.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; + this.winGridViewPager1.DataSource = null; + this.winGridViewPager1.DisplayColumns = ""; + this.winGridViewPager1.Dock = System.Windows.Forms.DockStyle.Fill; + this.winGridViewPager1.Location = new System.Drawing.Point(0, 28); + this.winGridViewPager1.MinimumSize = new System.Drawing.Size(540, 0); + this.winGridViewPager1.Name = "winGridViewPager1"; + this.winGridViewPager1.PrintTitle = ""; + this.winGridViewPager1.Size = new System.Drawing.Size(881, 446); + this.winGridViewPager1.TabIndex = 9; // // FrmFlagManagers // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(881, 474); - this.Controls.Add(this.tableLayoutPanel1); + this.Controls.Add(this.winGridViewPager1); + this.Controls.Add(this.bar1); this.DoubleBuffered = true; this.Name = "FrmFlagManagers"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "标识器管理"; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmFlagManagers_FormClosing); this.Load += new System.EventHandler(this.FrmFlagManagers_Load); - this.tableLayoutPanel1.ResumeLayout(false); + this.contextMenuStrip1.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.bar1)).EndInit(); this.ResumeLayout(false); @@ -161,8 +164,8 @@ #endregion - private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1; - private WHC.Pager.WinControl.WinGridViewPager winGridViewPager1; + private System.Windows.Forms.ContextMenuStrip contextMenuStrip1; + private System.Windows.Forms.ToolStripMenuItem 标识对象ToolStripMenuItem; private DevComponents.DotNetBar.Bar bar1; private DevComponents.DotNetBar.LabelItem labelItem1; private DevComponents.DotNetBar.TextBoxItem txt_no; @@ -171,6 +174,7 @@ private DevComponents.DotNetBar.ButtonItem btn_query; private DevComponents.DotNetBar.ButtonItem btn_add_batch; private DevComponents.DotNetBar.ButtonItem btn_add_menu; - private DevComponents.DotNetBar.ButtonItem btn_db; + private WHC.Pager.WinControl.WinGridViewPager winGridViewPager1; + private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem2; } } \ No newline at end of file diff --git a/FrmFlagManagers.cs b/FrmFlagManagers.cs index 38d4927..9bf9734 100644 --- a/FrmFlagManagers.cs +++ b/FrmFlagManagers.cs @@ -33,15 +33,13 @@ { this.globeControl1 = _globeControl1; InitializeComponent(); - winGridViewPager1.OnPageChanged += new EventHandler(winGridViewPager1_OnPageChanged); - this.winGridViewPager1.OnAddNew += new EventHandler(winGridViewPager1_OnAddNew); //右键定位 + winGridViewPager1.OnPageChanged += new EventHandler(winGridViewPager1_OnPageChanged); this.winGridViewPager1.OnEditSelected += new EventHandler(winGridViewPager1_OnEditSelected);//属性编辑 this.winGridViewPager1.OnDeleteSelected += new EventHandler(winGridViewPager1_OnDeleteSelected);//标识器报废 + this.winGridViewPager1.OnStartExport += new EventHandler(pager1_OnStartExport); this.winGridViewPager1.OnEndExport += new EventHandler(pager1_OnEndExport); - //this.winGridViewPager1.ExportCurrent += new ExportCurrentEventHandler(pager1_ExportCurrent); - //this.winGridViewPager1.ExportAll += new ExportAllEventHandler(pager1_ExportAll); winGridViewPager1.dataGridView1.MultiSelect = false; @@ -76,26 +74,25 @@ this.winGridViewPager1.AddColumnAlias("标识器型号", "标识器型号"); this.winGridViewPager1.AddColumnAlias("地面高程", "地面高程"); this.winGridViewPager1.AddColumnAlias("标识器埋深", "标识器埋深"); - this.winGridViewPager1.AddColumnAlias("对象编号", "对象编号"); - this.winGridViewPager1.AddColumnAlias("对象类型", "对象类型"); this.winGridViewPager1.AddColumnAlias("所属道路", "所属道路"); this.winGridViewPager1.AddColumnAlias("使用状态", "使用状态"); - this.winGridViewPager1.DisplayColumns = "编号,标识器ID号,标识器型号,地面高程,标识器埋深,对象编号,对象类型,所属道路,使用状态"; + this.winGridViewPager1.DisplayColumns = "编号,标识器ID号,标识器型号,地面高程,标识器埋深,所属道路,使用状态"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 //隐藏右键功能按钮 //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[1].Visible = false; - //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[4].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[5].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[6].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[7].Visible = false; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[1].Text = "定位查看"; + //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[1].Text = "定位查看"; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "属性编辑"; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Text = "标识器报废"; + winGridViewPager1.AppendedMenu = this.contextMenuStrip1; + //右键菜单宽度 winGridViewPager1.dataGridView1.ContextMenuStrip.AutoSize = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Width = 150; @@ -153,7 +150,7 @@ } /// - /// 右键定位 + /// 对象查看 /// /// /// @@ -306,20 +303,10 @@ string sqlCount = "select count(*) from 标识器 where 使用状态 = '使用中'"; - string sqlData = "select 编号,标识器ID号,标识器型号,地面高程,标识器埋深,对象编号,对象类型,所属道路,LSSYS_ID,X坐标,Y坐标,使用状态 " + + string sqlData = "select 编号,标识器ID号,标识器型号,地面高程,标识器埋深,所属道路,LSSYS_ID,X坐标,Y坐标,使用状态 " + "from (select t.*,rownum row_num from 标识器 t where 使用状态 = '使用中' order by 编号)b " + " where 1=1"; - if (!String.IsNullOrEmpty(txt_no.Text.Trim())) - { - sqlCount += " and 编号 like '%" + txt_no.Text.Trim() + "%'"; - sqlData += " and 编号 like '%" + txt_no.Text.Trim() + "%'"; - } - if (null != combo_street.SelectedItem && !String.IsNullOrEmpty(combo_street.SelectedItem.ToString().Trim())) - { - sqlData += " and 所属道路='" + combo_street.SelectedItem.ToString().Trim() + "'"; - sqlCount += " and 所属道路='" + combo_street.SelectedItem.ToString().Trim() + "'"; - } rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -332,9 +319,8 @@ int maxPage = pageIndex * maxPageIndex; string sqlCount = "select count(*) from 标识器 where 使用状态 = '使用中'"; - string sqlData = "select 编号,标识器ID号,标识器型号,地面高程,标识器埋深,对象编号,对象类型,所属道路,LSSYS_ID,X坐标,Y坐标,使用状态 " + - "from (select t.*,rownum row_num from 标识器 t where 使用状态 = '使用中' order by 编号)b "+ - " where(b.row_num between " + minPage + " and " + maxPage + ")"; + string sqlData = "select 编号,标识器ID号,标识器型号,地面高程,标识器埋深,所属道路,LSSYS_ID,X坐标,Y坐标,使用状态 " + + "from (select t.*,rownum row_num from 标识器 t where 使用状态 = '使用中'"; if (!String.IsNullOrEmpty(txt_no.Text.Trim())) { @@ -347,6 +333,8 @@ sqlCount += " and 所属道路='" + combo_street.SelectedItem.ToString().Trim() + "'"; } + sqlData += " order by 编号)b " + + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; @@ -372,9 +360,10 @@ private void FrmFlagManagers_FormClosing(object sender, FormClosingEventArgs e) { IS_OPEN = false; - Thread downloadJob = new Thread(new ParameterizedThreadStart(doSave)); - downloadJob.IsBackground = true; - downloadJob.Start(e); + //Thread downloadJob = new Thread(new ParameterizedThreadStart(doSave)); + //downloadJob.IsBackground = true; + //downloadJob.Start(e); + globeControl1.Globe.Layers["标识器"].Save(); globeControl1.Globe.MemoryLayer.RemoveAllFeature(); foreach (GSOFeature f in Features) { @@ -480,10 +469,88 @@ if (null != globeControl1) { FrmAddSinMark frm = new FrmAddSinMark(globeControl1); - frm.ShowDialog(); + frm.Show(); } } + private void 标识对象ToolStripMenuItem_Click(object sender, EventArgs e) + { + if (winGridViewPager1 != null && winGridViewPager1.dataGridView1 != null) + { + DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; + try + { + this.Hide(); + string id = row.Cells["编号"].Value.ToString(); + FrmFlagDetail p = new FrmFlagDetail(globeControl1, id); + p.showParentForm += new FrmFlagDetail.Handle(showThisForm);//改变值的事件 + p.Show(); + } + catch (Exception ex) + { + MessageBox.Show("失败:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } + + private void showThisForm() + { + this.Show(); + } + + private void toolStripMenuItem2_Click(object sender, EventArgs e) + { + if (winGridViewPager1 != null && winGridViewPager1.dataGridView1 != null) + { + DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; + try + { + this.WindowState = FormWindowState.Minimized; + string id = row.Cells["LSSYS_ID"].Value.ToString(); + string flagno = row.Cells["编号"].Value.ToString(); + string flagstreet = row.Cells["所属道路"].Value.ToString(); + double x = Convert.ToDouble(row.Cells["X坐标"].Value); + double y = Convert.ToDouble(row.Cells["Y坐标"].Value); + GSOFeature flagFeature = globeControl1.Globe.Layers.GetLayerByCaption("标识器").GetFeatureByID(int.Parse(id)); + + string type = ""; + string pipe = ""; + string sql = "select t.标识器型号,t.对象编号 from 标识器 t where t.编号='" + flagno + "'"; + using (OracleDataReader reader = OracleUtils.ExecuteReader(OracleUtils.ConnectionString, CommandType.Text, sql)) + { + while (reader.Read()) + { + type = reader.GetString(0); + pipe = reader.GetString(1); + } + } + + GSOLabel label = new GSOLabel(); + label.Text = "标识器编号：" + flagno + "\r\n" + + "标识器类型:" + type + "\r\n" + + //"标识对象编号:" + pipe + "\r\n" + + "所属道路:" + flagstreet; + label.Style = new GSOLabelStyle(); + label.Style.TextStyle.FontSize = 18; + label.Style.TextStyle.ForeColor = Color.FromArgb(0, 0, 0, 255); + label.Style.Opaque = 0.8; //设置标注的透明度，取值区间是0-1 + label.Style.TracktionLineType = EnumTracktionLineType.Solid; + label.Style.TextStyle.FontHeight = 10; + label.Style.TextStyle.FontName = "黑体"; + label.Style.TractionLineEndPos = new GSOPoint2d(80, 60); + + flagFeature.Label = label; + Features.Add(flagFeature); + globeControl1.Globe.JumpToFeature(flagFeature, 20); + this.globeControl1.Refresh(); + + } + catch (Exception ex) + { + MessageBox.Show("标识器定位失败:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } } diff --git a/FrmFlagManagers.resx b/FrmFlagManagers.resx index 1af7de1..ad53752 100644 --- a/FrmFlagManagers.resx +++ b/FrmFlagManagers.resx @@ -117,4 +117,7 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 17, 17 + \ No newline at end of file diff --git a/FrmPatrolerEdit.cs b/FrmPatrolerEdit.cs index dbd4fec..f45b5ae 100644 --- a/FrmPatrolerEdit.cs +++ b/FrmPatrolerEdit.cs @@ -46,7 +46,7 @@ txt_name.Focus(); return; } - if (String.IsNullOrEmpty(combo_sex.SelectedItem.ToString())) + if (combo_sex.SelectedItem == null ||String.IsNullOrEmpty(combo_sex.SelectedItem.ToString())) { MessageBox.Show("性别不能为空！", "警告", MessageBoxButtons.OK, MessageBoxIcon.Warning); combo_sex.Focus(); diff --git a/FrmPatrolerManager.Designer.cs b/FrmPatrolerManager.Designer.cs index bb8e5fb..10fac22 100644 --- a/FrmPatrolerManager.Designer.cs +++ b/FrmPatrolerManager.Designer.cs @@ -47,11 +47,13 @@ this.注销 = new DevComponents.Editors.ComboItem(); this.btn_query_person = new DevComponents.DotNetBar.ButtonItem(); this.btn_add_person = new DevComponents.DotNetBar.ButtonItem(); - this.winGridViewPager1 = new WHC.Pager.WinControl.WinGridViewPager(); this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components); this.日志ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.任务ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.定位ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.winGridViewPager1 = new WHC.Pager.WinControl.WinGridViewPager(); + this.编辑ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.注销ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); ((System.ComponentModel.ISupportInitialize)(this.bar1)).BeginInit(); this.contextMenuStrip1.SuspendLayout(); this.SuspendLayout(); @@ -173,9 +175,42 @@ this.btn_add_person.Text = "新增"; this.btn_add_person.Click += new System.EventHandler(this.btn_add_person_Click); // + // contextMenuStrip1 + // + this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.日志ToolStripMenuItem, + this.任务ToolStripMenuItem, + this.定位ToolStripMenuItem, + this.编辑ToolStripMenuItem, + this.注销ToolStripMenuItem}); + this.contextMenuStrip1.Name = "contextMenuStrip1"; + this.contextMenuStrip1.Size = new System.Drawing.Size(153, 136); + // + // 日志ToolStripMenuItem + // + this.日志ToolStripMenuItem.Name = "日志ToolStripMenuItem"; + this.日志ToolStripMenuItem.Size = new System.Drawing.Size(100, 22); + this.日志ToolStripMenuItem.Text = "日志"; + this.日志ToolStripMenuItem.Click += new System.EventHandler(this.日志ToolStripMenuItem_Click); + // + // 任务ToolStripMenuItem + // + this.任务ToolStripMenuItem.Name = "任务ToolStripMenuItem"; + this.任务ToolStripMenuItem.Size = new System.Drawing.Size(100, 22); + this.任务ToolStripMenuItem.Text = "任务"; + this.任务ToolStripMenuItem.Click += new System.EventHandler(this.任务ToolStripMenuItem_Click); + // + // 定位ToolStripMenuItem + // + this.定位ToolStripMenuItem.Name = "定位ToolStripMenuItem"; + this.定位ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.定位ToolStripMenuItem.Text = "定位"; + this.定位ToolStripMenuItem.Click += new System.EventHandler(this.定位ToolStripMenuItem_Click); + // // winGridViewPager1 // this.winGridViewPager1.AppendedMenu = null; + this.winGridViewPager1.ContextMenuStrip = this.contextMenuStrip1; this.winGridViewPager1.DataSource = null; this.winGridViewPager1.DisplayColumns = ""; this.winGridViewPager1.Dock = System.Windows.Forms.DockStyle.Fill; @@ -186,35 +221,19 @@ this.winGridViewPager1.Size = new System.Drawing.Size(756, 309); this.winGridViewPager1.TabIndex = 3; // - // contextMenuStrip1 + // 编辑ToolStripMenuItem // - this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.日志ToolStripMenuItem, - this.任务ToolStripMenuItem, - this.定位ToolStripMenuItem}); - this.contextMenuStrip1.Name = "contextMenuStrip1"; - this.contextMenuStrip1.Size = new System.Drawing.Size(101, 70); + this.编辑ToolStripMenuItem.Name = "编辑ToolStripMenuItem"; + this.编辑ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.编辑ToolStripMenuItem.Text = "编辑"; + this.编辑ToolStripMenuItem.Click += new System.EventHandler(this.编辑ToolStripMenuItem_Click); // - // 日志ToolStripMenuItem + // 注销ToolStripMenuItem // - this.日志ToolStripMenuItem.Name = "日志ToolStripMenuItem"; - this.日志ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); - this.日志ToolStripMenuItem.Text = "日志"; - this.日志ToolStripMenuItem.Click += new System.EventHandler(this.日志ToolStripMenuItem_Click); - // - // 任务ToolStripMenuItem - // - this.任务ToolStripMenuItem.Name = "任务ToolStripMenuItem"; - this.任务ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); - this.任务ToolStripMenuItem.Text = "任务"; - this.任务ToolStripMenuItem.Click += new System.EventHandler(this.任务ToolStripMenuItem_Click); - // - // 定位ToolStripMenuItem - // - this.定位ToolStripMenuItem.Name = "定位ToolStripMenuItem"; - this.定位ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); - this.定位ToolStripMenuItem.Text = "定位"; - this.定位ToolStripMenuItem.Click += new System.EventHandler(this.定位ToolStripMenuItem_Click); + this.注销ToolStripMenuItem.Name = "注销ToolStripMenuItem"; + this.注销ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.注销ToolStripMenuItem.Text = "注销"; + this.注销ToolStripMenuItem.Click += new System.EventHandler(this.注销ToolStripMenuItem_Click); // // FrmPatrolerManager // @@ -229,7 +248,7 @@ this.MinimizeBox = false; this.Name = "FrmPatrolerManager"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; - this.Text = "巡检人员维护"; + this.Text = "定位人员维护"; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmPatrolerManager_FormClosing); this.Load += new System.EventHandler(this.FrmPatrolerManager_Load); ((System.ComponentModel.ISupportInitialize)(this.bar1)).EndInit(); @@ -258,10 +277,12 @@ private DevComponents.Editors.ComboItem 注销; private DevComponents.Editors.ComboItem comboItem1; private DevComponents.Editors.ComboItem 不限; - private WHC.Pager.WinControl.WinGridViewPager winGridViewPager1; private System.Windows.Forms.ContextMenuStrip contextMenuStrip1; private System.Windows.Forms.ToolStripMenuItem 日志ToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem 任务ToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem 定位ToolStripMenuItem; + private WHC.Pager.WinControl.WinGridViewPager winGridViewPager1; + private System.Windows.Forms.ToolStripMenuItem 编辑ToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem 注销ToolStripMenuItem; } } \ No newline at end of file diff --git a/FrmPatrolerManager.cs b/FrmPatrolerManager.cs index 255a076..9c32f54 100644 --- a/FrmPatrolerManager.cs +++ b/FrmPatrolerManager.cs @@ -29,9 +29,7 @@ this.globeControl1 = globeControl1; winGridViewPager1.OnPageChanged += new EventHandler(winGridViewPager1_OnPageChanged); - this.winGridViewPager1.OnEditSelected += new EventHandler(winGridViewPager1_OnEditSelected);//编辑 - this.winGridViewPager1.OnDeleteSelected += new EventHandler(winGridViewPager1_OnDeleteSelected);//删除 - + this.winGridViewPager1.OnStartExport += new EventHandler(pager1_OnStartExport); this.winGridViewPager1.OnEndExport += new EventHandler(pager1_OnEndExport); @@ -47,26 +45,31 @@ //控制表格显示的列，以及每一列要显示的列名 this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - this.winGridViewPager1.AddColumnAlias("USERNAME", "姓名"); - this.winGridViewPager1.AddColumnAlias("DBID", "编号"); - this.winGridViewPager1.AddColumnAlias("SEX", "性别"); - this.winGridViewPager1.AddColumnAlias("AGE", "年龄"); - this.winGridViewPager1.AddColumnAlias("PHONENUM", "电话"); - this.winGridViewPager1.AddColumnAlias("ACCOUNTSTATE", "状态"); - this.winGridViewPager1.DisplayColumns = "USERNAME,SEX,AGE,PHONENUM,ACCOUNTSTATE"; + this.winGridViewPager1.AddColumnAlias("姓名", "姓名"); + this.winGridViewPager1.AddColumnAlias("编号", "编号"); + this.winGridViewPager1.AddColumnAlias("性别", "性别"); + this.winGridViewPager1.AddColumnAlias("年龄", "年龄"); + this.winGridViewPager1.AddColumnAlias("电话", "电话"); + this.winGridViewPager1.AddColumnAlias("状态", "状态"); + this.winGridViewPager1.DisplayColumns = "姓名,性别,年龄,电话,状态"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 + //隐藏右键功能按钮 //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[1].Visible = false; + winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Visible = false; + winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[4].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[5].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[6].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[7].Visible = false; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "编辑"; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Text = "注销"; + + //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "编辑"; + //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Text = "注销"; winGridViewPager1.AppendedMenu = this.contextMenuStrip1; + //右键菜单宽度 winGridViewPager1.dataGridView1.ContextMenuStrip.AutoSize = false; @@ -122,11 +125,11 @@ DataGridViewRow row = grid.SelectedRows[0]; try { - long dbid = long.Parse(row.Cells["dbid"].Value.ToString()); - String name = row.Cells["USERNAME"].Value.ToString(); - String sex = row.Cells["SEX"].Value.ToString(); - String age = row.Cells["AGE"].Value.ToString(); - string phone = row.Cells["PHONENUM"].Value.ToString(); + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); + String name = row.Cells["姓名"].Value.ToString(); + String sex = row.Cells["性别"].Value.ToString(); + String age = row.Cells["年龄"].Value.ToString(); + string phone = row.Cells["电话"].Value.ToString(); age = String.IsNullOrEmpty(age.ToString().Trim()) ? "1" : age.ToString().Trim(); FrmPatrolerEdit frm = new FrmPatrolerEdit(dbid.ToString(), name, age, sex, phone); frm.reloadGrid += new ReloadPatrolerGrid(LoadData); @@ -152,10 +155,10 @@ if (grid != null) { DataGridViewRow row = grid.SelectedRows[0]; - long dbid = long.Parse(row.Cells["DBID"].Value.ToString()); + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); try { - string state = row.Cells["ACCOUNTSTATE"].Value.ToString(); + string state = row.Cells["状态"].Value.ToString(); if ("在线".Equals(state)) { if (MessageBox.Show("确定注销？", "确认", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) @@ -180,60 +183,60 @@ { int pageIndex = winGridViewPager1.PagerInfo.CurrenetPageIndex; string sqlData = GetSql(pageIndex); - initlizeDatagrid(); + DataTable table = OracleUtils.ExecuteDataset(OracleUtils.ConnectionString, CommandType.Text, sqlData).Tables[0]; winGridViewPager1.DataSource = table.DefaultView; - for (int i = 0; i < winGridViewPager1.dataGridView1.Rows.Count; i++) - { - if (winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value.ToString() == "ONLINE") - { - winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value = "在线"; - } - else - { - if (winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value.ToString() == "OFFLINE") - { - winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value = "离线"; - } - else - { - if (winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value.ToString() == "LEAVER") - { - winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value = "注销"; - } - } - } - } + //for (int i = 0; i < winGridViewPager1.dataGridView1.Rows.Count; i++) + //{ + // if (winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value.ToString() == "ONLINE") + // { + // winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value = "在线"; + // } + // else + // { + // if (winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value.ToString() == "OFFLINE") + // { + // winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value = "离线"; + // } + // else + // { + // if (winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value.ToString() == "LEAVER") + // { + // winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value = "注销"; + // } + // } + // } + //} winGridViewPager1.Refresh(); } private void LoadData(int pageIndex) { string sqlData = GetSql(pageIndex); - initlizeDatagrid(); + DataTable table = OracleUtils.ExecuteDataset(OracleUtils.ConnectionString, CommandType.Text, sqlData).Tables[0]; winGridViewPager1.DataSource = table.DefaultView; - for (int i = 0; i < winGridViewPager1.dataGridView1.Rows.Count; i++) - { - if (winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value.ToString() == "ONLINE") - { - winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value = "在线"; - } - else - { - if (winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value.ToString() == "OFFLINE") - { - winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value = "离线"; - } - else - { - if (winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value.ToString() == "LEAVER") - { - winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value = "注销"; - } - } - } - } + //for (int i = 0; i < winGridViewPager1.dataGridView1.Rows.Count; i++) + //{ + // if (winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value.ToString() == "ONLINE") + // { + // winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value = "在线"; + // } + // else + // { + // if (winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value.ToString() == "OFFLINE") + // { + // winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value = "离线"; + // } + // else + // { + // if (winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value.ToString() == "LEAVER") + // { + // winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value = "注销"; + // } + // } + // } + //} winGridViewPager1.Refresh(); } @@ -241,7 +244,8 @@ { string sqlCount = "select count(*) from equipment where status = 'USING'"; - string sqlData = "select username,dbid,sex,age,phonenum,accountstate " + + string sqlData = "select username as 姓名,dbid as 编号,sex as 性别,age as 年龄,phonenum as 电话,"+ + "case when accountstate = 'ONLINE' then '在线' when accountstate = 'OFFLINE' then '离线' when accountstate = 'LEAVER' then '注销' end as 状态 " + "from (select t.*,rownum row_num from patroler t order by DBID desc)b " + " where 1=1"; @@ -255,9 +259,9 @@ int minPage = (pageIndex - 1) * maxPageIndex + 1; int maxPage = pageIndex * maxPageIndex; string sqlCount = "select count(*) from patroler where 1=1"; - string sqlData = "select username,dbid,sex,age,phonenum,accountstate " + - "from (select t.*,rownum row_num from patroler t order by DBID desc)b " + - " where(b.row_num between " + minPage + " and " + maxPage + ")"; + string sqlData = "select username as 姓名,dbid as 编号,sex as 性别,age as 年龄,phonenum as 电话,"+ + "case when accountstate = 'ONLINE' then '在线' when accountstate = 'OFFLINE' then '离线' when accountstate = 'LEAVER' then '注销' end as 状态 " + + "from (select t.*,rownum row_num from patroler t where 1=1"; if (!String.IsNullOrEmpty(txt_username.Text.Trim())) { @@ -281,7 +285,8 @@ sqlCount += " and accountstate='" + combo_stateText + "'"; sqlData += " and accountstate='" + combo_stateText + "'"; } - + sqlData += " order by DBID desc)b " + + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; @@ -291,6 +296,7 @@ { try { + initlizeDatagrid(); LoadData(); initForm(); IS_OPEN = true; @@ -310,11 +316,13 @@ } if (Utility.userRole.IndexOf("巡检员编辑") == -1) { - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Visible = false; + //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Visible = false; + 编辑ToolStripMenuItem.Visible = false; } if (Utility.userRole.IndexOf("巡检员注销") == -1) { - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Visible = false; + //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Visible = false; + 注销ToolStripMenuItem.Visible = false; } } @@ -376,7 +384,7 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - long dbid = long.Parse(row.Cells["dbid"].Value.ToString()); + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); Log p = new Log(dbid.ToString()); p.Show(); } @@ -395,8 +403,8 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - long dbid = long.Parse(row.Cells["dbid"].Value.ToString()); - String state = row.Cells["ACCOUNTSTATE"].Value.ToString(); + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); + String state = row.Cells["状态"].Value.ToString(); if ("在线".Equals(state)) { string sql = "select t.dbid " + @@ -435,8 +443,8 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - long dbid = long.Parse(row.Cells["dbid"].Value.ToString()); - String username = row.Cells["USERNAME"].Value.ToString(); + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); + String username = row.Cells["姓名"].Value.ToString(); string sql = "select t.latitude, t.longitude " + "from position t " + "where t.dbid = (select max(dbid) from position where patroler_id = " + dbid + ")"; @@ -489,6 +497,63 @@ } + private void 编辑ToolStripMenuItem_Click(object sender, EventArgs e) + { + if (winGridViewPager1 != null && winGridViewPager1.dataGridView1 != null) + { + DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; + try + { + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); + String name = row.Cells["姓名"].Value.ToString(); + String sex = row.Cells["性别"].Value.ToString(); + String age = row.Cells["年龄"].Value.ToString(); + string phone = row.Cells["电话"].Value.ToString(); + age = String.IsNullOrEmpty(age.ToString().Trim()) ? "1" : age.ToString().Trim(); + FrmPatrolerEdit frm = new FrmPatrolerEdit(dbid.ToString(), name, age, sex, phone); + frm.reloadGrid += new ReloadPatrolerGrid(LoadData); + frm.ShowDialog(); + winGridViewPager1.Refresh(); + } + catch (Exception ex) + { + MessageBox.Show("编辑失败:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } + + private void 注销ToolStripMenuItem_Click(object sender, EventArgs e) + { + if (winGridViewPager1 != null && winGridViewPager1.dataGridView1 != null) + { + DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); + try + { + if (MessageBox.Show("确定注销？", "确认", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) + { + String sql = "update patroler t set t.accountstate='LEAVER' where t.dbid=" + dbid; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + LoadData(); + MessageBox.Show("人员已注销", "信息", MessageBoxButtons.OK, MessageBoxIcon.Information); + } + //string state = row.Cells["状态"].Value.ToString(); + //if ("在线".Equals(state)) + //{ + + //} + //else + //{ + // MessageBox.Show("人员不在线，无法注销", "信息"); + //} + } + catch (Exception ex) + { + MessageBox.Show("人员注销失败:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } + } } diff --git a/FrmRoleInfoManager.cs b/FrmRoleInfoManager.cs index 8897133..35693cf 100644 --- a/FrmRoleInfoManager.cs +++ b/FrmRoleInfoManager.cs @@ -55,10 +55,10 @@ //控制表格显示的列，以及每一列要显示的列名 this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - this.winGridViewPager1.AddColumnAlias("NT", "角色名称"); - this.winGridViewPager1.AddColumnAlias("ID", "编号"); + this.winGridViewPager1.AddColumnAlias("角色名称", "角色名称"); + this.winGridViewPager1.AddColumnAlias("编号", "编号"); - this.winGridViewPager1.DisplayColumns = "NT"; + this.winGridViewPager1.DisplayColumns = "角色名称"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -131,7 +131,7 @@ { try { - string dbid = row.Cells["id"].Value.ToString(); + string dbid = row.Cells["编号"].Value.ToString(); string sql = "delete from casic_userroletest where id=" + dbid; OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); LoadData(); @@ -170,7 +170,7 @@ { string sqlCount = "select id,nt from casic_userroletest where sysname='EMS'"; - string sqlData = "select nt,id " + + string sqlData = "select nt as 角色名称,id as 编号 " + "from (select t.*,rownum row_num from casic_userroletest t order by id desc)b " + " where sysname='EMS'"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -183,7 +183,7 @@ int minPage = (pageIndex - 1) * maxPageIndex + 1; int maxPage = pageIndex * maxPageIndex; string sqlCount = "select id,nt from casic_userroletest where sysname='EMS'"; - string sqlData = "select nt,id " + + string sqlData = "select nt as 角色名称,id as 编号 " + "from (select t.*,rownum row_num from casic_userroletest t where sysname='EMS' order by id desc)b " + " where(b.row_num between " + minPage + " and " + maxPage + ")"; diff --git a/Cyberpipe.csproj b/Cyberpipe.csproj index fe600e5..501fd09 100644 --- a/Cyberpipe.csproj +++ b/Cyberpipe.csproj @@ -246,6 +246,12 @@ Form_TaskManager.cs + + Form + + + FrmFlagDetail.cs + Form @@ -1368,6 +1374,9 @@ Form_TaskManager.cs + + FrmFlagDetail.cs + FormDocumentManager.cs diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 537b4c3..1acf22a 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 7d5dd95..3f178cb 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -90,20 +90,20 @@ this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - - this.winGridViewPager1.AddColumnAlias("ACCIDENTTIME", "上报时间"); - this.winGridViewPager1.AddColumnAlias("DBID", "编号"); - this.winGridViewPager1.AddColumnAlias("DESCRIBE", "事件描述"); - this.winGridViewPager1.AddColumnAlias("LATITUDE", "纬度"); - this.winGridViewPager1.AddColumnAlias("LOCALE", "事件地点"); - this.winGridViewPager1.AddColumnAlias("LONGITUDE", "经度"); - this.winGridViewPager1.AddColumnAlias("PATROLERNAME", "上报人员"); - this.winGridViewPager1.AddColumnAlias("PATROLER_ID", "人员ID"); - this.winGridViewPager1.AddColumnAlias("TASK_ID", "任务编号"); - this.winGridViewPager1.AddColumnAlias("RESULT", "处理结果"); - this.winGridViewPager1.AddColumnAlias("STATE", "处理状态"); - this.winGridViewPager1.DisplayColumns = "ACCIDENTTIME,DESCRIBE,LOCALE,PATROLERNAME,TASK_ID,RESULT,STATE"; + this.winGridViewPager1.AddColumnAlias("上报时间", "上报时间"); + this.winGridViewPager1.AddColumnAlias("编号", "编号"); + this.winGridViewPager1.AddColumnAlias("事件描述", "事件描述"); + this.winGridViewPager1.AddColumnAlias("纬度", "纬度"); + this.winGridViewPager1.AddColumnAlias("事件地点", "事件地点"); + this.winGridViewPager1.AddColumnAlias("经度", "经度"); + this.winGridViewPager1.AddColumnAlias("上报人员", "上报人员"); + this.winGridViewPager1.AddColumnAlias("人员ID", "人员ID"); + this.winGridViewPager1.AddColumnAlias("任务编号", "任务编号"); + this.winGridViewPager1.AddColumnAlias("处理结果", "处理结果"); + this.winGridViewPager1.AddColumnAlias("处理状态", "处理状态"); + + this.winGridViewPager1.DisplayColumns = "上报时间,事件描述,事件地点,上报人员,任务编号,处理结果,处理状态"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -114,8 +114,8 @@ winGridViewPager1.dataGridView1.ContextMenuStrip.Items[5].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[6].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[7].Visible = false; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[1].Text = "查看位置"; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "结果编辑"; + winGridViewPager1.dataGridView1.ContextMenuStrip.Items[1].Text = "结果编辑"; + winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "查看位置"; //右键菜单宽度 winGridViewPager1.dataGridView1.ContextMenuStrip.AutoSize = false; @@ -160,13 +160,12 @@ this.WindowState = FormWindowState.Minimized; globeControl1.Globe.MemoryLayer.RemoveAllFeature(); this.WindowState = FormWindowState.Minimized; - double x = Convert.ToDouble(row.Cells["LONGITUDE"].Value); - double y = Convert.ToDouble(row.Cells["LATITUDE"].Value); - - string username = Convert.ToString(row.Cells["PATROLERNAME"].Value); - string Atime = Convert.ToString(row.Cells["ACCIDENTTIME"].Value); - string location = Convert.ToString(row.Cells["LOCALE"].Value); - string descp = Convert.ToString(row.Cells["DESCRIBE"].Value); + double x = Convert.ToDouble(row.Cells["经度"].Value); + double y = Convert.ToDouble(row.Cells["纬度"].Value); + string username = Convert.ToString(row.Cells["上报人员"].Value); + string Atime = Convert.ToString(row.Cells["上报时间"].Value); + string location = Convert.ToString(row.Cells["事件地点"].Value); + string descp = Convert.ToString(row.Cells["事件描述"].Value); /////////////////////////////////////// /*******设置飞行与创建模型******/ @@ -228,8 +227,8 @@ DataGridViewRow row = grid.SelectedRows[0]; try { - int dbId = Convert.ToInt32(row.Cells["DBID"].Value); - string result = Convert.ToString(row.Cells["RESULT"].Value); + int dbId = Convert.ToInt32(row.Cells["编号"].Value); + string result = Convert.ToString(row.Cells["处理结果"].Value); EMS_Forms.Form_EventResult form = new Form_EventResult(dbId, result); form.refresh += new Form_EventResult.Handle(LoadData);//改变值的事件 form.ShowDialog(); @@ -276,9 +275,9 @@ } for (int i = 0; i < table.Rows.Count; i++) { - if (winGridViewPager1.dataGridView1.Rows[i].Cells["RESULT"].Value != null && !(winGridViewPager1.dataGridView1.Rows[i].Cells["RESULT"].Value.ToString().Trim().Equals(""))) + if (winGridViewPager1.dataGridView1.Rows[i].Cells["处理结果"].Value != null && !(winGridViewPager1.dataGridView1.Rows[i].Cells["处理结果"].Value.ToString().Trim().Equals(""))) { - winGridViewPager1.dataGridView1.Rows[i].Cells["STATE"].Value = "已处理"; + winGridViewPager1.dataGridView1.Rows[i].Cells["处理状态"].Value = "已处理"; } } @@ -307,9 +306,9 @@ } for (int i = 0; i < table.Rows.Count; i++) { - if (winGridViewPager1.dataGridView1.Rows[i].Cells["RESULT"].Value != null && !(winGridViewPager1.dataGridView1.Rows[i].Cells["RESULT"].Value.ToString().Trim().Equals(""))) + if (winGridViewPager1.dataGridView1.Rows[i].Cells["处理结果"].Value != null && !(winGridViewPager1.dataGridView1.Rows[i].Cells["处理结果"].Value.ToString().Trim().Equals(""))) { - winGridViewPager1.dataGridView1.Rows[i].Cells["STATE"].Value = "已处理"; + winGridViewPager1.dataGridView1.Rows[i].Cells["处理状态"].Value = "已处理"; } } @@ -320,10 +319,12 @@ { string sqlCount = "select count(*) from ACCIDENT where 1=1"; - string sqlData = "select ACCIDENTTIME,DBID,DESCRIBE,LATITUDE,LOCALE,LONGITUDE,PATROLERNAME,PATROLER_ID,TASK_ID,RESULT,'' as STATE " + + string sqlData = "select ACCIDENTTIME as 上报时间,DBID as 编号,DESCRIBE as 事件描述,"+ + "LATITUDE as 纬度,LOCALE as 事件地点,LONGITUDE as 经度,PATROLERNAME 上报人员,"+ + "PATROLER_ID as 人员ID,TASK_ID as 任务编号,RESULT as 处理结果,'' as 处理状态 " + "from (select t.*,rownum row_num from ACCIDENT t order by DBID)b " + " where 1=1"; - + rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; @@ -340,9 +341,10 @@ string sqlCount = "select count(*) from ACCIDENT where 1=1"; - string sqlData = "select ACCIDENTTIME,DBID,DESCRIBE,LATITUDE,LOCALE,LONGITUDE,PATROLERNAME,PATROLER_ID,TASK_ID,RESULT,'' as STATE " + - "from (select t.*,rownum row_num from ACCIDENT t order by DBID)b " + - " where(b.row_num between " + minPage + " and " + maxPage + ")"; + string sqlData = "select ACCIDENTTIME as 上报时间,DBID as 编号,DESCRIBE as 事件描述," + + "LATITUDE as 纬度,LOCALE as 事件地点,LONGITUDE as 经度,PATROLERNAME 上报人员," + + "PATROLER_ID as 人员ID,TASK_ID as 任务编号,RESULT as 处理结果,'' as 处理状态 " + + "from (select t.*,rownum row_num from ACCIDENT t where 1=1"; if (!String.IsNullOrEmpty(comboBox_name.Text.Trim())) { @@ -361,7 +363,8 @@ sqlCount += "and ACCIDENTTIME<=to_date('" + time.ToShortDateString() + "','yyyy-MM-dd') "; sqlData += "and ACCIDENTTIME<=to_date('" + time.ToShortDateString() + "','yyyy-MM-dd') "; } - + sqlData += " order by DBID desc)b " + + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 225c8d7..8bd9e48 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -120,8 +120,8 @@ private void flyToTask(DataGridViewRow row, int taskState) { int dbID = 0; - dbID = Convert.ToInt32(row.Cells["DBID"].Value); - string userName = Convert.ToString(row.Cells["USERNAME"].Value); + dbID = Convert.ToInt32(row.Cells["任务编号"].Value); + string userName = Convert.ToString(row.Cells["任务执行人员"].Value); System.DateTime t = new DateTime(); try { @@ -392,15 +392,15 @@ //控制表格显示的列，以及每一列要显示的列名 this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - this.winGridViewPager1.AddColumnAlias("DBID", "任务编号"); - this.winGridViewPager1.AddColumnAlias("DEPLOYTIME", "创建时间"); - this.winGridViewPager1.AddColumnAlias("DESCIRPTION", "任务描述"); - this.winGridViewPager1.AddColumnAlias("FINISHTIME", "完成时间"); - this.winGridViewPager1.AddColumnAlias("STREET", "任务执行区域"); - this.winGridViewPager1.AddColumnAlias("TASKSTATE", "任务状态"); - this.winGridViewPager1.AddColumnAlias("USERNAME", "任务执行人员"); + this.winGridViewPager1.AddColumnAlias("任务编号", "任务编号"); + this.winGridViewPager1.AddColumnAlias("创建时间", "创建时间"); + this.winGridViewPager1.AddColumnAlias("任务描述", "任务描述"); + this.winGridViewPager1.AddColumnAlias("完成时间", "完成时间"); + this.winGridViewPager1.AddColumnAlias("任务执行区域", "任务执行区域"); + this.winGridViewPager1.AddColumnAlias("任务状态", "任务状态"); + this.winGridViewPager1.AddColumnAlias("任务执行人员", "任务执行人员"); - this.winGridViewPager1.DisplayColumns = "DBID,DEPLOYTIME,DESCIRPTION,FINISHTIME,STREET,TASKSTATE,USERNAME"; + this.winGridViewPager1.DisplayColumns = "任务编号,创建时间,任务描述,完成时间,任务执行区域,任务状态,任务执行人员"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -464,8 +464,8 @@ { int dbID = 0; int taskStateInt = 0; - dbID = Convert.ToInt32(row.Cells["DBID"].Value); - string taskState = row.Cells["TASKSTATE"].Value.ToString(); + dbID = Convert.ToInt32(row.Cells["任务编号"].Value); + string taskState = row.Cells["任务状态"].Value.ToString(); if (taskState.Equals("开始任务")) { taskStateInt = 1; @@ -534,9 +534,10 @@ private string GetSql() { - string sqlCount = "select count(*) from taskinfo t where 1=1'"; + string sqlCount = "select count(*) from taskinfo t where 1=1"; - string sqlData = "select dbid,deploytime,descirption,finishtime,street,taskstate,username " + + 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"; @@ -550,9 +551,9 @@ int minPage = (pageIndex - 1) * maxPageIndex + 1; int maxPage = pageIndex * maxPageIndex; string sqlCount = "select count(*) from taskinfo t where 1=1"; - string sqlData = "select dbid,deploytime,descirption,finishtime,street,taskstate,username " + - "from (select t.*,rownum row_num from taskinfo t order by DBID desc)b " + - " where(b.row_num between " + minPage + " and " + maxPage + ")"; + 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"; if (!String.IsNullOrEmpty(comboBox_userName.Text.Trim()) && !comboBox_userName.Text.Trim().Equals("不限")) { @@ -581,6 +582,8 @@ sqlCount += "and street='" + combo_street.Text + "' "; sqlData += "and street='" + combo_street.Text + "' "; } + sqlData += " order by DBID desc)b " + + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index e65a4bd..58f5342 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -73,13 +73,13 @@ //控制表格显示的列，以及每一列要显示的列名 this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - this.winGridViewPager1.AddColumnAlias("FILENAME", "文档名称"); - this.winGridViewPager1.AddColumnAlias("DBID", "编号"); - this.winGridViewPager1.AddColumnAlias("TITLE", "文档标题"); - this.winGridViewPager1.AddColumnAlias("FILETYPE", "文档类型"); - this.winGridViewPager1.AddColumnAlias("UPDAY", "上传日期"); - this.winGridViewPager1.AddColumnAlias("WRITER", "上传人"); - this.winGridViewPager1.DisplayColumns = "FILENAME,TITLE,FILETYPE,UPDAY,WRITER"; + this.winGridViewPager1.AddColumnAlias("文档名称", "文档名称"); + this.winGridViewPager1.AddColumnAlias("编号", "编号"); + this.winGridViewPager1.AddColumnAlias("文档标题", "文档标题"); + this.winGridViewPager1.AddColumnAlias("文档类型", "文档类型"); + this.winGridViewPager1.AddColumnAlias("上传日期", "上传日期"); + this.winGridViewPager1.AddColumnAlias("上传人", "上传人"); + this.winGridViewPager1.DisplayColumns = "文档名称,文档标题,文档类型,上传日期,上传人"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -167,7 +167,7 @@ if (grid != null) { DataGridViewRow row = grid.SelectedRows[0]; - string dbid = row.Cells["dbid"].Value.ToString(); + string dbid = row.Cells["编号"].Value.ToString(); try { if (MessageBox.Show("确认删除吗？", "确认", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) @@ -212,7 +212,8 @@ { string sqlCount = "select count(*) from casic_userdocument where sysname = 'EMS'"; - string sqlData = "select filename,dbid,title,filetype,upday,writer " + + string sqlData = "select filename as 文档名称,dbid as 编号,title as 文档标题," + + "filetype as 文档类型,upday as 上传日期,writer as 上传人 " + "from (select t.*,rownum row_num from casic_userdocument t order by DBID desc)b " + " where sysname = 'EMS'"; @@ -226,9 +227,9 @@ int minPage = (pageIndex - 1) * maxPageIndex + 1; int maxPage = pageIndex * maxPageIndex; string sqlCount = "select count(*) from casic_userdocument where sysname = 'EMS'"; - string sqlData = "select filename,dbid,title,filetype,upday,writer " + - "from (select t.*,rownum row_num from casic_userdocument t where sysname = 'EMS' order by DBID desc)b " + - " where(b.row_num between " + minPage + " and " + maxPage + ")"; + string sqlData = "select filename as 文档名称,dbid as 编号,title as 文档标题,"+ + "filetype as 文档类型,upday as 上传日期,writer as 上传人 " + + "from (select t.*,rownum row_num from casic_userdocument t where sysname = 'EMS'"; string txtTitleText = null; string comboFileType = null; @@ -278,7 +279,8 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - + sqlData += " order by DBID desc)b " + + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; @@ -437,7 +439,7 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - string filename = row.Cells["filename"].Value.ToString(); + string filename = row.Cells["文档名称"].Value.ToString(); string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; string file = System.Environment.CurrentDirectory + "\\download\\" + filename; int result = DownloadFile(url, file, progressBar1); @@ -515,7 +517,7 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - string filename = row.Cells["filename"].Value.ToString(); + string filename = row.Cells["文档名称"].Value.ToString(); string ext = Path.GetExtension(filename); SaveFileDialog dlg = new SaveFileDialog(); dlg.Filter = "保存文档|*" + ext + ";"; diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 1d1201b..3902629 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -748,6 +748,7 @@ this.Name = "FrmAddSinMark"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "单个标识器添加"; + this.TopMost = true; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmAddSinMark_FormClosing); this.Load += new System.EventHandler(this.FrmAddSinMark_Load); this.groupPanel1.ResumeLayout(false); diff --git a/FrmEquipmentManage.cs b/FrmEquipmentManage.cs index 90bfdb2..a3cf55c 100644 --- a/FrmEquipmentManage.cs +++ b/FrmEquipmentManage.cs @@ -74,13 +74,13 @@ //控制表格显示的列，以及每一列要显示的列名 this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - this.winGridViewPager1.AddColumnAlias("DESCIRPTION", "设备描述"); - this.winGridViewPager1.AddColumnAlias("DBID", "编号"); - this.winGridViewPager1.AddColumnAlias("MACID", "MAC地址"); - this.winGridViewPager1.AddColumnAlias("OWNER", "设备所有人"); - this.winGridViewPager1.AddColumnAlias("STATUS", "设备状态"); + this.winGridViewPager1.AddColumnAlias("设备描述", "设备描述"); + this.winGridViewPager1.AddColumnAlias("编号", "编号"); + this.winGridViewPager1.AddColumnAlias("MAC地址", "MAC地址"); + this.winGridViewPager1.AddColumnAlias("设备所有人", "设备所有人"); + this.winGridViewPager1.AddColumnAlias("设备状态", "设备状态"); - this.winGridViewPager1.DisplayColumns = "DESCIRPTION,MACID,OWNER,STATUS"; + this.winGridViewPager1.DisplayColumns = "设备描述,MAC地址,设备所有人,设备状态"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -146,10 +146,10 @@ DataGridViewRow row = grid.SelectedRows[0]; try { - long dbid = long.Parse(row.Cells["DBID"].Value.ToString()); - String macId = row.Cells["MACID"].Value.ToString(); - String username = row.Cells["OWNER"].Value.ToString(); - String descn = row.Cells["DESCIRPTION"].Value.ToString(); + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); + String macId = row.Cells["MAC地址"].Value.ToString(); + String username = row.Cells["设备所有人"].Value.ToString(); + String descn = row.Cells["设备状态"].Value.ToString(); FrmEquipmentEdit frm = new FrmEquipmentEdit(dbid.ToString(), macId, username, descn); frm.reloadGrid += new ReloadEquipmentGrid(LoadData); frm.ShowDialog(); @@ -179,7 +179,7 @@ { return; } - String macId = row.Cells["MACID"].Value.ToString(); + String macId = row.Cells["MAC地址"].Value.ToString(); FrmLog frm = new FrmLog(macId); frm.Show(); } @@ -201,7 +201,7 @@ if (grid != null) { DataGridViewRow row = grid.SelectedRows[0]; - long dbid = long.Parse(row.Cells["DBID"].Value.ToString()); + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); try { if (MessageBox.Show("确定删除？", "确认", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) @@ -243,7 +243,8 @@ { string sqlCount = "select count(*) from equipment where status = 'USING'"; - string sqlData = "select descirption,DBID,macid,owner,case when status = 'USING' then '可用' when status = 'DAMAGE' then '损坏' end as status " + + string sqlData = "select descirption as 设备描述,DBID as 编号,macid as MAC地址,owner as 设备所有人,"+ + "case when status = 'USING' then '可用' when status = 'DAMAGE' then '损坏' end as 设备状态 " + "from (select t.*,rownum row_num from equipment t where status = 'USING' order by dbid desc)b " + " where 1=1"; @@ -258,16 +259,17 @@ int maxPage = pageIndex * maxPageIndex; string sqlCount = "select count(*) from equipment where status = 'USING' "; - string sqlData = "select descirption,DBID,macid,owner,case when status = 'USING' then '可用' when status = 'DAMAGE' then '损坏' end as status " + - "from (select t.*,rownum row_num from equipment t where status = 'USING' order by DBID desc)b " + - " where(b.row_num between " + minPage + " and " + maxPage + ")"; + string sqlData = "select descirption as 设备描述,DBID as 编号,macid as MAC地址,owner as 设备所有人," + + "case when status = 'USING' then '可用' when status = 'DAMAGE' then '损坏' end as 设备状态 " + + "from (select t.*,rownum row_num from equipment t where status = 'USING'"; if (!String.IsNullOrEmpty(txtMacId.Text.Trim())) { sqlData += " and macid like '%" + txtMacId.Text.Trim() + "%'"; sqlCount += " and macid like '%" + txtMacId.Text.Trim() + "%'"; } - + sqlData += " order by DBID desc)b " + + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; @@ -299,76 +301,6 @@ } } - //public void reloadGrid(int pageIndex) - //{ - // if (pageIndex <= 0) - // { - // pageIndex = 1; - // currentpage = 1; - // } - // String sqlrows = "select * from (select rownum as rowno,dbid,descirption,macid,owner,case when status = 'USING' then '可用' when status = 'DAMAGE' then '损坏' end as status,'编辑' as btnEdit,'删除' as btnDel from equipment t where status = 'USING' "; - // string sqlcount = "select count(*) from equipment where status = 'USING' "; - // if (!String.IsNullOrEmpty(txtMacId.Text.Trim())) - // { - // sqlrows += " and macid like '%" + txtMacId.Text.Trim() + "%'"; - // sqlcount += " and macid like '%" + txtMacId.Text.Trim() + "%'"; - // } - // sqlrows += " and rownum<=" + (pagesize * pageIndex) + ") table_alias where table_alias.rowno>=" + ((pageIndex - 1) * pagesize + 1); - - // int rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlcount).ToString()); - // int pages = 0; - // if (rows % pagesize == 0) - // { - // pages = rows / pagesize; - // } - // else - // { - // pages = rows / pagesize + 1; - // } - - // lastpage = pages; - - // lab_page_msg.Text = "共" + rows + "条记录，每页" + pagesize + "条，第" + pageIndex + "页，共" + pages + "页"; - // combo_page_num.Items.Clear(); - // for (int i = 1; i <= pages; i++) - // { - // combo_page_num.Items.Add(new ComboBoxItem(i.ToString(), i.ToString())); - // } - - // if (lastpage == 1) - // { - // btn_page_first.Enabled = false; - // btn_page_pre.Enabled = false; - // btn_page_last.Enabled = false; - // btn_page_next.Enabled = false; - // } - // else if (currentpage == 1) - // { - // btn_page_first.Enabled = false; - // btn_page_pre.Enabled = false; - // btn_page_last.Enabled = true; - // btn_page_next.Enabled = true; - // } - // else if (currentpage == lastpage) - // { - // btn_page_first.Enabled = true; - // btn_page_pre.Enabled = true; - // btn_page_last.Enabled = false; - // btn_page_next.Enabled = false; - // } - // else - // { - // btn_page_first.Enabled = true; - // btn_page_pre.Enabled = true; - // btn_page_last.Enabled = true; - // btn_page_next.Enabled = true; - // } - - // DataTable table = OracleUtils.ExecuteDataset(OracleUtils.ConnectionString, CommandType.Text, sqlrows).Tables[0]; - // dataGridViewX1.DataSource = table; - - //} - private void FrmEquipmentManage_FormClosing(object sender, FormClosingEventArgs e) diff --git a/FrmFlagDetail.Designer.cs b/FrmFlagDetail.Designer.cs new file mode 100644 index 0000000..982bfc6 --- /dev/null +++ b/FrmFlagDetail.Designer.cs @@ -0,0 +1,103 @@ +namespace Cyberpipe +{ + partial class FrmFlagDetail + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); + this.dataGridViewX_markDetail = new DevComponents.DotNetBar.Controls.DataGridViewX(); + this.对象类型 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.对象编号 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.对象名称 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX_markDetail)).BeginInit(); + this.SuspendLayout(); + // + // dataGridViewX_markDetail + // + this.dataGridViewX_markDetail.AllowUserToAddRows = false; + this.dataGridViewX_markDetail.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; + this.dataGridViewX_markDetail.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dataGridViewX_markDetail.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.对象类型, + this.对象编号, + this.对象名称}); + dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle3.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dataGridViewX_markDetail.DefaultCellStyle = dataGridViewCellStyle3; + this.dataGridViewX_markDetail.Dock = System.Windows.Forms.DockStyle.Fill; + this.dataGridViewX_markDetail.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(170)))), ((int)(((byte)(170)))), ((int)(((byte)(170))))); + this.dataGridViewX_markDetail.Location = new System.Drawing.Point(0, 0); + this.dataGridViewX_markDetail.Name = "dataGridViewX_markDetail"; + this.dataGridViewX_markDetail.RowTemplate.Height = 23; + this.dataGridViewX_markDetail.Size = new System.Drawing.Size(508, 321); + this.dataGridViewX_markDetail.TabIndex = 0; + // + // 对象类型 + // + this.对象类型.HeaderText = "对象类型"; + this.对象类型.Name = "对象类型"; + // + // 对象编号 + // + this.对象编号.HeaderText = "对象编号"; + this.对象编号.Name = "对象编号"; + // + // 对象名称 + // + this.对象名称.HeaderText = "对象名称"; + this.对象名称.Name = "对象名称"; + // + // FrmFlagDetail + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(508, 321); + this.Controls.Add(this.dataGridViewX_markDetail); + this.Name = "FrmFlagDetail"; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; + this.Text = "标识对象信息"; + this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmFlagDetail_FormClosing); + this.Load += new System.EventHandler(this.FrmFlagDetail_Load); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX_markDetail)).EndInit(); + this.ResumeLayout(false); + + } + + #endregion + + private DevComponents.DotNetBar.Controls.DataGridViewX dataGridViewX_markDetail; + private System.Windows.Forms.DataGridViewTextBoxColumn 对象类型; + private System.Windows.Forms.DataGridViewTextBoxColumn 对象编号; + private System.Windows.Forms.DataGridViewTextBoxColumn 对象名称; + + } +} \ No newline at end of file diff --git a/FrmFlagDetail.cs b/FrmFlagDetail.cs new file mode 100644 index 0000000..81de974 --- /dev/null +++ b/FrmFlagDetail.cs @@ -0,0 +1,77 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Windows.Forms; +using GeoScene.Globe; +using System.Data.OracleClient; + +namespace Cyberpipe +{ + public partial class FrmFlagDetail : Form + { + DataTable dt = new DataTable(); + private GSOGlobeControl globeControl1; + + public delegate void Handle(); + public event Handle showParentForm; + String markId; + + public FrmFlagDetail(GSOGlobeControl globeControl1, String id) + { + InitializeComponent(); + this.markId = id; + } + + private void FrmFlagDetail_FormClosing(object sender, FormClosingEventArgs e) + { + showParentForm(); + } + + private void FrmFlagDetail_Load(object sender, EventArgs e) + { + string objectIds = ""; + string objectTypeCodes = ""; + string sql = "select t.对象编号,t.对象类型 from 标识器 t where t.编号='" + markId + "'"; + using (OracleDataReader reader = OracleUtils.ExecuteReader(OracleUtils.ConnectionString, CommandType.Text, sql)) + { + while (reader.Read()) + { + objectIds = reader.GetString(0); + objectTypeCodes = reader.GetString(1); + } + } + + string[] codeTypes = objectTypeCodes.Split(','); + string[] codeIds = objectIds.Split(','); + int length = 0; + if (codeTypes.Length <= codeIds.Length) + { + length = codeTypes.Length; + } + else + { + length = codeIds.Length; + } + for (int n = 0; n < length; n++) + { + for (int i = 0; i < Utility1.listPipelineType.Count; i++) + { + if (Utility1.listPipelineType[i].code == codeTypes[n]) + { + //string objectId = codeIds[i]; + //string objectType = Utility1.listPipelineType[i].type; + //string objectName = Utility1.listPipelineType[i].name; + int index = this.dataGridViewX_markDetail.Rows.Add(); + this.dataGridViewX_markDetail.Rows[index].Cells[0].Value = Utility1.listPipelineType[i].type; + this.dataGridViewX_markDetail.Rows[index].Cells[1].Value = codeIds[n].ToString(); + this.dataGridViewX_markDetail.Rows[index].Cells[2].Value = Utility1.listPipelineType[i].name; + } + } + } + } + } +} diff --git a/FrmFlagDetail.resx b/FrmFlagDetail.resx new file mode 100644 index 0000000..e98a8fe --- /dev/null +++ b/FrmFlagDetail.resx @@ -0,0 +1,129 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + True + + + True + + + True + + \ No newline at end of file diff --git a/FrmFlagManagers.Designer.cs b/FrmFlagManagers.Designer.cs index d7e2f60..9fe14fb 100644 --- a/FrmFlagManagers.Designer.cs +++ b/FrmFlagManagers.Designer.cs @@ -28,8 +28,10 @@ /// private void InitializeComponent() { - this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); - this.winGridViewPager1 = new WHC.Pager.WinControl.WinGridViewPager(); + this.components = new System.ComponentModel.Container(); + this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components); + this.标识对象ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripMenuItem2 = new System.Windows.Forms.ToolStripMenuItem(); this.bar1 = new DevComponents.DotNetBar.Bar(); this.labelItem1 = new DevComponents.DotNetBar.LabelItem(); this.txt_no = new DevComponents.DotNetBar.TextBoxItem(); @@ -38,45 +40,37 @@ this.btn_query = new DevComponents.DotNetBar.ButtonItem(); this.btn_add_batch = new DevComponents.DotNetBar.ButtonItem(); this.btn_add_menu = new DevComponents.DotNetBar.ButtonItem(); - this.btn_db = new DevComponents.DotNetBar.ButtonItem(); - this.tableLayoutPanel1.SuspendLayout(); + this.winGridViewPager1 = new WHC.Pager.WinControl.WinGridViewPager(); + this.contextMenuStrip1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.bar1)).BeginInit(); this.SuspendLayout(); // - // tableLayoutPanel1 + // contextMenuStrip1 // - this.tableLayoutPanel1.ColumnCount = 1; - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel1.Controls.Add(this.winGridViewPager1, 0, 1); - this.tableLayoutPanel1.Controls.Add(this.bar1, 0, 0); - this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 0); - this.tableLayoutPanel1.Name = "tableLayoutPanel1"; - this.tableLayoutPanel1.RowCount = 2; - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 32F)); - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel1.Size = new System.Drawing.Size(881, 474); - this.tableLayoutPanel1.TabIndex = 6; + this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.标识对象ToolStripMenuItem, + this.toolStripMenuItem2}); + this.contextMenuStrip1.Name = "contextMenuStrip1"; + this.contextMenuStrip1.Size = new System.Drawing.Size(125, 48); // - // winGridViewPager1 + // 标识对象ToolStripMenuItem // - this.winGridViewPager1.AppendedMenu = null; - this.winGridViewPager1.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; - this.winGridViewPager1.DataSource = null; - this.winGridViewPager1.DisplayColumns = ""; - this.winGridViewPager1.Dock = System.Windows.Forms.DockStyle.Fill; - this.winGridViewPager1.Location = new System.Drawing.Point(3, 35); - this.winGridViewPager1.MinimumSize = new System.Drawing.Size(540, 0); - this.winGridViewPager1.Name = "winGridViewPager1"; - this.winGridViewPager1.PrintTitle = ""; - this.winGridViewPager1.Size = new System.Drawing.Size(875, 436); - this.winGridViewPager1.TabIndex = 5; + this.标识对象ToolStripMenuItem.Name = "标识对象ToolStripMenuItem"; + this.标识对象ToolStripMenuItem.Size = new System.Drawing.Size(124, 22); + this.标识对象ToolStripMenuItem.Text = "标识对象"; + this.标识对象ToolStripMenuItem.Click += new System.EventHandler(this.标识对象ToolStripMenuItem_Click); + // + // toolStripMenuItem2 + // + this.toolStripMenuItem2.Name = "toolStripMenuItem2"; + this.toolStripMenuItem2.Size = new System.Drawing.Size(152, 22); + this.toolStripMenuItem2.Text = "查看位置"; + this.toolStripMenuItem2.Click += new System.EventHandler(this.toolStripMenuItem2_Click); // // bar1 // this.bar1.AntiAlias = true; this.bar1.Dock = System.Windows.Forms.DockStyle.Top; - this.bar1.DockSide = DevComponents.DotNetBar.eDockSide.Document; this.bar1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.labelItem1, this.txt_no, @@ -84,14 +78,13 @@ this.combo_street, this.btn_query, this.btn_add_batch, - this.btn_add_menu, - this.btn_db}); - this.bar1.Location = new System.Drawing.Point(3, 3); + this.btn_add_menu}); + this.bar1.Location = new System.Drawing.Point(0, 0); this.bar1.Name = "bar1"; - this.bar1.Size = new System.Drawing.Size(875, 28); + this.bar1.Size = new System.Drawing.Size(881, 28); this.bar1.Stretch = true; this.bar1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.bar1.TabIndex = 1; + this.bar1.TabIndex = 8; this.bar1.TabStop = false; this.bar1.Text = "bar1"; // @@ -136,24 +129,34 @@ this.btn_add_menu.Text = "手工添加"; this.btn_add_menu.Click += new System.EventHandler(this.btn_add_menu_Click); // - // btn_db + // winGridViewPager1 // - this.btn_db.Name = "btn_db"; - this.btn_db.Text = "数据导出"; + this.winGridViewPager1.AppendedMenu = null; + this.winGridViewPager1.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; + this.winGridViewPager1.DataSource = null; + this.winGridViewPager1.DisplayColumns = ""; + this.winGridViewPager1.Dock = System.Windows.Forms.DockStyle.Fill; + this.winGridViewPager1.Location = new System.Drawing.Point(0, 28); + this.winGridViewPager1.MinimumSize = new System.Drawing.Size(540, 0); + this.winGridViewPager1.Name = "winGridViewPager1"; + this.winGridViewPager1.PrintTitle = ""; + this.winGridViewPager1.Size = new System.Drawing.Size(881, 446); + this.winGridViewPager1.TabIndex = 9; // // FrmFlagManagers // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(881, 474); - this.Controls.Add(this.tableLayoutPanel1); + this.Controls.Add(this.winGridViewPager1); + this.Controls.Add(this.bar1); this.DoubleBuffered = true; this.Name = "FrmFlagManagers"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "标识器管理"; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmFlagManagers_FormClosing); this.Load += new System.EventHandler(this.FrmFlagManagers_Load); - this.tableLayoutPanel1.ResumeLayout(false); + this.contextMenuStrip1.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.bar1)).EndInit(); this.ResumeLayout(false); @@ -161,8 +164,8 @@ #endregion - private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1; - private WHC.Pager.WinControl.WinGridViewPager winGridViewPager1; + private System.Windows.Forms.ContextMenuStrip contextMenuStrip1; + private System.Windows.Forms.ToolStripMenuItem 标识对象ToolStripMenuItem; private DevComponents.DotNetBar.Bar bar1; private DevComponents.DotNetBar.LabelItem labelItem1; private DevComponents.DotNetBar.TextBoxItem txt_no; @@ -171,6 +174,7 @@ private DevComponents.DotNetBar.ButtonItem btn_query; private DevComponents.DotNetBar.ButtonItem btn_add_batch; private DevComponents.DotNetBar.ButtonItem btn_add_menu; - private DevComponents.DotNetBar.ButtonItem btn_db; + private WHC.Pager.WinControl.WinGridViewPager winGridViewPager1; + private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem2; } } \ No newline at end of file diff --git a/FrmFlagManagers.cs b/FrmFlagManagers.cs index 38d4927..9bf9734 100644 --- a/FrmFlagManagers.cs +++ b/FrmFlagManagers.cs @@ -33,15 +33,13 @@ { this.globeControl1 = _globeControl1; InitializeComponent(); - winGridViewPager1.OnPageChanged += new EventHandler(winGridViewPager1_OnPageChanged); - this.winGridViewPager1.OnAddNew += new EventHandler(winGridViewPager1_OnAddNew); //右键定位 + winGridViewPager1.OnPageChanged += new EventHandler(winGridViewPager1_OnPageChanged); this.winGridViewPager1.OnEditSelected += new EventHandler(winGridViewPager1_OnEditSelected);//属性编辑 this.winGridViewPager1.OnDeleteSelected += new EventHandler(winGridViewPager1_OnDeleteSelected);//标识器报废 + this.winGridViewPager1.OnStartExport += new EventHandler(pager1_OnStartExport); this.winGridViewPager1.OnEndExport += new EventHandler(pager1_OnEndExport); - //this.winGridViewPager1.ExportCurrent += new ExportCurrentEventHandler(pager1_ExportCurrent); - //this.winGridViewPager1.ExportAll += new ExportAllEventHandler(pager1_ExportAll); winGridViewPager1.dataGridView1.MultiSelect = false; @@ -76,26 +74,25 @@ this.winGridViewPager1.AddColumnAlias("标识器型号", "标识器型号"); this.winGridViewPager1.AddColumnAlias("地面高程", "地面高程"); this.winGridViewPager1.AddColumnAlias("标识器埋深", "标识器埋深"); - this.winGridViewPager1.AddColumnAlias("对象编号", "对象编号"); - this.winGridViewPager1.AddColumnAlias("对象类型", "对象类型"); this.winGridViewPager1.AddColumnAlias("所属道路", "所属道路"); this.winGridViewPager1.AddColumnAlias("使用状态", "使用状态"); - this.winGridViewPager1.DisplayColumns = "编号,标识器ID号,标识器型号,地面高程,标识器埋深,对象编号,对象类型,所属道路,使用状态"; + this.winGridViewPager1.DisplayColumns = "编号,标识器ID号,标识器型号,地面高程,标识器埋深,所属道路,使用状态"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 //隐藏右键功能按钮 //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[1].Visible = false; - //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[4].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[5].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[6].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[7].Visible = false; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[1].Text = "定位查看"; + //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[1].Text = "定位查看"; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "属性编辑"; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Text = "标识器报废"; + winGridViewPager1.AppendedMenu = this.contextMenuStrip1; + //右键菜单宽度 winGridViewPager1.dataGridView1.ContextMenuStrip.AutoSize = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Width = 150; @@ -153,7 +150,7 @@ } /// - /// 右键定位 + /// 对象查看 /// /// /// @@ -306,20 +303,10 @@ string sqlCount = "select count(*) from 标识器 where 使用状态 = '使用中'"; - string sqlData = "select 编号,标识器ID号,标识器型号,地面高程,标识器埋深,对象编号,对象类型,所属道路,LSSYS_ID,X坐标,Y坐标,使用状态 " + + string sqlData = "select 编号,标识器ID号,标识器型号,地面高程,标识器埋深,所属道路,LSSYS_ID,X坐标,Y坐标,使用状态 " + "from (select t.*,rownum row_num from 标识器 t where 使用状态 = '使用中' order by 编号)b " + " where 1=1"; - if (!String.IsNullOrEmpty(txt_no.Text.Trim())) - { - sqlCount += " and 编号 like '%" + txt_no.Text.Trim() + "%'"; - sqlData += " and 编号 like '%" + txt_no.Text.Trim() + "%'"; - } - if (null != combo_street.SelectedItem && !String.IsNullOrEmpty(combo_street.SelectedItem.ToString().Trim())) - { - sqlData += " and 所属道路='" + combo_street.SelectedItem.ToString().Trim() + "'"; - sqlCount += " and 所属道路='" + combo_street.SelectedItem.ToString().Trim() + "'"; - } rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -332,9 +319,8 @@ int maxPage = pageIndex * maxPageIndex; string sqlCount = "select count(*) from 标识器 where 使用状态 = '使用中'"; - string sqlData = "select 编号,标识器ID号,标识器型号,地面高程,标识器埋深,对象编号,对象类型,所属道路,LSSYS_ID,X坐标,Y坐标,使用状态 " + - "from (select t.*,rownum row_num from 标识器 t where 使用状态 = '使用中' order by 编号)b "+ - " where(b.row_num between " + minPage + " and " + maxPage + ")"; + string sqlData = "select 编号,标识器ID号,标识器型号,地面高程,标识器埋深,所属道路,LSSYS_ID,X坐标,Y坐标,使用状态 " + + "from (select t.*,rownum row_num from 标识器 t where 使用状态 = '使用中'"; if (!String.IsNullOrEmpty(txt_no.Text.Trim())) { @@ -347,6 +333,8 @@ sqlCount += " and 所属道路='" + combo_street.SelectedItem.ToString().Trim() + "'"; } + sqlData += " order by 编号)b " + + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; @@ -372,9 +360,10 @@ private void FrmFlagManagers_FormClosing(object sender, FormClosingEventArgs e) { IS_OPEN = false; - Thread downloadJob = new Thread(new ParameterizedThreadStart(doSave)); - downloadJob.IsBackground = true; - downloadJob.Start(e); + //Thread downloadJob = new Thread(new ParameterizedThreadStart(doSave)); + //downloadJob.IsBackground = true; + //downloadJob.Start(e); + globeControl1.Globe.Layers["标识器"].Save(); globeControl1.Globe.MemoryLayer.RemoveAllFeature(); foreach (GSOFeature f in Features) { @@ -480,10 +469,88 @@ if (null != globeControl1) { FrmAddSinMark frm = new FrmAddSinMark(globeControl1); - frm.ShowDialog(); + frm.Show(); } } + private void 标识对象ToolStripMenuItem_Click(object sender, EventArgs e) + { + if (winGridViewPager1 != null && winGridViewPager1.dataGridView1 != null) + { + DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; + try + { + this.Hide(); + string id = row.Cells["编号"].Value.ToString(); + FrmFlagDetail p = new FrmFlagDetail(globeControl1, id); + p.showParentForm += new FrmFlagDetail.Handle(showThisForm);//改变值的事件 + p.Show(); + } + catch (Exception ex) + { + MessageBox.Show("失败:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } + + private void showThisForm() + { + this.Show(); + } + + private void toolStripMenuItem2_Click(object sender, EventArgs e) + { + if (winGridViewPager1 != null && winGridViewPager1.dataGridView1 != null) + { + DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; + try + { + this.WindowState = FormWindowState.Minimized; + string id = row.Cells["LSSYS_ID"].Value.ToString(); + string flagno = row.Cells["编号"].Value.ToString(); + string flagstreet = row.Cells["所属道路"].Value.ToString(); + double x = Convert.ToDouble(row.Cells["X坐标"].Value); + double y = Convert.ToDouble(row.Cells["Y坐标"].Value); + GSOFeature flagFeature = globeControl1.Globe.Layers.GetLayerByCaption("标识器").GetFeatureByID(int.Parse(id)); + + string type = ""; + string pipe = ""; + string sql = "select t.标识器型号,t.对象编号 from 标识器 t where t.编号='" + flagno + "'"; + using (OracleDataReader reader = OracleUtils.ExecuteReader(OracleUtils.ConnectionString, CommandType.Text, sql)) + { + while (reader.Read()) + { + type = reader.GetString(0); + pipe = reader.GetString(1); + } + } + + GSOLabel label = new GSOLabel(); + label.Text = "标识器编号：" + flagno + "\r\n" + + "标识器类型:" + type + "\r\n" + + //"标识对象编号:" + pipe + "\r\n" + + "所属道路:" + flagstreet; + label.Style = new GSOLabelStyle(); + label.Style.TextStyle.FontSize = 18; + label.Style.TextStyle.ForeColor = Color.FromArgb(0, 0, 0, 255); + label.Style.Opaque = 0.8; //设置标注的透明度，取值区间是0-1 + label.Style.TracktionLineType = EnumTracktionLineType.Solid; + label.Style.TextStyle.FontHeight = 10; + label.Style.TextStyle.FontName = "黑体"; + label.Style.TractionLineEndPos = new GSOPoint2d(80, 60); + + flagFeature.Label = label; + Features.Add(flagFeature); + globeControl1.Globe.JumpToFeature(flagFeature, 20); + this.globeControl1.Refresh(); + + } + catch (Exception ex) + { + MessageBox.Show("标识器定位失败:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } } diff --git a/FrmFlagManagers.resx b/FrmFlagManagers.resx index 1af7de1..ad53752 100644 --- a/FrmFlagManagers.resx +++ b/FrmFlagManagers.resx @@ -117,4 +117,7 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 17, 17 + \ No newline at end of file diff --git a/FrmPatrolerEdit.cs b/FrmPatrolerEdit.cs index dbd4fec..f45b5ae 100644 --- a/FrmPatrolerEdit.cs +++ b/FrmPatrolerEdit.cs @@ -46,7 +46,7 @@ txt_name.Focus(); return; } - if (String.IsNullOrEmpty(combo_sex.SelectedItem.ToString())) + if (combo_sex.SelectedItem == null ||String.IsNullOrEmpty(combo_sex.SelectedItem.ToString())) { MessageBox.Show("性别不能为空！", "警告", MessageBoxButtons.OK, MessageBoxIcon.Warning); combo_sex.Focus(); diff --git a/FrmPatrolerManager.Designer.cs b/FrmPatrolerManager.Designer.cs index bb8e5fb..10fac22 100644 --- a/FrmPatrolerManager.Designer.cs +++ b/FrmPatrolerManager.Designer.cs @@ -47,11 +47,13 @@ this.注销 = new DevComponents.Editors.ComboItem(); this.btn_query_person = new DevComponents.DotNetBar.ButtonItem(); this.btn_add_person = new DevComponents.DotNetBar.ButtonItem(); - this.winGridViewPager1 = new WHC.Pager.WinControl.WinGridViewPager(); this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components); this.日志ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.任务ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.定位ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.winGridViewPager1 = new WHC.Pager.WinControl.WinGridViewPager(); + this.编辑ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.注销ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); ((System.ComponentModel.ISupportInitialize)(this.bar1)).BeginInit(); this.contextMenuStrip1.SuspendLayout(); this.SuspendLayout(); @@ -173,9 +175,42 @@ this.btn_add_person.Text = "新增"; this.btn_add_person.Click += new System.EventHandler(this.btn_add_person_Click); // + // contextMenuStrip1 + // + this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.日志ToolStripMenuItem, + this.任务ToolStripMenuItem, + this.定位ToolStripMenuItem, + this.编辑ToolStripMenuItem, + this.注销ToolStripMenuItem}); + this.contextMenuStrip1.Name = "contextMenuStrip1"; + this.contextMenuStrip1.Size = new System.Drawing.Size(153, 136); + // + // 日志ToolStripMenuItem + // + this.日志ToolStripMenuItem.Name = "日志ToolStripMenuItem"; + this.日志ToolStripMenuItem.Size = new System.Drawing.Size(100, 22); + this.日志ToolStripMenuItem.Text = "日志"; + this.日志ToolStripMenuItem.Click += new System.EventHandler(this.日志ToolStripMenuItem_Click); + // + // 任务ToolStripMenuItem + // + this.任务ToolStripMenuItem.Name = "任务ToolStripMenuItem"; + this.任务ToolStripMenuItem.Size = new System.Drawing.Size(100, 22); + this.任务ToolStripMenuItem.Text = "任务"; + this.任务ToolStripMenuItem.Click += new System.EventHandler(this.任务ToolStripMenuItem_Click); + // + // 定位ToolStripMenuItem + // + this.定位ToolStripMenuItem.Name = "定位ToolStripMenuItem"; + this.定位ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.定位ToolStripMenuItem.Text = "定位"; + this.定位ToolStripMenuItem.Click += new System.EventHandler(this.定位ToolStripMenuItem_Click); + // // winGridViewPager1 // this.winGridViewPager1.AppendedMenu = null; + this.winGridViewPager1.ContextMenuStrip = this.contextMenuStrip1; this.winGridViewPager1.DataSource = null; this.winGridViewPager1.DisplayColumns = ""; this.winGridViewPager1.Dock = System.Windows.Forms.DockStyle.Fill; @@ -186,35 +221,19 @@ this.winGridViewPager1.Size = new System.Drawing.Size(756, 309); this.winGridViewPager1.TabIndex = 3; // - // contextMenuStrip1 + // 编辑ToolStripMenuItem // - this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.日志ToolStripMenuItem, - this.任务ToolStripMenuItem, - this.定位ToolStripMenuItem}); - this.contextMenuStrip1.Name = "contextMenuStrip1"; - this.contextMenuStrip1.Size = new System.Drawing.Size(101, 70); + this.编辑ToolStripMenuItem.Name = "编辑ToolStripMenuItem"; + this.编辑ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.编辑ToolStripMenuItem.Text = "编辑"; + this.编辑ToolStripMenuItem.Click += new System.EventHandler(this.编辑ToolStripMenuItem_Click); // - // 日志ToolStripMenuItem + // 注销ToolStripMenuItem // - this.日志ToolStripMenuItem.Name = "日志ToolStripMenuItem"; - this.日志ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); - this.日志ToolStripMenuItem.Text = "日志"; - this.日志ToolStripMenuItem.Click += new System.EventHandler(this.日志ToolStripMenuItem_Click); - // - // 任务ToolStripMenuItem - // - this.任务ToolStripMenuItem.Name = "任务ToolStripMenuItem"; - this.任务ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); - this.任务ToolStripMenuItem.Text = "任务"; - this.任务ToolStripMenuItem.Click += new System.EventHandler(this.任务ToolStripMenuItem_Click); - // - // 定位ToolStripMenuItem - // - this.定位ToolStripMenuItem.Name = "定位ToolStripMenuItem"; - this.定位ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); - this.定位ToolStripMenuItem.Text = "定位"; - this.定位ToolStripMenuItem.Click += new System.EventHandler(this.定位ToolStripMenuItem_Click); + this.注销ToolStripMenuItem.Name = "注销ToolStripMenuItem"; + this.注销ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.注销ToolStripMenuItem.Text = "注销"; + this.注销ToolStripMenuItem.Click += new System.EventHandler(this.注销ToolStripMenuItem_Click); // // FrmPatrolerManager // @@ -229,7 +248,7 @@ this.MinimizeBox = false; this.Name = "FrmPatrolerManager"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; - this.Text = "巡检人员维护"; + this.Text = "定位人员维护"; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmPatrolerManager_FormClosing); this.Load += new System.EventHandler(this.FrmPatrolerManager_Load); ((System.ComponentModel.ISupportInitialize)(this.bar1)).EndInit(); @@ -258,10 +277,12 @@ private DevComponents.Editors.ComboItem 注销; private DevComponents.Editors.ComboItem comboItem1; private DevComponents.Editors.ComboItem 不限; - private WHC.Pager.WinControl.WinGridViewPager winGridViewPager1; private System.Windows.Forms.ContextMenuStrip contextMenuStrip1; private System.Windows.Forms.ToolStripMenuItem 日志ToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem 任务ToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem 定位ToolStripMenuItem; + private WHC.Pager.WinControl.WinGridViewPager winGridViewPager1; + private System.Windows.Forms.ToolStripMenuItem 编辑ToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem 注销ToolStripMenuItem; } } \ No newline at end of file diff --git a/FrmPatrolerManager.cs b/FrmPatrolerManager.cs index 255a076..9c32f54 100644 --- a/FrmPatrolerManager.cs +++ b/FrmPatrolerManager.cs @@ -29,9 +29,7 @@ this.globeControl1 = globeControl1; winGridViewPager1.OnPageChanged += new EventHandler(winGridViewPager1_OnPageChanged); - this.winGridViewPager1.OnEditSelected += new EventHandler(winGridViewPager1_OnEditSelected);//编辑 - this.winGridViewPager1.OnDeleteSelected += new EventHandler(winGridViewPager1_OnDeleteSelected);//删除 - + this.winGridViewPager1.OnStartExport += new EventHandler(pager1_OnStartExport); this.winGridViewPager1.OnEndExport += new EventHandler(pager1_OnEndExport); @@ -47,26 +45,31 @@ //控制表格显示的列，以及每一列要显示的列名 this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - this.winGridViewPager1.AddColumnAlias("USERNAME", "姓名"); - this.winGridViewPager1.AddColumnAlias("DBID", "编号"); - this.winGridViewPager1.AddColumnAlias("SEX", "性别"); - this.winGridViewPager1.AddColumnAlias("AGE", "年龄"); - this.winGridViewPager1.AddColumnAlias("PHONENUM", "电话"); - this.winGridViewPager1.AddColumnAlias("ACCOUNTSTATE", "状态"); - this.winGridViewPager1.DisplayColumns = "USERNAME,SEX,AGE,PHONENUM,ACCOUNTSTATE"; + this.winGridViewPager1.AddColumnAlias("姓名", "姓名"); + this.winGridViewPager1.AddColumnAlias("编号", "编号"); + this.winGridViewPager1.AddColumnAlias("性别", "性别"); + this.winGridViewPager1.AddColumnAlias("年龄", "年龄"); + this.winGridViewPager1.AddColumnAlias("电话", "电话"); + this.winGridViewPager1.AddColumnAlias("状态", "状态"); + this.winGridViewPager1.DisplayColumns = "姓名,性别,年龄,电话,状态"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 + //隐藏右键功能按钮 //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[1].Visible = false; + winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Visible = false; + winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[4].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[5].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[6].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[7].Visible = false; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "编辑"; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Text = "注销"; + + //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "编辑"; + //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Text = "注销"; winGridViewPager1.AppendedMenu = this.contextMenuStrip1; + //右键菜单宽度 winGridViewPager1.dataGridView1.ContextMenuStrip.AutoSize = false; @@ -122,11 +125,11 @@ DataGridViewRow row = grid.SelectedRows[0]; try { - long dbid = long.Parse(row.Cells["dbid"].Value.ToString()); - String name = row.Cells["USERNAME"].Value.ToString(); - String sex = row.Cells["SEX"].Value.ToString(); - String age = row.Cells["AGE"].Value.ToString(); - string phone = row.Cells["PHONENUM"].Value.ToString(); + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); + String name = row.Cells["姓名"].Value.ToString(); + String sex = row.Cells["性别"].Value.ToString(); + String age = row.Cells["年龄"].Value.ToString(); + string phone = row.Cells["电话"].Value.ToString(); age = String.IsNullOrEmpty(age.ToString().Trim()) ? "1" : age.ToString().Trim(); FrmPatrolerEdit frm = new FrmPatrolerEdit(dbid.ToString(), name, age, sex, phone); frm.reloadGrid += new ReloadPatrolerGrid(LoadData); @@ -152,10 +155,10 @@ if (grid != null) { DataGridViewRow row = grid.SelectedRows[0]; - long dbid = long.Parse(row.Cells["DBID"].Value.ToString()); + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); try { - string state = row.Cells["ACCOUNTSTATE"].Value.ToString(); + string state = row.Cells["状态"].Value.ToString(); if ("在线".Equals(state)) { if (MessageBox.Show("确定注销？", "确认", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) @@ -180,60 +183,60 @@ { int pageIndex = winGridViewPager1.PagerInfo.CurrenetPageIndex; string sqlData = GetSql(pageIndex); - initlizeDatagrid(); + DataTable table = OracleUtils.ExecuteDataset(OracleUtils.ConnectionString, CommandType.Text, sqlData).Tables[0]; winGridViewPager1.DataSource = table.DefaultView; - for (int i = 0; i < winGridViewPager1.dataGridView1.Rows.Count; i++) - { - if (winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value.ToString() == "ONLINE") - { - winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value = "在线"; - } - else - { - if (winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value.ToString() == "OFFLINE") - { - winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value = "离线"; - } - else - { - if (winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value.ToString() == "LEAVER") - { - winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value = "注销"; - } - } - } - } + //for (int i = 0; i < winGridViewPager1.dataGridView1.Rows.Count; i++) + //{ + // if (winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value.ToString() == "ONLINE") + // { + // winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value = "在线"; + // } + // else + // { + // if (winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value.ToString() == "OFFLINE") + // { + // winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value = "离线"; + // } + // else + // { + // if (winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value.ToString() == "LEAVER") + // { + // winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value = "注销"; + // } + // } + // } + //} winGridViewPager1.Refresh(); } private void LoadData(int pageIndex) { string sqlData = GetSql(pageIndex); - initlizeDatagrid(); + DataTable table = OracleUtils.ExecuteDataset(OracleUtils.ConnectionString, CommandType.Text, sqlData).Tables[0]; winGridViewPager1.DataSource = table.DefaultView; - for (int i = 0; i < winGridViewPager1.dataGridView1.Rows.Count; i++) - { - if (winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value.ToString() == "ONLINE") - { - winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value = "在线"; - } - else - { - if (winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value.ToString() == "OFFLINE") - { - winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value = "离线"; - } - else - { - if (winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value.ToString() == "LEAVER") - { - winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value = "注销"; - } - } - } - } + //for (int i = 0; i < winGridViewPager1.dataGridView1.Rows.Count; i++) + //{ + // if (winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value.ToString() == "ONLINE") + // { + // winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value = "在线"; + // } + // else + // { + // if (winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value.ToString() == "OFFLINE") + // { + // winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value = "离线"; + // } + // else + // { + // if (winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value.ToString() == "LEAVER") + // { + // winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value = "注销"; + // } + // } + // } + //} winGridViewPager1.Refresh(); } @@ -241,7 +244,8 @@ { string sqlCount = "select count(*) from equipment where status = 'USING'"; - string sqlData = "select username,dbid,sex,age,phonenum,accountstate " + + string sqlData = "select username as 姓名,dbid as 编号,sex as 性别,age as 年龄,phonenum as 电话,"+ + "case when accountstate = 'ONLINE' then '在线' when accountstate = 'OFFLINE' then '离线' when accountstate = 'LEAVER' then '注销' end as 状态 " + "from (select t.*,rownum row_num from patroler t order by DBID desc)b " + " where 1=1"; @@ -255,9 +259,9 @@ int minPage = (pageIndex - 1) * maxPageIndex + 1; int maxPage = pageIndex * maxPageIndex; string sqlCount = "select count(*) from patroler where 1=1"; - string sqlData = "select username,dbid,sex,age,phonenum,accountstate " + - "from (select t.*,rownum row_num from patroler t order by DBID desc)b " + - " where(b.row_num between " + minPage + " and " + maxPage + ")"; + string sqlData = "select username as 姓名,dbid as 编号,sex as 性别,age as 年龄,phonenum as 电话,"+ + "case when accountstate = 'ONLINE' then '在线' when accountstate = 'OFFLINE' then '离线' when accountstate = 'LEAVER' then '注销' end as 状态 " + + "from (select t.*,rownum row_num from patroler t where 1=1"; if (!String.IsNullOrEmpty(txt_username.Text.Trim())) { @@ -281,7 +285,8 @@ sqlCount += " and accountstate='" + combo_stateText + "'"; sqlData += " and accountstate='" + combo_stateText + "'"; } - + sqlData += " order by DBID desc)b " + + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; @@ -291,6 +296,7 @@ { try { + initlizeDatagrid(); LoadData(); initForm(); IS_OPEN = true; @@ -310,11 +316,13 @@ } if (Utility.userRole.IndexOf("巡检员编辑") == -1) { - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Visible = false; + //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Visible = false; + 编辑ToolStripMenuItem.Visible = false; } if (Utility.userRole.IndexOf("巡检员注销") == -1) { - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Visible = false; + //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Visible = false; + 注销ToolStripMenuItem.Visible = false; } } @@ -376,7 +384,7 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - long dbid = long.Parse(row.Cells["dbid"].Value.ToString()); + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); Log p = new Log(dbid.ToString()); p.Show(); } @@ -395,8 +403,8 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - long dbid = long.Parse(row.Cells["dbid"].Value.ToString()); - String state = row.Cells["ACCOUNTSTATE"].Value.ToString(); + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); + String state = row.Cells["状态"].Value.ToString(); if ("在线".Equals(state)) { string sql = "select t.dbid " + @@ -435,8 +443,8 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - long dbid = long.Parse(row.Cells["dbid"].Value.ToString()); - String username = row.Cells["USERNAME"].Value.ToString(); + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); + String username = row.Cells["姓名"].Value.ToString(); string sql = "select t.latitude, t.longitude " + "from position t " + "where t.dbid = (select max(dbid) from position where patroler_id = " + dbid + ")"; @@ -489,6 +497,63 @@ } + private void 编辑ToolStripMenuItem_Click(object sender, EventArgs e) + { + if (winGridViewPager1 != null && winGridViewPager1.dataGridView1 != null) + { + DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; + try + { + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); + String name = row.Cells["姓名"].Value.ToString(); + String sex = row.Cells["性别"].Value.ToString(); + String age = row.Cells["年龄"].Value.ToString(); + string phone = row.Cells["电话"].Value.ToString(); + age = String.IsNullOrEmpty(age.ToString().Trim()) ? "1" : age.ToString().Trim(); + FrmPatrolerEdit frm = new FrmPatrolerEdit(dbid.ToString(), name, age, sex, phone); + frm.reloadGrid += new ReloadPatrolerGrid(LoadData); + frm.ShowDialog(); + winGridViewPager1.Refresh(); + } + catch (Exception ex) + { + MessageBox.Show("编辑失败:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } + + private void 注销ToolStripMenuItem_Click(object sender, EventArgs e) + { + if (winGridViewPager1 != null && winGridViewPager1.dataGridView1 != null) + { + DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); + try + { + if (MessageBox.Show("确定注销？", "确认", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) + { + String sql = "update patroler t set t.accountstate='LEAVER' where t.dbid=" + dbid; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + LoadData(); + MessageBox.Show("人员已注销", "信息", MessageBoxButtons.OK, MessageBoxIcon.Information); + } + //string state = row.Cells["状态"].Value.ToString(); + //if ("在线".Equals(state)) + //{ + + //} + //else + //{ + // MessageBox.Show("人员不在线，无法注销", "信息"); + //} + } + catch (Exception ex) + { + MessageBox.Show("人员注销失败:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } + } } diff --git a/FrmRoleInfoManager.cs b/FrmRoleInfoManager.cs index 8897133..35693cf 100644 --- a/FrmRoleInfoManager.cs +++ b/FrmRoleInfoManager.cs @@ -55,10 +55,10 @@ //控制表格显示的列，以及每一列要显示的列名 this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - this.winGridViewPager1.AddColumnAlias("NT", "角色名称"); - this.winGridViewPager1.AddColumnAlias("ID", "编号"); + this.winGridViewPager1.AddColumnAlias("角色名称", "角色名称"); + this.winGridViewPager1.AddColumnAlias("编号", "编号"); - this.winGridViewPager1.DisplayColumns = "NT"; + this.winGridViewPager1.DisplayColumns = "角色名称"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -131,7 +131,7 @@ { try { - string dbid = row.Cells["id"].Value.ToString(); + string dbid = row.Cells["编号"].Value.ToString(); string sql = "delete from casic_userroletest where id=" + dbid; OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); LoadData(); @@ -170,7 +170,7 @@ { string sqlCount = "select id,nt from casic_userroletest where sysname='EMS'"; - string sqlData = "select nt,id " + + string sqlData = "select nt as 角色名称,id as 编号 " + "from (select t.*,rownum row_num from casic_userroletest t order by id desc)b " + " where sysname='EMS'"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -183,7 +183,7 @@ int minPage = (pageIndex - 1) * maxPageIndex + 1; int maxPage = pageIndex * maxPageIndex; string sqlCount = "select id,nt from casic_userroletest where sysname='EMS'"; - string sqlData = "select nt,id " + + string sqlData = "select nt as 角色名称,id as 编号 " + "from (select t.*,rownum row_num from casic_userroletest t where sysname='EMS' order by id desc)b " + " where(b.row_num between " + minPage + " and " + maxPage + ")"; diff --git a/FrmSysUserInfoManger.cs b/FrmSysUserInfoManger.cs index 7903916..e193a61 100644 --- a/FrmSysUserInfoManger.cs +++ b/FrmSysUserInfoManger.cs @@ -28,6 +28,7 @@ this.winGridViewPager1.OnEndExport += new EventHandler(pager1_OnEndExport); winGridViewPager1.dataGridView1.MultiSelect = false; + } private void FrmSysUserInfoManger_Load(object sender, EventArgs e) @@ -59,10 +60,10 @@ //控制表格显示的列，以及每一列要显示的列名 this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - this.winGridViewPager1.AddColumnAlias("USERNAME", "账号"); - this.winGridViewPager1.AddColumnAlias("ID", "编号"); + this.winGridViewPager1.AddColumnAlias("账号", "账号"); + this.winGridViewPager1.AddColumnAlias("编号", "编号"); - this.winGridViewPager1.DisplayColumns = "USERNAME"; + this.winGridViewPager1.DisplayColumns = "账号"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -130,8 +131,8 @@ if (grid != null) { DataGridViewRow row = grid.SelectedRows[0]; - string dbid = row.Cells["id"].Value.ToString(); - string userName = row.Cells["USERNAME"].Value.ToString(); + string dbid = row.Cells["编号"].Value.ToString(); + string userName = row.Cells["账号"].Value.ToString(); if (userName.Equals("ems")) { MessageBox.Show("该用户为管理员用户，无法删除！", "信息"); @@ -184,7 +185,7 @@ { string sqlCount = "select count(*) from casic_userinfotest where sysname='EMS'"; - string sqlData = "select username,id " + + string sqlData = "select username as 账号,id as 编号 " + "from (select t.*,rownum row_num from casic_userinfotest t order by id desc)b " + " where sysname='EMS'"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -197,16 +198,16 @@ int minPage = (pageIndex - 1) * maxPageIndex + 1; int maxPage = pageIndex * maxPageIndex; string sqlCount = "select count(*) from casic_userinfotest where sysname='EMS'"; - string sqlData = "select username,id " + - "from (select t.*,rownum row_num from casic_userinfotest t where sysname='EMS' order by id desc)b " + - " where(b.row_num between " + minPage + " and " + maxPage + ")"; + string sqlData = "select username as 账号,id as 编号 " + + "from (select t.*,rownum row_num from casic_userinfotest t where sysname='EMS'"; if (!String.IsNullOrEmpty(txt_user_code.Text.Trim())) { sqlCount += " and username like '%" + txt_user_code.Text.Trim() + "%'"; sqlData += " and username like '%" + txt_user_code.Text.Trim() + "%'"; } - + sqlData += " order by id desc)b " + + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; diff --git a/Cyberpipe.csproj b/Cyberpipe.csproj index fe600e5..501fd09 100644 --- a/Cyberpipe.csproj +++ b/Cyberpipe.csproj @@ -246,6 +246,12 @@ Form_TaskManager.cs + + Form + + + FrmFlagDetail.cs + Form @@ -1368,6 +1374,9 @@ Form_TaskManager.cs + + FrmFlagDetail.cs + FormDocumentManager.cs diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 537b4c3..1acf22a 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 7d5dd95..3f178cb 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -90,20 +90,20 @@ this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - - this.winGridViewPager1.AddColumnAlias("ACCIDENTTIME", "上报时间"); - this.winGridViewPager1.AddColumnAlias("DBID", "编号"); - this.winGridViewPager1.AddColumnAlias("DESCRIBE", "事件描述"); - this.winGridViewPager1.AddColumnAlias("LATITUDE", "纬度"); - this.winGridViewPager1.AddColumnAlias("LOCALE", "事件地点"); - this.winGridViewPager1.AddColumnAlias("LONGITUDE", "经度"); - this.winGridViewPager1.AddColumnAlias("PATROLERNAME", "上报人员"); - this.winGridViewPager1.AddColumnAlias("PATROLER_ID", "人员ID"); - this.winGridViewPager1.AddColumnAlias("TASK_ID", "任务编号"); - this.winGridViewPager1.AddColumnAlias("RESULT", "处理结果"); - this.winGridViewPager1.AddColumnAlias("STATE", "处理状态"); - this.winGridViewPager1.DisplayColumns = "ACCIDENTTIME,DESCRIBE,LOCALE,PATROLERNAME,TASK_ID,RESULT,STATE"; + this.winGridViewPager1.AddColumnAlias("上报时间", "上报时间"); + this.winGridViewPager1.AddColumnAlias("编号", "编号"); + this.winGridViewPager1.AddColumnAlias("事件描述", "事件描述"); + this.winGridViewPager1.AddColumnAlias("纬度", "纬度"); + this.winGridViewPager1.AddColumnAlias("事件地点", "事件地点"); + this.winGridViewPager1.AddColumnAlias("经度", "经度"); + this.winGridViewPager1.AddColumnAlias("上报人员", "上报人员"); + this.winGridViewPager1.AddColumnAlias("人员ID", "人员ID"); + this.winGridViewPager1.AddColumnAlias("任务编号", "任务编号"); + this.winGridViewPager1.AddColumnAlias("处理结果", "处理结果"); + this.winGridViewPager1.AddColumnAlias("处理状态", "处理状态"); + + this.winGridViewPager1.DisplayColumns = "上报时间,事件描述,事件地点,上报人员,任务编号,处理结果,处理状态"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -114,8 +114,8 @@ winGridViewPager1.dataGridView1.ContextMenuStrip.Items[5].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[6].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[7].Visible = false; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[1].Text = "查看位置"; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "结果编辑"; + winGridViewPager1.dataGridView1.ContextMenuStrip.Items[1].Text = "结果编辑"; + winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "查看位置"; //右键菜单宽度 winGridViewPager1.dataGridView1.ContextMenuStrip.AutoSize = false; @@ -160,13 +160,12 @@ this.WindowState = FormWindowState.Minimized; globeControl1.Globe.MemoryLayer.RemoveAllFeature(); this.WindowState = FormWindowState.Minimized; - double x = Convert.ToDouble(row.Cells["LONGITUDE"].Value); - double y = Convert.ToDouble(row.Cells["LATITUDE"].Value); - - string username = Convert.ToString(row.Cells["PATROLERNAME"].Value); - string Atime = Convert.ToString(row.Cells["ACCIDENTTIME"].Value); - string location = Convert.ToString(row.Cells["LOCALE"].Value); - string descp = Convert.ToString(row.Cells["DESCRIBE"].Value); + double x = Convert.ToDouble(row.Cells["经度"].Value); + double y = Convert.ToDouble(row.Cells["纬度"].Value); + string username = Convert.ToString(row.Cells["上报人员"].Value); + string Atime = Convert.ToString(row.Cells["上报时间"].Value); + string location = Convert.ToString(row.Cells["事件地点"].Value); + string descp = Convert.ToString(row.Cells["事件描述"].Value); /////////////////////////////////////// /*******设置飞行与创建模型******/ @@ -228,8 +227,8 @@ DataGridViewRow row = grid.SelectedRows[0]; try { - int dbId = Convert.ToInt32(row.Cells["DBID"].Value); - string result = Convert.ToString(row.Cells["RESULT"].Value); + int dbId = Convert.ToInt32(row.Cells["编号"].Value); + string result = Convert.ToString(row.Cells["处理结果"].Value); EMS_Forms.Form_EventResult form = new Form_EventResult(dbId, result); form.refresh += new Form_EventResult.Handle(LoadData);//改变值的事件 form.ShowDialog(); @@ -276,9 +275,9 @@ } for (int i = 0; i < table.Rows.Count; i++) { - if (winGridViewPager1.dataGridView1.Rows[i].Cells["RESULT"].Value != null && !(winGridViewPager1.dataGridView1.Rows[i].Cells["RESULT"].Value.ToString().Trim().Equals(""))) + if (winGridViewPager1.dataGridView1.Rows[i].Cells["处理结果"].Value != null && !(winGridViewPager1.dataGridView1.Rows[i].Cells["处理结果"].Value.ToString().Trim().Equals(""))) { - winGridViewPager1.dataGridView1.Rows[i].Cells["STATE"].Value = "已处理"; + winGridViewPager1.dataGridView1.Rows[i].Cells["处理状态"].Value = "已处理"; } } @@ -307,9 +306,9 @@ } for (int i = 0; i < table.Rows.Count; i++) { - if (winGridViewPager1.dataGridView1.Rows[i].Cells["RESULT"].Value != null && !(winGridViewPager1.dataGridView1.Rows[i].Cells["RESULT"].Value.ToString().Trim().Equals(""))) + if (winGridViewPager1.dataGridView1.Rows[i].Cells["处理结果"].Value != null && !(winGridViewPager1.dataGridView1.Rows[i].Cells["处理结果"].Value.ToString().Trim().Equals(""))) { - winGridViewPager1.dataGridView1.Rows[i].Cells["STATE"].Value = "已处理"; + winGridViewPager1.dataGridView1.Rows[i].Cells["处理状态"].Value = "已处理"; } } @@ -320,10 +319,12 @@ { string sqlCount = "select count(*) from ACCIDENT where 1=1"; - string sqlData = "select ACCIDENTTIME,DBID,DESCRIBE,LATITUDE,LOCALE,LONGITUDE,PATROLERNAME,PATROLER_ID,TASK_ID,RESULT,'' as STATE " + + string sqlData = "select ACCIDENTTIME as 上报时间,DBID as 编号,DESCRIBE as 事件描述,"+ + "LATITUDE as 纬度,LOCALE as 事件地点,LONGITUDE as 经度,PATROLERNAME 上报人员,"+ + "PATROLER_ID as 人员ID,TASK_ID as 任务编号,RESULT as 处理结果,'' as 处理状态 " + "from (select t.*,rownum row_num from ACCIDENT t order by DBID)b " + " where 1=1"; - + rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; @@ -340,9 +341,10 @@ string sqlCount = "select count(*) from ACCIDENT where 1=1"; - string sqlData = "select ACCIDENTTIME,DBID,DESCRIBE,LATITUDE,LOCALE,LONGITUDE,PATROLERNAME,PATROLER_ID,TASK_ID,RESULT,'' as STATE " + - "from (select t.*,rownum row_num from ACCIDENT t order by DBID)b " + - " where(b.row_num between " + minPage + " and " + maxPage + ")"; + string sqlData = "select ACCIDENTTIME as 上报时间,DBID as 编号,DESCRIBE as 事件描述," + + "LATITUDE as 纬度,LOCALE as 事件地点,LONGITUDE as 经度,PATROLERNAME 上报人员," + + "PATROLER_ID as 人员ID,TASK_ID as 任务编号,RESULT as 处理结果,'' as 处理状态 " + + "from (select t.*,rownum row_num from ACCIDENT t where 1=1"; if (!String.IsNullOrEmpty(comboBox_name.Text.Trim())) { @@ -361,7 +363,8 @@ sqlCount += "and ACCIDENTTIME<=to_date('" + time.ToShortDateString() + "','yyyy-MM-dd') "; sqlData += "and ACCIDENTTIME<=to_date('" + time.ToShortDateString() + "','yyyy-MM-dd') "; } - + sqlData += " order by DBID desc)b " + + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 225c8d7..8bd9e48 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -120,8 +120,8 @@ private void flyToTask(DataGridViewRow row, int taskState) { int dbID = 0; - dbID = Convert.ToInt32(row.Cells["DBID"].Value); - string userName = Convert.ToString(row.Cells["USERNAME"].Value); + dbID = Convert.ToInt32(row.Cells["任务编号"].Value); + string userName = Convert.ToString(row.Cells["任务执行人员"].Value); System.DateTime t = new DateTime(); try { @@ -392,15 +392,15 @@ //控制表格显示的列，以及每一列要显示的列名 this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - this.winGridViewPager1.AddColumnAlias("DBID", "任务编号"); - this.winGridViewPager1.AddColumnAlias("DEPLOYTIME", "创建时间"); - this.winGridViewPager1.AddColumnAlias("DESCIRPTION", "任务描述"); - this.winGridViewPager1.AddColumnAlias("FINISHTIME", "完成时间"); - this.winGridViewPager1.AddColumnAlias("STREET", "任务执行区域"); - this.winGridViewPager1.AddColumnAlias("TASKSTATE", "任务状态"); - this.winGridViewPager1.AddColumnAlias("USERNAME", "任务执行人员"); + this.winGridViewPager1.AddColumnAlias("任务编号", "任务编号"); + this.winGridViewPager1.AddColumnAlias("创建时间", "创建时间"); + this.winGridViewPager1.AddColumnAlias("任务描述", "任务描述"); + this.winGridViewPager1.AddColumnAlias("完成时间", "完成时间"); + this.winGridViewPager1.AddColumnAlias("任务执行区域", "任务执行区域"); + this.winGridViewPager1.AddColumnAlias("任务状态", "任务状态"); + this.winGridViewPager1.AddColumnAlias("任务执行人员", "任务执行人员"); - this.winGridViewPager1.DisplayColumns = "DBID,DEPLOYTIME,DESCIRPTION,FINISHTIME,STREET,TASKSTATE,USERNAME"; + this.winGridViewPager1.DisplayColumns = "任务编号,创建时间,任务描述,完成时间,任务执行区域,任务状态,任务执行人员"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -464,8 +464,8 @@ { int dbID = 0; int taskStateInt = 0; - dbID = Convert.ToInt32(row.Cells["DBID"].Value); - string taskState = row.Cells["TASKSTATE"].Value.ToString(); + dbID = Convert.ToInt32(row.Cells["任务编号"].Value); + string taskState = row.Cells["任务状态"].Value.ToString(); if (taskState.Equals("开始任务")) { taskStateInt = 1; @@ -534,9 +534,10 @@ private string GetSql() { - string sqlCount = "select count(*) from taskinfo t where 1=1'"; + string sqlCount = "select count(*) from taskinfo t where 1=1"; - string sqlData = "select dbid,deploytime,descirption,finishtime,street,taskstate,username " + + 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"; @@ -550,9 +551,9 @@ int minPage = (pageIndex - 1) * maxPageIndex + 1; int maxPage = pageIndex * maxPageIndex; string sqlCount = "select count(*) from taskinfo t where 1=1"; - string sqlData = "select dbid,deploytime,descirption,finishtime,street,taskstate,username " + - "from (select t.*,rownum row_num from taskinfo t order by DBID desc)b " + - " where(b.row_num between " + minPage + " and " + maxPage + ")"; + 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"; if (!String.IsNullOrEmpty(comboBox_userName.Text.Trim()) && !comboBox_userName.Text.Trim().Equals("不限")) { @@ -581,6 +582,8 @@ sqlCount += "and street='" + combo_street.Text + "' "; sqlData += "and street='" + combo_street.Text + "' "; } + sqlData += " order by DBID desc)b " + + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index e65a4bd..58f5342 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -73,13 +73,13 @@ //控制表格显示的列，以及每一列要显示的列名 this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - this.winGridViewPager1.AddColumnAlias("FILENAME", "文档名称"); - this.winGridViewPager1.AddColumnAlias("DBID", "编号"); - this.winGridViewPager1.AddColumnAlias("TITLE", "文档标题"); - this.winGridViewPager1.AddColumnAlias("FILETYPE", "文档类型"); - this.winGridViewPager1.AddColumnAlias("UPDAY", "上传日期"); - this.winGridViewPager1.AddColumnAlias("WRITER", "上传人"); - this.winGridViewPager1.DisplayColumns = "FILENAME,TITLE,FILETYPE,UPDAY,WRITER"; + this.winGridViewPager1.AddColumnAlias("文档名称", "文档名称"); + this.winGridViewPager1.AddColumnAlias("编号", "编号"); + this.winGridViewPager1.AddColumnAlias("文档标题", "文档标题"); + this.winGridViewPager1.AddColumnAlias("文档类型", "文档类型"); + this.winGridViewPager1.AddColumnAlias("上传日期", "上传日期"); + this.winGridViewPager1.AddColumnAlias("上传人", "上传人"); + this.winGridViewPager1.DisplayColumns = "文档名称,文档标题,文档类型,上传日期,上传人"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -167,7 +167,7 @@ if (grid != null) { DataGridViewRow row = grid.SelectedRows[0]; - string dbid = row.Cells["dbid"].Value.ToString(); + string dbid = row.Cells["编号"].Value.ToString(); try { if (MessageBox.Show("确认删除吗？", "确认", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) @@ -212,7 +212,8 @@ { string sqlCount = "select count(*) from casic_userdocument where sysname = 'EMS'"; - string sqlData = "select filename,dbid,title,filetype,upday,writer " + + string sqlData = "select filename as 文档名称,dbid as 编号,title as 文档标题," + + "filetype as 文档类型,upday as 上传日期,writer as 上传人 " + "from (select t.*,rownum row_num from casic_userdocument t order by DBID desc)b " + " where sysname = 'EMS'"; @@ -226,9 +227,9 @@ int minPage = (pageIndex - 1) * maxPageIndex + 1; int maxPage = pageIndex * maxPageIndex; string sqlCount = "select count(*) from casic_userdocument where sysname = 'EMS'"; - string sqlData = "select filename,dbid,title,filetype,upday,writer " + - "from (select t.*,rownum row_num from casic_userdocument t where sysname = 'EMS' order by DBID desc)b " + - " where(b.row_num between " + minPage + " and " + maxPage + ")"; + string sqlData = "select filename as 文档名称,dbid as 编号,title as 文档标题,"+ + "filetype as 文档类型,upday as 上传日期,writer as 上传人 " + + "from (select t.*,rownum row_num from casic_userdocument t where sysname = 'EMS'"; string txtTitleText = null; string comboFileType = null; @@ -278,7 +279,8 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - + sqlData += " order by DBID desc)b " + + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; @@ -437,7 +439,7 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - string filename = row.Cells["filename"].Value.ToString(); + string filename = row.Cells["文档名称"].Value.ToString(); string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; string file = System.Environment.CurrentDirectory + "\\download\\" + filename; int result = DownloadFile(url, file, progressBar1); @@ -515,7 +517,7 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - string filename = row.Cells["filename"].Value.ToString(); + string filename = row.Cells["文档名称"].Value.ToString(); string ext = Path.GetExtension(filename); SaveFileDialog dlg = new SaveFileDialog(); dlg.Filter = "保存文档|*" + ext + ";"; diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 1d1201b..3902629 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -748,6 +748,7 @@ this.Name = "FrmAddSinMark"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "单个标识器添加"; + this.TopMost = true; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmAddSinMark_FormClosing); this.Load += new System.EventHandler(this.FrmAddSinMark_Load); this.groupPanel1.ResumeLayout(false); diff --git a/FrmEquipmentManage.cs b/FrmEquipmentManage.cs index 90bfdb2..a3cf55c 100644 --- a/FrmEquipmentManage.cs +++ b/FrmEquipmentManage.cs @@ -74,13 +74,13 @@ //控制表格显示的列，以及每一列要显示的列名 this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - this.winGridViewPager1.AddColumnAlias("DESCIRPTION", "设备描述"); - this.winGridViewPager1.AddColumnAlias("DBID", "编号"); - this.winGridViewPager1.AddColumnAlias("MACID", "MAC地址"); - this.winGridViewPager1.AddColumnAlias("OWNER", "设备所有人"); - this.winGridViewPager1.AddColumnAlias("STATUS", "设备状态"); + this.winGridViewPager1.AddColumnAlias("设备描述", "设备描述"); + this.winGridViewPager1.AddColumnAlias("编号", "编号"); + this.winGridViewPager1.AddColumnAlias("MAC地址", "MAC地址"); + this.winGridViewPager1.AddColumnAlias("设备所有人", "设备所有人"); + this.winGridViewPager1.AddColumnAlias("设备状态", "设备状态"); - this.winGridViewPager1.DisplayColumns = "DESCIRPTION,MACID,OWNER,STATUS"; + this.winGridViewPager1.DisplayColumns = "设备描述,MAC地址,设备所有人,设备状态"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -146,10 +146,10 @@ DataGridViewRow row = grid.SelectedRows[0]; try { - long dbid = long.Parse(row.Cells["DBID"].Value.ToString()); - String macId = row.Cells["MACID"].Value.ToString(); - String username = row.Cells["OWNER"].Value.ToString(); - String descn = row.Cells["DESCIRPTION"].Value.ToString(); + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); + String macId = row.Cells["MAC地址"].Value.ToString(); + String username = row.Cells["设备所有人"].Value.ToString(); + String descn = row.Cells["设备状态"].Value.ToString(); FrmEquipmentEdit frm = new FrmEquipmentEdit(dbid.ToString(), macId, username, descn); frm.reloadGrid += new ReloadEquipmentGrid(LoadData); frm.ShowDialog(); @@ -179,7 +179,7 @@ { return; } - String macId = row.Cells["MACID"].Value.ToString(); + String macId = row.Cells["MAC地址"].Value.ToString(); FrmLog frm = new FrmLog(macId); frm.Show(); } @@ -201,7 +201,7 @@ if (grid != null) { DataGridViewRow row = grid.SelectedRows[0]; - long dbid = long.Parse(row.Cells["DBID"].Value.ToString()); + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); try { if (MessageBox.Show("确定删除？", "确认", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) @@ -243,7 +243,8 @@ { string sqlCount = "select count(*) from equipment where status = 'USING'"; - string sqlData = "select descirption,DBID,macid,owner,case when status = 'USING' then '可用' when status = 'DAMAGE' then '损坏' end as status " + + string sqlData = "select descirption as 设备描述,DBID as 编号,macid as MAC地址,owner as 设备所有人,"+ + "case when status = 'USING' then '可用' when status = 'DAMAGE' then '损坏' end as 设备状态 " + "from (select t.*,rownum row_num from equipment t where status = 'USING' order by dbid desc)b " + " where 1=1"; @@ -258,16 +259,17 @@ int maxPage = pageIndex * maxPageIndex; string sqlCount = "select count(*) from equipment where status = 'USING' "; - string sqlData = "select descirption,DBID,macid,owner,case when status = 'USING' then '可用' when status = 'DAMAGE' then '损坏' end as status " + - "from (select t.*,rownum row_num from equipment t where status = 'USING' order by DBID desc)b " + - " where(b.row_num between " + minPage + " and " + maxPage + ")"; + string sqlData = "select descirption as 设备描述,DBID as 编号,macid as MAC地址,owner as 设备所有人," + + "case when status = 'USING' then '可用' when status = 'DAMAGE' then '损坏' end as 设备状态 " + + "from (select t.*,rownum row_num from equipment t where status = 'USING'"; if (!String.IsNullOrEmpty(txtMacId.Text.Trim())) { sqlData += " and macid like '%" + txtMacId.Text.Trim() + "%'"; sqlCount += " and macid like '%" + txtMacId.Text.Trim() + "%'"; } - + sqlData += " order by DBID desc)b " + + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; @@ -299,76 +301,6 @@ } } - //public void reloadGrid(int pageIndex) - //{ - // if (pageIndex <= 0) - // { - // pageIndex = 1; - // currentpage = 1; - // } - // String sqlrows = "select * from (select rownum as rowno,dbid,descirption,macid,owner,case when status = 'USING' then '可用' when status = 'DAMAGE' then '损坏' end as status,'编辑' as btnEdit,'删除' as btnDel from equipment t where status = 'USING' "; - // string sqlcount = "select count(*) from equipment where status = 'USING' "; - // if (!String.IsNullOrEmpty(txtMacId.Text.Trim())) - // { - // sqlrows += " and macid like '%" + txtMacId.Text.Trim() + "%'"; - // sqlcount += " and macid like '%" + txtMacId.Text.Trim() + "%'"; - // } - // sqlrows += " and rownum<=" + (pagesize * pageIndex) + ") table_alias where table_alias.rowno>=" + ((pageIndex - 1) * pagesize + 1); - - // int rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlcount).ToString()); - // int pages = 0; - // if (rows % pagesize == 0) - // { - // pages = rows / pagesize; - // } - // else - // { - // pages = rows / pagesize + 1; - // } - - // lastpage = pages; - - // lab_page_msg.Text = "共" + rows + "条记录，每页" + pagesize + "条，第" + pageIndex + "页，共" + pages + "页"; - // combo_page_num.Items.Clear(); - // for (int i = 1; i <= pages; i++) - // { - // combo_page_num.Items.Add(new ComboBoxItem(i.ToString(), i.ToString())); - // } - - // if (lastpage == 1) - // { - // btn_page_first.Enabled = false; - // btn_page_pre.Enabled = false; - // btn_page_last.Enabled = false; - // btn_page_next.Enabled = false; - // } - // else if (currentpage == 1) - // { - // btn_page_first.Enabled = false; - // btn_page_pre.Enabled = false; - // btn_page_last.Enabled = true; - // btn_page_next.Enabled = true; - // } - // else if (currentpage == lastpage) - // { - // btn_page_first.Enabled = true; - // btn_page_pre.Enabled = true; - // btn_page_last.Enabled = false; - // btn_page_next.Enabled = false; - // } - // else - // { - // btn_page_first.Enabled = true; - // btn_page_pre.Enabled = true; - // btn_page_last.Enabled = true; - // btn_page_next.Enabled = true; - // } - - // DataTable table = OracleUtils.ExecuteDataset(OracleUtils.ConnectionString, CommandType.Text, sqlrows).Tables[0]; - // dataGridViewX1.DataSource = table; - - //} - private void FrmEquipmentManage_FormClosing(object sender, FormClosingEventArgs e) diff --git a/FrmFlagDetail.Designer.cs b/FrmFlagDetail.Designer.cs new file mode 100644 index 0000000..982bfc6 --- /dev/null +++ b/FrmFlagDetail.Designer.cs @@ -0,0 +1,103 @@ +namespace Cyberpipe +{ + partial class FrmFlagDetail + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); + this.dataGridViewX_markDetail = new DevComponents.DotNetBar.Controls.DataGridViewX(); + this.对象类型 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.对象编号 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.对象名称 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX_markDetail)).BeginInit(); + this.SuspendLayout(); + // + // dataGridViewX_markDetail + // + this.dataGridViewX_markDetail.AllowUserToAddRows = false; + this.dataGridViewX_markDetail.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; + this.dataGridViewX_markDetail.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dataGridViewX_markDetail.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.对象类型, + this.对象编号, + this.对象名称}); + dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle3.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dataGridViewX_markDetail.DefaultCellStyle = dataGridViewCellStyle3; + this.dataGridViewX_markDetail.Dock = System.Windows.Forms.DockStyle.Fill; + this.dataGridViewX_markDetail.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(170)))), ((int)(((byte)(170)))), ((int)(((byte)(170))))); + this.dataGridViewX_markDetail.Location = new System.Drawing.Point(0, 0); + this.dataGridViewX_markDetail.Name = "dataGridViewX_markDetail"; + this.dataGridViewX_markDetail.RowTemplate.Height = 23; + this.dataGridViewX_markDetail.Size = new System.Drawing.Size(508, 321); + this.dataGridViewX_markDetail.TabIndex = 0; + // + // 对象类型 + // + this.对象类型.HeaderText = "对象类型"; + this.对象类型.Name = "对象类型"; + // + // 对象编号 + // + this.对象编号.HeaderText = "对象编号"; + this.对象编号.Name = "对象编号"; + // + // 对象名称 + // + this.对象名称.HeaderText = "对象名称"; + this.对象名称.Name = "对象名称"; + // + // FrmFlagDetail + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(508, 321); + this.Controls.Add(this.dataGridViewX_markDetail); + this.Name = "FrmFlagDetail"; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; + this.Text = "标识对象信息"; + this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmFlagDetail_FormClosing); + this.Load += new System.EventHandler(this.FrmFlagDetail_Load); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX_markDetail)).EndInit(); + this.ResumeLayout(false); + + } + + #endregion + + private DevComponents.DotNetBar.Controls.DataGridViewX dataGridViewX_markDetail; + private System.Windows.Forms.DataGridViewTextBoxColumn 对象类型; + private System.Windows.Forms.DataGridViewTextBoxColumn 对象编号; + private System.Windows.Forms.DataGridViewTextBoxColumn 对象名称; + + } +} \ No newline at end of file diff --git a/FrmFlagDetail.cs b/FrmFlagDetail.cs new file mode 100644 index 0000000..81de974 --- /dev/null +++ b/FrmFlagDetail.cs @@ -0,0 +1,77 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Windows.Forms; +using GeoScene.Globe; +using System.Data.OracleClient; + +namespace Cyberpipe +{ + public partial class FrmFlagDetail : Form + { + DataTable dt = new DataTable(); + private GSOGlobeControl globeControl1; + + public delegate void Handle(); + public event Handle showParentForm; + String markId; + + public FrmFlagDetail(GSOGlobeControl globeControl1, String id) + { + InitializeComponent(); + this.markId = id; + } + + private void FrmFlagDetail_FormClosing(object sender, FormClosingEventArgs e) + { + showParentForm(); + } + + private void FrmFlagDetail_Load(object sender, EventArgs e) + { + string objectIds = ""; + string objectTypeCodes = ""; + string sql = "select t.对象编号,t.对象类型 from 标识器 t where t.编号='" + markId + "'"; + using (OracleDataReader reader = OracleUtils.ExecuteReader(OracleUtils.ConnectionString, CommandType.Text, sql)) + { + while (reader.Read()) + { + objectIds = reader.GetString(0); + objectTypeCodes = reader.GetString(1); + } + } + + string[] codeTypes = objectTypeCodes.Split(','); + string[] codeIds = objectIds.Split(','); + int length = 0; + if (codeTypes.Length <= codeIds.Length) + { + length = codeTypes.Length; + } + else + { + length = codeIds.Length; + } + for (int n = 0; n < length; n++) + { + for (int i = 0; i < Utility1.listPipelineType.Count; i++) + { + if (Utility1.listPipelineType[i].code == codeTypes[n]) + { + //string objectId = codeIds[i]; + //string objectType = Utility1.listPipelineType[i].type; + //string objectName = Utility1.listPipelineType[i].name; + int index = this.dataGridViewX_markDetail.Rows.Add(); + this.dataGridViewX_markDetail.Rows[index].Cells[0].Value = Utility1.listPipelineType[i].type; + this.dataGridViewX_markDetail.Rows[index].Cells[1].Value = codeIds[n].ToString(); + this.dataGridViewX_markDetail.Rows[index].Cells[2].Value = Utility1.listPipelineType[i].name; + } + } + } + } + } +} diff --git a/FrmFlagDetail.resx b/FrmFlagDetail.resx new file mode 100644 index 0000000..e98a8fe --- /dev/null +++ b/FrmFlagDetail.resx @@ -0,0 +1,129 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + True + + + True + + + True + + \ No newline at end of file diff --git a/FrmFlagManagers.Designer.cs b/FrmFlagManagers.Designer.cs index d7e2f60..9fe14fb 100644 --- a/FrmFlagManagers.Designer.cs +++ b/FrmFlagManagers.Designer.cs @@ -28,8 +28,10 @@ /// private void InitializeComponent() { - this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); - this.winGridViewPager1 = new WHC.Pager.WinControl.WinGridViewPager(); + this.components = new System.ComponentModel.Container(); + this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components); + this.标识对象ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripMenuItem2 = new System.Windows.Forms.ToolStripMenuItem(); this.bar1 = new DevComponents.DotNetBar.Bar(); this.labelItem1 = new DevComponents.DotNetBar.LabelItem(); this.txt_no = new DevComponents.DotNetBar.TextBoxItem(); @@ -38,45 +40,37 @@ this.btn_query = new DevComponents.DotNetBar.ButtonItem(); this.btn_add_batch = new DevComponents.DotNetBar.ButtonItem(); this.btn_add_menu = new DevComponents.DotNetBar.ButtonItem(); - this.btn_db = new DevComponents.DotNetBar.ButtonItem(); - this.tableLayoutPanel1.SuspendLayout(); + this.winGridViewPager1 = new WHC.Pager.WinControl.WinGridViewPager(); + this.contextMenuStrip1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.bar1)).BeginInit(); this.SuspendLayout(); // - // tableLayoutPanel1 + // contextMenuStrip1 // - this.tableLayoutPanel1.ColumnCount = 1; - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel1.Controls.Add(this.winGridViewPager1, 0, 1); - this.tableLayoutPanel1.Controls.Add(this.bar1, 0, 0); - this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 0); - this.tableLayoutPanel1.Name = "tableLayoutPanel1"; - this.tableLayoutPanel1.RowCount = 2; - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 32F)); - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel1.Size = new System.Drawing.Size(881, 474); - this.tableLayoutPanel1.TabIndex = 6; + this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.标识对象ToolStripMenuItem, + this.toolStripMenuItem2}); + this.contextMenuStrip1.Name = "contextMenuStrip1"; + this.contextMenuStrip1.Size = new System.Drawing.Size(125, 48); // - // winGridViewPager1 + // 标识对象ToolStripMenuItem // - this.winGridViewPager1.AppendedMenu = null; - this.winGridViewPager1.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; - this.winGridViewPager1.DataSource = null; - this.winGridViewPager1.DisplayColumns = ""; - this.winGridViewPager1.Dock = System.Windows.Forms.DockStyle.Fill; - this.winGridViewPager1.Location = new System.Drawing.Point(3, 35); - this.winGridViewPager1.MinimumSize = new System.Drawing.Size(540, 0); - this.winGridViewPager1.Name = "winGridViewPager1"; - this.winGridViewPager1.PrintTitle = ""; - this.winGridViewPager1.Size = new System.Drawing.Size(875, 436); - this.winGridViewPager1.TabIndex = 5; + this.标识对象ToolStripMenuItem.Name = "标识对象ToolStripMenuItem"; + this.标识对象ToolStripMenuItem.Size = new System.Drawing.Size(124, 22); + this.标识对象ToolStripMenuItem.Text = "标识对象"; + this.标识对象ToolStripMenuItem.Click += new System.EventHandler(this.标识对象ToolStripMenuItem_Click); + // + // toolStripMenuItem2 + // + this.toolStripMenuItem2.Name = "toolStripMenuItem2"; + this.toolStripMenuItem2.Size = new System.Drawing.Size(152, 22); + this.toolStripMenuItem2.Text = "查看位置"; + this.toolStripMenuItem2.Click += new System.EventHandler(this.toolStripMenuItem2_Click); // // bar1 // this.bar1.AntiAlias = true; this.bar1.Dock = System.Windows.Forms.DockStyle.Top; - this.bar1.DockSide = DevComponents.DotNetBar.eDockSide.Document; this.bar1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.labelItem1, this.txt_no, @@ -84,14 +78,13 @@ this.combo_street, this.btn_query, this.btn_add_batch, - this.btn_add_menu, - this.btn_db}); - this.bar1.Location = new System.Drawing.Point(3, 3); + this.btn_add_menu}); + this.bar1.Location = new System.Drawing.Point(0, 0); this.bar1.Name = "bar1"; - this.bar1.Size = new System.Drawing.Size(875, 28); + this.bar1.Size = new System.Drawing.Size(881, 28); this.bar1.Stretch = true; this.bar1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.bar1.TabIndex = 1; + this.bar1.TabIndex = 8; this.bar1.TabStop = false; this.bar1.Text = "bar1"; // @@ -136,24 +129,34 @@ this.btn_add_menu.Text = "手工添加"; this.btn_add_menu.Click += new System.EventHandler(this.btn_add_menu_Click); // - // btn_db + // winGridViewPager1 // - this.btn_db.Name = "btn_db"; - this.btn_db.Text = "数据导出"; + this.winGridViewPager1.AppendedMenu = null; + this.winGridViewPager1.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; + this.winGridViewPager1.DataSource = null; + this.winGridViewPager1.DisplayColumns = ""; + this.winGridViewPager1.Dock = System.Windows.Forms.DockStyle.Fill; + this.winGridViewPager1.Location = new System.Drawing.Point(0, 28); + this.winGridViewPager1.MinimumSize = new System.Drawing.Size(540, 0); + this.winGridViewPager1.Name = "winGridViewPager1"; + this.winGridViewPager1.PrintTitle = ""; + this.winGridViewPager1.Size = new System.Drawing.Size(881, 446); + this.winGridViewPager1.TabIndex = 9; // // FrmFlagManagers // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(881, 474); - this.Controls.Add(this.tableLayoutPanel1); + this.Controls.Add(this.winGridViewPager1); + this.Controls.Add(this.bar1); this.DoubleBuffered = true; this.Name = "FrmFlagManagers"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "标识器管理"; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmFlagManagers_FormClosing); this.Load += new System.EventHandler(this.FrmFlagManagers_Load); - this.tableLayoutPanel1.ResumeLayout(false); + this.contextMenuStrip1.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.bar1)).EndInit(); this.ResumeLayout(false); @@ -161,8 +164,8 @@ #endregion - private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1; - private WHC.Pager.WinControl.WinGridViewPager winGridViewPager1; + private System.Windows.Forms.ContextMenuStrip contextMenuStrip1; + private System.Windows.Forms.ToolStripMenuItem 标识对象ToolStripMenuItem; private DevComponents.DotNetBar.Bar bar1; private DevComponents.DotNetBar.LabelItem labelItem1; private DevComponents.DotNetBar.TextBoxItem txt_no; @@ -171,6 +174,7 @@ private DevComponents.DotNetBar.ButtonItem btn_query; private DevComponents.DotNetBar.ButtonItem btn_add_batch; private DevComponents.DotNetBar.ButtonItem btn_add_menu; - private DevComponents.DotNetBar.ButtonItem btn_db; + private WHC.Pager.WinControl.WinGridViewPager winGridViewPager1; + private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem2; } } \ No newline at end of file diff --git a/FrmFlagManagers.cs b/FrmFlagManagers.cs index 38d4927..9bf9734 100644 --- a/FrmFlagManagers.cs +++ b/FrmFlagManagers.cs @@ -33,15 +33,13 @@ { this.globeControl1 = _globeControl1; InitializeComponent(); - winGridViewPager1.OnPageChanged += new EventHandler(winGridViewPager1_OnPageChanged); - this.winGridViewPager1.OnAddNew += new EventHandler(winGridViewPager1_OnAddNew); //右键定位 + winGridViewPager1.OnPageChanged += new EventHandler(winGridViewPager1_OnPageChanged); this.winGridViewPager1.OnEditSelected += new EventHandler(winGridViewPager1_OnEditSelected);//属性编辑 this.winGridViewPager1.OnDeleteSelected += new EventHandler(winGridViewPager1_OnDeleteSelected);//标识器报废 + this.winGridViewPager1.OnStartExport += new EventHandler(pager1_OnStartExport); this.winGridViewPager1.OnEndExport += new EventHandler(pager1_OnEndExport); - //this.winGridViewPager1.ExportCurrent += new ExportCurrentEventHandler(pager1_ExportCurrent); - //this.winGridViewPager1.ExportAll += new ExportAllEventHandler(pager1_ExportAll); winGridViewPager1.dataGridView1.MultiSelect = false; @@ -76,26 +74,25 @@ this.winGridViewPager1.AddColumnAlias("标识器型号", "标识器型号"); this.winGridViewPager1.AddColumnAlias("地面高程", "地面高程"); this.winGridViewPager1.AddColumnAlias("标识器埋深", "标识器埋深"); - this.winGridViewPager1.AddColumnAlias("对象编号", "对象编号"); - this.winGridViewPager1.AddColumnAlias("对象类型", "对象类型"); this.winGridViewPager1.AddColumnAlias("所属道路", "所属道路"); this.winGridViewPager1.AddColumnAlias("使用状态", "使用状态"); - this.winGridViewPager1.DisplayColumns = "编号,标识器ID号,标识器型号,地面高程,标识器埋深,对象编号,对象类型,所属道路,使用状态"; + this.winGridViewPager1.DisplayColumns = "编号,标识器ID号,标识器型号,地面高程,标识器埋深,所属道路,使用状态"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 //隐藏右键功能按钮 //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[1].Visible = false; - //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[4].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[5].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[6].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[7].Visible = false; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[1].Text = "定位查看"; + //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[1].Text = "定位查看"; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "属性编辑"; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Text = "标识器报废"; + winGridViewPager1.AppendedMenu = this.contextMenuStrip1; + //右键菜单宽度 winGridViewPager1.dataGridView1.ContextMenuStrip.AutoSize = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Width = 150; @@ -153,7 +150,7 @@ } /// - /// 右键定位 + /// 对象查看 /// /// /// @@ -306,20 +303,10 @@ string sqlCount = "select count(*) from 标识器 where 使用状态 = '使用中'"; - string sqlData = "select 编号,标识器ID号,标识器型号,地面高程,标识器埋深,对象编号,对象类型,所属道路,LSSYS_ID,X坐标,Y坐标,使用状态 " + + string sqlData = "select 编号,标识器ID号,标识器型号,地面高程,标识器埋深,所属道路,LSSYS_ID,X坐标,Y坐标,使用状态 " + "from (select t.*,rownum row_num from 标识器 t where 使用状态 = '使用中' order by 编号)b " + " where 1=1"; - if (!String.IsNullOrEmpty(txt_no.Text.Trim())) - { - sqlCount += " and 编号 like '%" + txt_no.Text.Trim() + "%'"; - sqlData += " and 编号 like '%" + txt_no.Text.Trim() + "%'"; - } - if (null != combo_street.SelectedItem && !String.IsNullOrEmpty(combo_street.SelectedItem.ToString().Trim())) - { - sqlData += " and 所属道路='" + combo_street.SelectedItem.ToString().Trim() + "'"; - sqlCount += " and 所属道路='" + combo_street.SelectedItem.ToString().Trim() + "'"; - } rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -332,9 +319,8 @@ int maxPage = pageIndex * maxPageIndex; string sqlCount = "select count(*) from 标识器 where 使用状态 = '使用中'"; - string sqlData = "select 编号,标识器ID号,标识器型号,地面高程,标识器埋深,对象编号,对象类型,所属道路,LSSYS_ID,X坐标,Y坐标,使用状态 " + - "from (select t.*,rownum row_num from 标识器 t where 使用状态 = '使用中' order by 编号)b "+ - " where(b.row_num between " + minPage + " and " + maxPage + ")"; + string sqlData = "select 编号,标识器ID号,标识器型号,地面高程,标识器埋深,所属道路,LSSYS_ID,X坐标,Y坐标,使用状态 " + + "from (select t.*,rownum row_num from 标识器 t where 使用状态 = '使用中'"; if (!String.IsNullOrEmpty(txt_no.Text.Trim())) { @@ -347,6 +333,8 @@ sqlCount += " and 所属道路='" + combo_street.SelectedItem.ToString().Trim() + "'"; } + sqlData += " order by 编号)b " + + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; @@ -372,9 +360,10 @@ private void FrmFlagManagers_FormClosing(object sender, FormClosingEventArgs e) { IS_OPEN = false; - Thread downloadJob = new Thread(new ParameterizedThreadStart(doSave)); - downloadJob.IsBackground = true; - downloadJob.Start(e); + //Thread downloadJob = new Thread(new ParameterizedThreadStart(doSave)); + //downloadJob.IsBackground = true; + //downloadJob.Start(e); + globeControl1.Globe.Layers["标识器"].Save(); globeControl1.Globe.MemoryLayer.RemoveAllFeature(); foreach (GSOFeature f in Features) { @@ -480,10 +469,88 @@ if (null != globeControl1) { FrmAddSinMark frm = new FrmAddSinMark(globeControl1); - frm.ShowDialog(); + frm.Show(); } } + private void 标识对象ToolStripMenuItem_Click(object sender, EventArgs e) + { + if (winGridViewPager1 != null && winGridViewPager1.dataGridView1 != null) + { + DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; + try + { + this.Hide(); + string id = row.Cells["编号"].Value.ToString(); + FrmFlagDetail p = new FrmFlagDetail(globeControl1, id); + p.showParentForm += new FrmFlagDetail.Handle(showThisForm);//改变值的事件 + p.Show(); + } + catch (Exception ex) + { + MessageBox.Show("失败:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } + + private void showThisForm() + { + this.Show(); + } + + private void toolStripMenuItem2_Click(object sender, EventArgs e) + { + if (winGridViewPager1 != null && winGridViewPager1.dataGridView1 != null) + { + DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; + try + { + this.WindowState = FormWindowState.Minimized; + string id = row.Cells["LSSYS_ID"].Value.ToString(); + string flagno = row.Cells["编号"].Value.ToString(); + string flagstreet = row.Cells["所属道路"].Value.ToString(); + double x = Convert.ToDouble(row.Cells["X坐标"].Value); + double y = Convert.ToDouble(row.Cells["Y坐标"].Value); + GSOFeature flagFeature = globeControl1.Globe.Layers.GetLayerByCaption("标识器").GetFeatureByID(int.Parse(id)); + + string type = ""; + string pipe = ""; + string sql = "select t.标识器型号,t.对象编号 from 标识器 t where t.编号='" + flagno + "'"; + using (OracleDataReader reader = OracleUtils.ExecuteReader(OracleUtils.ConnectionString, CommandType.Text, sql)) + { + while (reader.Read()) + { + type = reader.GetString(0); + pipe = reader.GetString(1); + } + } + + GSOLabel label = new GSOLabel(); + label.Text = "标识器编号：" + flagno + "\r\n" + + "标识器类型:" + type + "\r\n" + + //"标识对象编号:" + pipe + "\r\n" + + "所属道路:" + flagstreet; + label.Style = new GSOLabelStyle(); + label.Style.TextStyle.FontSize = 18; + label.Style.TextStyle.ForeColor = Color.FromArgb(0, 0, 0, 255); + label.Style.Opaque = 0.8; //设置标注的透明度，取值区间是0-1 + label.Style.TracktionLineType = EnumTracktionLineType.Solid; + label.Style.TextStyle.FontHeight = 10; + label.Style.TextStyle.FontName = "黑体"; + label.Style.TractionLineEndPos = new GSOPoint2d(80, 60); + + flagFeature.Label = label; + Features.Add(flagFeature); + globeControl1.Globe.JumpToFeature(flagFeature, 20); + this.globeControl1.Refresh(); + + } + catch (Exception ex) + { + MessageBox.Show("标识器定位失败:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } } diff --git a/FrmFlagManagers.resx b/FrmFlagManagers.resx index 1af7de1..ad53752 100644 --- a/FrmFlagManagers.resx +++ b/FrmFlagManagers.resx @@ -117,4 +117,7 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 17, 17 + \ No newline at end of file diff --git a/FrmPatrolerEdit.cs b/FrmPatrolerEdit.cs index dbd4fec..f45b5ae 100644 --- a/FrmPatrolerEdit.cs +++ b/FrmPatrolerEdit.cs @@ -46,7 +46,7 @@ txt_name.Focus(); return; } - if (String.IsNullOrEmpty(combo_sex.SelectedItem.ToString())) + if (combo_sex.SelectedItem == null ||String.IsNullOrEmpty(combo_sex.SelectedItem.ToString())) { MessageBox.Show("性别不能为空！", "警告", MessageBoxButtons.OK, MessageBoxIcon.Warning); combo_sex.Focus(); diff --git a/FrmPatrolerManager.Designer.cs b/FrmPatrolerManager.Designer.cs index bb8e5fb..10fac22 100644 --- a/FrmPatrolerManager.Designer.cs +++ b/FrmPatrolerManager.Designer.cs @@ -47,11 +47,13 @@ this.注销 = new DevComponents.Editors.ComboItem(); this.btn_query_person = new DevComponents.DotNetBar.ButtonItem(); this.btn_add_person = new DevComponents.DotNetBar.ButtonItem(); - this.winGridViewPager1 = new WHC.Pager.WinControl.WinGridViewPager(); this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components); this.日志ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.任务ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.定位ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.winGridViewPager1 = new WHC.Pager.WinControl.WinGridViewPager(); + this.编辑ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.注销ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); ((System.ComponentModel.ISupportInitialize)(this.bar1)).BeginInit(); this.contextMenuStrip1.SuspendLayout(); this.SuspendLayout(); @@ -173,9 +175,42 @@ this.btn_add_person.Text = "新增"; this.btn_add_person.Click += new System.EventHandler(this.btn_add_person_Click); // + // contextMenuStrip1 + // + this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.日志ToolStripMenuItem, + this.任务ToolStripMenuItem, + this.定位ToolStripMenuItem, + this.编辑ToolStripMenuItem, + this.注销ToolStripMenuItem}); + this.contextMenuStrip1.Name = "contextMenuStrip1"; + this.contextMenuStrip1.Size = new System.Drawing.Size(153, 136); + // + // 日志ToolStripMenuItem + // + this.日志ToolStripMenuItem.Name = "日志ToolStripMenuItem"; + this.日志ToolStripMenuItem.Size = new System.Drawing.Size(100, 22); + this.日志ToolStripMenuItem.Text = "日志"; + this.日志ToolStripMenuItem.Click += new System.EventHandler(this.日志ToolStripMenuItem_Click); + // + // 任务ToolStripMenuItem + // + this.任务ToolStripMenuItem.Name = "任务ToolStripMenuItem"; + this.任务ToolStripMenuItem.Size = new System.Drawing.Size(100, 22); + this.任务ToolStripMenuItem.Text = "任务"; + this.任务ToolStripMenuItem.Click += new System.EventHandler(this.任务ToolStripMenuItem_Click); + // + // 定位ToolStripMenuItem + // + this.定位ToolStripMenuItem.Name = "定位ToolStripMenuItem"; + this.定位ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.定位ToolStripMenuItem.Text = "定位"; + this.定位ToolStripMenuItem.Click += new System.EventHandler(this.定位ToolStripMenuItem_Click); + // // winGridViewPager1 // this.winGridViewPager1.AppendedMenu = null; + this.winGridViewPager1.ContextMenuStrip = this.contextMenuStrip1; this.winGridViewPager1.DataSource = null; this.winGridViewPager1.DisplayColumns = ""; this.winGridViewPager1.Dock = System.Windows.Forms.DockStyle.Fill; @@ -186,35 +221,19 @@ this.winGridViewPager1.Size = new System.Drawing.Size(756, 309); this.winGridViewPager1.TabIndex = 3; // - // contextMenuStrip1 + // 编辑ToolStripMenuItem // - this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.日志ToolStripMenuItem, - this.任务ToolStripMenuItem, - this.定位ToolStripMenuItem}); - this.contextMenuStrip1.Name = "contextMenuStrip1"; - this.contextMenuStrip1.Size = new System.Drawing.Size(101, 70); + this.编辑ToolStripMenuItem.Name = "编辑ToolStripMenuItem"; + this.编辑ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.编辑ToolStripMenuItem.Text = "编辑"; + this.编辑ToolStripMenuItem.Click += new System.EventHandler(this.编辑ToolStripMenuItem_Click); // - // 日志ToolStripMenuItem + // 注销ToolStripMenuItem // - this.日志ToolStripMenuItem.Name = "日志ToolStripMenuItem"; - this.日志ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); - this.日志ToolStripMenuItem.Text = "日志"; - this.日志ToolStripMenuItem.Click += new System.EventHandler(this.日志ToolStripMenuItem_Click); - // - // 任务ToolStripMenuItem - // - this.任务ToolStripMenuItem.Name = "任务ToolStripMenuItem"; - this.任务ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); - this.任务ToolStripMenuItem.Text = "任务"; - this.任务ToolStripMenuItem.Click += new System.EventHandler(this.任务ToolStripMenuItem_Click); - // - // 定位ToolStripMenuItem - // - this.定位ToolStripMenuItem.Name = "定位ToolStripMenuItem"; - this.定位ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); - this.定位ToolStripMenuItem.Text = "定位"; - this.定位ToolStripMenuItem.Click += new System.EventHandler(this.定位ToolStripMenuItem_Click); + this.注销ToolStripMenuItem.Name = "注销ToolStripMenuItem"; + this.注销ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.注销ToolStripMenuItem.Text = "注销"; + this.注销ToolStripMenuItem.Click += new System.EventHandler(this.注销ToolStripMenuItem_Click); // // FrmPatrolerManager // @@ -229,7 +248,7 @@ this.MinimizeBox = false; this.Name = "FrmPatrolerManager"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; - this.Text = "巡检人员维护"; + this.Text = "定位人员维护"; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmPatrolerManager_FormClosing); this.Load += new System.EventHandler(this.FrmPatrolerManager_Load); ((System.ComponentModel.ISupportInitialize)(this.bar1)).EndInit(); @@ -258,10 +277,12 @@ private DevComponents.Editors.ComboItem 注销; private DevComponents.Editors.ComboItem comboItem1; private DevComponents.Editors.ComboItem 不限; - private WHC.Pager.WinControl.WinGridViewPager winGridViewPager1; private System.Windows.Forms.ContextMenuStrip contextMenuStrip1; private System.Windows.Forms.ToolStripMenuItem 日志ToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem 任务ToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem 定位ToolStripMenuItem; + private WHC.Pager.WinControl.WinGridViewPager winGridViewPager1; + private System.Windows.Forms.ToolStripMenuItem 编辑ToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem 注销ToolStripMenuItem; } } \ No newline at end of file diff --git a/FrmPatrolerManager.cs b/FrmPatrolerManager.cs index 255a076..9c32f54 100644 --- a/FrmPatrolerManager.cs +++ b/FrmPatrolerManager.cs @@ -29,9 +29,7 @@ this.globeControl1 = globeControl1; winGridViewPager1.OnPageChanged += new EventHandler(winGridViewPager1_OnPageChanged); - this.winGridViewPager1.OnEditSelected += new EventHandler(winGridViewPager1_OnEditSelected);//编辑 - this.winGridViewPager1.OnDeleteSelected += new EventHandler(winGridViewPager1_OnDeleteSelected);//删除 - + this.winGridViewPager1.OnStartExport += new EventHandler(pager1_OnStartExport); this.winGridViewPager1.OnEndExport += new EventHandler(pager1_OnEndExport); @@ -47,26 +45,31 @@ //控制表格显示的列，以及每一列要显示的列名 this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - this.winGridViewPager1.AddColumnAlias("USERNAME", "姓名"); - this.winGridViewPager1.AddColumnAlias("DBID", "编号"); - this.winGridViewPager1.AddColumnAlias("SEX", "性别"); - this.winGridViewPager1.AddColumnAlias("AGE", "年龄"); - this.winGridViewPager1.AddColumnAlias("PHONENUM", "电话"); - this.winGridViewPager1.AddColumnAlias("ACCOUNTSTATE", "状态"); - this.winGridViewPager1.DisplayColumns = "USERNAME,SEX,AGE,PHONENUM,ACCOUNTSTATE"; + this.winGridViewPager1.AddColumnAlias("姓名", "姓名"); + this.winGridViewPager1.AddColumnAlias("编号", "编号"); + this.winGridViewPager1.AddColumnAlias("性别", "性别"); + this.winGridViewPager1.AddColumnAlias("年龄", "年龄"); + this.winGridViewPager1.AddColumnAlias("电话", "电话"); + this.winGridViewPager1.AddColumnAlias("状态", "状态"); + this.winGridViewPager1.DisplayColumns = "姓名,性别,年龄,电话,状态"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 + //隐藏右键功能按钮 //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[1].Visible = false; + winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Visible = false; + winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[4].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[5].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[6].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[7].Visible = false; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "编辑"; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Text = "注销"; + + //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "编辑"; + //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Text = "注销"; winGridViewPager1.AppendedMenu = this.contextMenuStrip1; + //右键菜单宽度 winGridViewPager1.dataGridView1.ContextMenuStrip.AutoSize = false; @@ -122,11 +125,11 @@ DataGridViewRow row = grid.SelectedRows[0]; try { - long dbid = long.Parse(row.Cells["dbid"].Value.ToString()); - String name = row.Cells["USERNAME"].Value.ToString(); - String sex = row.Cells["SEX"].Value.ToString(); - String age = row.Cells["AGE"].Value.ToString(); - string phone = row.Cells["PHONENUM"].Value.ToString(); + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); + String name = row.Cells["姓名"].Value.ToString(); + String sex = row.Cells["性别"].Value.ToString(); + String age = row.Cells["年龄"].Value.ToString(); + string phone = row.Cells["电话"].Value.ToString(); age = String.IsNullOrEmpty(age.ToString().Trim()) ? "1" : age.ToString().Trim(); FrmPatrolerEdit frm = new FrmPatrolerEdit(dbid.ToString(), name, age, sex, phone); frm.reloadGrid += new ReloadPatrolerGrid(LoadData); @@ -152,10 +155,10 @@ if (grid != null) { DataGridViewRow row = grid.SelectedRows[0]; - long dbid = long.Parse(row.Cells["DBID"].Value.ToString()); + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); try { - string state = row.Cells["ACCOUNTSTATE"].Value.ToString(); + string state = row.Cells["状态"].Value.ToString(); if ("在线".Equals(state)) { if (MessageBox.Show("确定注销？", "确认", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) @@ -180,60 +183,60 @@ { int pageIndex = winGridViewPager1.PagerInfo.CurrenetPageIndex; string sqlData = GetSql(pageIndex); - initlizeDatagrid(); + DataTable table = OracleUtils.ExecuteDataset(OracleUtils.ConnectionString, CommandType.Text, sqlData).Tables[0]; winGridViewPager1.DataSource = table.DefaultView; - for (int i = 0; i < winGridViewPager1.dataGridView1.Rows.Count; i++) - { - if (winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value.ToString() == "ONLINE") - { - winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value = "在线"; - } - else - { - if (winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value.ToString() == "OFFLINE") - { - winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value = "离线"; - } - else - { - if (winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value.ToString() == "LEAVER") - { - winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value = "注销"; - } - } - } - } + //for (int i = 0; i < winGridViewPager1.dataGridView1.Rows.Count; i++) + //{ + // if (winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value.ToString() == "ONLINE") + // { + // winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value = "在线"; + // } + // else + // { + // if (winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value.ToString() == "OFFLINE") + // { + // winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value = "离线"; + // } + // else + // { + // if (winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value.ToString() == "LEAVER") + // { + // winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value = "注销"; + // } + // } + // } + //} winGridViewPager1.Refresh(); } private void LoadData(int pageIndex) { string sqlData = GetSql(pageIndex); - initlizeDatagrid(); + DataTable table = OracleUtils.ExecuteDataset(OracleUtils.ConnectionString, CommandType.Text, sqlData).Tables[0]; winGridViewPager1.DataSource = table.DefaultView; - for (int i = 0; i < winGridViewPager1.dataGridView1.Rows.Count; i++) - { - if (winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value.ToString() == "ONLINE") - { - winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value = "在线"; - } - else - { - if (winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value.ToString() == "OFFLINE") - { - winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value = "离线"; - } - else - { - if (winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value.ToString() == "LEAVER") - { - winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value = "注销"; - } - } - } - } + //for (int i = 0; i < winGridViewPager1.dataGridView1.Rows.Count; i++) + //{ + // if (winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value.ToString() == "ONLINE") + // { + // winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value = "在线"; + // } + // else + // { + // if (winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value.ToString() == "OFFLINE") + // { + // winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value = "离线"; + // } + // else + // { + // if (winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value.ToString() == "LEAVER") + // { + // winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value = "注销"; + // } + // } + // } + //} winGridViewPager1.Refresh(); } @@ -241,7 +244,8 @@ { string sqlCount = "select count(*) from equipment where status = 'USING'"; - string sqlData = "select username,dbid,sex,age,phonenum,accountstate " + + string sqlData = "select username as 姓名,dbid as 编号,sex as 性别,age as 年龄,phonenum as 电话,"+ + "case when accountstate = 'ONLINE' then '在线' when accountstate = 'OFFLINE' then '离线' when accountstate = 'LEAVER' then '注销' end as 状态 " + "from (select t.*,rownum row_num from patroler t order by DBID desc)b " + " where 1=1"; @@ -255,9 +259,9 @@ int minPage = (pageIndex - 1) * maxPageIndex + 1; int maxPage = pageIndex * maxPageIndex; string sqlCount = "select count(*) from patroler where 1=1"; - string sqlData = "select username,dbid,sex,age,phonenum,accountstate " + - "from (select t.*,rownum row_num from patroler t order by DBID desc)b " + - " where(b.row_num between " + minPage + " and " + maxPage + ")"; + string sqlData = "select username as 姓名,dbid as 编号,sex as 性别,age as 年龄,phonenum as 电话,"+ + "case when accountstate = 'ONLINE' then '在线' when accountstate = 'OFFLINE' then '离线' when accountstate = 'LEAVER' then '注销' end as 状态 " + + "from (select t.*,rownum row_num from patroler t where 1=1"; if (!String.IsNullOrEmpty(txt_username.Text.Trim())) { @@ -281,7 +285,8 @@ sqlCount += " and accountstate='" + combo_stateText + "'"; sqlData += " and accountstate='" + combo_stateText + "'"; } - + sqlData += " order by DBID desc)b " + + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; @@ -291,6 +296,7 @@ { try { + initlizeDatagrid(); LoadData(); initForm(); IS_OPEN = true; @@ -310,11 +316,13 @@ } if (Utility.userRole.IndexOf("巡检员编辑") == -1) { - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Visible = false; + //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Visible = false; + 编辑ToolStripMenuItem.Visible = false; } if (Utility.userRole.IndexOf("巡检员注销") == -1) { - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Visible = false; + //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Visible = false; + 注销ToolStripMenuItem.Visible = false; } } @@ -376,7 +384,7 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - long dbid = long.Parse(row.Cells["dbid"].Value.ToString()); + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); Log p = new Log(dbid.ToString()); p.Show(); } @@ -395,8 +403,8 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - long dbid = long.Parse(row.Cells["dbid"].Value.ToString()); - String state = row.Cells["ACCOUNTSTATE"].Value.ToString(); + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); + String state = row.Cells["状态"].Value.ToString(); if ("在线".Equals(state)) { string sql = "select t.dbid " + @@ -435,8 +443,8 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - long dbid = long.Parse(row.Cells["dbid"].Value.ToString()); - String username = row.Cells["USERNAME"].Value.ToString(); + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); + String username = row.Cells["姓名"].Value.ToString(); string sql = "select t.latitude, t.longitude " + "from position t " + "where t.dbid = (select max(dbid) from position where patroler_id = " + dbid + ")"; @@ -489,6 +497,63 @@ } + private void 编辑ToolStripMenuItem_Click(object sender, EventArgs e) + { + if (winGridViewPager1 != null && winGridViewPager1.dataGridView1 != null) + { + DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; + try + { + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); + String name = row.Cells["姓名"].Value.ToString(); + String sex = row.Cells["性别"].Value.ToString(); + String age = row.Cells["年龄"].Value.ToString(); + string phone = row.Cells["电话"].Value.ToString(); + age = String.IsNullOrEmpty(age.ToString().Trim()) ? "1" : age.ToString().Trim(); + FrmPatrolerEdit frm = new FrmPatrolerEdit(dbid.ToString(), name, age, sex, phone); + frm.reloadGrid += new ReloadPatrolerGrid(LoadData); + frm.ShowDialog(); + winGridViewPager1.Refresh(); + } + catch (Exception ex) + { + MessageBox.Show("编辑失败:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } + + private void 注销ToolStripMenuItem_Click(object sender, EventArgs e) + { + if (winGridViewPager1 != null && winGridViewPager1.dataGridView1 != null) + { + DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); + try + { + if (MessageBox.Show("确定注销？", "确认", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) + { + String sql = "update patroler t set t.accountstate='LEAVER' where t.dbid=" + dbid; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + LoadData(); + MessageBox.Show("人员已注销", "信息", MessageBoxButtons.OK, MessageBoxIcon.Information); + } + //string state = row.Cells["状态"].Value.ToString(); + //if ("在线".Equals(state)) + //{ + + //} + //else + //{ + // MessageBox.Show("人员不在线，无法注销", "信息"); + //} + } + catch (Exception ex) + { + MessageBox.Show("人员注销失败:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } + } } diff --git a/FrmRoleInfoManager.cs b/FrmRoleInfoManager.cs index 8897133..35693cf 100644 --- a/FrmRoleInfoManager.cs +++ b/FrmRoleInfoManager.cs @@ -55,10 +55,10 @@ //控制表格显示的列，以及每一列要显示的列名 this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - this.winGridViewPager1.AddColumnAlias("NT", "角色名称"); - this.winGridViewPager1.AddColumnAlias("ID", "编号"); + this.winGridViewPager1.AddColumnAlias("角色名称", "角色名称"); + this.winGridViewPager1.AddColumnAlias("编号", "编号"); - this.winGridViewPager1.DisplayColumns = "NT"; + this.winGridViewPager1.DisplayColumns = "角色名称"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -131,7 +131,7 @@ { try { - string dbid = row.Cells["id"].Value.ToString(); + string dbid = row.Cells["编号"].Value.ToString(); string sql = "delete from casic_userroletest where id=" + dbid; OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); LoadData(); @@ -170,7 +170,7 @@ { string sqlCount = "select id,nt from casic_userroletest where sysname='EMS'"; - string sqlData = "select nt,id " + + string sqlData = "select nt as 角色名称,id as 编号 " + "from (select t.*,rownum row_num from casic_userroletest t order by id desc)b " + " where sysname='EMS'"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -183,7 +183,7 @@ int minPage = (pageIndex - 1) * maxPageIndex + 1; int maxPage = pageIndex * maxPageIndex; string sqlCount = "select id,nt from casic_userroletest where sysname='EMS'"; - string sqlData = "select nt,id " + + string sqlData = "select nt as 角色名称,id as 编号 " + "from (select t.*,rownum row_num from casic_userroletest t where sysname='EMS' order by id desc)b " + " where(b.row_num between " + minPage + " and " + maxPage + ")"; diff --git a/FrmSysUserInfoManger.cs b/FrmSysUserInfoManger.cs index 7903916..e193a61 100644 --- a/FrmSysUserInfoManger.cs +++ b/FrmSysUserInfoManger.cs @@ -28,6 +28,7 @@ this.winGridViewPager1.OnEndExport += new EventHandler(pager1_OnEndExport); winGridViewPager1.dataGridView1.MultiSelect = false; + } private void FrmSysUserInfoManger_Load(object sender, EventArgs e) @@ -59,10 +60,10 @@ //控制表格显示的列，以及每一列要显示的列名 this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - this.winGridViewPager1.AddColumnAlias("USERNAME", "账号"); - this.winGridViewPager1.AddColumnAlias("ID", "编号"); + this.winGridViewPager1.AddColumnAlias("账号", "账号"); + this.winGridViewPager1.AddColumnAlias("编号", "编号"); - this.winGridViewPager1.DisplayColumns = "USERNAME"; + this.winGridViewPager1.DisplayColumns = "账号"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -130,8 +131,8 @@ if (grid != null) { DataGridViewRow row = grid.SelectedRows[0]; - string dbid = row.Cells["id"].Value.ToString(); - string userName = row.Cells["USERNAME"].Value.ToString(); + string dbid = row.Cells["编号"].Value.ToString(); + string userName = row.Cells["账号"].Value.ToString(); if (userName.Equals("ems")) { MessageBox.Show("该用户为管理员用户，无法删除！", "信息"); @@ -184,7 +185,7 @@ { string sqlCount = "select count(*) from casic_userinfotest where sysname='EMS'"; - string sqlData = "select username,id " + + string sqlData = "select username as 账号,id as 编号 " + "from (select t.*,rownum row_num from casic_userinfotest t order by id desc)b " + " where sysname='EMS'"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -197,16 +198,16 @@ int minPage = (pageIndex - 1) * maxPageIndex + 1; int maxPage = pageIndex * maxPageIndex; string sqlCount = "select count(*) from casic_userinfotest where sysname='EMS'"; - string sqlData = "select username,id " + - "from (select t.*,rownum row_num from casic_userinfotest t where sysname='EMS' order by id desc)b " + - " where(b.row_num between " + minPage + " and " + maxPage + ")"; + string sqlData = "select username as 账号,id as 编号 " + + "from (select t.*,rownum row_num from casic_userinfotest t where sysname='EMS'"; if (!String.IsNullOrEmpty(txt_user_code.Text.Trim())) { sqlCount += " and username like '%" + txt_user_code.Text.Trim() + "%'"; sqlData += " and username like '%" + txt_user_code.Text.Trim() + "%'"; } - + sqlData += " order by id desc)b " + + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; diff --git a/MainFrm.cs b/MainFrm.cs index 39df646..0cd5881 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3310,10 +3310,10 @@ string str1 = ""; if (feature != null) { - if (feature.GetFieldDefn("图?片?编括?码?") != null) // + if (feature.GetFieldDefn("图片编码") != null) // { str1 = GetBubbleInfo(feature); - if (RemoteFileExists(Utility.PicRootURL + feature.GetValue("图?片?编括?码?").ToString())) + if (RemoteFileExists(Utility.PicRootURL + feature.GetValue("图片编码").ToString())) { str1 += ""; } @@ -3450,9 +3450,15 @@ string value1 = ""; if (field1 != null) { - if (field1.Name == "图片编码") + //if (field1.Name == "图片编码" || field1.Name == "对象编号" || field1.Name == "对象类型" || field1.Name == "对象名称") + //{ + // j++; + //} + while (field1.Name == "图片编码" || field1.Name == "对象编号" || field1.Name == "对象类型" || field1.Name == "对象名称") { j++; + fieldName = fieldNames[j].Trim(); + field1 = (GSOFieldDefn)feature.GetFieldDefn(fieldName); } if (j < rowCount) { @@ -3479,6 +3485,11 @@ if (!feature.IsFieldValueNull(j)) { value1 = feature.GetValue(j).ToString(); + if (name1 == "标识器埋深") + { + if (value1!=null&&value1.Length>4) + value1 = value1.Substring(0,4); + } } } } @@ -3491,9 +3502,14 @@ if (field2 != null) { - if (field2.Name == "图片编码") + //if (field2.Name == "图片编码" || field1.Name == "对象编号" || field1.Name == "对象类型" || field1.Name == "对象名称") + //{ + // j++; + //} + while (field2.Name == "图片编码" || field2.Name == "对象编号" || field2.Name == "对象类型" || field2.Name == "对象名称") { j++; + field2 = (GSOFieldDefn)feature.GetFieldDefn(j + 1); } if (j + 1 < rowCount) { @@ -3521,6 +3537,11 @@ if (!feature.IsFieldValueNull(j + 1)) { value2 = feature.GetValue(j + 1).ToString(); + if (name2 == "标识器埋深") + { + if (value2 != null && value2.Length > 4) + value2 = value2.Substring(0, 4); + } } } } @@ -15347,7 +15368,7 @@ return; } FrmFlagManagers frm = new FrmFlagManagers(globeControl1); - frm.Show(this); + frm.Show(); } private void ribbonTabItem2_MouseDown(object sender, MouseEventArgs e) diff --git a/Cyberpipe.csproj b/Cyberpipe.csproj index fe600e5..501fd09 100644 --- a/Cyberpipe.csproj +++ b/Cyberpipe.csproj @@ -246,6 +246,12 @@ Form_TaskManager.cs + + Form + + + FrmFlagDetail.cs + Form @@ -1368,6 +1374,9 @@ Form_TaskManager.cs + + FrmFlagDetail.cs + FormDocumentManager.cs diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 537b4c3..1acf22a 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 7d5dd95..3f178cb 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -90,20 +90,20 @@ this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - - this.winGridViewPager1.AddColumnAlias("ACCIDENTTIME", "上报时间"); - this.winGridViewPager1.AddColumnAlias("DBID", "编号"); - this.winGridViewPager1.AddColumnAlias("DESCRIBE", "事件描述"); - this.winGridViewPager1.AddColumnAlias("LATITUDE", "纬度"); - this.winGridViewPager1.AddColumnAlias("LOCALE", "事件地点"); - this.winGridViewPager1.AddColumnAlias("LONGITUDE", "经度"); - this.winGridViewPager1.AddColumnAlias("PATROLERNAME", "上报人员"); - this.winGridViewPager1.AddColumnAlias("PATROLER_ID", "人员ID"); - this.winGridViewPager1.AddColumnAlias("TASK_ID", "任务编号"); - this.winGridViewPager1.AddColumnAlias("RESULT", "处理结果"); - this.winGridViewPager1.AddColumnAlias("STATE", "处理状态"); - this.winGridViewPager1.DisplayColumns = "ACCIDENTTIME,DESCRIBE,LOCALE,PATROLERNAME,TASK_ID,RESULT,STATE"; + this.winGridViewPager1.AddColumnAlias("上报时间", "上报时间"); + this.winGridViewPager1.AddColumnAlias("编号", "编号"); + this.winGridViewPager1.AddColumnAlias("事件描述", "事件描述"); + this.winGridViewPager1.AddColumnAlias("纬度", "纬度"); + this.winGridViewPager1.AddColumnAlias("事件地点", "事件地点"); + this.winGridViewPager1.AddColumnAlias("经度", "经度"); + this.winGridViewPager1.AddColumnAlias("上报人员", "上报人员"); + this.winGridViewPager1.AddColumnAlias("人员ID", "人员ID"); + this.winGridViewPager1.AddColumnAlias("任务编号", "任务编号"); + this.winGridViewPager1.AddColumnAlias("处理结果", "处理结果"); + this.winGridViewPager1.AddColumnAlias("处理状态", "处理状态"); + + this.winGridViewPager1.DisplayColumns = "上报时间,事件描述,事件地点,上报人员,任务编号,处理结果,处理状态"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -114,8 +114,8 @@ winGridViewPager1.dataGridView1.ContextMenuStrip.Items[5].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[6].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[7].Visible = false; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[1].Text = "查看位置"; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "结果编辑"; + winGridViewPager1.dataGridView1.ContextMenuStrip.Items[1].Text = "结果编辑"; + winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "查看位置"; //右键菜单宽度 winGridViewPager1.dataGridView1.ContextMenuStrip.AutoSize = false; @@ -160,13 +160,12 @@ this.WindowState = FormWindowState.Minimized; globeControl1.Globe.MemoryLayer.RemoveAllFeature(); this.WindowState = FormWindowState.Minimized; - double x = Convert.ToDouble(row.Cells["LONGITUDE"].Value); - double y = Convert.ToDouble(row.Cells["LATITUDE"].Value); - - string username = Convert.ToString(row.Cells["PATROLERNAME"].Value); - string Atime = Convert.ToString(row.Cells["ACCIDENTTIME"].Value); - string location = Convert.ToString(row.Cells["LOCALE"].Value); - string descp = Convert.ToString(row.Cells["DESCRIBE"].Value); + double x = Convert.ToDouble(row.Cells["经度"].Value); + double y = Convert.ToDouble(row.Cells["纬度"].Value); + string username = Convert.ToString(row.Cells["上报人员"].Value); + string Atime = Convert.ToString(row.Cells["上报时间"].Value); + string location = Convert.ToString(row.Cells["事件地点"].Value); + string descp = Convert.ToString(row.Cells["事件描述"].Value); /////////////////////////////////////// /*******设置飞行与创建模型******/ @@ -228,8 +227,8 @@ DataGridViewRow row = grid.SelectedRows[0]; try { - int dbId = Convert.ToInt32(row.Cells["DBID"].Value); - string result = Convert.ToString(row.Cells["RESULT"].Value); + int dbId = Convert.ToInt32(row.Cells["编号"].Value); + string result = Convert.ToString(row.Cells["处理结果"].Value); EMS_Forms.Form_EventResult form = new Form_EventResult(dbId, result); form.refresh += new Form_EventResult.Handle(LoadData);//改变值的事件 form.ShowDialog(); @@ -276,9 +275,9 @@ } for (int i = 0; i < table.Rows.Count; i++) { - if (winGridViewPager1.dataGridView1.Rows[i].Cells["RESULT"].Value != null && !(winGridViewPager1.dataGridView1.Rows[i].Cells["RESULT"].Value.ToString().Trim().Equals(""))) + if (winGridViewPager1.dataGridView1.Rows[i].Cells["处理结果"].Value != null && !(winGridViewPager1.dataGridView1.Rows[i].Cells["处理结果"].Value.ToString().Trim().Equals(""))) { - winGridViewPager1.dataGridView1.Rows[i].Cells["STATE"].Value = "已处理"; + winGridViewPager1.dataGridView1.Rows[i].Cells["处理状态"].Value = "已处理"; } } @@ -307,9 +306,9 @@ } for (int i = 0; i < table.Rows.Count; i++) { - if (winGridViewPager1.dataGridView1.Rows[i].Cells["RESULT"].Value != null && !(winGridViewPager1.dataGridView1.Rows[i].Cells["RESULT"].Value.ToString().Trim().Equals(""))) + if (winGridViewPager1.dataGridView1.Rows[i].Cells["处理结果"].Value != null && !(winGridViewPager1.dataGridView1.Rows[i].Cells["处理结果"].Value.ToString().Trim().Equals(""))) { - winGridViewPager1.dataGridView1.Rows[i].Cells["STATE"].Value = "已处理"; + winGridViewPager1.dataGridView1.Rows[i].Cells["处理状态"].Value = "已处理"; } } @@ -320,10 +319,12 @@ { string sqlCount = "select count(*) from ACCIDENT where 1=1"; - string sqlData = "select ACCIDENTTIME,DBID,DESCRIBE,LATITUDE,LOCALE,LONGITUDE,PATROLERNAME,PATROLER_ID,TASK_ID,RESULT,'' as STATE " + + string sqlData = "select ACCIDENTTIME as 上报时间,DBID as 编号,DESCRIBE as 事件描述,"+ + "LATITUDE as 纬度,LOCALE as 事件地点,LONGITUDE as 经度,PATROLERNAME 上报人员,"+ + "PATROLER_ID as 人员ID,TASK_ID as 任务编号,RESULT as 处理结果,'' as 处理状态 " + "from (select t.*,rownum row_num from ACCIDENT t order by DBID)b " + " where 1=1"; - + rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; @@ -340,9 +341,10 @@ string sqlCount = "select count(*) from ACCIDENT where 1=1"; - string sqlData = "select ACCIDENTTIME,DBID,DESCRIBE,LATITUDE,LOCALE,LONGITUDE,PATROLERNAME,PATROLER_ID,TASK_ID,RESULT,'' as STATE " + - "from (select t.*,rownum row_num from ACCIDENT t order by DBID)b " + - " where(b.row_num between " + minPage + " and " + maxPage + ")"; + string sqlData = "select ACCIDENTTIME as 上报时间,DBID as 编号,DESCRIBE as 事件描述," + + "LATITUDE as 纬度,LOCALE as 事件地点,LONGITUDE as 经度,PATROLERNAME 上报人员," + + "PATROLER_ID as 人员ID,TASK_ID as 任务编号,RESULT as 处理结果,'' as 处理状态 " + + "from (select t.*,rownum row_num from ACCIDENT t where 1=1"; if (!String.IsNullOrEmpty(comboBox_name.Text.Trim())) { @@ -361,7 +363,8 @@ sqlCount += "and ACCIDENTTIME<=to_date('" + time.ToShortDateString() + "','yyyy-MM-dd') "; sqlData += "and ACCIDENTTIME<=to_date('" + time.ToShortDateString() + "','yyyy-MM-dd') "; } - + sqlData += " order by DBID desc)b " + + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 225c8d7..8bd9e48 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -120,8 +120,8 @@ private void flyToTask(DataGridViewRow row, int taskState) { int dbID = 0; - dbID = Convert.ToInt32(row.Cells["DBID"].Value); - string userName = Convert.ToString(row.Cells["USERNAME"].Value); + dbID = Convert.ToInt32(row.Cells["任务编号"].Value); + string userName = Convert.ToString(row.Cells["任务执行人员"].Value); System.DateTime t = new DateTime(); try { @@ -392,15 +392,15 @@ //控制表格显示的列，以及每一列要显示的列名 this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - this.winGridViewPager1.AddColumnAlias("DBID", "任务编号"); - this.winGridViewPager1.AddColumnAlias("DEPLOYTIME", "创建时间"); - this.winGridViewPager1.AddColumnAlias("DESCIRPTION", "任务描述"); - this.winGridViewPager1.AddColumnAlias("FINISHTIME", "完成时间"); - this.winGridViewPager1.AddColumnAlias("STREET", "任务执行区域"); - this.winGridViewPager1.AddColumnAlias("TASKSTATE", "任务状态"); - this.winGridViewPager1.AddColumnAlias("USERNAME", "任务执行人员"); + this.winGridViewPager1.AddColumnAlias("任务编号", "任务编号"); + this.winGridViewPager1.AddColumnAlias("创建时间", "创建时间"); + this.winGridViewPager1.AddColumnAlias("任务描述", "任务描述"); + this.winGridViewPager1.AddColumnAlias("完成时间", "完成时间"); + this.winGridViewPager1.AddColumnAlias("任务执行区域", "任务执行区域"); + this.winGridViewPager1.AddColumnAlias("任务状态", "任务状态"); + this.winGridViewPager1.AddColumnAlias("任务执行人员", "任务执行人员"); - this.winGridViewPager1.DisplayColumns = "DBID,DEPLOYTIME,DESCIRPTION,FINISHTIME,STREET,TASKSTATE,USERNAME"; + this.winGridViewPager1.DisplayColumns = "任务编号,创建时间,任务描述,完成时间,任务执行区域,任务状态,任务执行人员"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -464,8 +464,8 @@ { int dbID = 0; int taskStateInt = 0; - dbID = Convert.ToInt32(row.Cells["DBID"].Value); - string taskState = row.Cells["TASKSTATE"].Value.ToString(); + dbID = Convert.ToInt32(row.Cells["任务编号"].Value); + string taskState = row.Cells["任务状态"].Value.ToString(); if (taskState.Equals("开始任务")) { taskStateInt = 1; @@ -534,9 +534,10 @@ private string GetSql() { - string sqlCount = "select count(*) from taskinfo t where 1=1'"; + string sqlCount = "select count(*) from taskinfo t where 1=1"; - string sqlData = "select dbid,deploytime,descirption,finishtime,street,taskstate,username " + + 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"; @@ -550,9 +551,9 @@ int minPage = (pageIndex - 1) * maxPageIndex + 1; int maxPage = pageIndex * maxPageIndex; string sqlCount = "select count(*) from taskinfo t where 1=1"; - string sqlData = "select dbid,deploytime,descirption,finishtime,street,taskstate,username " + - "from (select t.*,rownum row_num from taskinfo t order by DBID desc)b " + - " where(b.row_num between " + minPage + " and " + maxPage + ")"; + 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"; if (!String.IsNullOrEmpty(comboBox_userName.Text.Trim()) && !comboBox_userName.Text.Trim().Equals("不限")) { @@ -581,6 +582,8 @@ sqlCount += "and street='" + combo_street.Text + "' "; sqlData += "and street='" + combo_street.Text + "' "; } + sqlData += " order by DBID desc)b " + + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index e65a4bd..58f5342 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -73,13 +73,13 @@ //控制表格显示的列，以及每一列要显示的列名 this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - this.winGridViewPager1.AddColumnAlias("FILENAME", "文档名称"); - this.winGridViewPager1.AddColumnAlias("DBID", "编号"); - this.winGridViewPager1.AddColumnAlias("TITLE", "文档标题"); - this.winGridViewPager1.AddColumnAlias("FILETYPE", "文档类型"); - this.winGridViewPager1.AddColumnAlias("UPDAY", "上传日期"); - this.winGridViewPager1.AddColumnAlias("WRITER", "上传人"); - this.winGridViewPager1.DisplayColumns = "FILENAME,TITLE,FILETYPE,UPDAY,WRITER"; + this.winGridViewPager1.AddColumnAlias("文档名称", "文档名称"); + this.winGridViewPager1.AddColumnAlias("编号", "编号"); + this.winGridViewPager1.AddColumnAlias("文档标题", "文档标题"); + this.winGridViewPager1.AddColumnAlias("文档类型", "文档类型"); + this.winGridViewPager1.AddColumnAlias("上传日期", "上传日期"); + this.winGridViewPager1.AddColumnAlias("上传人", "上传人"); + this.winGridViewPager1.DisplayColumns = "文档名称,文档标题,文档类型,上传日期,上传人"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -167,7 +167,7 @@ if (grid != null) { DataGridViewRow row = grid.SelectedRows[0]; - string dbid = row.Cells["dbid"].Value.ToString(); + string dbid = row.Cells["编号"].Value.ToString(); try { if (MessageBox.Show("确认删除吗？", "确认", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) @@ -212,7 +212,8 @@ { string sqlCount = "select count(*) from casic_userdocument where sysname = 'EMS'"; - string sqlData = "select filename,dbid,title,filetype,upday,writer " + + string sqlData = "select filename as 文档名称,dbid as 编号,title as 文档标题," + + "filetype as 文档类型,upday as 上传日期,writer as 上传人 " + "from (select t.*,rownum row_num from casic_userdocument t order by DBID desc)b " + " where sysname = 'EMS'"; @@ -226,9 +227,9 @@ int minPage = (pageIndex - 1) * maxPageIndex + 1; int maxPage = pageIndex * maxPageIndex; string sqlCount = "select count(*) from casic_userdocument where sysname = 'EMS'"; - string sqlData = "select filename,dbid,title,filetype,upday,writer " + - "from (select t.*,rownum row_num from casic_userdocument t where sysname = 'EMS' order by DBID desc)b " + - " where(b.row_num between " + minPage + " and " + maxPage + ")"; + string sqlData = "select filename as 文档名称,dbid as 编号,title as 文档标题,"+ + "filetype as 文档类型,upday as 上传日期,writer as 上传人 " + + "from (select t.*,rownum row_num from casic_userdocument t where sysname = 'EMS'"; string txtTitleText = null; string comboFileType = null; @@ -278,7 +279,8 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - + sqlData += " order by DBID desc)b " + + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; @@ -437,7 +439,7 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - string filename = row.Cells["filename"].Value.ToString(); + string filename = row.Cells["文档名称"].Value.ToString(); string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; string file = System.Environment.CurrentDirectory + "\\download\\" + filename; int result = DownloadFile(url, file, progressBar1); @@ -515,7 +517,7 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - string filename = row.Cells["filename"].Value.ToString(); + string filename = row.Cells["文档名称"].Value.ToString(); string ext = Path.GetExtension(filename); SaveFileDialog dlg = new SaveFileDialog(); dlg.Filter = "保存文档|*" + ext + ";"; diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 1d1201b..3902629 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -748,6 +748,7 @@ this.Name = "FrmAddSinMark"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "单个标识器添加"; + this.TopMost = true; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmAddSinMark_FormClosing); this.Load += new System.EventHandler(this.FrmAddSinMark_Load); this.groupPanel1.ResumeLayout(false); diff --git a/FrmEquipmentManage.cs b/FrmEquipmentManage.cs index 90bfdb2..a3cf55c 100644 --- a/FrmEquipmentManage.cs +++ b/FrmEquipmentManage.cs @@ -74,13 +74,13 @@ //控制表格显示的列，以及每一列要显示的列名 this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - this.winGridViewPager1.AddColumnAlias("DESCIRPTION", "设备描述"); - this.winGridViewPager1.AddColumnAlias("DBID", "编号"); - this.winGridViewPager1.AddColumnAlias("MACID", "MAC地址"); - this.winGridViewPager1.AddColumnAlias("OWNER", "设备所有人"); - this.winGridViewPager1.AddColumnAlias("STATUS", "设备状态"); + this.winGridViewPager1.AddColumnAlias("设备描述", "设备描述"); + this.winGridViewPager1.AddColumnAlias("编号", "编号"); + this.winGridViewPager1.AddColumnAlias("MAC地址", "MAC地址"); + this.winGridViewPager1.AddColumnAlias("设备所有人", "设备所有人"); + this.winGridViewPager1.AddColumnAlias("设备状态", "设备状态"); - this.winGridViewPager1.DisplayColumns = "DESCIRPTION,MACID,OWNER,STATUS"; + this.winGridViewPager1.DisplayColumns = "设备描述,MAC地址,设备所有人,设备状态"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -146,10 +146,10 @@ DataGridViewRow row = grid.SelectedRows[0]; try { - long dbid = long.Parse(row.Cells["DBID"].Value.ToString()); - String macId = row.Cells["MACID"].Value.ToString(); - String username = row.Cells["OWNER"].Value.ToString(); - String descn = row.Cells["DESCIRPTION"].Value.ToString(); + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); + String macId = row.Cells["MAC地址"].Value.ToString(); + String username = row.Cells["设备所有人"].Value.ToString(); + String descn = row.Cells["设备状态"].Value.ToString(); FrmEquipmentEdit frm = new FrmEquipmentEdit(dbid.ToString(), macId, username, descn); frm.reloadGrid += new ReloadEquipmentGrid(LoadData); frm.ShowDialog(); @@ -179,7 +179,7 @@ { return; } - String macId = row.Cells["MACID"].Value.ToString(); + String macId = row.Cells["MAC地址"].Value.ToString(); FrmLog frm = new FrmLog(macId); frm.Show(); } @@ -201,7 +201,7 @@ if (grid != null) { DataGridViewRow row = grid.SelectedRows[0]; - long dbid = long.Parse(row.Cells["DBID"].Value.ToString()); + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); try { if (MessageBox.Show("确定删除？", "确认", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) @@ -243,7 +243,8 @@ { string sqlCount = "select count(*) from equipment where status = 'USING'"; - string sqlData = "select descirption,DBID,macid,owner,case when status = 'USING' then '可用' when status = 'DAMAGE' then '损坏' end as status " + + string sqlData = "select descirption as 设备描述,DBID as 编号,macid as MAC地址,owner as 设备所有人,"+ + "case when status = 'USING' then '可用' when status = 'DAMAGE' then '损坏' end as 设备状态 " + "from (select t.*,rownum row_num from equipment t where status = 'USING' order by dbid desc)b " + " where 1=1"; @@ -258,16 +259,17 @@ int maxPage = pageIndex * maxPageIndex; string sqlCount = "select count(*) from equipment where status = 'USING' "; - string sqlData = "select descirption,DBID,macid,owner,case when status = 'USING' then '可用' when status = 'DAMAGE' then '损坏' end as status " + - "from (select t.*,rownum row_num from equipment t where status = 'USING' order by DBID desc)b " + - " where(b.row_num between " + minPage + " and " + maxPage + ")"; + string sqlData = "select descirption as 设备描述,DBID as 编号,macid as MAC地址,owner as 设备所有人," + + "case when status = 'USING' then '可用' when status = 'DAMAGE' then '损坏' end as 设备状态 " + + "from (select t.*,rownum row_num from equipment t where status = 'USING'"; if (!String.IsNullOrEmpty(txtMacId.Text.Trim())) { sqlData += " and macid like '%" + txtMacId.Text.Trim() + "%'"; sqlCount += " and macid like '%" + txtMacId.Text.Trim() + "%'"; } - + sqlData += " order by DBID desc)b " + + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; @@ -299,76 +301,6 @@ } } - //public void reloadGrid(int pageIndex) - //{ - // if (pageIndex <= 0) - // { - // pageIndex = 1; - // currentpage = 1; - // } - // String sqlrows = "select * from (select rownum as rowno,dbid,descirption,macid,owner,case when status = 'USING' then '可用' when status = 'DAMAGE' then '损坏' end as status,'编辑' as btnEdit,'删除' as btnDel from equipment t where status = 'USING' "; - // string sqlcount = "select count(*) from equipment where status = 'USING' "; - // if (!String.IsNullOrEmpty(txtMacId.Text.Trim())) - // { - // sqlrows += " and macid like '%" + txtMacId.Text.Trim() + "%'"; - // sqlcount += " and macid like '%" + txtMacId.Text.Trim() + "%'"; - // } - // sqlrows += " and rownum<=" + (pagesize * pageIndex) + ") table_alias where table_alias.rowno>=" + ((pageIndex - 1) * pagesize + 1); - - // int rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlcount).ToString()); - // int pages = 0; - // if (rows % pagesize == 0) - // { - // pages = rows / pagesize; - // } - // else - // { - // pages = rows / pagesize + 1; - // } - - // lastpage = pages; - - // lab_page_msg.Text = "共" + rows + "条记录，每页" + pagesize + "条，第" + pageIndex + "页，共" + pages + "页"; - // combo_page_num.Items.Clear(); - // for (int i = 1; i <= pages; i++) - // { - // combo_page_num.Items.Add(new ComboBoxItem(i.ToString(), i.ToString())); - // } - - // if (lastpage == 1) - // { - // btn_page_first.Enabled = false; - // btn_page_pre.Enabled = false; - // btn_page_last.Enabled = false; - // btn_page_next.Enabled = false; - // } - // else if (currentpage == 1) - // { - // btn_page_first.Enabled = false; - // btn_page_pre.Enabled = false; - // btn_page_last.Enabled = true; - // btn_page_next.Enabled = true; - // } - // else if (currentpage == lastpage) - // { - // btn_page_first.Enabled = true; - // btn_page_pre.Enabled = true; - // btn_page_last.Enabled = false; - // btn_page_next.Enabled = false; - // } - // else - // { - // btn_page_first.Enabled = true; - // btn_page_pre.Enabled = true; - // btn_page_last.Enabled = true; - // btn_page_next.Enabled = true; - // } - - // DataTable table = OracleUtils.ExecuteDataset(OracleUtils.ConnectionString, CommandType.Text, sqlrows).Tables[0]; - // dataGridViewX1.DataSource = table; - - //} - private void FrmEquipmentManage_FormClosing(object sender, FormClosingEventArgs e) diff --git a/FrmFlagDetail.Designer.cs b/FrmFlagDetail.Designer.cs new file mode 100644 index 0000000..982bfc6 --- /dev/null +++ b/FrmFlagDetail.Designer.cs @@ -0,0 +1,103 @@ +namespace Cyberpipe +{ + partial class FrmFlagDetail + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); + this.dataGridViewX_markDetail = new DevComponents.DotNetBar.Controls.DataGridViewX(); + this.对象类型 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.对象编号 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.对象名称 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX_markDetail)).BeginInit(); + this.SuspendLayout(); + // + // dataGridViewX_markDetail + // + this.dataGridViewX_markDetail.AllowUserToAddRows = false; + this.dataGridViewX_markDetail.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; + this.dataGridViewX_markDetail.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dataGridViewX_markDetail.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.对象类型, + this.对象编号, + this.对象名称}); + dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle3.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dataGridViewX_markDetail.DefaultCellStyle = dataGridViewCellStyle3; + this.dataGridViewX_markDetail.Dock = System.Windows.Forms.DockStyle.Fill; + this.dataGridViewX_markDetail.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(170)))), ((int)(((byte)(170)))), ((int)(((byte)(170))))); + this.dataGridViewX_markDetail.Location = new System.Drawing.Point(0, 0); + this.dataGridViewX_markDetail.Name = "dataGridViewX_markDetail"; + this.dataGridViewX_markDetail.RowTemplate.Height = 23; + this.dataGridViewX_markDetail.Size = new System.Drawing.Size(508, 321); + this.dataGridViewX_markDetail.TabIndex = 0; + // + // 对象类型 + // + this.对象类型.HeaderText = "对象类型"; + this.对象类型.Name = "对象类型"; + // + // 对象编号 + // + this.对象编号.HeaderText = "对象编号"; + this.对象编号.Name = "对象编号"; + // + // 对象名称 + // + this.对象名称.HeaderText = "对象名称"; + this.对象名称.Name = "对象名称"; + // + // FrmFlagDetail + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(508, 321); + this.Controls.Add(this.dataGridViewX_markDetail); + this.Name = "FrmFlagDetail"; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; + this.Text = "标识对象信息"; + this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmFlagDetail_FormClosing); + this.Load += new System.EventHandler(this.FrmFlagDetail_Load); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX_markDetail)).EndInit(); + this.ResumeLayout(false); + + } + + #endregion + + private DevComponents.DotNetBar.Controls.DataGridViewX dataGridViewX_markDetail; + private System.Windows.Forms.DataGridViewTextBoxColumn 对象类型; + private System.Windows.Forms.DataGridViewTextBoxColumn 对象编号; + private System.Windows.Forms.DataGridViewTextBoxColumn 对象名称; + + } +} \ No newline at end of file diff --git a/FrmFlagDetail.cs b/FrmFlagDetail.cs new file mode 100644 index 0000000..81de974 --- /dev/null +++ b/FrmFlagDetail.cs @@ -0,0 +1,77 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Windows.Forms; +using GeoScene.Globe; +using System.Data.OracleClient; + +namespace Cyberpipe +{ + public partial class FrmFlagDetail : Form + { + DataTable dt = new DataTable(); + private GSOGlobeControl globeControl1; + + public delegate void Handle(); + public event Handle showParentForm; + String markId; + + public FrmFlagDetail(GSOGlobeControl globeControl1, String id) + { + InitializeComponent(); + this.markId = id; + } + + private void FrmFlagDetail_FormClosing(object sender, FormClosingEventArgs e) + { + showParentForm(); + } + + private void FrmFlagDetail_Load(object sender, EventArgs e) + { + string objectIds = ""; + string objectTypeCodes = ""; + string sql = "select t.对象编号,t.对象类型 from 标识器 t where t.编号='" + markId + "'"; + using (OracleDataReader reader = OracleUtils.ExecuteReader(OracleUtils.ConnectionString, CommandType.Text, sql)) + { + while (reader.Read()) + { + objectIds = reader.GetString(0); + objectTypeCodes = reader.GetString(1); + } + } + + string[] codeTypes = objectTypeCodes.Split(','); + string[] codeIds = objectIds.Split(','); + int length = 0; + if (codeTypes.Length <= codeIds.Length) + { + length = codeTypes.Length; + } + else + { + length = codeIds.Length; + } + for (int n = 0; n < length; n++) + { + for (int i = 0; i < Utility1.listPipelineType.Count; i++) + { + if (Utility1.listPipelineType[i].code == codeTypes[n]) + { + //string objectId = codeIds[i]; + //string objectType = Utility1.listPipelineType[i].type; + //string objectName = Utility1.listPipelineType[i].name; + int index = this.dataGridViewX_markDetail.Rows.Add(); + this.dataGridViewX_markDetail.Rows[index].Cells[0].Value = Utility1.listPipelineType[i].type; + this.dataGridViewX_markDetail.Rows[index].Cells[1].Value = codeIds[n].ToString(); + this.dataGridViewX_markDetail.Rows[index].Cells[2].Value = Utility1.listPipelineType[i].name; + } + } + } + } + } +} diff --git a/FrmFlagDetail.resx b/FrmFlagDetail.resx new file mode 100644 index 0000000..e98a8fe --- /dev/null +++ b/FrmFlagDetail.resx @@ -0,0 +1,129 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + True + + + True + + + True + + \ No newline at end of file diff --git a/FrmFlagManagers.Designer.cs b/FrmFlagManagers.Designer.cs index d7e2f60..9fe14fb 100644 --- a/FrmFlagManagers.Designer.cs +++ b/FrmFlagManagers.Designer.cs @@ -28,8 +28,10 @@ /// private void InitializeComponent() { - this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); - this.winGridViewPager1 = new WHC.Pager.WinControl.WinGridViewPager(); + this.components = new System.ComponentModel.Container(); + this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components); + this.标识对象ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripMenuItem2 = new System.Windows.Forms.ToolStripMenuItem(); this.bar1 = new DevComponents.DotNetBar.Bar(); this.labelItem1 = new DevComponents.DotNetBar.LabelItem(); this.txt_no = new DevComponents.DotNetBar.TextBoxItem(); @@ -38,45 +40,37 @@ this.btn_query = new DevComponents.DotNetBar.ButtonItem(); this.btn_add_batch = new DevComponents.DotNetBar.ButtonItem(); this.btn_add_menu = new DevComponents.DotNetBar.ButtonItem(); - this.btn_db = new DevComponents.DotNetBar.ButtonItem(); - this.tableLayoutPanel1.SuspendLayout(); + this.winGridViewPager1 = new WHC.Pager.WinControl.WinGridViewPager(); + this.contextMenuStrip1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.bar1)).BeginInit(); this.SuspendLayout(); // - // tableLayoutPanel1 + // contextMenuStrip1 // - this.tableLayoutPanel1.ColumnCount = 1; - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel1.Controls.Add(this.winGridViewPager1, 0, 1); - this.tableLayoutPanel1.Controls.Add(this.bar1, 0, 0); - this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 0); - this.tableLayoutPanel1.Name = "tableLayoutPanel1"; - this.tableLayoutPanel1.RowCount = 2; - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 32F)); - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel1.Size = new System.Drawing.Size(881, 474); - this.tableLayoutPanel1.TabIndex = 6; + this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.标识对象ToolStripMenuItem, + this.toolStripMenuItem2}); + this.contextMenuStrip1.Name = "contextMenuStrip1"; + this.contextMenuStrip1.Size = new System.Drawing.Size(125, 48); // - // winGridViewPager1 + // 标识对象ToolStripMenuItem // - this.winGridViewPager1.AppendedMenu = null; - this.winGridViewPager1.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; - this.winGridViewPager1.DataSource = null; - this.winGridViewPager1.DisplayColumns = ""; - this.winGridViewPager1.Dock = System.Windows.Forms.DockStyle.Fill; - this.winGridViewPager1.Location = new System.Drawing.Point(3, 35); - this.winGridViewPager1.MinimumSize = new System.Drawing.Size(540, 0); - this.winGridViewPager1.Name = "winGridViewPager1"; - this.winGridViewPager1.PrintTitle = ""; - this.winGridViewPager1.Size = new System.Drawing.Size(875, 436); - this.winGridViewPager1.TabIndex = 5; + this.标识对象ToolStripMenuItem.Name = "标识对象ToolStripMenuItem"; + this.标识对象ToolStripMenuItem.Size = new System.Drawing.Size(124, 22); + this.标识对象ToolStripMenuItem.Text = "标识对象"; + this.标识对象ToolStripMenuItem.Click += new System.EventHandler(this.标识对象ToolStripMenuItem_Click); + // + // toolStripMenuItem2 + // + this.toolStripMenuItem2.Name = "toolStripMenuItem2"; + this.toolStripMenuItem2.Size = new System.Drawing.Size(152, 22); + this.toolStripMenuItem2.Text = "查看位置"; + this.toolStripMenuItem2.Click += new System.EventHandler(this.toolStripMenuItem2_Click); // // bar1 // this.bar1.AntiAlias = true; this.bar1.Dock = System.Windows.Forms.DockStyle.Top; - this.bar1.DockSide = DevComponents.DotNetBar.eDockSide.Document; this.bar1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.labelItem1, this.txt_no, @@ -84,14 +78,13 @@ this.combo_street, this.btn_query, this.btn_add_batch, - this.btn_add_menu, - this.btn_db}); - this.bar1.Location = new System.Drawing.Point(3, 3); + this.btn_add_menu}); + this.bar1.Location = new System.Drawing.Point(0, 0); this.bar1.Name = "bar1"; - this.bar1.Size = new System.Drawing.Size(875, 28); + this.bar1.Size = new System.Drawing.Size(881, 28); this.bar1.Stretch = true; this.bar1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.bar1.TabIndex = 1; + this.bar1.TabIndex = 8; this.bar1.TabStop = false; this.bar1.Text = "bar1"; // @@ -136,24 +129,34 @@ this.btn_add_menu.Text = "手工添加"; this.btn_add_menu.Click += new System.EventHandler(this.btn_add_menu_Click); // - // btn_db + // winGridViewPager1 // - this.btn_db.Name = "btn_db"; - this.btn_db.Text = "数据导出"; + this.winGridViewPager1.AppendedMenu = null; + this.winGridViewPager1.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; + this.winGridViewPager1.DataSource = null; + this.winGridViewPager1.DisplayColumns = ""; + this.winGridViewPager1.Dock = System.Windows.Forms.DockStyle.Fill; + this.winGridViewPager1.Location = new System.Drawing.Point(0, 28); + this.winGridViewPager1.MinimumSize = new System.Drawing.Size(540, 0); + this.winGridViewPager1.Name = "winGridViewPager1"; + this.winGridViewPager1.PrintTitle = ""; + this.winGridViewPager1.Size = new System.Drawing.Size(881, 446); + this.winGridViewPager1.TabIndex = 9; // // FrmFlagManagers // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(881, 474); - this.Controls.Add(this.tableLayoutPanel1); + this.Controls.Add(this.winGridViewPager1); + this.Controls.Add(this.bar1); this.DoubleBuffered = true; this.Name = "FrmFlagManagers"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "标识器管理"; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmFlagManagers_FormClosing); this.Load += new System.EventHandler(this.FrmFlagManagers_Load); - this.tableLayoutPanel1.ResumeLayout(false); + this.contextMenuStrip1.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.bar1)).EndInit(); this.ResumeLayout(false); @@ -161,8 +164,8 @@ #endregion - private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1; - private WHC.Pager.WinControl.WinGridViewPager winGridViewPager1; + private System.Windows.Forms.ContextMenuStrip contextMenuStrip1; + private System.Windows.Forms.ToolStripMenuItem 标识对象ToolStripMenuItem; private DevComponents.DotNetBar.Bar bar1; private DevComponents.DotNetBar.LabelItem labelItem1; private DevComponents.DotNetBar.TextBoxItem txt_no; @@ -171,6 +174,7 @@ private DevComponents.DotNetBar.ButtonItem btn_query; private DevComponents.DotNetBar.ButtonItem btn_add_batch; private DevComponents.DotNetBar.ButtonItem btn_add_menu; - private DevComponents.DotNetBar.ButtonItem btn_db; + private WHC.Pager.WinControl.WinGridViewPager winGridViewPager1; + private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem2; } } \ No newline at end of file diff --git a/FrmFlagManagers.cs b/FrmFlagManagers.cs index 38d4927..9bf9734 100644 --- a/FrmFlagManagers.cs +++ b/FrmFlagManagers.cs @@ -33,15 +33,13 @@ { this.globeControl1 = _globeControl1; InitializeComponent(); - winGridViewPager1.OnPageChanged += new EventHandler(winGridViewPager1_OnPageChanged); - this.winGridViewPager1.OnAddNew += new EventHandler(winGridViewPager1_OnAddNew); //右键定位 + winGridViewPager1.OnPageChanged += new EventHandler(winGridViewPager1_OnPageChanged); this.winGridViewPager1.OnEditSelected += new EventHandler(winGridViewPager1_OnEditSelected);//属性编辑 this.winGridViewPager1.OnDeleteSelected += new EventHandler(winGridViewPager1_OnDeleteSelected);//标识器报废 + this.winGridViewPager1.OnStartExport += new EventHandler(pager1_OnStartExport); this.winGridViewPager1.OnEndExport += new EventHandler(pager1_OnEndExport); - //this.winGridViewPager1.ExportCurrent += new ExportCurrentEventHandler(pager1_ExportCurrent); - //this.winGridViewPager1.ExportAll += new ExportAllEventHandler(pager1_ExportAll); winGridViewPager1.dataGridView1.MultiSelect = false; @@ -76,26 +74,25 @@ this.winGridViewPager1.AddColumnAlias("标识器型号", "标识器型号"); this.winGridViewPager1.AddColumnAlias("地面高程", "地面高程"); this.winGridViewPager1.AddColumnAlias("标识器埋深", "标识器埋深"); - this.winGridViewPager1.AddColumnAlias("对象编号", "对象编号"); - this.winGridViewPager1.AddColumnAlias("对象类型", "对象类型"); this.winGridViewPager1.AddColumnAlias("所属道路", "所属道路"); this.winGridViewPager1.AddColumnAlias("使用状态", "使用状态"); - this.winGridViewPager1.DisplayColumns = "编号,标识器ID号,标识器型号,地面高程,标识器埋深,对象编号,对象类型,所属道路,使用状态"; + this.winGridViewPager1.DisplayColumns = "编号,标识器ID号,标识器型号,地面高程,标识器埋深,所属道路,使用状态"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 //隐藏右键功能按钮 //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[1].Visible = false; - //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[4].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[5].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[6].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[7].Visible = false; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[1].Text = "定位查看"; + //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[1].Text = "定位查看"; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "属性编辑"; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Text = "标识器报废"; + winGridViewPager1.AppendedMenu = this.contextMenuStrip1; + //右键菜单宽度 winGridViewPager1.dataGridView1.ContextMenuStrip.AutoSize = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Width = 150; @@ -153,7 +150,7 @@ } /// - /// 右键定位 + /// 对象查看 /// /// /// @@ -306,20 +303,10 @@ string sqlCount = "select count(*) from 标识器 where 使用状态 = '使用中'"; - string sqlData = "select 编号,标识器ID号,标识器型号,地面高程,标识器埋深,对象编号,对象类型,所属道路,LSSYS_ID,X坐标,Y坐标,使用状态 " + + string sqlData = "select 编号,标识器ID号,标识器型号,地面高程,标识器埋深,所属道路,LSSYS_ID,X坐标,Y坐标,使用状态 " + "from (select t.*,rownum row_num from 标识器 t where 使用状态 = '使用中' order by 编号)b " + " where 1=1"; - if (!String.IsNullOrEmpty(txt_no.Text.Trim())) - { - sqlCount += " and 编号 like '%" + txt_no.Text.Trim() + "%'"; - sqlData += " and 编号 like '%" + txt_no.Text.Trim() + "%'"; - } - if (null != combo_street.SelectedItem && !String.IsNullOrEmpty(combo_street.SelectedItem.ToString().Trim())) - { - sqlData += " and 所属道路='" + combo_street.SelectedItem.ToString().Trim() + "'"; - sqlCount += " and 所属道路='" + combo_street.SelectedItem.ToString().Trim() + "'"; - } rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -332,9 +319,8 @@ int maxPage = pageIndex * maxPageIndex; string sqlCount = "select count(*) from 标识器 where 使用状态 = '使用中'"; - string sqlData = "select 编号,标识器ID号,标识器型号,地面高程,标识器埋深,对象编号,对象类型,所属道路,LSSYS_ID,X坐标,Y坐标,使用状态 " + - "from (select t.*,rownum row_num from 标识器 t where 使用状态 = '使用中' order by 编号)b "+ - " where(b.row_num between " + minPage + " and " + maxPage + ")"; + string sqlData = "select 编号,标识器ID号,标识器型号,地面高程,标识器埋深,所属道路,LSSYS_ID,X坐标,Y坐标,使用状态 " + + "from (select t.*,rownum row_num from 标识器 t where 使用状态 = '使用中'"; if (!String.IsNullOrEmpty(txt_no.Text.Trim())) { @@ -347,6 +333,8 @@ sqlCount += " and 所属道路='" + combo_street.SelectedItem.ToString().Trim() + "'"; } + sqlData += " order by 编号)b " + + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; @@ -372,9 +360,10 @@ private void FrmFlagManagers_FormClosing(object sender, FormClosingEventArgs e) { IS_OPEN = false; - Thread downloadJob = new Thread(new ParameterizedThreadStart(doSave)); - downloadJob.IsBackground = true; - downloadJob.Start(e); + //Thread downloadJob = new Thread(new ParameterizedThreadStart(doSave)); + //downloadJob.IsBackground = true; + //downloadJob.Start(e); + globeControl1.Globe.Layers["标识器"].Save(); globeControl1.Globe.MemoryLayer.RemoveAllFeature(); foreach (GSOFeature f in Features) { @@ -480,10 +469,88 @@ if (null != globeControl1) { FrmAddSinMark frm = new FrmAddSinMark(globeControl1); - frm.ShowDialog(); + frm.Show(); } } + private void 标识对象ToolStripMenuItem_Click(object sender, EventArgs e) + { + if (winGridViewPager1 != null && winGridViewPager1.dataGridView1 != null) + { + DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; + try + { + this.Hide(); + string id = row.Cells["编号"].Value.ToString(); + FrmFlagDetail p = new FrmFlagDetail(globeControl1, id); + p.showParentForm += new FrmFlagDetail.Handle(showThisForm);//改变值的事件 + p.Show(); + } + catch (Exception ex) + { + MessageBox.Show("失败:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } + + private void showThisForm() + { + this.Show(); + } + + private void toolStripMenuItem2_Click(object sender, EventArgs e) + { + if (winGridViewPager1 != null && winGridViewPager1.dataGridView1 != null) + { + DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; + try + { + this.WindowState = FormWindowState.Minimized; + string id = row.Cells["LSSYS_ID"].Value.ToString(); + string flagno = row.Cells["编号"].Value.ToString(); + string flagstreet = row.Cells["所属道路"].Value.ToString(); + double x = Convert.ToDouble(row.Cells["X坐标"].Value); + double y = Convert.ToDouble(row.Cells["Y坐标"].Value); + GSOFeature flagFeature = globeControl1.Globe.Layers.GetLayerByCaption("标识器").GetFeatureByID(int.Parse(id)); + + string type = ""; + string pipe = ""; + string sql = "select t.标识器型号,t.对象编号 from 标识器 t where t.编号='" + flagno + "'"; + using (OracleDataReader reader = OracleUtils.ExecuteReader(OracleUtils.ConnectionString, CommandType.Text, sql)) + { + while (reader.Read()) + { + type = reader.GetString(0); + pipe = reader.GetString(1); + } + } + + GSOLabel label = new GSOLabel(); + label.Text = "标识器编号：" + flagno + "\r\n" + + "标识器类型:" + type + "\r\n" + + //"标识对象编号:" + pipe + "\r\n" + + "所属道路:" + flagstreet; + label.Style = new GSOLabelStyle(); + label.Style.TextStyle.FontSize = 18; + label.Style.TextStyle.ForeColor = Color.FromArgb(0, 0, 0, 255); + label.Style.Opaque = 0.8; //设置标注的透明度，取值区间是0-1 + label.Style.TracktionLineType = EnumTracktionLineType.Solid; + label.Style.TextStyle.FontHeight = 10; + label.Style.TextStyle.FontName = "黑体"; + label.Style.TractionLineEndPos = new GSOPoint2d(80, 60); + + flagFeature.Label = label; + Features.Add(flagFeature); + globeControl1.Globe.JumpToFeature(flagFeature, 20); + this.globeControl1.Refresh(); + + } + catch (Exception ex) + { + MessageBox.Show("标识器定位失败:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } } diff --git a/FrmFlagManagers.resx b/FrmFlagManagers.resx index 1af7de1..ad53752 100644 --- a/FrmFlagManagers.resx +++ b/FrmFlagManagers.resx @@ -117,4 +117,7 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 17, 17 + \ No newline at end of file diff --git a/FrmPatrolerEdit.cs b/FrmPatrolerEdit.cs index dbd4fec..f45b5ae 100644 --- a/FrmPatrolerEdit.cs +++ b/FrmPatrolerEdit.cs @@ -46,7 +46,7 @@ txt_name.Focus(); return; } - if (String.IsNullOrEmpty(combo_sex.SelectedItem.ToString())) + if (combo_sex.SelectedItem == null ||String.IsNullOrEmpty(combo_sex.SelectedItem.ToString())) { MessageBox.Show("性别不能为空！", "警告", MessageBoxButtons.OK, MessageBoxIcon.Warning); combo_sex.Focus(); diff --git a/FrmPatrolerManager.Designer.cs b/FrmPatrolerManager.Designer.cs index bb8e5fb..10fac22 100644 --- a/FrmPatrolerManager.Designer.cs +++ b/FrmPatrolerManager.Designer.cs @@ -47,11 +47,13 @@ this.注销 = new DevComponents.Editors.ComboItem(); this.btn_query_person = new DevComponents.DotNetBar.ButtonItem(); this.btn_add_person = new DevComponents.DotNetBar.ButtonItem(); - this.winGridViewPager1 = new WHC.Pager.WinControl.WinGridViewPager(); this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components); this.日志ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.任务ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.定位ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.winGridViewPager1 = new WHC.Pager.WinControl.WinGridViewPager(); + this.编辑ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.注销ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); ((System.ComponentModel.ISupportInitialize)(this.bar1)).BeginInit(); this.contextMenuStrip1.SuspendLayout(); this.SuspendLayout(); @@ -173,9 +175,42 @@ this.btn_add_person.Text = "新增"; this.btn_add_person.Click += new System.EventHandler(this.btn_add_person_Click); // + // contextMenuStrip1 + // + this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.日志ToolStripMenuItem, + this.任务ToolStripMenuItem, + this.定位ToolStripMenuItem, + this.编辑ToolStripMenuItem, + this.注销ToolStripMenuItem}); + this.contextMenuStrip1.Name = "contextMenuStrip1"; + this.contextMenuStrip1.Size = new System.Drawing.Size(153, 136); + // + // 日志ToolStripMenuItem + // + this.日志ToolStripMenuItem.Name = "日志ToolStripMenuItem"; + this.日志ToolStripMenuItem.Size = new System.Drawing.Size(100, 22); + this.日志ToolStripMenuItem.Text = "日志"; + this.日志ToolStripMenuItem.Click += new System.EventHandler(this.日志ToolStripMenuItem_Click); + // + // 任务ToolStripMenuItem + // + this.任务ToolStripMenuItem.Name = "任务ToolStripMenuItem"; + this.任务ToolStripMenuItem.Size = new System.Drawing.Size(100, 22); + this.任务ToolStripMenuItem.Text = "任务"; + this.任务ToolStripMenuItem.Click += new System.EventHandler(this.任务ToolStripMenuItem_Click); + // + // 定位ToolStripMenuItem + // + this.定位ToolStripMenuItem.Name = "定位ToolStripMenuItem"; + this.定位ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.定位ToolStripMenuItem.Text = "定位"; + this.定位ToolStripMenuItem.Click += new System.EventHandler(this.定位ToolStripMenuItem_Click); + // // winGridViewPager1 // this.winGridViewPager1.AppendedMenu = null; + this.winGridViewPager1.ContextMenuStrip = this.contextMenuStrip1; this.winGridViewPager1.DataSource = null; this.winGridViewPager1.DisplayColumns = ""; this.winGridViewPager1.Dock = System.Windows.Forms.DockStyle.Fill; @@ -186,35 +221,19 @@ this.winGridViewPager1.Size = new System.Drawing.Size(756, 309); this.winGridViewPager1.TabIndex = 3; // - // contextMenuStrip1 + // 编辑ToolStripMenuItem // - this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.日志ToolStripMenuItem, - this.任务ToolStripMenuItem, - this.定位ToolStripMenuItem}); - this.contextMenuStrip1.Name = "contextMenuStrip1"; - this.contextMenuStrip1.Size = new System.Drawing.Size(101, 70); + this.编辑ToolStripMenuItem.Name = "编辑ToolStripMenuItem"; + this.编辑ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.编辑ToolStripMenuItem.Text = "编辑"; + this.编辑ToolStripMenuItem.Click += new System.EventHandler(this.编辑ToolStripMenuItem_Click); // - // 日志ToolStripMenuItem + // 注销ToolStripMenuItem // - this.日志ToolStripMenuItem.Name = "日志ToolStripMenuItem"; - this.日志ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); - this.日志ToolStripMenuItem.Text = "日志"; - this.日志ToolStripMenuItem.Click += new System.EventHandler(this.日志ToolStripMenuItem_Click); - // - // 任务ToolStripMenuItem - // - this.任务ToolStripMenuItem.Name = "任务ToolStripMenuItem"; - this.任务ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); - this.任务ToolStripMenuItem.Text = "任务"; - this.任务ToolStripMenuItem.Click += new System.EventHandler(this.任务ToolStripMenuItem_Click); - // - // 定位ToolStripMenuItem - // - this.定位ToolStripMenuItem.Name = "定位ToolStripMenuItem"; - this.定位ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); - this.定位ToolStripMenuItem.Text = "定位"; - this.定位ToolStripMenuItem.Click += new System.EventHandler(this.定位ToolStripMenuItem_Click); + this.注销ToolStripMenuItem.Name = "注销ToolStripMenuItem"; + this.注销ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.注销ToolStripMenuItem.Text = "注销"; + this.注销ToolStripMenuItem.Click += new System.EventHandler(this.注销ToolStripMenuItem_Click); // // FrmPatrolerManager // @@ -229,7 +248,7 @@ this.MinimizeBox = false; this.Name = "FrmPatrolerManager"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; - this.Text = "巡检人员维护"; + this.Text = "定位人员维护"; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmPatrolerManager_FormClosing); this.Load += new System.EventHandler(this.FrmPatrolerManager_Load); ((System.ComponentModel.ISupportInitialize)(this.bar1)).EndInit(); @@ -258,10 +277,12 @@ private DevComponents.Editors.ComboItem 注销; private DevComponents.Editors.ComboItem comboItem1; private DevComponents.Editors.ComboItem 不限; - private WHC.Pager.WinControl.WinGridViewPager winGridViewPager1; private System.Windows.Forms.ContextMenuStrip contextMenuStrip1; private System.Windows.Forms.ToolStripMenuItem 日志ToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem 任务ToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem 定位ToolStripMenuItem; + private WHC.Pager.WinControl.WinGridViewPager winGridViewPager1; + private System.Windows.Forms.ToolStripMenuItem 编辑ToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem 注销ToolStripMenuItem; } } \ No newline at end of file diff --git a/FrmPatrolerManager.cs b/FrmPatrolerManager.cs index 255a076..9c32f54 100644 --- a/FrmPatrolerManager.cs +++ b/FrmPatrolerManager.cs @@ -29,9 +29,7 @@ this.globeControl1 = globeControl1; winGridViewPager1.OnPageChanged += new EventHandler(winGridViewPager1_OnPageChanged); - this.winGridViewPager1.OnEditSelected += new EventHandler(winGridViewPager1_OnEditSelected);//编辑 - this.winGridViewPager1.OnDeleteSelected += new EventHandler(winGridViewPager1_OnDeleteSelected);//删除 - + this.winGridViewPager1.OnStartExport += new EventHandler(pager1_OnStartExport); this.winGridViewPager1.OnEndExport += new EventHandler(pager1_OnEndExport); @@ -47,26 +45,31 @@ //控制表格显示的列，以及每一列要显示的列名 this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - this.winGridViewPager1.AddColumnAlias("USERNAME", "姓名"); - this.winGridViewPager1.AddColumnAlias("DBID", "编号"); - this.winGridViewPager1.AddColumnAlias("SEX", "性别"); - this.winGridViewPager1.AddColumnAlias("AGE", "年龄"); - this.winGridViewPager1.AddColumnAlias("PHONENUM", "电话"); - this.winGridViewPager1.AddColumnAlias("ACCOUNTSTATE", "状态"); - this.winGridViewPager1.DisplayColumns = "USERNAME,SEX,AGE,PHONENUM,ACCOUNTSTATE"; + this.winGridViewPager1.AddColumnAlias("姓名", "姓名"); + this.winGridViewPager1.AddColumnAlias("编号", "编号"); + this.winGridViewPager1.AddColumnAlias("性别", "性别"); + this.winGridViewPager1.AddColumnAlias("年龄", "年龄"); + this.winGridViewPager1.AddColumnAlias("电话", "电话"); + this.winGridViewPager1.AddColumnAlias("状态", "状态"); + this.winGridViewPager1.DisplayColumns = "姓名,性别,年龄,电话,状态"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 + //隐藏右键功能按钮 //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[1].Visible = false; + winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Visible = false; + winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[4].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[5].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[6].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[7].Visible = false; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "编辑"; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Text = "注销"; + + //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "编辑"; + //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Text = "注销"; winGridViewPager1.AppendedMenu = this.contextMenuStrip1; + //右键菜单宽度 winGridViewPager1.dataGridView1.ContextMenuStrip.AutoSize = false; @@ -122,11 +125,11 @@ DataGridViewRow row = grid.SelectedRows[0]; try { - long dbid = long.Parse(row.Cells["dbid"].Value.ToString()); - String name = row.Cells["USERNAME"].Value.ToString(); - String sex = row.Cells["SEX"].Value.ToString(); - String age = row.Cells["AGE"].Value.ToString(); - string phone = row.Cells["PHONENUM"].Value.ToString(); + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); + String name = row.Cells["姓名"].Value.ToString(); + String sex = row.Cells["性别"].Value.ToString(); + String age = row.Cells["年龄"].Value.ToString(); + string phone = row.Cells["电话"].Value.ToString(); age = String.IsNullOrEmpty(age.ToString().Trim()) ? "1" : age.ToString().Trim(); FrmPatrolerEdit frm = new FrmPatrolerEdit(dbid.ToString(), name, age, sex, phone); frm.reloadGrid += new ReloadPatrolerGrid(LoadData); @@ -152,10 +155,10 @@ if (grid != null) { DataGridViewRow row = grid.SelectedRows[0]; - long dbid = long.Parse(row.Cells["DBID"].Value.ToString()); + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); try { - string state = row.Cells["ACCOUNTSTATE"].Value.ToString(); + string state = row.Cells["状态"].Value.ToString(); if ("在线".Equals(state)) { if (MessageBox.Show("确定注销？", "确认", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) @@ -180,60 +183,60 @@ { int pageIndex = winGridViewPager1.PagerInfo.CurrenetPageIndex; string sqlData = GetSql(pageIndex); - initlizeDatagrid(); + DataTable table = OracleUtils.ExecuteDataset(OracleUtils.ConnectionString, CommandType.Text, sqlData).Tables[0]; winGridViewPager1.DataSource = table.DefaultView; - for (int i = 0; i < winGridViewPager1.dataGridView1.Rows.Count; i++) - { - if (winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value.ToString() == "ONLINE") - { - winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value = "在线"; - } - else - { - if (winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value.ToString() == "OFFLINE") - { - winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value = "离线"; - } - else - { - if (winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value.ToString() == "LEAVER") - { - winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value = "注销"; - } - } - } - } + //for (int i = 0; i < winGridViewPager1.dataGridView1.Rows.Count; i++) + //{ + // if (winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value.ToString() == "ONLINE") + // { + // winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value = "在线"; + // } + // else + // { + // if (winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value.ToString() == "OFFLINE") + // { + // winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value = "离线"; + // } + // else + // { + // if (winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value.ToString() == "LEAVER") + // { + // winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value = "注销"; + // } + // } + // } + //} winGridViewPager1.Refresh(); } private void LoadData(int pageIndex) { string sqlData = GetSql(pageIndex); - initlizeDatagrid(); + DataTable table = OracleUtils.ExecuteDataset(OracleUtils.ConnectionString, CommandType.Text, sqlData).Tables[0]; winGridViewPager1.DataSource = table.DefaultView; - for (int i = 0; i < winGridViewPager1.dataGridView1.Rows.Count; i++) - { - if (winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value.ToString() == "ONLINE") - { - winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value = "在线"; - } - else - { - if (winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value.ToString() == "OFFLINE") - { - winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value = "离线"; - } - else - { - if (winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value.ToString() == "LEAVER") - { - winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value = "注销"; - } - } - } - } + //for (int i = 0; i < winGridViewPager1.dataGridView1.Rows.Count; i++) + //{ + // if (winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value.ToString() == "ONLINE") + // { + // winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value = "在线"; + // } + // else + // { + // if (winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value.ToString() == "OFFLINE") + // { + // winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value = "离线"; + // } + // else + // { + // if (winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value.ToString() == "LEAVER") + // { + // winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value = "注销"; + // } + // } + // } + //} winGridViewPager1.Refresh(); } @@ -241,7 +244,8 @@ { string sqlCount = "select count(*) from equipment where status = 'USING'"; - string sqlData = "select username,dbid,sex,age,phonenum,accountstate " + + string sqlData = "select username as 姓名,dbid as 编号,sex as 性别,age as 年龄,phonenum as 电话,"+ + "case when accountstate = 'ONLINE' then '在线' when accountstate = 'OFFLINE' then '离线' when accountstate = 'LEAVER' then '注销' end as 状态 " + "from (select t.*,rownum row_num from patroler t order by DBID desc)b " + " where 1=1"; @@ -255,9 +259,9 @@ int minPage = (pageIndex - 1) * maxPageIndex + 1; int maxPage = pageIndex * maxPageIndex; string sqlCount = "select count(*) from patroler where 1=1"; - string sqlData = "select username,dbid,sex,age,phonenum,accountstate " + - "from (select t.*,rownum row_num from patroler t order by DBID desc)b " + - " where(b.row_num between " + minPage + " and " + maxPage + ")"; + string sqlData = "select username as 姓名,dbid as 编号,sex as 性别,age as 年龄,phonenum as 电话,"+ + "case when accountstate = 'ONLINE' then '在线' when accountstate = 'OFFLINE' then '离线' when accountstate = 'LEAVER' then '注销' end as 状态 " + + "from (select t.*,rownum row_num from patroler t where 1=1"; if (!String.IsNullOrEmpty(txt_username.Text.Trim())) { @@ -281,7 +285,8 @@ sqlCount += " and accountstate='" + combo_stateText + "'"; sqlData += " and accountstate='" + combo_stateText + "'"; } - + sqlData += " order by DBID desc)b " + + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; @@ -291,6 +296,7 @@ { try { + initlizeDatagrid(); LoadData(); initForm(); IS_OPEN = true; @@ -310,11 +316,13 @@ } if (Utility.userRole.IndexOf("巡检员编辑") == -1) { - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Visible = false; + //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Visible = false; + 编辑ToolStripMenuItem.Visible = false; } if (Utility.userRole.IndexOf("巡检员注销") == -1) { - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Visible = false; + //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Visible = false; + 注销ToolStripMenuItem.Visible = false; } } @@ -376,7 +384,7 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - long dbid = long.Parse(row.Cells["dbid"].Value.ToString()); + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); Log p = new Log(dbid.ToString()); p.Show(); } @@ -395,8 +403,8 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - long dbid = long.Parse(row.Cells["dbid"].Value.ToString()); - String state = row.Cells["ACCOUNTSTATE"].Value.ToString(); + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); + String state = row.Cells["状态"].Value.ToString(); if ("在线".Equals(state)) { string sql = "select t.dbid " + @@ -435,8 +443,8 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - long dbid = long.Parse(row.Cells["dbid"].Value.ToString()); - String username = row.Cells["USERNAME"].Value.ToString(); + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); + String username = row.Cells["姓名"].Value.ToString(); string sql = "select t.latitude, t.longitude " + "from position t " + "where t.dbid = (select max(dbid) from position where patroler_id = " + dbid + ")"; @@ -489,6 +497,63 @@ } + private void 编辑ToolStripMenuItem_Click(object sender, EventArgs e) + { + if (winGridViewPager1 != null && winGridViewPager1.dataGridView1 != null) + { + DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; + try + { + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); + String name = row.Cells["姓名"].Value.ToString(); + String sex = row.Cells["性别"].Value.ToString(); + String age = row.Cells["年龄"].Value.ToString(); + string phone = row.Cells["电话"].Value.ToString(); + age = String.IsNullOrEmpty(age.ToString().Trim()) ? "1" : age.ToString().Trim(); + FrmPatrolerEdit frm = new FrmPatrolerEdit(dbid.ToString(), name, age, sex, phone); + frm.reloadGrid += new ReloadPatrolerGrid(LoadData); + frm.ShowDialog(); + winGridViewPager1.Refresh(); + } + catch (Exception ex) + { + MessageBox.Show("编辑失败:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } + + private void 注销ToolStripMenuItem_Click(object sender, EventArgs e) + { + if (winGridViewPager1 != null && winGridViewPager1.dataGridView1 != null) + { + DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); + try + { + if (MessageBox.Show("确定注销？", "确认", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) + { + String sql = "update patroler t set t.accountstate='LEAVER' where t.dbid=" + dbid; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + LoadData(); + MessageBox.Show("人员已注销", "信息", MessageBoxButtons.OK, MessageBoxIcon.Information); + } + //string state = row.Cells["状态"].Value.ToString(); + //if ("在线".Equals(state)) + //{ + + //} + //else + //{ + // MessageBox.Show("人员不在线，无法注销", "信息"); + //} + } + catch (Exception ex) + { + MessageBox.Show("人员注销失败:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } + } } diff --git a/FrmRoleInfoManager.cs b/FrmRoleInfoManager.cs index 8897133..35693cf 100644 --- a/FrmRoleInfoManager.cs +++ b/FrmRoleInfoManager.cs @@ -55,10 +55,10 @@ //控制表格显示的列，以及每一列要显示的列名 this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - this.winGridViewPager1.AddColumnAlias("NT", "角色名称"); - this.winGridViewPager1.AddColumnAlias("ID", "编号"); + this.winGridViewPager1.AddColumnAlias("角色名称", "角色名称"); + this.winGridViewPager1.AddColumnAlias("编号", "编号"); - this.winGridViewPager1.DisplayColumns = "NT"; + this.winGridViewPager1.DisplayColumns = "角色名称"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -131,7 +131,7 @@ { try { - string dbid = row.Cells["id"].Value.ToString(); + string dbid = row.Cells["编号"].Value.ToString(); string sql = "delete from casic_userroletest where id=" + dbid; OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); LoadData(); @@ -170,7 +170,7 @@ { string sqlCount = "select id,nt from casic_userroletest where sysname='EMS'"; - string sqlData = "select nt,id " + + string sqlData = "select nt as 角色名称,id as 编号 " + "from (select t.*,rownum row_num from casic_userroletest t order by id desc)b " + " where sysname='EMS'"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -183,7 +183,7 @@ int minPage = (pageIndex - 1) * maxPageIndex + 1; int maxPage = pageIndex * maxPageIndex; string sqlCount = "select id,nt from casic_userroletest where sysname='EMS'"; - string sqlData = "select nt,id " + + string sqlData = "select nt as 角色名称,id as 编号 " + "from (select t.*,rownum row_num from casic_userroletest t where sysname='EMS' order by id desc)b " + " where(b.row_num between " + minPage + " and " + maxPage + ")"; diff --git a/FrmSysUserInfoManger.cs b/FrmSysUserInfoManger.cs index 7903916..e193a61 100644 --- a/FrmSysUserInfoManger.cs +++ b/FrmSysUserInfoManger.cs @@ -28,6 +28,7 @@ this.winGridViewPager1.OnEndExport += new EventHandler(pager1_OnEndExport); winGridViewPager1.dataGridView1.MultiSelect = false; + } private void FrmSysUserInfoManger_Load(object sender, EventArgs e) @@ -59,10 +60,10 @@ //控制表格显示的列，以及每一列要显示的列名 this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - this.winGridViewPager1.AddColumnAlias("USERNAME", "账号"); - this.winGridViewPager1.AddColumnAlias("ID", "编号"); + this.winGridViewPager1.AddColumnAlias("账号", "账号"); + this.winGridViewPager1.AddColumnAlias("编号", "编号"); - this.winGridViewPager1.DisplayColumns = "USERNAME"; + this.winGridViewPager1.DisplayColumns = "账号"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -130,8 +131,8 @@ if (grid != null) { DataGridViewRow row = grid.SelectedRows[0]; - string dbid = row.Cells["id"].Value.ToString(); - string userName = row.Cells["USERNAME"].Value.ToString(); + string dbid = row.Cells["编号"].Value.ToString(); + string userName = row.Cells["账号"].Value.ToString(); if (userName.Equals("ems")) { MessageBox.Show("该用户为管理员用户，无法删除！", "信息"); @@ -184,7 +185,7 @@ { string sqlCount = "select count(*) from casic_userinfotest where sysname='EMS'"; - string sqlData = "select username,id " + + string sqlData = "select username as 账号,id as 编号 " + "from (select t.*,rownum row_num from casic_userinfotest t order by id desc)b " + " where sysname='EMS'"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -197,16 +198,16 @@ int minPage = (pageIndex - 1) * maxPageIndex + 1; int maxPage = pageIndex * maxPageIndex; string sqlCount = "select count(*) from casic_userinfotest where sysname='EMS'"; - string sqlData = "select username,id " + - "from (select t.*,rownum row_num from casic_userinfotest t where sysname='EMS' order by id desc)b " + - " where(b.row_num between " + minPage + " and " + maxPage + ")"; + string sqlData = "select username as 账号,id as 编号 " + + "from (select t.*,rownum row_num from casic_userinfotest t where sysname='EMS'"; if (!String.IsNullOrEmpty(txt_user_code.Text.Trim())) { sqlCount += " and username like '%" + txt_user_code.Text.Trim() + "%'"; sqlData += " and username like '%" + txt_user_code.Text.Trim() + "%'"; } - + sqlData += " order by id desc)b " + + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; diff --git a/MainFrm.cs b/MainFrm.cs index 39df646..0cd5881 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3310,10 +3310,10 @@ string str1 = ""; if (feature != null) { - if (feature.GetFieldDefn("图?片?编括?码?") != null) // + if (feature.GetFieldDefn("图片编码") != null) // { str1 = GetBubbleInfo(feature); - if (RemoteFileExists(Utility.PicRootURL + feature.GetValue("图?片?编括?码?").ToString())) + if (RemoteFileExists(Utility.PicRootURL + feature.GetValue("图片编码").ToString())) { str1 += ""; } @@ -3450,9 +3450,15 @@ string value1 = ""; if (field1 != null) { - if (field1.Name == "图片编码") + //if (field1.Name == "图片编码" || field1.Name == "对象编号" || field1.Name == "对象类型" || field1.Name == "对象名称") + //{ + // j++; + //} + while (field1.Name == "图片编码" || field1.Name == "对象编号" || field1.Name == "对象类型" || field1.Name == "对象名称") { j++; + fieldName = fieldNames[j].Trim(); + field1 = (GSOFieldDefn)feature.GetFieldDefn(fieldName); } if (j < rowCount) { @@ -3479,6 +3485,11 @@ if (!feature.IsFieldValueNull(j)) { value1 = feature.GetValue(j).ToString(); + if (name1 == "标识器埋深") + { + if (value1!=null&&value1.Length>4) + value1 = value1.Substring(0,4); + } } } } @@ -3491,9 +3502,14 @@ if (field2 != null) { - if (field2.Name == "图片编码") + //if (field2.Name == "图片编码" || field1.Name == "对象编号" || field1.Name == "对象类型" || field1.Name == "对象名称") + //{ + // j++; + //} + while (field2.Name == "图片编码" || field2.Name == "对象编号" || field2.Name == "对象类型" || field2.Name == "对象名称") { j++; + field2 = (GSOFieldDefn)feature.GetFieldDefn(j + 1); } if (j + 1 < rowCount) { @@ -3521,6 +3537,11 @@ if (!feature.IsFieldValueNull(j + 1)) { value2 = feature.GetValue(j + 1).ToString(); + if (name2 == "标识器埋深") + { + if (value2 != null && value2.Length > 4) + value2 = value2.Substring(0, 4); + } } } } @@ -15347,7 +15368,7 @@ return; } FrmFlagManagers frm = new FrmFlagManagers(globeControl1); - frm.Show(this); + frm.Show(); } private void ribbonTabItem2_MouseDown(object sender, MouseEventArgs e) diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index fddfb94..e5f0003 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -365,6 +365,16 @@ this.可编辑ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.保存ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.ribbonControl1 = new DevComponents.DotNetBar.RibbonControl(); + this.ribbonPanel3 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar3 = new DevComponents.DotNetBar.RibbonBar(); + this.btn_device = new DevComponents.DotNetBar.ButtonItem(); + this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); + this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel7 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); + this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); + this.slider4ground = new DevComponents.DotNetBar.SliderItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -374,12 +384,6 @@ this.btn_user_role = new DevComponents.DotNetBar.ButtonItem(); this.btn_password_edit = new DevComponents.DotNetBar.ButtonItem(); this.btn_reset_password = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel3 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar3 = new DevComponents.DotNetBar.RibbonBar(); - this.btn_device = new DevComponents.DotNetBar.ButtonItem(); - this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); - this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); @@ -551,10 +555,6 @@ this.buttonItemBZ9 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItemBZ10 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItemBZ11 = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel7 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); - this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); - this.slider4ground = new DevComponents.DotNetBar.SliderItem(); this.ribbonPanel12 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar18 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItem133 = new DevComponents.DotNetBar.ButtonItem(); @@ -690,11 +690,11 @@ this.contextMenuStrip3.SuspendLayout(); this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); - this.ribbonPanel8.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel7.SuspendLayout(); + this.ribbonPanel8.SuspendLayout(); this.ribbonPanel2.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); - this.ribbonPanel7.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); this.ribbonPanel5.SuspendLayout(); this.ribbonPanel6.SuspendLayout(); @@ -4162,10 +4162,10 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); - this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel2); - this.ribbonControl1.Controls.Add(this.ribbonPanel15); + this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel7); + this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); this.ribbonControl1.Controls.Add(this.ribbonPanel5); this.ribbonControl1.Controls.Add(this.ribbonPanel6); @@ -4216,135 +4216,6 @@ this.ribbonControl1.UseCustomizeDialog = false; this.ribbonControl1.Click += new System.EventHandler(this.ribbonControl1_Click); // - // ribbonPanel8 - // - this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel8.Controls.Add(this.ribbonBar_UserInfo); - this.ribbonPanel8.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel8.Location = new System.Drawing.Point(0, 33); - this.ribbonPanel8.Name = "ribbonPanel8"; - this.ribbonPanel8.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel8.Size = new System.Drawing.Size(1328, 62); - // - // - // - this.ribbonPanel8.Style.Class = ""; - this.ribbonPanel8.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel8.StyleMouseDown.Class = ""; - this.ribbonPanel8.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel8.StyleMouseOver.Class = ""; - this.ribbonPanel8.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel8.TabIndex = 42; - this.ribbonPanel8.Visible = false; - // - // ribbonBar_UserInfo - // - this.ribbonBar_UserInfo.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar_UserInfo.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar_UserInfo.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar_UserInfo.BackgroundStyle.Class = ""; - this.ribbonBar_UserInfo.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar_UserInfo.ContainerControlProcessDialogKey = true; - this.ribbonBar_UserInfo.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar_UserInfo.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.btn_user_info, - this.btn_role_info, - this.btn_resc_info, - this.btn_role_resc, - this.btn_user_role, - this.btn_password_edit, - this.btn_reset_password}); - this.ribbonBar_UserInfo.Location = new System.Drawing.Point(3, 0); - this.ribbonBar_UserInfo.Name = "ribbonBar_UserInfo"; - this.ribbonBar_UserInfo.Size = new System.Drawing.Size(427, 59); - this.ribbonBar_UserInfo.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar_UserInfo.TabIndex = 0; - // - // - // - this.ribbonBar_UserInfo.TitleStyle.Class = ""; - this.ribbonBar_UserInfo.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar_UserInfo.TitleStyleMouseOver.Class = ""; - this.ribbonBar_UserInfo.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // btn_user_info - // - this.btn_user_info.Image = global::Cyberpipe.Properties.Resources._24x24icon_13_hover; - this.btn_user_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_user_info.Name = "btn_user_info"; - this.btn_user_info.SubItemsExpandWidth = 14; - this.btn_user_info.Text = "用户管理"; - this.btn_user_info.Click += new System.EventHandler(this.btn_user_info_Click); - // - // btn_role_info - // - this.btn_role_info.Image = global::Cyberpipe.Properties.Resources._24x24icon_05_hover1; - this.btn_role_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_role_info.Name = "btn_role_info"; - this.btn_role_info.SubItemsExpandWidth = 14; - this.btn_role_info.Text = "角色管理"; - this.btn_role_info.Click += new System.EventHandler(this.btn_role_info_Click); - // - // btn_resc_info - // - this.btn_resc_info.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__09; - this.btn_resc_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_resc_info.Name = "btn_resc_info"; - this.btn_resc_info.SubItemsExpandWidth = 14; - this.btn_resc_info.Text = "资源管理"; - this.btn_resc_info.Click += new System.EventHandler(this.btn_resc_info_Click); - // - // btn_role_resc - // - this.btn_role_resc.Image = global::Cyberpipe.Properties.Resources.btnlegendSet_Image_副本; - this.btn_role_resc.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_role_resc.Name = "btn_role_resc"; - this.btn_role_resc.SubItemsExpandWidth = 14; - this.btn_role_resc.Text = "角色授权"; - this.btn_role_resc.Click += new System.EventHandler(this.btn_role_resc_Click); - // - // btn_user_role - // - this.btn_user_role.Image = global::Cyberpipe.Properties.Resources._24x24icon_08_hover; - this.btn_user_role.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_user_role.Name = "btn_user_role"; - this.btn_user_role.SubItemsExpandWidth = 14; - this.btn_user_role.Text = "用户授权"; - this.btn_user_role.Click += new System.EventHandler(this.btn_user_role_Click); - // - // btn_password_edit - // - this.btn_password_edit.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__67; - this.btn_password_edit.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_password_edit.Name = "btn_password_edit"; - this.btn_password_edit.SubItemsExpandWidth = 14; - this.btn_password_edit.Text = "密码修改"; - this.btn_password_edit.Click += new System.EventHandler(this.btn_password_edit_Click); - // - // btn_reset_password - // - this.btn_reset_password.Image = global::Cyberpipe.Properties.Resources.liuxiang; - this.btn_reset_password.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_reset_password.Name = "btn_reset_password"; - this.btn_reset_password.SubItemsExpandWidth = 14; - this.btn_reset_password.Text = "重置密码"; - this.btn_reset_password.Click += new System.EventHandler(this.btn_reset_password_Click); - // // ribbonPanel3 // this.ribbonPanel3.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4425,7 +4296,7 @@ this.btn_Person.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; this.btn_Person.Name = "btn_Person"; this.btn_Person.SubItemsExpandWidth = 14; - this.btn_Person.Text = "巡检人员维护"; + this.btn_Person.Text = "定位人员维护"; this.btn_Person.Click += new System.EventHandler(this.btn_Person_Click); // // btn_constructMap @@ -4446,6 +4317,214 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel7 + // + this.ribbonPanel7.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel7.Controls.Add(this.ribbonBar5); + this.ribbonPanel7.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel7.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel7.Name = "ribbonPanel7"; + this.ribbonPanel7.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel7.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel7.Style.Class = ""; + this.ribbonPanel7.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel7.StyleMouseDown.Class = ""; + this.ribbonPanel7.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel7.StyleMouseOver.Class = ""; + this.ribbonPanel7.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel7.TabIndex = 41; + this.ribbonPanel7.Visible = false; + // + // ribbonBar5 + // + this.ribbonBar5.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar5.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar5.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar5.BackgroundStyle.Class = ""; + this.ribbonBar5.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar5.ContainerControlProcessDialogKey = true; + this.ribbonBar5.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar5.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.btn_flag, + this.slider4ground}); + this.ribbonBar5.Location = new System.Drawing.Point(3, 0); + this.ribbonBar5.Name = "ribbonBar5"; + this.ribbonBar5.Size = new System.Drawing.Size(427, 92); + this.ribbonBar5.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar5.TabIndex = 0; + // + // + // + this.ribbonBar5.TitleStyle.Class = ""; + this.ribbonBar5.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar5.TitleStyleMouseOver.Class = ""; + this.ribbonBar5.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar5.TitleVisible = false; + // + // btn_flag + // + this.btn_flag.Image = global::Cyberpipe.Properties.Resources._24x24icon_03_hover; + this.btn_flag.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_flag.Name = "btn_flag"; + this.btn_flag.SubItemsExpandWidth = 14; + this.btn_flag.Text = "标识器管理"; + this.btn_flag.Click += new System.EventHandler(this.btn_flag_Click); + // + // slider4ground + // + this.slider4ground.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; + this.slider4ground.Name = "slider4ground"; + this.slider4ground.Text = "地面透明度"; + this.slider4ground.Value = 0; + this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); + // + // ribbonPanel8 + // + this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel8.Controls.Add(this.ribbonBar_UserInfo); + this.ribbonPanel8.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel8.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel8.Name = "ribbonPanel8"; + this.ribbonPanel8.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel8.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel8.Style.Class = ""; + this.ribbonPanel8.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel8.StyleMouseDown.Class = ""; + this.ribbonPanel8.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel8.StyleMouseOver.Class = ""; + this.ribbonPanel8.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel8.TabIndex = 42; + this.ribbonPanel8.Visible = false; + // + // ribbonBar_UserInfo + // + this.ribbonBar_UserInfo.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar_UserInfo.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar_UserInfo.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar_UserInfo.BackgroundStyle.Class = ""; + this.ribbonBar_UserInfo.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar_UserInfo.ContainerControlProcessDialogKey = true; + this.ribbonBar_UserInfo.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar_UserInfo.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.btn_user_info, + this.btn_role_info, + this.btn_resc_info, + this.btn_role_resc, + this.btn_user_role, + this.btn_password_edit, + this.btn_reset_password}); + this.ribbonBar_UserInfo.Location = new System.Drawing.Point(3, 0); + this.ribbonBar_UserInfo.Name = "ribbonBar_UserInfo"; + this.ribbonBar_UserInfo.Size = new System.Drawing.Size(427, 92); + this.ribbonBar_UserInfo.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar_UserInfo.TabIndex = 0; + // + // + // + this.ribbonBar_UserInfo.TitleStyle.Class = ""; + this.ribbonBar_UserInfo.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar_UserInfo.TitleStyleMouseOver.Class = ""; + this.ribbonBar_UserInfo.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // btn_user_info + // + this.btn_user_info.Image = global::Cyberpipe.Properties.Resources._24x24icon_13_hover; + this.btn_user_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_user_info.Name = "btn_user_info"; + this.btn_user_info.SubItemsExpandWidth = 14; + this.btn_user_info.Text = "用户管理"; + this.btn_user_info.Click += new System.EventHandler(this.btn_user_info_Click); + // + // btn_role_info + // + this.btn_role_info.Image = global::Cyberpipe.Properties.Resources._24x24icon_05_hover1; + this.btn_role_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_role_info.Name = "btn_role_info"; + this.btn_role_info.SubItemsExpandWidth = 14; + this.btn_role_info.Text = "角色管理"; + this.btn_role_info.Click += new System.EventHandler(this.btn_role_info_Click); + // + // btn_resc_info + // + this.btn_resc_info.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__09; + this.btn_resc_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_resc_info.Name = "btn_resc_info"; + this.btn_resc_info.SubItemsExpandWidth = 14; + this.btn_resc_info.Text = "资源管理"; + this.btn_resc_info.Click += new System.EventHandler(this.btn_resc_info_Click); + // + // btn_role_resc + // + this.btn_role_resc.Image = global::Cyberpipe.Properties.Resources.btnlegendSet_Image_副本; + this.btn_role_resc.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_role_resc.Name = "btn_role_resc"; + this.btn_role_resc.SubItemsExpandWidth = 14; + this.btn_role_resc.Text = "角色授权"; + this.btn_role_resc.Click += new System.EventHandler(this.btn_role_resc_Click); + // + // btn_user_role + // + this.btn_user_role.Image = global::Cyberpipe.Properties.Resources._24x24icon_08_hover; + this.btn_user_role.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_user_role.Name = "btn_user_role"; + this.btn_user_role.SubItemsExpandWidth = 14; + this.btn_user_role.Text = "用户授权"; + this.btn_user_role.Click += new System.EventHandler(this.btn_user_role_Click); + // + // btn_password_edit + // + this.btn_password_edit.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__67; + this.btn_password_edit.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_password_edit.Name = "btn_password_edit"; + this.btn_password_edit.SubItemsExpandWidth = 14; + this.btn_password_edit.Text = "密码修改"; + this.btn_password_edit.Click += new System.EventHandler(this.btn_password_edit_Click); + // + // btn_reset_password + // + this.btn_reset_password.Image = global::Cyberpipe.Properties.Resources.liuxiang; + this.btn_reset_password.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_reset_password.Name = "btn_reset_password"; + this.btn_reset_password.SubItemsExpandWidth = 14; + this.btn_reset_password.Text = "重置密码"; + this.btn_reset_password.Click += new System.EventHandler(this.btn_reset_password_Click); + // // ribbonPanel2 // this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -5891,85 +5970,6 @@ this.buttonItemBZ11.Text = "标注管理"; this.buttonItemBZ11.Click += new System.EventHandler(this.buttonItemBZ11_Click); // - // ribbonPanel7 - // - this.ribbonPanel7.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel7.Controls.Add(this.ribbonBar5); - this.ribbonPanel7.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel7.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel7.Name = "ribbonPanel7"; - this.ribbonPanel7.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel7.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel7.Style.Class = ""; - this.ribbonPanel7.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel7.StyleMouseDown.Class = ""; - this.ribbonPanel7.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel7.StyleMouseOver.Class = ""; - this.ribbonPanel7.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel7.TabIndex = 41; - this.ribbonPanel7.Visible = false; - // - // ribbonBar5 - // - this.ribbonBar5.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar5.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar5.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar5.BackgroundStyle.Class = ""; - this.ribbonBar5.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar5.ContainerControlProcessDialogKey = true; - this.ribbonBar5.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar5.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.btn_flag, - this.slider4ground}); - this.ribbonBar5.Location = new System.Drawing.Point(3, 0); - this.ribbonBar5.Name = "ribbonBar5"; - this.ribbonBar5.Size = new System.Drawing.Size(427, 92); - this.ribbonBar5.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar5.TabIndex = 0; - // - // - // - this.ribbonBar5.TitleStyle.Class = ""; - this.ribbonBar5.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar5.TitleStyleMouseOver.Class = ""; - this.ribbonBar5.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar5.TitleVisible = false; - // - // btn_flag - // - this.btn_flag.Image = global::Cyberpipe.Properties.Resources._24x24icon_03_hover; - this.btn_flag.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_flag.Name = "btn_flag"; - this.btn_flag.SubItemsExpandWidth = 14; - this.btn_flag.Text = "标识器管理"; - this.btn_flag.Click += new System.EventHandler(this.btn_flag_Click); - // - // slider4ground - // - this.slider4ground.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; - this.slider4ground.Name = "slider4ground"; - this.slider4ground.Text = "地面透明度"; - this.slider4ground.Value = 0; - this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); - // // ribbonPanel12 // this.ribbonPanel12.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7181,11 +7181,11 @@ this.contextMenuStripDeleteLayerNode.ResumeLayout(false); this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); - this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel7.ResumeLayout(false); + this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); - this.ribbonPanel7.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); this.ribbonPanel5.ResumeLayout(false); this.ribbonPanel6.ResumeLayout(false); diff --git a/Cyberpipe.csproj b/Cyberpipe.csproj index fe600e5..501fd09 100644 --- a/Cyberpipe.csproj +++ b/Cyberpipe.csproj @@ -246,6 +246,12 @@ Form_TaskManager.cs + + Form + + + FrmFlagDetail.cs + Form @@ -1368,6 +1374,9 @@ Form_TaskManager.cs + + FrmFlagDetail.cs + FormDocumentManager.cs diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 537b4c3..1acf22a 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 7d5dd95..3f178cb 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -90,20 +90,20 @@ this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - - this.winGridViewPager1.AddColumnAlias("ACCIDENTTIME", "上报时间"); - this.winGridViewPager1.AddColumnAlias("DBID", "编号"); - this.winGridViewPager1.AddColumnAlias("DESCRIBE", "事件描述"); - this.winGridViewPager1.AddColumnAlias("LATITUDE", "纬度"); - this.winGridViewPager1.AddColumnAlias("LOCALE", "事件地点"); - this.winGridViewPager1.AddColumnAlias("LONGITUDE", "经度"); - this.winGridViewPager1.AddColumnAlias("PATROLERNAME", "上报人员"); - this.winGridViewPager1.AddColumnAlias("PATROLER_ID", "人员ID"); - this.winGridViewPager1.AddColumnAlias("TASK_ID", "任务编号"); - this.winGridViewPager1.AddColumnAlias("RESULT", "处理结果"); - this.winGridViewPager1.AddColumnAlias("STATE", "处理状态"); - this.winGridViewPager1.DisplayColumns = "ACCIDENTTIME,DESCRIBE,LOCALE,PATROLERNAME,TASK_ID,RESULT,STATE"; + this.winGridViewPager1.AddColumnAlias("上报时间", "上报时间"); + this.winGridViewPager1.AddColumnAlias("编号", "编号"); + this.winGridViewPager1.AddColumnAlias("事件描述", "事件描述"); + this.winGridViewPager1.AddColumnAlias("纬度", "纬度"); + this.winGridViewPager1.AddColumnAlias("事件地点", "事件地点"); + this.winGridViewPager1.AddColumnAlias("经度", "经度"); + this.winGridViewPager1.AddColumnAlias("上报人员", "上报人员"); + this.winGridViewPager1.AddColumnAlias("人员ID", "人员ID"); + this.winGridViewPager1.AddColumnAlias("任务编号", "任务编号"); + this.winGridViewPager1.AddColumnAlias("处理结果", "处理结果"); + this.winGridViewPager1.AddColumnAlias("处理状态", "处理状态"); + + this.winGridViewPager1.DisplayColumns = "上报时间,事件描述,事件地点,上报人员,任务编号,处理结果,处理状态"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -114,8 +114,8 @@ winGridViewPager1.dataGridView1.ContextMenuStrip.Items[5].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[6].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[7].Visible = false; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[1].Text = "查看位置"; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "结果编辑"; + winGridViewPager1.dataGridView1.ContextMenuStrip.Items[1].Text = "结果编辑"; + winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "查看位置"; //右键菜单宽度 winGridViewPager1.dataGridView1.ContextMenuStrip.AutoSize = false; @@ -160,13 +160,12 @@ this.WindowState = FormWindowState.Minimized; globeControl1.Globe.MemoryLayer.RemoveAllFeature(); this.WindowState = FormWindowState.Minimized; - double x = Convert.ToDouble(row.Cells["LONGITUDE"].Value); - double y = Convert.ToDouble(row.Cells["LATITUDE"].Value); - - string username = Convert.ToString(row.Cells["PATROLERNAME"].Value); - string Atime = Convert.ToString(row.Cells["ACCIDENTTIME"].Value); - string location = Convert.ToString(row.Cells["LOCALE"].Value); - string descp = Convert.ToString(row.Cells["DESCRIBE"].Value); + double x = Convert.ToDouble(row.Cells["经度"].Value); + double y = Convert.ToDouble(row.Cells["纬度"].Value); + string username = Convert.ToString(row.Cells["上报人员"].Value); + string Atime = Convert.ToString(row.Cells["上报时间"].Value); + string location = Convert.ToString(row.Cells["事件地点"].Value); + string descp = Convert.ToString(row.Cells["事件描述"].Value); /////////////////////////////////////// /*******设置飞行与创建模型******/ @@ -228,8 +227,8 @@ DataGridViewRow row = grid.SelectedRows[0]; try { - int dbId = Convert.ToInt32(row.Cells["DBID"].Value); - string result = Convert.ToString(row.Cells["RESULT"].Value); + int dbId = Convert.ToInt32(row.Cells["编号"].Value); + string result = Convert.ToString(row.Cells["处理结果"].Value); EMS_Forms.Form_EventResult form = new Form_EventResult(dbId, result); form.refresh += new Form_EventResult.Handle(LoadData);//改变值的事件 form.ShowDialog(); @@ -276,9 +275,9 @@ } for (int i = 0; i < table.Rows.Count; i++) { - if (winGridViewPager1.dataGridView1.Rows[i].Cells["RESULT"].Value != null && !(winGridViewPager1.dataGridView1.Rows[i].Cells["RESULT"].Value.ToString().Trim().Equals(""))) + if (winGridViewPager1.dataGridView1.Rows[i].Cells["处理结果"].Value != null && !(winGridViewPager1.dataGridView1.Rows[i].Cells["处理结果"].Value.ToString().Trim().Equals(""))) { - winGridViewPager1.dataGridView1.Rows[i].Cells["STATE"].Value = "已处理"; + winGridViewPager1.dataGridView1.Rows[i].Cells["处理状态"].Value = "已处理"; } } @@ -307,9 +306,9 @@ } for (int i = 0; i < table.Rows.Count; i++) { - if (winGridViewPager1.dataGridView1.Rows[i].Cells["RESULT"].Value != null && !(winGridViewPager1.dataGridView1.Rows[i].Cells["RESULT"].Value.ToString().Trim().Equals(""))) + if (winGridViewPager1.dataGridView1.Rows[i].Cells["处理结果"].Value != null && !(winGridViewPager1.dataGridView1.Rows[i].Cells["处理结果"].Value.ToString().Trim().Equals(""))) { - winGridViewPager1.dataGridView1.Rows[i].Cells["STATE"].Value = "已处理"; + winGridViewPager1.dataGridView1.Rows[i].Cells["处理状态"].Value = "已处理"; } } @@ -320,10 +319,12 @@ { string sqlCount = "select count(*) from ACCIDENT where 1=1"; - string sqlData = "select ACCIDENTTIME,DBID,DESCRIBE,LATITUDE,LOCALE,LONGITUDE,PATROLERNAME,PATROLER_ID,TASK_ID,RESULT,'' as STATE " + + string sqlData = "select ACCIDENTTIME as 上报时间,DBID as 编号,DESCRIBE as 事件描述,"+ + "LATITUDE as 纬度,LOCALE as 事件地点,LONGITUDE as 经度,PATROLERNAME 上报人员,"+ + "PATROLER_ID as 人员ID,TASK_ID as 任务编号,RESULT as 处理结果,'' as 处理状态 " + "from (select t.*,rownum row_num from ACCIDENT t order by DBID)b " + " where 1=1"; - + rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; @@ -340,9 +341,10 @@ string sqlCount = "select count(*) from ACCIDENT where 1=1"; - string sqlData = "select ACCIDENTTIME,DBID,DESCRIBE,LATITUDE,LOCALE,LONGITUDE,PATROLERNAME,PATROLER_ID,TASK_ID,RESULT,'' as STATE " + - "from (select t.*,rownum row_num from ACCIDENT t order by DBID)b " + - " where(b.row_num between " + minPage + " and " + maxPage + ")"; + string sqlData = "select ACCIDENTTIME as 上报时间,DBID as 编号,DESCRIBE as 事件描述," + + "LATITUDE as 纬度,LOCALE as 事件地点,LONGITUDE as 经度,PATROLERNAME 上报人员," + + "PATROLER_ID as 人员ID,TASK_ID as 任务编号,RESULT as 处理结果,'' as 处理状态 " + + "from (select t.*,rownum row_num from ACCIDENT t where 1=1"; if (!String.IsNullOrEmpty(comboBox_name.Text.Trim())) { @@ -361,7 +363,8 @@ sqlCount += "and ACCIDENTTIME<=to_date('" + time.ToShortDateString() + "','yyyy-MM-dd') "; sqlData += "and ACCIDENTTIME<=to_date('" + time.ToShortDateString() + "','yyyy-MM-dd') "; } - + sqlData += " order by DBID desc)b " + + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 225c8d7..8bd9e48 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -120,8 +120,8 @@ private void flyToTask(DataGridViewRow row, int taskState) { int dbID = 0; - dbID = Convert.ToInt32(row.Cells["DBID"].Value); - string userName = Convert.ToString(row.Cells["USERNAME"].Value); + dbID = Convert.ToInt32(row.Cells["任务编号"].Value); + string userName = Convert.ToString(row.Cells["任务执行人员"].Value); System.DateTime t = new DateTime(); try { @@ -392,15 +392,15 @@ //控制表格显示的列，以及每一列要显示的列名 this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - this.winGridViewPager1.AddColumnAlias("DBID", "任务编号"); - this.winGridViewPager1.AddColumnAlias("DEPLOYTIME", "创建时间"); - this.winGridViewPager1.AddColumnAlias("DESCIRPTION", "任务描述"); - this.winGridViewPager1.AddColumnAlias("FINISHTIME", "完成时间"); - this.winGridViewPager1.AddColumnAlias("STREET", "任务执行区域"); - this.winGridViewPager1.AddColumnAlias("TASKSTATE", "任务状态"); - this.winGridViewPager1.AddColumnAlias("USERNAME", "任务执行人员"); + this.winGridViewPager1.AddColumnAlias("任务编号", "任务编号"); + this.winGridViewPager1.AddColumnAlias("创建时间", "创建时间"); + this.winGridViewPager1.AddColumnAlias("任务描述", "任务描述"); + this.winGridViewPager1.AddColumnAlias("完成时间", "完成时间"); + this.winGridViewPager1.AddColumnAlias("任务执行区域", "任务执行区域"); + this.winGridViewPager1.AddColumnAlias("任务状态", "任务状态"); + this.winGridViewPager1.AddColumnAlias("任务执行人员", "任务执行人员"); - this.winGridViewPager1.DisplayColumns = "DBID,DEPLOYTIME,DESCIRPTION,FINISHTIME,STREET,TASKSTATE,USERNAME"; + this.winGridViewPager1.DisplayColumns = "任务编号,创建时间,任务描述,完成时间,任务执行区域,任务状态,任务执行人员"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -464,8 +464,8 @@ { int dbID = 0; int taskStateInt = 0; - dbID = Convert.ToInt32(row.Cells["DBID"].Value); - string taskState = row.Cells["TASKSTATE"].Value.ToString(); + dbID = Convert.ToInt32(row.Cells["任务编号"].Value); + string taskState = row.Cells["任务状态"].Value.ToString(); if (taskState.Equals("开始任务")) { taskStateInt = 1; @@ -534,9 +534,10 @@ private string GetSql() { - string sqlCount = "select count(*) from taskinfo t where 1=1'"; + string sqlCount = "select count(*) from taskinfo t where 1=1"; - string sqlData = "select dbid,deploytime,descirption,finishtime,street,taskstate,username " + + 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"; @@ -550,9 +551,9 @@ int minPage = (pageIndex - 1) * maxPageIndex + 1; int maxPage = pageIndex * maxPageIndex; string sqlCount = "select count(*) from taskinfo t where 1=1"; - string sqlData = "select dbid,deploytime,descirption,finishtime,street,taskstate,username " + - "from (select t.*,rownum row_num from taskinfo t order by DBID desc)b " + - " where(b.row_num between " + minPage + " and " + maxPage + ")"; + 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"; if (!String.IsNullOrEmpty(comboBox_userName.Text.Trim()) && !comboBox_userName.Text.Trim().Equals("不限")) { @@ -581,6 +582,8 @@ sqlCount += "and street='" + combo_street.Text + "' "; sqlData += "and street='" + combo_street.Text + "' "; } + sqlData += " order by DBID desc)b " + + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index e65a4bd..58f5342 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -73,13 +73,13 @@ //控制表格显示的列，以及每一列要显示的列名 this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - this.winGridViewPager1.AddColumnAlias("FILENAME", "文档名称"); - this.winGridViewPager1.AddColumnAlias("DBID", "编号"); - this.winGridViewPager1.AddColumnAlias("TITLE", "文档标题"); - this.winGridViewPager1.AddColumnAlias("FILETYPE", "文档类型"); - this.winGridViewPager1.AddColumnAlias("UPDAY", "上传日期"); - this.winGridViewPager1.AddColumnAlias("WRITER", "上传人"); - this.winGridViewPager1.DisplayColumns = "FILENAME,TITLE,FILETYPE,UPDAY,WRITER"; + this.winGridViewPager1.AddColumnAlias("文档名称", "文档名称"); + this.winGridViewPager1.AddColumnAlias("编号", "编号"); + this.winGridViewPager1.AddColumnAlias("文档标题", "文档标题"); + this.winGridViewPager1.AddColumnAlias("文档类型", "文档类型"); + this.winGridViewPager1.AddColumnAlias("上传日期", "上传日期"); + this.winGridViewPager1.AddColumnAlias("上传人", "上传人"); + this.winGridViewPager1.DisplayColumns = "文档名称,文档标题,文档类型,上传日期,上传人"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -167,7 +167,7 @@ if (grid != null) { DataGridViewRow row = grid.SelectedRows[0]; - string dbid = row.Cells["dbid"].Value.ToString(); + string dbid = row.Cells["编号"].Value.ToString(); try { if (MessageBox.Show("确认删除吗？", "确认", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) @@ -212,7 +212,8 @@ { string sqlCount = "select count(*) from casic_userdocument where sysname = 'EMS'"; - string sqlData = "select filename,dbid,title,filetype,upday,writer " + + string sqlData = "select filename as 文档名称,dbid as 编号,title as 文档标题," + + "filetype as 文档类型,upday as 上传日期,writer as 上传人 " + "from (select t.*,rownum row_num from casic_userdocument t order by DBID desc)b " + " where sysname = 'EMS'"; @@ -226,9 +227,9 @@ int minPage = (pageIndex - 1) * maxPageIndex + 1; int maxPage = pageIndex * maxPageIndex; string sqlCount = "select count(*) from casic_userdocument where sysname = 'EMS'"; - string sqlData = "select filename,dbid,title,filetype,upday,writer " + - "from (select t.*,rownum row_num from casic_userdocument t where sysname = 'EMS' order by DBID desc)b " + - " where(b.row_num between " + minPage + " and " + maxPage + ")"; + string sqlData = "select filename as 文档名称,dbid as 编号,title as 文档标题,"+ + "filetype as 文档类型,upday as 上传日期,writer as 上传人 " + + "from (select t.*,rownum row_num from casic_userdocument t where sysname = 'EMS'"; string txtTitleText = null; string comboFileType = null; @@ -278,7 +279,8 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - + sqlData += " order by DBID desc)b " + + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; @@ -437,7 +439,7 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - string filename = row.Cells["filename"].Value.ToString(); + string filename = row.Cells["文档名称"].Value.ToString(); string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; string file = System.Environment.CurrentDirectory + "\\download\\" + filename; int result = DownloadFile(url, file, progressBar1); @@ -515,7 +517,7 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - string filename = row.Cells["filename"].Value.ToString(); + string filename = row.Cells["文档名称"].Value.ToString(); string ext = Path.GetExtension(filename); SaveFileDialog dlg = new SaveFileDialog(); dlg.Filter = "保存文档|*" + ext + ";"; diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 1d1201b..3902629 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -748,6 +748,7 @@ this.Name = "FrmAddSinMark"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "单个标识器添加"; + this.TopMost = true; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmAddSinMark_FormClosing); this.Load += new System.EventHandler(this.FrmAddSinMark_Load); this.groupPanel1.ResumeLayout(false); diff --git a/FrmEquipmentManage.cs b/FrmEquipmentManage.cs index 90bfdb2..a3cf55c 100644 --- a/FrmEquipmentManage.cs +++ b/FrmEquipmentManage.cs @@ -74,13 +74,13 @@ //控制表格显示的列，以及每一列要显示的列名 this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - this.winGridViewPager1.AddColumnAlias("DESCIRPTION", "设备描述"); - this.winGridViewPager1.AddColumnAlias("DBID", "编号"); - this.winGridViewPager1.AddColumnAlias("MACID", "MAC地址"); - this.winGridViewPager1.AddColumnAlias("OWNER", "设备所有人"); - this.winGridViewPager1.AddColumnAlias("STATUS", "设备状态"); + this.winGridViewPager1.AddColumnAlias("设备描述", "设备描述"); + this.winGridViewPager1.AddColumnAlias("编号", "编号"); + this.winGridViewPager1.AddColumnAlias("MAC地址", "MAC地址"); + this.winGridViewPager1.AddColumnAlias("设备所有人", "设备所有人"); + this.winGridViewPager1.AddColumnAlias("设备状态", "设备状态"); - this.winGridViewPager1.DisplayColumns = "DESCIRPTION,MACID,OWNER,STATUS"; + this.winGridViewPager1.DisplayColumns = "设备描述,MAC地址,设备所有人,设备状态"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -146,10 +146,10 @@ DataGridViewRow row = grid.SelectedRows[0]; try { - long dbid = long.Parse(row.Cells["DBID"].Value.ToString()); - String macId = row.Cells["MACID"].Value.ToString(); - String username = row.Cells["OWNER"].Value.ToString(); - String descn = row.Cells["DESCIRPTION"].Value.ToString(); + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); + String macId = row.Cells["MAC地址"].Value.ToString(); + String username = row.Cells["设备所有人"].Value.ToString(); + String descn = row.Cells["设备状态"].Value.ToString(); FrmEquipmentEdit frm = new FrmEquipmentEdit(dbid.ToString(), macId, username, descn); frm.reloadGrid += new ReloadEquipmentGrid(LoadData); frm.ShowDialog(); @@ -179,7 +179,7 @@ { return; } - String macId = row.Cells["MACID"].Value.ToString(); + String macId = row.Cells["MAC地址"].Value.ToString(); FrmLog frm = new FrmLog(macId); frm.Show(); } @@ -201,7 +201,7 @@ if (grid != null) { DataGridViewRow row = grid.SelectedRows[0]; - long dbid = long.Parse(row.Cells["DBID"].Value.ToString()); + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); try { if (MessageBox.Show("确定删除？", "确认", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) @@ -243,7 +243,8 @@ { string sqlCount = "select count(*) from equipment where status = 'USING'"; - string sqlData = "select descirption,DBID,macid,owner,case when status = 'USING' then '可用' when status = 'DAMAGE' then '损坏' end as status " + + string sqlData = "select descirption as 设备描述,DBID as 编号,macid as MAC地址,owner as 设备所有人,"+ + "case when status = 'USING' then '可用' when status = 'DAMAGE' then '损坏' end as 设备状态 " + "from (select t.*,rownum row_num from equipment t where status = 'USING' order by dbid desc)b " + " where 1=1"; @@ -258,16 +259,17 @@ int maxPage = pageIndex * maxPageIndex; string sqlCount = "select count(*) from equipment where status = 'USING' "; - string sqlData = "select descirption,DBID,macid,owner,case when status = 'USING' then '可用' when status = 'DAMAGE' then '损坏' end as status " + - "from (select t.*,rownum row_num from equipment t where status = 'USING' order by DBID desc)b " + - " where(b.row_num between " + minPage + " and " + maxPage + ")"; + string sqlData = "select descirption as 设备描述,DBID as 编号,macid as MAC地址,owner as 设备所有人," + + "case when status = 'USING' then '可用' when status = 'DAMAGE' then '损坏' end as 设备状态 " + + "from (select t.*,rownum row_num from equipment t where status = 'USING'"; if (!String.IsNullOrEmpty(txtMacId.Text.Trim())) { sqlData += " and macid like '%" + txtMacId.Text.Trim() + "%'"; sqlCount += " and macid like '%" + txtMacId.Text.Trim() + "%'"; } - + sqlData += " order by DBID desc)b " + + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; @@ -299,76 +301,6 @@ } } - //public void reloadGrid(int pageIndex) - //{ - // if (pageIndex <= 0) - // { - // pageIndex = 1; - // currentpage = 1; - // } - // String sqlrows = "select * from (select rownum as rowno,dbid,descirption,macid,owner,case when status = 'USING' then '可用' when status = 'DAMAGE' then '损坏' end as status,'编辑' as btnEdit,'删除' as btnDel from equipment t where status = 'USING' "; - // string sqlcount = "select count(*) from equipment where status = 'USING' "; - // if (!String.IsNullOrEmpty(txtMacId.Text.Trim())) - // { - // sqlrows += " and macid like '%" + txtMacId.Text.Trim() + "%'"; - // sqlcount += " and macid like '%" + txtMacId.Text.Trim() + "%'"; - // } - // sqlrows += " and rownum<=" + (pagesize * pageIndex) + ") table_alias where table_alias.rowno>=" + ((pageIndex - 1) * pagesize + 1); - - // int rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlcount).ToString()); - // int pages = 0; - // if (rows % pagesize == 0) - // { - // pages = rows / pagesize; - // } - // else - // { - // pages = rows / pagesize + 1; - // } - - // lastpage = pages; - - // lab_page_msg.Text = "共" + rows + "条记录，每页" + pagesize + "条，第" + pageIndex + "页，共" + pages + "页"; - // combo_page_num.Items.Clear(); - // for (int i = 1; i <= pages; i++) - // { - // combo_page_num.Items.Add(new ComboBoxItem(i.ToString(), i.ToString())); - // } - - // if (lastpage == 1) - // { - // btn_page_first.Enabled = false; - // btn_page_pre.Enabled = false; - // btn_page_last.Enabled = false; - // btn_page_next.Enabled = false; - // } - // else if (currentpage == 1) - // { - // btn_page_first.Enabled = false; - // btn_page_pre.Enabled = false; - // btn_page_last.Enabled = true; - // btn_page_next.Enabled = true; - // } - // else if (currentpage == lastpage) - // { - // btn_page_first.Enabled = true; - // btn_page_pre.Enabled = true; - // btn_page_last.Enabled = false; - // btn_page_next.Enabled = false; - // } - // else - // { - // btn_page_first.Enabled = true; - // btn_page_pre.Enabled = true; - // btn_page_last.Enabled = true; - // btn_page_next.Enabled = true; - // } - - // DataTable table = OracleUtils.ExecuteDataset(OracleUtils.ConnectionString, CommandType.Text, sqlrows).Tables[0]; - // dataGridViewX1.DataSource = table; - - //} - private void FrmEquipmentManage_FormClosing(object sender, FormClosingEventArgs e) diff --git a/FrmFlagDetail.Designer.cs b/FrmFlagDetail.Designer.cs new file mode 100644 index 0000000..982bfc6 --- /dev/null +++ b/FrmFlagDetail.Designer.cs @@ -0,0 +1,103 @@ +namespace Cyberpipe +{ + partial class FrmFlagDetail + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); + this.dataGridViewX_markDetail = new DevComponents.DotNetBar.Controls.DataGridViewX(); + this.对象类型 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.对象编号 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.对象名称 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX_markDetail)).BeginInit(); + this.SuspendLayout(); + // + // dataGridViewX_markDetail + // + this.dataGridViewX_markDetail.AllowUserToAddRows = false; + this.dataGridViewX_markDetail.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; + this.dataGridViewX_markDetail.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dataGridViewX_markDetail.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.对象类型, + this.对象编号, + this.对象名称}); + dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle3.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dataGridViewX_markDetail.DefaultCellStyle = dataGridViewCellStyle3; + this.dataGridViewX_markDetail.Dock = System.Windows.Forms.DockStyle.Fill; + this.dataGridViewX_markDetail.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(170)))), ((int)(((byte)(170)))), ((int)(((byte)(170))))); + this.dataGridViewX_markDetail.Location = new System.Drawing.Point(0, 0); + this.dataGridViewX_markDetail.Name = "dataGridViewX_markDetail"; + this.dataGridViewX_markDetail.RowTemplate.Height = 23; + this.dataGridViewX_markDetail.Size = new System.Drawing.Size(508, 321); + this.dataGridViewX_markDetail.TabIndex = 0; + // + // 对象类型 + // + this.对象类型.HeaderText = "对象类型"; + this.对象类型.Name = "对象类型"; + // + // 对象编号 + // + this.对象编号.HeaderText = "对象编号"; + this.对象编号.Name = "对象编号"; + // + // 对象名称 + // + this.对象名称.HeaderText = "对象名称"; + this.对象名称.Name = "对象名称"; + // + // FrmFlagDetail + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(508, 321); + this.Controls.Add(this.dataGridViewX_markDetail); + this.Name = "FrmFlagDetail"; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; + this.Text = "标识对象信息"; + this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmFlagDetail_FormClosing); + this.Load += new System.EventHandler(this.FrmFlagDetail_Load); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX_markDetail)).EndInit(); + this.ResumeLayout(false); + + } + + #endregion + + private DevComponents.DotNetBar.Controls.DataGridViewX dataGridViewX_markDetail; + private System.Windows.Forms.DataGridViewTextBoxColumn 对象类型; + private System.Windows.Forms.DataGridViewTextBoxColumn 对象编号; + private System.Windows.Forms.DataGridViewTextBoxColumn 对象名称; + + } +} \ No newline at end of file diff --git a/FrmFlagDetail.cs b/FrmFlagDetail.cs new file mode 100644 index 0000000..81de974 --- /dev/null +++ b/FrmFlagDetail.cs @@ -0,0 +1,77 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Windows.Forms; +using GeoScene.Globe; +using System.Data.OracleClient; + +namespace Cyberpipe +{ + public partial class FrmFlagDetail : Form + { + DataTable dt = new DataTable(); + private GSOGlobeControl globeControl1; + + public delegate void Handle(); + public event Handle showParentForm; + String markId; + + public FrmFlagDetail(GSOGlobeControl globeControl1, String id) + { + InitializeComponent(); + this.markId = id; + } + + private void FrmFlagDetail_FormClosing(object sender, FormClosingEventArgs e) + { + showParentForm(); + } + + private void FrmFlagDetail_Load(object sender, EventArgs e) + { + string objectIds = ""; + string objectTypeCodes = ""; + string sql = "select t.对象编号,t.对象类型 from 标识器 t where t.编号='" + markId + "'"; + using (OracleDataReader reader = OracleUtils.ExecuteReader(OracleUtils.ConnectionString, CommandType.Text, sql)) + { + while (reader.Read()) + { + objectIds = reader.GetString(0); + objectTypeCodes = reader.GetString(1); + } + } + + string[] codeTypes = objectTypeCodes.Split(','); + string[] codeIds = objectIds.Split(','); + int length = 0; + if (codeTypes.Length <= codeIds.Length) + { + length = codeTypes.Length; + } + else + { + length = codeIds.Length; + } + for (int n = 0; n < length; n++) + { + for (int i = 0; i < Utility1.listPipelineType.Count; i++) + { + if (Utility1.listPipelineType[i].code == codeTypes[n]) + { + //string objectId = codeIds[i]; + //string objectType = Utility1.listPipelineType[i].type; + //string objectName = Utility1.listPipelineType[i].name; + int index = this.dataGridViewX_markDetail.Rows.Add(); + this.dataGridViewX_markDetail.Rows[index].Cells[0].Value = Utility1.listPipelineType[i].type; + this.dataGridViewX_markDetail.Rows[index].Cells[1].Value = codeIds[n].ToString(); + this.dataGridViewX_markDetail.Rows[index].Cells[2].Value = Utility1.listPipelineType[i].name; + } + } + } + } + } +} diff --git a/FrmFlagDetail.resx b/FrmFlagDetail.resx new file mode 100644 index 0000000..e98a8fe --- /dev/null +++ b/FrmFlagDetail.resx @@ -0,0 +1,129 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + True + + + True + + + True + + \ No newline at end of file diff --git a/FrmFlagManagers.Designer.cs b/FrmFlagManagers.Designer.cs index d7e2f60..9fe14fb 100644 --- a/FrmFlagManagers.Designer.cs +++ b/FrmFlagManagers.Designer.cs @@ -28,8 +28,10 @@ /// private void InitializeComponent() { - this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); - this.winGridViewPager1 = new WHC.Pager.WinControl.WinGridViewPager(); + this.components = new System.ComponentModel.Container(); + this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components); + this.标识对象ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripMenuItem2 = new System.Windows.Forms.ToolStripMenuItem(); this.bar1 = new DevComponents.DotNetBar.Bar(); this.labelItem1 = new DevComponents.DotNetBar.LabelItem(); this.txt_no = new DevComponents.DotNetBar.TextBoxItem(); @@ -38,45 +40,37 @@ this.btn_query = new DevComponents.DotNetBar.ButtonItem(); this.btn_add_batch = new DevComponents.DotNetBar.ButtonItem(); this.btn_add_menu = new DevComponents.DotNetBar.ButtonItem(); - this.btn_db = new DevComponents.DotNetBar.ButtonItem(); - this.tableLayoutPanel1.SuspendLayout(); + this.winGridViewPager1 = new WHC.Pager.WinControl.WinGridViewPager(); + this.contextMenuStrip1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.bar1)).BeginInit(); this.SuspendLayout(); // - // tableLayoutPanel1 + // contextMenuStrip1 // - this.tableLayoutPanel1.ColumnCount = 1; - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel1.Controls.Add(this.winGridViewPager1, 0, 1); - this.tableLayoutPanel1.Controls.Add(this.bar1, 0, 0); - this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 0); - this.tableLayoutPanel1.Name = "tableLayoutPanel1"; - this.tableLayoutPanel1.RowCount = 2; - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 32F)); - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel1.Size = new System.Drawing.Size(881, 474); - this.tableLayoutPanel1.TabIndex = 6; + this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.标识对象ToolStripMenuItem, + this.toolStripMenuItem2}); + this.contextMenuStrip1.Name = "contextMenuStrip1"; + this.contextMenuStrip1.Size = new System.Drawing.Size(125, 48); // - // winGridViewPager1 + // 标识对象ToolStripMenuItem // - this.winGridViewPager1.AppendedMenu = null; - this.winGridViewPager1.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; - this.winGridViewPager1.DataSource = null; - this.winGridViewPager1.DisplayColumns = ""; - this.winGridViewPager1.Dock = System.Windows.Forms.DockStyle.Fill; - this.winGridViewPager1.Location = new System.Drawing.Point(3, 35); - this.winGridViewPager1.MinimumSize = new System.Drawing.Size(540, 0); - this.winGridViewPager1.Name = "winGridViewPager1"; - this.winGridViewPager1.PrintTitle = ""; - this.winGridViewPager1.Size = new System.Drawing.Size(875, 436); - this.winGridViewPager1.TabIndex = 5; + this.标识对象ToolStripMenuItem.Name = "标识对象ToolStripMenuItem"; + this.标识对象ToolStripMenuItem.Size = new System.Drawing.Size(124, 22); + this.标识对象ToolStripMenuItem.Text = "标识对象"; + this.标识对象ToolStripMenuItem.Click += new System.EventHandler(this.标识对象ToolStripMenuItem_Click); + // + // toolStripMenuItem2 + // + this.toolStripMenuItem2.Name = "toolStripMenuItem2"; + this.toolStripMenuItem2.Size = new System.Drawing.Size(152, 22); + this.toolStripMenuItem2.Text = "查看位置"; + this.toolStripMenuItem2.Click += new System.EventHandler(this.toolStripMenuItem2_Click); // // bar1 // this.bar1.AntiAlias = true; this.bar1.Dock = System.Windows.Forms.DockStyle.Top; - this.bar1.DockSide = DevComponents.DotNetBar.eDockSide.Document; this.bar1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.labelItem1, this.txt_no, @@ -84,14 +78,13 @@ this.combo_street, this.btn_query, this.btn_add_batch, - this.btn_add_menu, - this.btn_db}); - this.bar1.Location = new System.Drawing.Point(3, 3); + this.btn_add_menu}); + this.bar1.Location = new System.Drawing.Point(0, 0); this.bar1.Name = "bar1"; - this.bar1.Size = new System.Drawing.Size(875, 28); + this.bar1.Size = new System.Drawing.Size(881, 28); this.bar1.Stretch = true; this.bar1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.bar1.TabIndex = 1; + this.bar1.TabIndex = 8; this.bar1.TabStop = false; this.bar1.Text = "bar1"; // @@ -136,24 +129,34 @@ this.btn_add_menu.Text = "手工添加"; this.btn_add_menu.Click += new System.EventHandler(this.btn_add_menu_Click); // - // btn_db + // winGridViewPager1 // - this.btn_db.Name = "btn_db"; - this.btn_db.Text = "数据导出"; + this.winGridViewPager1.AppendedMenu = null; + this.winGridViewPager1.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; + this.winGridViewPager1.DataSource = null; + this.winGridViewPager1.DisplayColumns = ""; + this.winGridViewPager1.Dock = System.Windows.Forms.DockStyle.Fill; + this.winGridViewPager1.Location = new System.Drawing.Point(0, 28); + this.winGridViewPager1.MinimumSize = new System.Drawing.Size(540, 0); + this.winGridViewPager1.Name = "winGridViewPager1"; + this.winGridViewPager1.PrintTitle = ""; + this.winGridViewPager1.Size = new System.Drawing.Size(881, 446); + this.winGridViewPager1.TabIndex = 9; // // FrmFlagManagers // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(881, 474); - this.Controls.Add(this.tableLayoutPanel1); + this.Controls.Add(this.winGridViewPager1); + this.Controls.Add(this.bar1); this.DoubleBuffered = true; this.Name = "FrmFlagManagers"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "标识器管理"; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmFlagManagers_FormClosing); this.Load += new System.EventHandler(this.FrmFlagManagers_Load); - this.tableLayoutPanel1.ResumeLayout(false); + this.contextMenuStrip1.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.bar1)).EndInit(); this.ResumeLayout(false); @@ -161,8 +164,8 @@ #endregion - private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1; - private WHC.Pager.WinControl.WinGridViewPager winGridViewPager1; + private System.Windows.Forms.ContextMenuStrip contextMenuStrip1; + private System.Windows.Forms.ToolStripMenuItem 标识对象ToolStripMenuItem; private DevComponents.DotNetBar.Bar bar1; private DevComponents.DotNetBar.LabelItem labelItem1; private DevComponents.DotNetBar.TextBoxItem txt_no; @@ -171,6 +174,7 @@ private DevComponents.DotNetBar.ButtonItem btn_query; private DevComponents.DotNetBar.ButtonItem btn_add_batch; private DevComponents.DotNetBar.ButtonItem btn_add_menu; - private DevComponents.DotNetBar.ButtonItem btn_db; + private WHC.Pager.WinControl.WinGridViewPager winGridViewPager1; + private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem2; } } \ No newline at end of file diff --git a/FrmFlagManagers.cs b/FrmFlagManagers.cs index 38d4927..9bf9734 100644 --- a/FrmFlagManagers.cs +++ b/FrmFlagManagers.cs @@ -33,15 +33,13 @@ { this.globeControl1 = _globeControl1; InitializeComponent(); - winGridViewPager1.OnPageChanged += new EventHandler(winGridViewPager1_OnPageChanged); - this.winGridViewPager1.OnAddNew += new EventHandler(winGridViewPager1_OnAddNew); //右键定位 + winGridViewPager1.OnPageChanged += new EventHandler(winGridViewPager1_OnPageChanged); this.winGridViewPager1.OnEditSelected += new EventHandler(winGridViewPager1_OnEditSelected);//属性编辑 this.winGridViewPager1.OnDeleteSelected += new EventHandler(winGridViewPager1_OnDeleteSelected);//标识器报废 + this.winGridViewPager1.OnStartExport += new EventHandler(pager1_OnStartExport); this.winGridViewPager1.OnEndExport += new EventHandler(pager1_OnEndExport); - //this.winGridViewPager1.ExportCurrent += new ExportCurrentEventHandler(pager1_ExportCurrent); - //this.winGridViewPager1.ExportAll += new ExportAllEventHandler(pager1_ExportAll); winGridViewPager1.dataGridView1.MultiSelect = false; @@ -76,26 +74,25 @@ this.winGridViewPager1.AddColumnAlias("标识器型号", "标识器型号"); this.winGridViewPager1.AddColumnAlias("地面高程", "地面高程"); this.winGridViewPager1.AddColumnAlias("标识器埋深", "标识器埋深"); - this.winGridViewPager1.AddColumnAlias("对象编号", "对象编号"); - this.winGridViewPager1.AddColumnAlias("对象类型", "对象类型"); this.winGridViewPager1.AddColumnAlias("所属道路", "所属道路"); this.winGridViewPager1.AddColumnAlias("使用状态", "使用状态"); - this.winGridViewPager1.DisplayColumns = "编号,标识器ID号,标识器型号,地面高程,标识器埋深,对象编号,对象类型,所属道路,使用状态"; + this.winGridViewPager1.DisplayColumns = "编号,标识器ID号,标识器型号,地面高程,标识器埋深,所属道路,使用状态"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 //隐藏右键功能按钮 //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[1].Visible = false; - //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[4].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[5].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[6].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[7].Visible = false; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[1].Text = "定位查看"; + //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[1].Text = "定位查看"; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "属性编辑"; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Text = "标识器报废"; + winGridViewPager1.AppendedMenu = this.contextMenuStrip1; + //右键菜单宽度 winGridViewPager1.dataGridView1.ContextMenuStrip.AutoSize = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Width = 150; @@ -153,7 +150,7 @@ } /// - /// 右键定位 + /// 对象查看 /// /// /// @@ -306,20 +303,10 @@ string sqlCount = "select count(*) from 标识器 where 使用状态 = '使用中'"; - string sqlData = "select 编号,标识器ID号,标识器型号,地面高程,标识器埋深,对象编号,对象类型,所属道路,LSSYS_ID,X坐标,Y坐标,使用状态 " + + string sqlData = "select 编号,标识器ID号,标识器型号,地面高程,标识器埋深,所属道路,LSSYS_ID,X坐标,Y坐标,使用状态 " + "from (select t.*,rownum row_num from 标识器 t where 使用状态 = '使用中' order by 编号)b " + " where 1=1"; - if (!String.IsNullOrEmpty(txt_no.Text.Trim())) - { - sqlCount += " and 编号 like '%" + txt_no.Text.Trim() + "%'"; - sqlData += " and 编号 like '%" + txt_no.Text.Trim() + "%'"; - } - if (null != combo_street.SelectedItem && !String.IsNullOrEmpty(combo_street.SelectedItem.ToString().Trim())) - { - sqlData += " and 所属道路='" + combo_street.SelectedItem.ToString().Trim() + "'"; - sqlCount += " and 所属道路='" + combo_street.SelectedItem.ToString().Trim() + "'"; - } rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -332,9 +319,8 @@ int maxPage = pageIndex * maxPageIndex; string sqlCount = "select count(*) from 标识器 where 使用状态 = '使用中'"; - string sqlData = "select 编号,标识器ID号,标识器型号,地面高程,标识器埋深,对象编号,对象类型,所属道路,LSSYS_ID,X坐标,Y坐标,使用状态 " + - "from (select t.*,rownum row_num from 标识器 t where 使用状态 = '使用中' order by 编号)b "+ - " where(b.row_num between " + minPage + " and " + maxPage + ")"; + string sqlData = "select 编号,标识器ID号,标识器型号,地面高程,标识器埋深,所属道路,LSSYS_ID,X坐标,Y坐标,使用状态 " + + "from (select t.*,rownum row_num from 标识器 t where 使用状态 = '使用中'"; if (!String.IsNullOrEmpty(txt_no.Text.Trim())) { @@ -347,6 +333,8 @@ sqlCount += " and 所属道路='" + combo_street.SelectedItem.ToString().Trim() + "'"; } + sqlData += " order by 编号)b " + + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; @@ -372,9 +360,10 @@ private void FrmFlagManagers_FormClosing(object sender, FormClosingEventArgs e) { IS_OPEN = false; - Thread downloadJob = new Thread(new ParameterizedThreadStart(doSave)); - downloadJob.IsBackground = true; - downloadJob.Start(e); + //Thread downloadJob = new Thread(new ParameterizedThreadStart(doSave)); + //downloadJob.IsBackground = true; + //downloadJob.Start(e); + globeControl1.Globe.Layers["标识器"].Save(); globeControl1.Globe.MemoryLayer.RemoveAllFeature(); foreach (GSOFeature f in Features) { @@ -480,10 +469,88 @@ if (null != globeControl1) { FrmAddSinMark frm = new FrmAddSinMark(globeControl1); - frm.ShowDialog(); + frm.Show(); } } + private void 标识对象ToolStripMenuItem_Click(object sender, EventArgs e) + { + if (winGridViewPager1 != null && winGridViewPager1.dataGridView1 != null) + { + DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; + try + { + this.Hide(); + string id = row.Cells["编号"].Value.ToString(); + FrmFlagDetail p = new FrmFlagDetail(globeControl1, id); + p.showParentForm += new FrmFlagDetail.Handle(showThisForm);//改变值的事件 + p.Show(); + } + catch (Exception ex) + { + MessageBox.Show("失败:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } + + private void showThisForm() + { + this.Show(); + } + + private void toolStripMenuItem2_Click(object sender, EventArgs e) + { + if (winGridViewPager1 != null && winGridViewPager1.dataGridView1 != null) + { + DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; + try + { + this.WindowState = FormWindowState.Minimized; + string id = row.Cells["LSSYS_ID"].Value.ToString(); + string flagno = row.Cells["编号"].Value.ToString(); + string flagstreet = row.Cells["所属道路"].Value.ToString(); + double x = Convert.ToDouble(row.Cells["X坐标"].Value); + double y = Convert.ToDouble(row.Cells["Y坐标"].Value); + GSOFeature flagFeature = globeControl1.Globe.Layers.GetLayerByCaption("标识器").GetFeatureByID(int.Parse(id)); + + string type = ""; + string pipe = ""; + string sql = "select t.标识器型号,t.对象编号 from 标识器 t where t.编号='" + flagno + "'"; + using (OracleDataReader reader = OracleUtils.ExecuteReader(OracleUtils.ConnectionString, CommandType.Text, sql)) + { + while (reader.Read()) + { + type = reader.GetString(0); + pipe = reader.GetString(1); + } + } + + GSOLabel label = new GSOLabel(); + label.Text = "标识器编号：" + flagno + "\r\n" + + "标识器类型:" + type + "\r\n" + + //"标识对象编号:" + pipe + "\r\n" + + "所属道路:" + flagstreet; + label.Style = new GSOLabelStyle(); + label.Style.TextStyle.FontSize = 18; + label.Style.TextStyle.ForeColor = Color.FromArgb(0, 0, 0, 255); + label.Style.Opaque = 0.8; //设置标注的透明度，取值区间是0-1 + label.Style.TracktionLineType = EnumTracktionLineType.Solid; + label.Style.TextStyle.FontHeight = 10; + label.Style.TextStyle.FontName = "黑体"; + label.Style.TractionLineEndPos = new GSOPoint2d(80, 60); + + flagFeature.Label = label; + Features.Add(flagFeature); + globeControl1.Globe.JumpToFeature(flagFeature, 20); + this.globeControl1.Refresh(); + + } + catch (Exception ex) + { + MessageBox.Show("标识器定位失败:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } } diff --git a/FrmFlagManagers.resx b/FrmFlagManagers.resx index 1af7de1..ad53752 100644 --- a/FrmFlagManagers.resx +++ b/FrmFlagManagers.resx @@ -117,4 +117,7 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 17, 17 + \ No newline at end of file diff --git a/FrmPatrolerEdit.cs b/FrmPatrolerEdit.cs index dbd4fec..f45b5ae 100644 --- a/FrmPatrolerEdit.cs +++ b/FrmPatrolerEdit.cs @@ -46,7 +46,7 @@ txt_name.Focus(); return; } - if (String.IsNullOrEmpty(combo_sex.SelectedItem.ToString())) + if (combo_sex.SelectedItem == null ||String.IsNullOrEmpty(combo_sex.SelectedItem.ToString())) { MessageBox.Show("性别不能为空！", "警告", MessageBoxButtons.OK, MessageBoxIcon.Warning); combo_sex.Focus(); diff --git a/FrmPatrolerManager.Designer.cs b/FrmPatrolerManager.Designer.cs index bb8e5fb..10fac22 100644 --- a/FrmPatrolerManager.Designer.cs +++ b/FrmPatrolerManager.Designer.cs @@ -47,11 +47,13 @@ this.注销 = new DevComponents.Editors.ComboItem(); this.btn_query_person = new DevComponents.DotNetBar.ButtonItem(); this.btn_add_person = new DevComponents.DotNetBar.ButtonItem(); - this.winGridViewPager1 = new WHC.Pager.WinControl.WinGridViewPager(); this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components); this.日志ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.任务ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.定位ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.winGridViewPager1 = new WHC.Pager.WinControl.WinGridViewPager(); + this.编辑ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.注销ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); ((System.ComponentModel.ISupportInitialize)(this.bar1)).BeginInit(); this.contextMenuStrip1.SuspendLayout(); this.SuspendLayout(); @@ -173,9 +175,42 @@ this.btn_add_person.Text = "新增"; this.btn_add_person.Click += new System.EventHandler(this.btn_add_person_Click); // + // contextMenuStrip1 + // + this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.日志ToolStripMenuItem, + this.任务ToolStripMenuItem, + this.定位ToolStripMenuItem, + this.编辑ToolStripMenuItem, + this.注销ToolStripMenuItem}); + this.contextMenuStrip1.Name = "contextMenuStrip1"; + this.contextMenuStrip1.Size = new System.Drawing.Size(153, 136); + // + // 日志ToolStripMenuItem + // + this.日志ToolStripMenuItem.Name = "日志ToolStripMenuItem"; + this.日志ToolStripMenuItem.Size = new System.Drawing.Size(100, 22); + this.日志ToolStripMenuItem.Text = "日志"; + this.日志ToolStripMenuItem.Click += new System.EventHandler(this.日志ToolStripMenuItem_Click); + // + // 任务ToolStripMenuItem + // + this.任务ToolStripMenuItem.Name = "任务ToolStripMenuItem"; + this.任务ToolStripMenuItem.Size = new System.Drawing.Size(100, 22); + this.任务ToolStripMenuItem.Text = "任务"; + this.任务ToolStripMenuItem.Click += new System.EventHandler(this.任务ToolStripMenuItem_Click); + // + // 定位ToolStripMenuItem + // + this.定位ToolStripMenuItem.Name = "定位ToolStripMenuItem"; + this.定位ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.定位ToolStripMenuItem.Text = "定位"; + this.定位ToolStripMenuItem.Click += new System.EventHandler(this.定位ToolStripMenuItem_Click); + // // winGridViewPager1 // this.winGridViewPager1.AppendedMenu = null; + this.winGridViewPager1.ContextMenuStrip = this.contextMenuStrip1; this.winGridViewPager1.DataSource = null; this.winGridViewPager1.DisplayColumns = ""; this.winGridViewPager1.Dock = System.Windows.Forms.DockStyle.Fill; @@ -186,35 +221,19 @@ this.winGridViewPager1.Size = new System.Drawing.Size(756, 309); this.winGridViewPager1.TabIndex = 3; // - // contextMenuStrip1 + // 编辑ToolStripMenuItem // - this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.日志ToolStripMenuItem, - this.任务ToolStripMenuItem, - this.定位ToolStripMenuItem}); - this.contextMenuStrip1.Name = "contextMenuStrip1"; - this.contextMenuStrip1.Size = new System.Drawing.Size(101, 70); + this.编辑ToolStripMenuItem.Name = "编辑ToolStripMenuItem"; + this.编辑ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.编辑ToolStripMenuItem.Text = "编辑"; + this.编辑ToolStripMenuItem.Click += new System.EventHandler(this.编辑ToolStripMenuItem_Click); // - // 日志ToolStripMenuItem + // 注销ToolStripMenuItem // - this.日志ToolStripMenuItem.Name = "日志ToolStripMenuItem"; - this.日志ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); - this.日志ToolStripMenuItem.Text = "日志"; - this.日志ToolStripMenuItem.Click += new System.EventHandler(this.日志ToolStripMenuItem_Click); - // - // 任务ToolStripMenuItem - // - this.任务ToolStripMenuItem.Name = "任务ToolStripMenuItem"; - this.任务ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); - this.任务ToolStripMenuItem.Text = "任务"; - this.任务ToolStripMenuItem.Click += new System.EventHandler(this.任务ToolStripMenuItem_Click); - // - // 定位ToolStripMenuItem - // - this.定位ToolStripMenuItem.Name = "定位ToolStripMenuItem"; - this.定位ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); - this.定位ToolStripMenuItem.Text = "定位"; - this.定位ToolStripMenuItem.Click += new System.EventHandler(this.定位ToolStripMenuItem_Click); + this.注销ToolStripMenuItem.Name = "注销ToolStripMenuItem"; + this.注销ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.注销ToolStripMenuItem.Text = "注销"; + this.注销ToolStripMenuItem.Click += new System.EventHandler(this.注销ToolStripMenuItem_Click); // // FrmPatrolerManager // @@ -229,7 +248,7 @@ this.MinimizeBox = false; this.Name = "FrmPatrolerManager"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; - this.Text = "巡检人员维护"; + this.Text = "定位人员维护"; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmPatrolerManager_FormClosing); this.Load += new System.EventHandler(this.FrmPatrolerManager_Load); ((System.ComponentModel.ISupportInitialize)(this.bar1)).EndInit(); @@ -258,10 +277,12 @@ private DevComponents.Editors.ComboItem 注销; private DevComponents.Editors.ComboItem comboItem1; private DevComponents.Editors.ComboItem 不限; - private WHC.Pager.WinControl.WinGridViewPager winGridViewPager1; private System.Windows.Forms.ContextMenuStrip contextMenuStrip1; private System.Windows.Forms.ToolStripMenuItem 日志ToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem 任务ToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem 定位ToolStripMenuItem; + private WHC.Pager.WinControl.WinGridViewPager winGridViewPager1; + private System.Windows.Forms.ToolStripMenuItem 编辑ToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem 注销ToolStripMenuItem; } } \ No newline at end of file diff --git a/FrmPatrolerManager.cs b/FrmPatrolerManager.cs index 255a076..9c32f54 100644 --- a/FrmPatrolerManager.cs +++ b/FrmPatrolerManager.cs @@ -29,9 +29,7 @@ this.globeControl1 = globeControl1; winGridViewPager1.OnPageChanged += new EventHandler(winGridViewPager1_OnPageChanged); - this.winGridViewPager1.OnEditSelected += new EventHandler(winGridViewPager1_OnEditSelected);//编辑 - this.winGridViewPager1.OnDeleteSelected += new EventHandler(winGridViewPager1_OnDeleteSelected);//删除 - + this.winGridViewPager1.OnStartExport += new EventHandler(pager1_OnStartExport); this.winGridViewPager1.OnEndExport += new EventHandler(pager1_OnEndExport); @@ -47,26 +45,31 @@ //控制表格显示的列，以及每一列要显示的列名 this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - this.winGridViewPager1.AddColumnAlias("USERNAME", "姓名"); - this.winGridViewPager1.AddColumnAlias("DBID", "编号"); - this.winGridViewPager1.AddColumnAlias("SEX", "性别"); - this.winGridViewPager1.AddColumnAlias("AGE", "年龄"); - this.winGridViewPager1.AddColumnAlias("PHONENUM", "电话"); - this.winGridViewPager1.AddColumnAlias("ACCOUNTSTATE", "状态"); - this.winGridViewPager1.DisplayColumns = "USERNAME,SEX,AGE,PHONENUM,ACCOUNTSTATE"; + this.winGridViewPager1.AddColumnAlias("姓名", "姓名"); + this.winGridViewPager1.AddColumnAlias("编号", "编号"); + this.winGridViewPager1.AddColumnAlias("性别", "性别"); + this.winGridViewPager1.AddColumnAlias("年龄", "年龄"); + this.winGridViewPager1.AddColumnAlias("电话", "电话"); + this.winGridViewPager1.AddColumnAlias("状态", "状态"); + this.winGridViewPager1.DisplayColumns = "姓名,性别,年龄,电话,状态"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 + //隐藏右键功能按钮 //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[1].Visible = false; + winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Visible = false; + winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[4].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[5].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[6].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[7].Visible = false; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "编辑"; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Text = "注销"; + + //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "编辑"; + //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Text = "注销"; winGridViewPager1.AppendedMenu = this.contextMenuStrip1; + //右键菜单宽度 winGridViewPager1.dataGridView1.ContextMenuStrip.AutoSize = false; @@ -122,11 +125,11 @@ DataGridViewRow row = grid.SelectedRows[0]; try { - long dbid = long.Parse(row.Cells["dbid"].Value.ToString()); - String name = row.Cells["USERNAME"].Value.ToString(); - String sex = row.Cells["SEX"].Value.ToString(); - String age = row.Cells["AGE"].Value.ToString(); - string phone = row.Cells["PHONENUM"].Value.ToString(); + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); + String name = row.Cells["姓名"].Value.ToString(); + String sex = row.Cells["性别"].Value.ToString(); + String age = row.Cells["年龄"].Value.ToString(); + string phone = row.Cells["电话"].Value.ToString(); age = String.IsNullOrEmpty(age.ToString().Trim()) ? "1" : age.ToString().Trim(); FrmPatrolerEdit frm = new FrmPatrolerEdit(dbid.ToString(), name, age, sex, phone); frm.reloadGrid += new ReloadPatrolerGrid(LoadData); @@ -152,10 +155,10 @@ if (grid != null) { DataGridViewRow row = grid.SelectedRows[0]; - long dbid = long.Parse(row.Cells["DBID"].Value.ToString()); + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); try { - string state = row.Cells["ACCOUNTSTATE"].Value.ToString(); + string state = row.Cells["状态"].Value.ToString(); if ("在线".Equals(state)) { if (MessageBox.Show("确定注销？", "确认", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) @@ -180,60 +183,60 @@ { int pageIndex = winGridViewPager1.PagerInfo.CurrenetPageIndex; string sqlData = GetSql(pageIndex); - initlizeDatagrid(); + DataTable table = OracleUtils.ExecuteDataset(OracleUtils.ConnectionString, CommandType.Text, sqlData).Tables[0]; winGridViewPager1.DataSource = table.DefaultView; - for (int i = 0; i < winGridViewPager1.dataGridView1.Rows.Count; i++) - { - if (winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value.ToString() == "ONLINE") - { - winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value = "在线"; - } - else - { - if (winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value.ToString() == "OFFLINE") - { - winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value = "离线"; - } - else - { - if (winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value.ToString() == "LEAVER") - { - winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value = "注销"; - } - } - } - } + //for (int i = 0; i < winGridViewPager1.dataGridView1.Rows.Count; i++) + //{ + // if (winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value.ToString() == "ONLINE") + // { + // winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value = "在线"; + // } + // else + // { + // if (winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value.ToString() == "OFFLINE") + // { + // winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value = "离线"; + // } + // else + // { + // if (winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value.ToString() == "LEAVER") + // { + // winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value = "注销"; + // } + // } + // } + //} winGridViewPager1.Refresh(); } private void LoadData(int pageIndex) { string sqlData = GetSql(pageIndex); - initlizeDatagrid(); + DataTable table = OracleUtils.ExecuteDataset(OracleUtils.ConnectionString, CommandType.Text, sqlData).Tables[0]; winGridViewPager1.DataSource = table.DefaultView; - for (int i = 0; i < winGridViewPager1.dataGridView1.Rows.Count; i++) - { - if (winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value.ToString() == "ONLINE") - { - winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value = "在线"; - } - else - { - if (winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value.ToString() == "OFFLINE") - { - winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value = "离线"; - } - else - { - if (winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value.ToString() == "LEAVER") - { - winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value = "注销"; - } - } - } - } + //for (int i = 0; i < winGridViewPager1.dataGridView1.Rows.Count; i++) + //{ + // if (winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value.ToString() == "ONLINE") + // { + // winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value = "在线"; + // } + // else + // { + // if (winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value.ToString() == "OFFLINE") + // { + // winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value = "离线"; + // } + // else + // { + // if (winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value.ToString() == "LEAVER") + // { + // winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value = "注销"; + // } + // } + // } + //} winGridViewPager1.Refresh(); } @@ -241,7 +244,8 @@ { string sqlCount = "select count(*) from equipment where status = 'USING'"; - string sqlData = "select username,dbid,sex,age,phonenum,accountstate " + + string sqlData = "select username as 姓名,dbid as 编号,sex as 性别,age as 年龄,phonenum as 电话,"+ + "case when accountstate = 'ONLINE' then '在线' when accountstate = 'OFFLINE' then '离线' when accountstate = 'LEAVER' then '注销' end as 状态 " + "from (select t.*,rownum row_num from patroler t order by DBID desc)b " + " where 1=1"; @@ -255,9 +259,9 @@ int minPage = (pageIndex - 1) * maxPageIndex + 1; int maxPage = pageIndex * maxPageIndex; string sqlCount = "select count(*) from patroler where 1=1"; - string sqlData = "select username,dbid,sex,age,phonenum,accountstate " + - "from (select t.*,rownum row_num from patroler t order by DBID desc)b " + - " where(b.row_num between " + minPage + " and " + maxPage + ")"; + string sqlData = "select username as 姓名,dbid as 编号,sex as 性别,age as 年龄,phonenum as 电话,"+ + "case when accountstate = 'ONLINE' then '在线' when accountstate = 'OFFLINE' then '离线' when accountstate = 'LEAVER' then '注销' end as 状态 " + + "from (select t.*,rownum row_num from patroler t where 1=1"; if (!String.IsNullOrEmpty(txt_username.Text.Trim())) { @@ -281,7 +285,8 @@ sqlCount += " and accountstate='" + combo_stateText + "'"; sqlData += " and accountstate='" + combo_stateText + "'"; } - + sqlData += " order by DBID desc)b " + + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; @@ -291,6 +296,7 @@ { try { + initlizeDatagrid(); LoadData(); initForm(); IS_OPEN = true; @@ -310,11 +316,13 @@ } if (Utility.userRole.IndexOf("巡检员编辑") == -1) { - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Visible = false; + //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Visible = false; + 编辑ToolStripMenuItem.Visible = false; } if (Utility.userRole.IndexOf("巡检员注销") == -1) { - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Visible = false; + //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Visible = false; + 注销ToolStripMenuItem.Visible = false; } } @@ -376,7 +384,7 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - long dbid = long.Parse(row.Cells["dbid"].Value.ToString()); + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); Log p = new Log(dbid.ToString()); p.Show(); } @@ -395,8 +403,8 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - long dbid = long.Parse(row.Cells["dbid"].Value.ToString()); - String state = row.Cells["ACCOUNTSTATE"].Value.ToString(); + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); + String state = row.Cells["状态"].Value.ToString(); if ("在线".Equals(state)) { string sql = "select t.dbid " + @@ -435,8 +443,8 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - long dbid = long.Parse(row.Cells["dbid"].Value.ToString()); - String username = row.Cells["USERNAME"].Value.ToString(); + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); + String username = row.Cells["姓名"].Value.ToString(); string sql = "select t.latitude, t.longitude " + "from position t " + "where t.dbid = (select max(dbid) from position where patroler_id = " + dbid + ")"; @@ -489,6 +497,63 @@ } + private void 编辑ToolStripMenuItem_Click(object sender, EventArgs e) + { + if (winGridViewPager1 != null && winGridViewPager1.dataGridView1 != null) + { + DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; + try + { + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); + String name = row.Cells["姓名"].Value.ToString(); + String sex = row.Cells["性别"].Value.ToString(); + String age = row.Cells["年龄"].Value.ToString(); + string phone = row.Cells["电话"].Value.ToString(); + age = String.IsNullOrEmpty(age.ToString().Trim()) ? "1" : age.ToString().Trim(); + FrmPatrolerEdit frm = new FrmPatrolerEdit(dbid.ToString(), name, age, sex, phone); + frm.reloadGrid += new ReloadPatrolerGrid(LoadData); + frm.ShowDialog(); + winGridViewPager1.Refresh(); + } + catch (Exception ex) + { + MessageBox.Show("编辑失败:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } + + private void 注销ToolStripMenuItem_Click(object sender, EventArgs e) + { + if (winGridViewPager1 != null && winGridViewPager1.dataGridView1 != null) + { + DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); + try + { + if (MessageBox.Show("确定注销？", "确认", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) + { + String sql = "update patroler t set t.accountstate='LEAVER' where t.dbid=" + dbid; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + LoadData(); + MessageBox.Show("人员已注销", "信息", MessageBoxButtons.OK, MessageBoxIcon.Information); + } + //string state = row.Cells["状态"].Value.ToString(); + //if ("在线".Equals(state)) + //{ + + //} + //else + //{ + // MessageBox.Show("人员不在线，无法注销", "信息"); + //} + } + catch (Exception ex) + { + MessageBox.Show("人员注销失败:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } + } } diff --git a/FrmRoleInfoManager.cs b/FrmRoleInfoManager.cs index 8897133..35693cf 100644 --- a/FrmRoleInfoManager.cs +++ b/FrmRoleInfoManager.cs @@ -55,10 +55,10 @@ //控制表格显示的列，以及每一列要显示的列名 this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - this.winGridViewPager1.AddColumnAlias("NT", "角色名称"); - this.winGridViewPager1.AddColumnAlias("ID", "编号"); + this.winGridViewPager1.AddColumnAlias("角色名称", "角色名称"); + this.winGridViewPager1.AddColumnAlias("编号", "编号"); - this.winGridViewPager1.DisplayColumns = "NT"; + this.winGridViewPager1.DisplayColumns = "角色名称"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -131,7 +131,7 @@ { try { - string dbid = row.Cells["id"].Value.ToString(); + string dbid = row.Cells["编号"].Value.ToString(); string sql = "delete from casic_userroletest where id=" + dbid; OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); LoadData(); @@ -170,7 +170,7 @@ { string sqlCount = "select id,nt from casic_userroletest where sysname='EMS'"; - string sqlData = "select nt,id " + + string sqlData = "select nt as 角色名称,id as 编号 " + "from (select t.*,rownum row_num from casic_userroletest t order by id desc)b " + " where sysname='EMS'"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -183,7 +183,7 @@ int minPage = (pageIndex - 1) * maxPageIndex + 1; int maxPage = pageIndex * maxPageIndex; string sqlCount = "select id,nt from casic_userroletest where sysname='EMS'"; - string sqlData = "select nt,id " + + string sqlData = "select nt as 角色名称,id as 编号 " + "from (select t.*,rownum row_num from casic_userroletest t where sysname='EMS' order by id desc)b " + " where(b.row_num between " + minPage + " and " + maxPage + ")"; diff --git a/FrmSysUserInfoManger.cs b/FrmSysUserInfoManger.cs index 7903916..e193a61 100644 --- a/FrmSysUserInfoManger.cs +++ b/FrmSysUserInfoManger.cs @@ -28,6 +28,7 @@ this.winGridViewPager1.OnEndExport += new EventHandler(pager1_OnEndExport); winGridViewPager1.dataGridView1.MultiSelect = false; + } private void FrmSysUserInfoManger_Load(object sender, EventArgs e) @@ -59,10 +60,10 @@ //控制表格显示的列，以及每一列要显示的列名 this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - this.winGridViewPager1.AddColumnAlias("USERNAME", "账号"); - this.winGridViewPager1.AddColumnAlias("ID", "编号"); + this.winGridViewPager1.AddColumnAlias("账号", "账号"); + this.winGridViewPager1.AddColumnAlias("编号", "编号"); - this.winGridViewPager1.DisplayColumns = "USERNAME"; + this.winGridViewPager1.DisplayColumns = "账号"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -130,8 +131,8 @@ if (grid != null) { DataGridViewRow row = grid.SelectedRows[0]; - string dbid = row.Cells["id"].Value.ToString(); - string userName = row.Cells["USERNAME"].Value.ToString(); + string dbid = row.Cells["编号"].Value.ToString(); + string userName = row.Cells["账号"].Value.ToString(); if (userName.Equals("ems")) { MessageBox.Show("该用户为管理员用户，无法删除！", "信息"); @@ -184,7 +185,7 @@ { string sqlCount = "select count(*) from casic_userinfotest where sysname='EMS'"; - string sqlData = "select username,id " + + string sqlData = "select username as 账号,id as 编号 " + "from (select t.*,rownum row_num from casic_userinfotest t order by id desc)b " + " where sysname='EMS'"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -197,16 +198,16 @@ int minPage = (pageIndex - 1) * maxPageIndex + 1; int maxPage = pageIndex * maxPageIndex; string sqlCount = "select count(*) from casic_userinfotest where sysname='EMS'"; - string sqlData = "select username,id " + - "from (select t.*,rownum row_num from casic_userinfotest t where sysname='EMS' order by id desc)b " + - " where(b.row_num between " + minPage + " and " + maxPage + ")"; + string sqlData = "select username as 账号,id as 编号 " + + "from (select t.*,rownum row_num from casic_userinfotest t where sysname='EMS'"; if (!String.IsNullOrEmpty(txt_user_code.Text.Trim())) { sqlCount += " and username like '%" + txt_user_code.Text.Trim() + "%'"; sqlData += " and username like '%" + txt_user_code.Text.Trim() + "%'"; } - + sqlData += " order by id desc)b " + + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; diff --git a/MainFrm.cs b/MainFrm.cs index 39df646..0cd5881 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3310,10 +3310,10 @@ string str1 = ""; if (feature != null) { - if (feature.GetFieldDefn("图?片?编括?码?") != null) // + if (feature.GetFieldDefn("图片编码") != null) // { str1 = GetBubbleInfo(feature); - if (RemoteFileExists(Utility.PicRootURL + feature.GetValue("图?片?编括?码?").ToString())) + if (RemoteFileExists(Utility.PicRootURL + feature.GetValue("图片编码").ToString())) { str1 += ""; } @@ -3450,9 +3450,15 @@ string value1 = ""; if (field1 != null) { - if (field1.Name == "图片编码") + //if (field1.Name == "图片编码" || field1.Name == "对象编号" || field1.Name == "对象类型" || field1.Name == "对象名称") + //{ + // j++; + //} + while (field1.Name == "图片编码" || field1.Name == "对象编号" || field1.Name == "对象类型" || field1.Name == "对象名称") { j++; + fieldName = fieldNames[j].Trim(); + field1 = (GSOFieldDefn)feature.GetFieldDefn(fieldName); } if (j < rowCount) { @@ -3479,6 +3485,11 @@ if (!feature.IsFieldValueNull(j)) { value1 = feature.GetValue(j).ToString(); + if (name1 == "标识器埋深") + { + if (value1!=null&&value1.Length>4) + value1 = value1.Substring(0,4); + } } } } @@ -3491,9 +3502,14 @@ if (field2 != null) { - if (field2.Name == "图片编码") + //if (field2.Name == "图片编码" || field1.Name == "对象编号" || field1.Name == "对象类型" || field1.Name == "对象名称") + //{ + // j++; + //} + while (field2.Name == "图片编码" || field2.Name == "对象编号" || field2.Name == "对象类型" || field2.Name == "对象名称") { j++; + field2 = (GSOFieldDefn)feature.GetFieldDefn(j + 1); } if (j + 1 < rowCount) { @@ -3521,6 +3537,11 @@ if (!feature.IsFieldValueNull(j + 1)) { value2 = feature.GetValue(j + 1).ToString(); + if (name2 == "标识器埋深") + { + if (value2 != null && value2.Length > 4) + value2 = value2.Substring(0, 4); + } } } } @@ -15347,7 +15368,7 @@ return; } FrmFlagManagers frm = new FrmFlagManagers(globeControl1); - frm.Show(this); + frm.Show(); } private void ribbonTabItem2_MouseDown(object sender, MouseEventArgs e) diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index fddfb94..e5f0003 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -365,6 +365,16 @@ this.可编辑ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.保存ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.ribbonControl1 = new DevComponents.DotNetBar.RibbonControl(); + this.ribbonPanel3 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar3 = new DevComponents.DotNetBar.RibbonBar(); + this.btn_device = new DevComponents.DotNetBar.ButtonItem(); + this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); + this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel7 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); + this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); + this.slider4ground = new DevComponents.DotNetBar.SliderItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -374,12 +384,6 @@ this.btn_user_role = new DevComponents.DotNetBar.ButtonItem(); this.btn_password_edit = new DevComponents.DotNetBar.ButtonItem(); this.btn_reset_password = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel3 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar3 = new DevComponents.DotNetBar.RibbonBar(); - this.btn_device = new DevComponents.DotNetBar.ButtonItem(); - this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); - this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); @@ -551,10 +555,6 @@ this.buttonItemBZ9 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItemBZ10 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItemBZ11 = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel7 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); - this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); - this.slider4ground = new DevComponents.DotNetBar.SliderItem(); this.ribbonPanel12 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar18 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItem133 = new DevComponents.DotNetBar.ButtonItem(); @@ -690,11 +690,11 @@ this.contextMenuStrip3.SuspendLayout(); this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); - this.ribbonPanel8.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel7.SuspendLayout(); + this.ribbonPanel8.SuspendLayout(); this.ribbonPanel2.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); - this.ribbonPanel7.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); this.ribbonPanel5.SuspendLayout(); this.ribbonPanel6.SuspendLayout(); @@ -4162,10 +4162,10 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); - this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel2); - this.ribbonControl1.Controls.Add(this.ribbonPanel15); + this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel7); + this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); this.ribbonControl1.Controls.Add(this.ribbonPanel5); this.ribbonControl1.Controls.Add(this.ribbonPanel6); @@ -4216,135 +4216,6 @@ this.ribbonControl1.UseCustomizeDialog = false; this.ribbonControl1.Click += new System.EventHandler(this.ribbonControl1_Click); // - // ribbonPanel8 - // - this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel8.Controls.Add(this.ribbonBar_UserInfo); - this.ribbonPanel8.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel8.Location = new System.Drawing.Point(0, 33); - this.ribbonPanel8.Name = "ribbonPanel8"; - this.ribbonPanel8.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel8.Size = new System.Drawing.Size(1328, 62); - // - // - // - this.ribbonPanel8.Style.Class = ""; - this.ribbonPanel8.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel8.StyleMouseDown.Class = ""; - this.ribbonPanel8.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel8.StyleMouseOver.Class = ""; - this.ribbonPanel8.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel8.TabIndex = 42; - this.ribbonPanel8.Visible = false; - // - // ribbonBar_UserInfo - // - this.ribbonBar_UserInfo.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar_UserInfo.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar_UserInfo.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar_UserInfo.BackgroundStyle.Class = ""; - this.ribbonBar_UserInfo.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar_UserInfo.ContainerControlProcessDialogKey = true; - this.ribbonBar_UserInfo.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar_UserInfo.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.btn_user_info, - this.btn_role_info, - this.btn_resc_info, - this.btn_role_resc, - this.btn_user_role, - this.btn_password_edit, - this.btn_reset_password}); - this.ribbonBar_UserInfo.Location = new System.Drawing.Point(3, 0); - this.ribbonBar_UserInfo.Name = "ribbonBar_UserInfo"; - this.ribbonBar_UserInfo.Size = new System.Drawing.Size(427, 59); - this.ribbonBar_UserInfo.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar_UserInfo.TabIndex = 0; - // - // - // - this.ribbonBar_UserInfo.TitleStyle.Class = ""; - this.ribbonBar_UserInfo.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar_UserInfo.TitleStyleMouseOver.Class = ""; - this.ribbonBar_UserInfo.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // btn_user_info - // - this.btn_user_info.Image = global::Cyberpipe.Properties.Resources._24x24icon_13_hover; - this.btn_user_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_user_info.Name = "btn_user_info"; - this.btn_user_info.SubItemsExpandWidth = 14; - this.btn_user_info.Text = "用户管理"; - this.btn_user_info.Click += new System.EventHandler(this.btn_user_info_Click); - // - // btn_role_info - // - this.btn_role_info.Image = global::Cyberpipe.Properties.Resources._24x24icon_05_hover1; - this.btn_role_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_role_info.Name = "btn_role_info"; - this.btn_role_info.SubItemsExpandWidth = 14; - this.btn_role_info.Text = "角色管理"; - this.btn_role_info.Click += new System.EventHandler(this.btn_role_info_Click); - // - // btn_resc_info - // - this.btn_resc_info.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__09; - this.btn_resc_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_resc_info.Name = "btn_resc_info"; - this.btn_resc_info.SubItemsExpandWidth = 14; - this.btn_resc_info.Text = "资源管理"; - this.btn_resc_info.Click += new System.EventHandler(this.btn_resc_info_Click); - // - // btn_role_resc - // - this.btn_role_resc.Image = global::Cyberpipe.Properties.Resources.btnlegendSet_Image_副本; - this.btn_role_resc.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_role_resc.Name = "btn_role_resc"; - this.btn_role_resc.SubItemsExpandWidth = 14; - this.btn_role_resc.Text = "角色授权"; - this.btn_role_resc.Click += new System.EventHandler(this.btn_role_resc_Click); - // - // btn_user_role - // - this.btn_user_role.Image = global::Cyberpipe.Properties.Resources._24x24icon_08_hover; - this.btn_user_role.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_user_role.Name = "btn_user_role"; - this.btn_user_role.SubItemsExpandWidth = 14; - this.btn_user_role.Text = "用户授权"; - this.btn_user_role.Click += new System.EventHandler(this.btn_user_role_Click); - // - // btn_password_edit - // - this.btn_password_edit.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__67; - this.btn_password_edit.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_password_edit.Name = "btn_password_edit"; - this.btn_password_edit.SubItemsExpandWidth = 14; - this.btn_password_edit.Text = "密码修改"; - this.btn_password_edit.Click += new System.EventHandler(this.btn_password_edit_Click); - // - // btn_reset_password - // - this.btn_reset_password.Image = global::Cyberpipe.Properties.Resources.liuxiang; - this.btn_reset_password.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_reset_password.Name = "btn_reset_password"; - this.btn_reset_password.SubItemsExpandWidth = 14; - this.btn_reset_password.Text = "重置密码"; - this.btn_reset_password.Click += new System.EventHandler(this.btn_reset_password_Click); - // // ribbonPanel3 // this.ribbonPanel3.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4425,7 +4296,7 @@ this.btn_Person.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; this.btn_Person.Name = "btn_Person"; this.btn_Person.SubItemsExpandWidth = 14; - this.btn_Person.Text = "巡检人员维护"; + this.btn_Person.Text = "定位人员维护"; this.btn_Person.Click += new System.EventHandler(this.btn_Person_Click); // // btn_constructMap @@ -4446,6 +4317,214 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel7 + // + this.ribbonPanel7.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel7.Controls.Add(this.ribbonBar5); + this.ribbonPanel7.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel7.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel7.Name = "ribbonPanel7"; + this.ribbonPanel7.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel7.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel7.Style.Class = ""; + this.ribbonPanel7.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel7.StyleMouseDown.Class = ""; + this.ribbonPanel7.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel7.StyleMouseOver.Class = ""; + this.ribbonPanel7.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel7.TabIndex = 41; + this.ribbonPanel7.Visible = false; + // + // ribbonBar5 + // + this.ribbonBar5.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar5.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar5.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar5.BackgroundStyle.Class = ""; + this.ribbonBar5.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar5.ContainerControlProcessDialogKey = true; + this.ribbonBar5.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar5.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.btn_flag, + this.slider4ground}); + this.ribbonBar5.Location = new System.Drawing.Point(3, 0); + this.ribbonBar5.Name = "ribbonBar5"; + this.ribbonBar5.Size = new System.Drawing.Size(427, 92); + this.ribbonBar5.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar5.TabIndex = 0; + // + // + // + this.ribbonBar5.TitleStyle.Class = ""; + this.ribbonBar5.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar5.TitleStyleMouseOver.Class = ""; + this.ribbonBar5.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar5.TitleVisible = false; + // + // btn_flag + // + this.btn_flag.Image = global::Cyberpipe.Properties.Resources._24x24icon_03_hover; + this.btn_flag.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_flag.Name = "btn_flag"; + this.btn_flag.SubItemsExpandWidth = 14; + this.btn_flag.Text = "标识器管理"; + this.btn_flag.Click += new System.EventHandler(this.btn_flag_Click); + // + // slider4ground + // + this.slider4ground.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; + this.slider4ground.Name = "slider4ground"; + this.slider4ground.Text = "地面透明度"; + this.slider4ground.Value = 0; + this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); + // + // ribbonPanel8 + // + this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel8.Controls.Add(this.ribbonBar_UserInfo); + this.ribbonPanel8.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel8.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel8.Name = "ribbonPanel8"; + this.ribbonPanel8.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel8.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel8.Style.Class = ""; + this.ribbonPanel8.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel8.StyleMouseDown.Class = ""; + this.ribbonPanel8.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel8.StyleMouseOver.Class = ""; + this.ribbonPanel8.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel8.TabIndex = 42; + this.ribbonPanel8.Visible = false; + // + // ribbonBar_UserInfo + // + this.ribbonBar_UserInfo.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar_UserInfo.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar_UserInfo.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar_UserInfo.BackgroundStyle.Class = ""; + this.ribbonBar_UserInfo.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar_UserInfo.ContainerControlProcessDialogKey = true; + this.ribbonBar_UserInfo.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar_UserInfo.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.btn_user_info, + this.btn_role_info, + this.btn_resc_info, + this.btn_role_resc, + this.btn_user_role, + this.btn_password_edit, + this.btn_reset_password}); + this.ribbonBar_UserInfo.Location = new System.Drawing.Point(3, 0); + this.ribbonBar_UserInfo.Name = "ribbonBar_UserInfo"; + this.ribbonBar_UserInfo.Size = new System.Drawing.Size(427, 92); + this.ribbonBar_UserInfo.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar_UserInfo.TabIndex = 0; + // + // + // + this.ribbonBar_UserInfo.TitleStyle.Class = ""; + this.ribbonBar_UserInfo.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar_UserInfo.TitleStyleMouseOver.Class = ""; + this.ribbonBar_UserInfo.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // btn_user_info + // + this.btn_user_info.Image = global::Cyberpipe.Properties.Resources._24x24icon_13_hover; + this.btn_user_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_user_info.Name = "btn_user_info"; + this.btn_user_info.SubItemsExpandWidth = 14; + this.btn_user_info.Text = "用户管理"; + this.btn_user_info.Click += new System.EventHandler(this.btn_user_info_Click); + // + // btn_role_info + // + this.btn_role_info.Image = global::Cyberpipe.Properties.Resources._24x24icon_05_hover1; + this.btn_role_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_role_info.Name = "btn_role_info"; + this.btn_role_info.SubItemsExpandWidth = 14; + this.btn_role_info.Text = "角色管理"; + this.btn_role_info.Click += new System.EventHandler(this.btn_role_info_Click); + // + // btn_resc_info + // + this.btn_resc_info.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__09; + this.btn_resc_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_resc_info.Name = "btn_resc_info"; + this.btn_resc_info.SubItemsExpandWidth = 14; + this.btn_resc_info.Text = "资源管理"; + this.btn_resc_info.Click += new System.EventHandler(this.btn_resc_info_Click); + // + // btn_role_resc + // + this.btn_role_resc.Image = global::Cyberpipe.Properties.Resources.btnlegendSet_Image_副本; + this.btn_role_resc.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_role_resc.Name = "btn_role_resc"; + this.btn_role_resc.SubItemsExpandWidth = 14; + this.btn_role_resc.Text = "角色授权"; + this.btn_role_resc.Click += new System.EventHandler(this.btn_role_resc_Click); + // + // btn_user_role + // + this.btn_user_role.Image = global::Cyberpipe.Properties.Resources._24x24icon_08_hover; + this.btn_user_role.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_user_role.Name = "btn_user_role"; + this.btn_user_role.SubItemsExpandWidth = 14; + this.btn_user_role.Text = "用户授权"; + this.btn_user_role.Click += new System.EventHandler(this.btn_user_role_Click); + // + // btn_password_edit + // + this.btn_password_edit.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__67; + this.btn_password_edit.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_password_edit.Name = "btn_password_edit"; + this.btn_password_edit.SubItemsExpandWidth = 14; + this.btn_password_edit.Text = "密码修改"; + this.btn_password_edit.Click += new System.EventHandler(this.btn_password_edit_Click); + // + // btn_reset_password + // + this.btn_reset_password.Image = global::Cyberpipe.Properties.Resources.liuxiang; + this.btn_reset_password.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_reset_password.Name = "btn_reset_password"; + this.btn_reset_password.SubItemsExpandWidth = 14; + this.btn_reset_password.Text = "重置密码"; + this.btn_reset_password.Click += new System.EventHandler(this.btn_reset_password_Click); + // // ribbonPanel2 // this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -5891,85 +5970,6 @@ this.buttonItemBZ11.Text = "标注管理"; this.buttonItemBZ11.Click += new System.EventHandler(this.buttonItemBZ11_Click); // - // ribbonPanel7 - // - this.ribbonPanel7.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel7.Controls.Add(this.ribbonBar5); - this.ribbonPanel7.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel7.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel7.Name = "ribbonPanel7"; - this.ribbonPanel7.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel7.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel7.Style.Class = ""; - this.ribbonPanel7.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel7.StyleMouseDown.Class = ""; - this.ribbonPanel7.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel7.StyleMouseOver.Class = ""; - this.ribbonPanel7.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel7.TabIndex = 41; - this.ribbonPanel7.Visible = false; - // - // ribbonBar5 - // - this.ribbonBar5.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar5.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar5.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar5.BackgroundStyle.Class = ""; - this.ribbonBar5.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar5.ContainerControlProcessDialogKey = true; - this.ribbonBar5.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar5.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.btn_flag, - this.slider4ground}); - this.ribbonBar5.Location = new System.Drawing.Point(3, 0); - this.ribbonBar5.Name = "ribbonBar5"; - this.ribbonBar5.Size = new System.Drawing.Size(427, 92); - this.ribbonBar5.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar5.TabIndex = 0; - // - // - // - this.ribbonBar5.TitleStyle.Class = ""; - this.ribbonBar5.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar5.TitleStyleMouseOver.Class = ""; - this.ribbonBar5.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar5.TitleVisible = false; - // - // btn_flag - // - this.btn_flag.Image = global::Cyberpipe.Properties.Resources._24x24icon_03_hover; - this.btn_flag.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_flag.Name = "btn_flag"; - this.btn_flag.SubItemsExpandWidth = 14; - this.btn_flag.Text = "标识器管理"; - this.btn_flag.Click += new System.EventHandler(this.btn_flag_Click); - // - // slider4ground - // - this.slider4ground.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; - this.slider4ground.Name = "slider4ground"; - this.slider4ground.Text = "地面透明度"; - this.slider4ground.Value = 0; - this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); - // // ribbonPanel12 // this.ribbonPanel12.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7181,11 +7181,11 @@ this.contextMenuStripDeleteLayerNode.ResumeLayout(false); this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); - this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel7.ResumeLayout(false); + this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); - this.ribbonPanel7.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); this.ribbonPanel5.ResumeLayout(false); this.ribbonPanel6.ResumeLayout(false); diff --git a/SysRescInfoManager.cs b/SysRescInfoManager.cs index 3a84d95..fda6f3f 100644 --- a/SysRescInfoManager.cs +++ b/SysRescInfoManager.cs @@ -79,11 +79,11 @@ //控制表格显示的列，以及每一列要显示的列名 this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - - this.winGridViewPager1.AddColumnAlias("RESC", "资源名称"); - this.winGridViewPager1.AddColumnAlias("ID", "编号"); - this.winGridViewPager1.AddColumnAlias("DESP", "资源描述"); - this.winGridViewPager1.DisplayColumns = "RESC,DESP"; + + this.winGridViewPager1.AddColumnAlias("资源名称", "资源名称"); + this.winGridViewPager1.AddColumnAlias("编号", "编号"); + this.winGridViewPager1.AddColumnAlias("资源描述", "资源描述"); + this.winGridViewPager1.DisplayColumns = "资源名称,资源描述"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -153,8 +153,8 @@ DataGridViewRow row = grid.SelectedRows[0]; if (MessageBox.Show("确定删除？", "确认", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) { - string dbid = row.Cells["id"].Value.ToString(); - string resc = row.Cells["resc"].Value.ToString(); + string dbid = row.Cells["编号"].Value.ToString(); + string resc = row.Cells["资源名称"].Value.ToString(); OracleConnection conn = null; OracleTransaction tran = null; try @@ -229,7 +229,7 @@ private string GetSql() { string sqlCount = "select count(*) from casic_userresctest where sysname='EMS'"; - string sqlData = "select resc,id,desp " + + string sqlData = "select resc as 资源名称,id as 编号,desp as 资源描述 " + "from (select t.*,rownum row_num from casic_userresctest t order by id desc)b " + " where sysname='EMS'"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -242,7 +242,7 @@ int minPage = (pageIndex - 1) * maxPageIndex + 1; int maxPage = pageIndex * maxPageIndex; string sqlCount = "select count(*) from casic_userresctest where sysname='EMS'"; - string sqlData = "select resc,id,desp " + + string sqlData = "select resc as 资源名称,id as 编号,desp as 资源描述 " + "from (select t.*,rownum row_num from casic_userresctest t where sysname='EMS' order by id desc)b " + " where(b.row_num between " + minPage + " and " + maxPage + ")"; diff --git a/Cyberpipe.csproj b/Cyberpipe.csproj index fe600e5..501fd09 100644 --- a/Cyberpipe.csproj +++ b/Cyberpipe.csproj @@ -246,6 +246,12 @@ Form_TaskManager.cs + + Form + + + FrmFlagDetail.cs + Form @@ -1368,6 +1374,9 @@ Form_TaskManager.cs + + FrmFlagDetail.cs + FormDocumentManager.cs diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 537b4c3..1acf22a 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 7d5dd95..3f178cb 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -90,20 +90,20 @@ this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - - this.winGridViewPager1.AddColumnAlias("ACCIDENTTIME", "上报时间"); - this.winGridViewPager1.AddColumnAlias("DBID", "编号"); - this.winGridViewPager1.AddColumnAlias("DESCRIBE", "事件描述"); - this.winGridViewPager1.AddColumnAlias("LATITUDE", "纬度"); - this.winGridViewPager1.AddColumnAlias("LOCALE", "事件地点"); - this.winGridViewPager1.AddColumnAlias("LONGITUDE", "经度"); - this.winGridViewPager1.AddColumnAlias("PATROLERNAME", "上报人员"); - this.winGridViewPager1.AddColumnAlias("PATROLER_ID", "人员ID"); - this.winGridViewPager1.AddColumnAlias("TASK_ID", "任务编号"); - this.winGridViewPager1.AddColumnAlias("RESULT", "处理结果"); - this.winGridViewPager1.AddColumnAlias("STATE", "处理状态"); - this.winGridViewPager1.DisplayColumns = "ACCIDENTTIME,DESCRIBE,LOCALE,PATROLERNAME,TASK_ID,RESULT,STATE"; + this.winGridViewPager1.AddColumnAlias("上报时间", "上报时间"); + this.winGridViewPager1.AddColumnAlias("编号", "编号"); + this.winGridViewPager1.AddColumnAlias("事件描述", "事件描述"); + this.winGridViewPager1.AddColumnAlias("纬度", "纬度"); + this.winGridViewPager1.AddColumnAlias("事件地点", "事件地点"); + this.winGridViewPager1.AddColumnAlias("经度", "经度"); + this.winGridViewPager1.AddColumnAlias("上报人员", "上报人员"); + this.winGridViewPager1.AddColumnAlias("人员ID", "人员ID"); + this.winGridViewPager1.AddColumnAlias("任务编号", "任务编号"); + this.winGridViewPager1.AddColumnAlias("处理结果", "处理结果"); + this.winGridViewPager1.AddColumnAlias("处理状态", "处理状态"); + + this.winGridViewPager1.DisplayColumns = "上报时间,事件描述,事件地点,上报人员,任务编号,处理结果,处理状态"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -114,8 +114,8 @@ winGridViewPager1.dataGridView1.ContextMenuStrip.Items[5].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[6].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[7].Visible = false; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[1].Text = "查看位置"; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "结果编辑"; + winGridViewPager1.dataGridView1.ContextMenuStrip.Items[1].Text = "结果编辑"; + winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "查看位置"; //右键菜单宽度 winGridViewPager1.dataGridView1.ContextMenuStrip.AutoSize = false; @@ -160,13 +160,12 @@ this.WindowState = FormWindowState.Minimized; globeControl1.Globe.MemoryLayer.RemoveAllFeature(); this.WindowState = FormWindowState.Minimized; - double x = Convert.ToDouble(row.Cells["LONGITUDE"].Value); - double y = Convert.ToDouble(row.Cells["LATITUDE"].Value); - - string username = Convert.ToString(row.Cells["PATROLERNAME"].Value); - string Atime = Convert.ToString(row.Cells["ACCIDENTTIME"].Value); - string location = Convert.ToString(row.Cells["LOCALE"].Value); - string descp = Convert.ToString(row.Cells["DESCRIBE"].Value); + double x = Convert.ToDouble(row.Cells["经度"].Value); + double y = Convert.ToDouble(row.Cells["纬度"].Value); + string username = Convert.ToString(row.Cells["上报人员"].Value); + string Atime = Convert.ToString(row.Cells["上报时间"].Value); + string location = Convert.ToString(row.Cells["事件地点"].Value); + string descp = Convert.ToString(row.Cells["事件描述"].Value); /////////////////////////////////////// /*******设置飞行与创建模型******/ @@ -228,8 +227,8 @@ DataGridViewRow row = grid.SelectedRows[0]; try { - int dbId = Convert.ToInt32(row.Cells["DBID"].Value); - string result = Convert.ToString(row.Cells["RESULT"].Value); + int dbId = Convert.ToInt32(row.Cells["编号"].Value); + string result = Convert.ToString(row.Cells["处理结果"].Value); EMS_Forms.Form_EventResult form = new Form_EventResult(dbId, result); form.refresh += new Form_EventResult.Handle(LoadData);//改变值的事件 form.ShowDialog(); @@ -276,9 +275,9 @@ } for (int i = 0; i < table.Rows.Count; i++) { - if (winGridViewPager1.dataGridView1.Rows[i].Cells["RESULT"].Value != null && !(winGridViewPager1.dataGridView1.Rows[i].Cells["RESULT"].Value.ToString().Trim().Equals(""))) + if (winGridViewPager1.dataGridView1.Rows[i].Cells["处理结果"].Value != null && !(winGridViewPager1.dataGridView1.Rows[i].Cells["处理结果"].Value.ToString().Trim().Equals(""))) { - winGridViewPager1.dataGridView1.Rows[i].Cells["STATE"].Value = "已处理"; + winGridViewPager1.dataGridView1.Rows[i].Cells["处理状态"].Value = "已处理"; } } @@ -307,9 +306,9 @@ } for (int i = 0; i < table.Rows.Count; i++) { - if (winGridViewPager1.dataGridView1.Rows[i].Cells["RESULT"].Value != null && !(winGridViewPager1.dataGridView1.Rows[i].Cells["RESULT"].Value.ToString().Trim().Equals(""))) + if (winGridViewPager1.dataGridView1.Rows[i].Cells["处理结果"].Value != null && !(winGridViewPager1.dataGridView1.Rows[i].Cells["处理结果"].Value.ToString().Trim().Equals(""))) { - winGridViewPager1.dataGridView1.Rows[i].Cells["STATE"].Value = "已处理"; + winGridViewPager1.dataGridView1.Rows[i].Cells["处理状态"].Value = "已处理"; } } @@ -320,10 +319,12 @@ { string sqlCount = "select count(*) from ACCIDENT where 1=1"; - string sqlData = "select ACCIDENTTIME,DBID,DESCRIBE,LATITUDE,LOCALE,LONGITUDE,PATROLERNAME,PATROLER_ID,TASK_ID,RESULT,'' as STATE " + + string sqlData = "select ACCIDENTTIME as 上报时间,DBID as 编号,DESCRIBE as 事件描述,"+ + "LATITUDE as 纬度,LOCALE as 事件地点,LONGITUDE as 经度,PATROLERNAME 上报人员,"+ + "PATROLER_ID as 人员ID,TASK_ID as 任务编号,RESULT as 处理结果,'' as 处理状态 " + "from (select t.*,rownum row_num from ACCIDENT t order by DBID)b " + " where 1=1"; - + rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; @@ -340,9 +341,10 @@ string sqlCount = "select count(*) from ACCIDENT where 1=1"; - string sqlData = "select ACCIDENTTIME,DBID,DESCRIBE,LATITUDE,LOCALE,LONGITUDE,PATROLERNAME,PATROLER_ID,TASK_ID,RESULT,'' as STATE " + - "from (select t.*,rownum row_num from ACCIDENT t order by DBID)b " + - " where(b.row_num between " + minPage + " and " + maxPage + ")"; + string sqlData = "select ACCIDENTTIME as 上报时间,DBID as 编号,DESCRIBE as 事件描述," + + "LATITUDE as 纬度,LOCALE as 事件地点,LONGITUDE as 经度,PATROLERNAME 上报人员," + + "PATROLER_ID as 人员ID,TASK_ID as 任务编号,RESULT as 处理结果,'' as 处理状态 " + + "from (select t.*,rownum row_num from ACCIDENT t where 1=1"; if (!String.IsNullOrEmpty(comboBox_name.Text.Trim())) { @@ -361,7 +363,8 @@ sqlCount += "and ACCIDENTTIME<=to_date('" + time.ToShortDateString() + "','yyyy-MM-dd') "; sqlData += "and ACCIDENTTIME<=to_date('" + time.ToShortDateString() + "','yyyy-MM-dd') "; } - + sqlData += " order by DBID desc)b " + + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 225c8d7..8bd9e48 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -120,8 +120,8 @@ private void flyToTask(DataGridViewRow row, int taskState) { int dbID = 0; - dbID = Convert.ToInt32(row.Cells["DBID"].Value); - string userName = Convert.ToString(row.Cells["USERNAME"].Value); + dbID = Convert.ToInt32(row.Cells["任务编号"].Value); + string userName = Convert.ToString(row.Cells["任务执行人员"].Value); System.DateTime t = new DateTime(); try { @@ -392,15 +392,15 @@ //控制表格显示的列，以及每一列要显示的列名 this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - this.winGridViewPager1.AddColumnAlias("DBID", "任务编号"); - this.winGridViewPager1.AddColumnAlias("DEPLOYTIME", "创建时间"); - this.winGridViewPager1.AddColumnAlias("DESCIRPTION", "任务描述"); - this.winGridViewPager1.AddColumnAlias("FINISHTIME", "完成时间"); - this.winGridViewPager1.AddColumnAlias("STREET", "任务执行区域"); - this.winGridViewPager1.AddColumnAlias("TASKSTATE", "任务状态"); - this.winGridViewPager1.AddColumnAlias("USERNAME", "任务执行人员"); + this.winGridViewPager1.AddColumnAlias("任务编号", "任务编号"); + this.winGridViewPager1.AddColumnAlias("创建时间", "创建时间"); + this.winGridViewPager1.AddColumnAlias("任务描述", "任务描述"); + this.winGridViewPager1.AddColumnAlias("完成时间", "完成时间"); + this.winGridViewPager1.AddColumnAlias("任务执行区域", "任务执行区域"); + this.winGridViewPager1.AddColumnAlias("任务状态", "任务状态"); + this.winGridViewPager1.AddColumnAlias("任务执行人员", "任务执行人员"); - this.winGridViewPager1.DisplayColumns = "DBID,DEPLOYTIME,DESCIRPTION,FINISHTIME,STREET,TASKSTATE,USERNAME"; + this.winGridViewPager1.DisplayColumns = "任务编号,创建时间,任务描述,完成时间,任务执行区域,任务状态,任务执行人员"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -464,8 +464,8 @@ { int dbID = 0; int taskStateInt = 0; - dbID = Convert.ToInt32(row.Cells["DBID"].Value); - string taskState = row.Cells["TASKSTATE"].Value.ToString(); + dbID = Convert.ToInt32(row.Cells["任务编号"].Value); + string taskState = row.Cells["任务状态"].Value.ToString(); if (taskState.Equals("开始任务")) { taskStateInt = 1; @@ -534,9 +534,10 @@ private string GetSql() { - string sqlCount = "select count(*) from taskinfo t where 1=1'"; + string sqlCount = "select count(*) from taskinfo t where 1=1"; - string sqlData = "select dbid,deploytime,descirption,finishtime,street,taskstate,username " + + 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"; @@ -550,9 +551,9 @@ int minPage = (pageIndex - 1) * maxPageIndex + 1; int maxPage = pageIndex * maxPageIndex; string sqlCount = "select count(*) from taskinfo t where 1=1"; - string sqlData = "select dbid,deploytime,descirption,finishtime,street,taskstate,username " + - "from (select t.*,rownum row_num from taskinfo t order by DBID desc)b " + - " where(b.row_num between " + minPage + " and " + maxPage + ")"; + 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"; if (!String.IsNullOrEmpty(comboBox_userName.Text.Trim()) && !comboBox_userName.Text.Trim().Equals("不限")) { @@ -581,6 +582,8 @@ sqlCount += "and street='" + combo_street.Text + "' "; sqlData += "and street='" + combo_street.Text + "' "; } + sqlData += " order by DBID desc)b " + + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index e65a4bd..58f5342 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -73,13 +73,13 @@ //控制表格显示的列，以及每一列要显示的列名 this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - this.winGridViewPager1.AddColumnAlias("FILENAME", "文档名称"); - this.winGridViewPager1.AddColumnAlias("DBID", "编号"); - this.winGridViewPager1.AddColumnAlias("TITLE", "文档标题"); - this.winGridViewPager1.AddColumnAlias("FILETYPE", "文档类型"); - this.winGridViewPager1.AddColumnAlias("UPDAY", "上传日期"); - this.winGridViewPager1.AddColumnAlias("WRITER", "上传人"); - this.winGridViewPager1.DisplayColumns = "FILENAME,TITLE,FILETYPE,UPDAY,WRITER"; + this.winGridViewPager1.AddColumnAlias("文档名称", "文档名称"); + this.winGridViewPager1.AddColumnAlias("编号", "编号"); + this.winGridViewPager1.AddColumnAlias("文档标题", "文档标题"); + this.winGridViewPager1.AddColumnAlias("文档类型", "文档类型"); + this.winGridViewPager1.AddColumnAlias("上传日期", "上传日期"); + this.winGridViewPager1.AddColumnAlias("上传人", "上传人"); + this.winGridViewPager1.DisplayColumns = "文档名称,文档标题,文档类型,上传日期,上传人"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -167,7 +167,7 @@ if (grid != null) { DataGridViewRow row = grid.SelectedRows[0]; - string dbid = row.Cells["dbid"].Value.ToString(); + string dbid = row.Cells["编号"].Value.ToString(); try { if (MessageBox.Show("确认删除吗？", "确认", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) @@ -212,7 +212,8 @@ { string sqlCount = "select count(*) from casic_userdocument where sysname = 'EMS'"; - string sqlData = "select filename,dbid,title,filetype,upday,writer " + + string sqlData = "select filename as 文档名称,dbid as 编号,title as 文档标题," + + "filetype as 文档类型,upday as 上传日期,writer as 上传人 " + "from (select t.*,rownum row_num from casic_userdocument t order by DBID desc)b " + " where sysname = 'EMS'"; @@ -226,9 +227,9 @@ int minPage = (pageIndex - 1) * maxPageIndex + 1; int maxPage = pageIndex * maxPageIndex; string sqlCount = "select count(*) from casic_userdocument where sysname = 'EMS'"; - string sqlData = "select filename,dbid,title,filetype,upday,writer " + - "from (select t.*,rownum row_num from casic_userdocument t where sysname = 'EMS' order by DBID desc)b " + - " where(b.row_num between " + minPage + " and " + maxPage + ")"; + string sqlData = "select filename as 文档名称,dbid as 编号,title as 文档标题,"+ + "filetype as 文档类型,upday as 上传日期,writer as 上传人 " + + "from (select t.*,rownum row_num from casic_userdocument t where sysname = 'EMS'"; string txtTitleText = null; string comboFileType = null; @@ -278,7 +279,8 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - + sqlData += " order by DBID desc)b " + + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; @@ -437,7 +439,7 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - string filename = row.Cells["filename"].Value.ToString(); + string filename = row.Cells["文档名称"].Value.ToString(); string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; string file = System.Environment.CurrentDirectory + "\\download\\" + filename; int result = DownloadFile(url, file, progressBar1); @@ -515,7 +517,7 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - string filename = row.Cells["filename"].Value.ToString(); + string filename = row.Cells["文档名称"].Value.ToString(); string ext = Path.GetExtension(filename); SaveFileDialog dlg = new SaveFileDialog(); dlg.Filter = "保存文档|*" + ext + ";"; diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 1d1201b..3902629 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -748,6 +748,7 @@ this.Name = "FrmAddSinMark"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "单个标识器添加"; + this.TopMost = true; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmAddSinMark_FormClosing); this.Load += new System.EventHandler(this.FrmAddSinMark_Load); this.groupPanel1.ResumeLayout(false); diff --git a/FrmEquipmentManage.cs b/FrmEquipmentManage.cs index 90bfdb2..a3cf55c 100644 --- a/FrmEquipmentManage.cs +++ b/FrmEquipmentManage.cs @@ -74,13 +74,13 @@ //控制表格显示的列，以及每一列要显示的列名 this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - this.winGridViewPager1.AddColumnAlias("DESCIRPTION", "设备描述"); - this.winGridViewPager1.AddColumnAlias("DBID", "编号"); - this.winGridViewPager1.AddColumnAlias("MACID", "MAC地址"); - this.winGridViewPager1.AddColumnAlias("OWNER", "设备所有人"); - this.winGridViewPager1.AddColumnAlias("STATUS", "设备状态"); + this.winGridViewPager1.AddColumnAlias("设备描述", "设备描述"); + this.winGridViewPager1.AddColumnAlias("编号", "编号"); + this.winGridViewPager1.AddColumnAlias("MAC地址", "MAC地址"); + this.winGridViewPager1.AddColumnAlias("设备所有人", "设备所有人"); + this.winGridViewPager1.AddColumnAlias("设备状态", "设备状态"); - this.winGridViewPager1.DisplayColumns = "DESCIRPTION,MACID,OWNER,STATUS"; + this.winGridViewPager1.DisplayColumns = "设备描述,MAC地址,设备所有人,设备状态"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -146,10 +146,10 @@ DataGridViewRow row = grid.SelectedRows[0]; try { - long dbid = long.Parse(row.Cells["DBID"].Value.ToString()); - String macId = row.Cells["MACID"].Value.ToString(); - String username = row.Cells["OWNER"].Value.ToString(); - String descn = row.Cells["DESCIRPTION"].Value.ToString(); + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); + String macId = row.Cells["MAC地址"].Value.ToString(); + String username = row.Cells["设备所有人"].Value.ToString(); + String descn = row.Cells["设备状态"].Value.ToString(); FrmEquipmentEdit frm = new FrmEquipmentEdit(dbid.ToString(), macId, username, descn); frm.reloadGrid += new ReloadEquipmentGrid(LoadData); frm.ShowDialog(); @@ -179,7 +179,7 @@ { return; } - String macId = row.Cells["MACID"].Value.ToString(); + String macId = row.Cells["MAC地址"].Value.ToString(); FrmLog frm = new FrmLog(macId); frm.Show(); } @@ -201,7 +201,7 @@ if (grid != null) { DataGridViewRow row = grid.SelectedRows[0]; - long dbid = long.Parse(row.Cells["DBID"].Value.ToString()); + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); try { if (MessageBox.Show("确定删除？", "确认", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) @@ -243,7 +243,8 @@ { string sqlCount = "select count(*) from equipment where status = 'USING'"; - string sqlData = "select descirption,DBID,macid,owner,case when status = 'USING' then '可用' when status = 'DAMAGE' then '损坏' end as status " + + string sqlData = "select descirption as 设备描述,DBID as 编号,macid as MAC地址,owner as 设备所有人,"+ + "case when status = 'USING' then '可用' when status = 'DAMAGE' then '损坏' end as 设备状态 " + "from (select t.*,rownum row_num from equipment t where status = 'USING' order by dbid desc)b " + " where 1=1"; @@ -258,16 +259,17 @@ int maxPage = pageIndex * maxPageIndex; string sqlCount = "select count(*) from equipment where status = 'USING' "; - string sqlData = "select descirption,DBID,macid,owner,case when status = 'USING' then '可用' when status = 'DAMAGE' then '损坏' end as status " + - "from (select t.*,rownum row_num from equipment t where status = 'USING' order by DBID desc)b " + - " where(b.row_num between " + minPage + " and " + maxPage + ")"; + string sqlData = "select descirption as 设备描述,DBID as 编号,macid as MAC地址,owner as 设备所有人," + + "case when status = 'USING' then '可用' when status = 'DAMAGE' then '损坏' end as 设备状态 " + + "from (select t.*,rownum row_num from equipment t where status = 'USING'"; if (!String.IsNullOrEmpty(txtMacId.Text.Trim())) { sqlData += " and macid like '%" + txtMacId.Text.Trim() + "%'"; sqlCount += " and macid like '%" + txtMacId.Text.Trim() + "%'"; } - + sqlData += " order by DBID desc)b " + + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; @@ -299,76 +301,6 @@ } } - //public void reloadGrid(int pageIndex) - //{ - // if (pageIndex <= 0) - // { - // pageIndex = 1; - // currentpage = 1; - // } - // String sqlrows = "select * from (select rownum as rowno,dbid,descirption,macid,owner,case when status = 'USING' then '可用' when status = 'DAMAGE' then '损坏' end as status,'编辑' as btnEdit,'删除' as btnDel from equipment t where status = 'USING' "; - // string sqlcount = "select count(*) from equipment where status = 'USING' "; - // if (!String.IsNullOrEmpty(txtMacId.Text.Trim())) - // { - // sqlrows += " and macid like '%" + txtMacId.Text.Trim() + "%'"; - // sqlcount += " and macid like '%" + txtMacId.Text.Trim() + "%'"; - // } - // sqlrows += " and rownum<=" + (pagesize * pageIndex) + ") table_alias where table_alias.rowno>=" + ((pageIndex - 1) * pagesize + 1); - - // int rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlcount).ToString()); - // int pages = 0; - // if (rows % pagesize == 0) - // { - // pages = rows / pagesize; - // } - // else - // { - // pages = rows / pagesize + 1; - // } - - // lastpage = pages; - - // lab_page_msg.Text = "共" + rows + "条记录，每页" + pagesize + "条，第" + pageIndex + "页，共" + pages + "页"; - // combo_page_num.Items.Clear(); - // for (int i = 1; i <= pages; i++) - // { - // combo_page_num.Items.Add(new ComboBoxItem(i.ToString(), i.ToString())); - // } - - // if (lastpage == 1) - // { - // btn_page_first.Enabled = false; - // btn_page_pre.Enabled = false; - // btn_page_last.Enabled = false; - // btn_page_next.Enabled = false; - // } - // else if (currentpage == 1) - // { - // btn_page_first.Enabled = false; - // btn_page_pre.Enabled = false; - // btn_page_last.Enabled = true; - // btn_page_next.Enabled = true; - // } - // else if (currentpage == lastpage) - // { - // btn_page_first.Enabled = true; - // btn_page_pre.Enabled = true; - // btn_page_last.Enabled = false; - // btn_page_next.Enabled = false; - // } - // else - // { - // btn_page_first.Enabled = true; - // btn_page_pre.Enabled = true; - // btn_page_last.Enabled = true; - // btn_page_next.Enabled = true; - // } - - // DataTable table = OracleUtils.ExecuteDataset(OracleUtils.ConnectionString, CommandType.Text, sqlrows).Tables[0]; - // dataGridViewX1.DataSource = table; - - //} - private void FrmEquipmentManage_FormClosing(object sender, FormClosingEventArgs e) diff --git a/FrmFlagDetail.Designer.cs b/FrmFlagDetail.Designer.cs new file mode 100644 index 0000000..982bfc6 --- /dev/null +++ b/FrmFlagDetail.Designer.cs @@ -0,0 +1,103 @@ +namespace Cyberpipe +{ + partial class FrmFlagDetail + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); + this.dataGridViewX_markDetail = new DevComponents.DotNetBar.Controls.DataGridViewX(); + this.对象类型 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.对象编号 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.对象名称 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX_markDetail)).BeginInit(); + this.SuspendLayout(); + // + // dataGridViewX_markDetail + // + this.dataGridViewX_markDetail.AllowUserToAddRows = false; + this.dataGridViewX_markDetail.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; + this.dataGridViewX_markDetail.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dataGridViewX_markDetail.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.对象类型, + this.对象编号, + this.对象名称}); + dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle3.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dataGridViewX_markDetail.DefaultCellStyle = dataGridViewCellStyle3; + this.dataGridViewX_markDetail.Dock = System.Windows.Forms.DockStyle.Fill; + this.dataGridViewX_markDetail.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(170)))), ((int)(((byte)(170)))), ((int)(((byte)(170))))); + this.dataGridViewX_markDetail.Location = new System.Drawing.Point(0, 0); + this.dataGridViewX_markDetail.Name = "dataGridViewX_markDetail"; + this.dataGridViewX_markDetail.RowTemplate.Height = 23; + this.dataGridViewX_markDetail.Size = new System.Drawing.Size(508, 321); + this.dataGridViewX_markDetail.TabIndex = 0; + // + // 对象类型 + // + this.对象类型.HeaderText = "对象类型"; + this.对象类型.Name = "对象类型"; + // + // 对象编号 + // + this.对象编号.HeaderText = "对象编号"; + this.对象编号.Name = "对象编号"; + // + // 对象名称 + // + this.对象名称.HeaderText = "对象名称"; + this.对象名称.Name = "对象名称"; + // + // FrmFlagDetail + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(508, 321); + this.Controls.Add(this.dataGridViewX_markDetail); + this.Name = "FrmFlagDetail"; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; + this.Text = "标识对象信息"; + this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmFlagDetail_FormClosing); + this.Load += new System.EventHandler(this.FrmFlagDetail_Load); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX_markDetail)).EndInit(); + this.ResumeLayout(false); + + } + + #endregion + + private DevComponents.DotNetBar.Controls.DataGridViewX dataGridViewX_markDetail; + private System.Windows.Forms.DataGridViewTextBoxColumn 对象类型; + private System.Windows.Forms.DataGridViewTextBoxColumn 对象编号; + private System.Windows.Forms.DataGridViewTextBoxColumn 对象名称; + + } +} \ No newline at end of file diff --git a/FrmFlagDetail.cs b/FrmFlagDetail.cs new file mode 100644 index 0000000..81de974 --- /dev/null +++ b/FrmFlagDetail.cs @@ -0,0 +1,77 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Windows.Forms; +using GeoScene.Globe; +using System.Data.OracleClient; + +namespace Cyberpipe +{ + public partial class FrmFlagDetail : Form + { + DataTable dt = new DataTable(); + private GSOGlobeControl globeControl1; + + public delegate void Handle(); + public event Handle showParentForm; + String markId; + + public FrmFlagDetail(GSOGlobeControl globeControl1, String id) + { + InitializeComponent(); + this.markId = id; + } + + private void FrmFlagDetail_FormClosing(object sender, FormClosingEventArgs e) + { + showParentForm(); + } + + private void FrmFlagDetail_Load(object sender, EventArgs e) + { + string objectIds = ""; + string objectTypeCodes = ""; + string sql = "select t.对象编号,t.对象类型 from 标识器 t where t.编号='" + markId + "'"; + using (OracleDataReader reader = OracleUtils.ExecuteReader(OracleUtils.ConnectionString, CommandType.Text, sql)) + { + while (reader.Read()) + { + objectIds = reader.GetString(0); + objectTypeCodes = reader.GetString(1); + } + } + + string[] codeTypes = objectTypeCodes.Split(','); + string[] codeIds = objectIds.Split(','); + int length = 0; + if (codeTypes.Length <= codeIds.Length) + { + length = codeTypes.Length; + } + else + { + length = codeIds.Length; + } + for (int n = 0; n < length; n++) + { + for (int i = 0; i < Utility1.listPipelineType.Count; i++) + { + if (Utility1.listPipelineType[i].code == codeTypes[n]) + { + //string objectId = codeIds[i]; + //string objectType = Utility1.listPipelineType[i].type; + //string objectName = Utility1.listPipelineType[i].name; + int index = this.dataGridViewX_markDetail.Rows.Add(); + this.dataGridViewX_markDetail.Rows[index].Cells[0].Value = Utility1.listPipelineType[i].type; + this.dataGridViewX_markDetail.Rows[index].Cells[1].Value = codeIds[n].ToString(); + this.dataGridViewX_markDetail.Rows[index].Cells[2].Value = Utility1.listPipelineType[i].name; + } + } + } + } + } +} diff --git a/FrmFlagDetail.resx b/FrmFlagDetail.resx new file mode 100644 index 0000000..e98a8fe --- /dev/null +++ b/FrmFlagDetail.resx @@ -0,0 +1,129 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + True + + + True + + + True + + \ No newline at end of file diff --git a/FrmFlagManagers.Designer.cs b/FrmFlagManagers.Designer.cs index d7e2f60..9fe14fb 100644 --- a/FrmFlagManagers.Designer.cs +++ b/FrmFlagManagers.Designer.cs @@ -28,8 +28,10 @@ /// private void InitializeComponent() { - this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); - this.winGridViewPager1 = new WHC.Pager.WinControl.WinGridViewPager(); + this.components = new System.ComponentModel.Container(); + this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components); + this.标识对象ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripMenuItem2 = new System.Windows.Forms.ToolStripMenuItem(); this.bar1 = new DevComponents.DotNetBar.Bar(); this.labelItem1 = new DevComponents.DotNetBar.LabelItem(); this.txt_no = new DevComponents.DotNetBar.TextBoxItem(); @@ -38,45 +40,37 @@ this.btn_query = new DevComponents.DotNetBar.ButtonItem(); this.btn_add_batch = new DevComponents.DotNetBar.ButtonItem(); this.btn_add_menu = new DevComponents.DotNetBar.ButtonItem(); - this.btn_db = new DevComponents.DotNetBar.ButtonItem(); - this.tableLayoutPanel1.SuspendLayout(); + this.winGridViewPager1 = new WHC.Pager.WinControl.WinGridViewPager(); + this.contextMenuStrip1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.bar1)).BeginInit(); this.SuspendLayout(); // - // tableLayoutPanel1 + // contextMenuStrip1 // - this.tableLayoutPanel1.ColumnCount = 1; - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel1.Controls.Add(this.winGridViewPager1, 0, 1); - this.tableLayoutPanel1.Controls.Add(this.bar1, 0, 0); - this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 0); - this.tableLayoutPanel1.Name = "tableLayoutPanel1"; - this.tableLayoutPanel1.RowCount = 2; - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 32F)); - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel1.Size = new System.Drawing.Size(881, 474); - this.tableLayoutPanel1.TabIndex = 6; + this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.标识对象ToolStripMenuItem, + this.toolStripMenuItem2}); + this.contextMenuStrip1.Name = "contextMenuStrip1"; + this.contextMenuStrip1.Size = new System.Drawing.Size(125, 48); // - // winGridViewPager1 + // 标识对象ToolStripMenuItem // - this.winGridViewPager1.AppendedMenu = null; - this.winGridViewPager1.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; - this.winGridViewPager1.DataSource = null; - this.winGridViewPager1.DisplayColumns = ""; - this.winGridViewPager1.Dock = System.Windows.Forms.DockStyle.Fill; - this.winGridViewPager1.Location = new System.Drawing.Point(3, 35); - this.winGridViewPager1.MinimumSize = new System.Drawing.Size(540, 0); - this.winGridViewPager1.Name = "winGridViewPager1"; - this.winGridViewPager1.PrintTitle = ""; - this.winGridViewPager1.Size = new System.Drawing.Size(875, 436); - this.winGridViewPager1.TabIndex = 5; + this.标识对象ToolStripMenuItem.Name = "标识对象ToolStripMenuItem"; + this.标识对象ToolStripMenuItem.Size = new System.Drawing.Size(124, 22); + this.标识对象ToolStripMenuItem.Text = "标识对象"; + this.标识对象ToolStripMenuItem.Click += new System.EventHandler(this.标识对象ToolStripMenuItem_Click); + // + // toolStripMenuItem2 + // + this.toolStripMenuItem2.Name = "toolStripMenuItem2"; + this.toolStripMenuItem2.Size = new System.Drawing.Size(152, 22); + this.toolStripMenuItem2.Text = "查看位置"; + this.toolStripMenuItem2.Click += new System.EventHandler(this.toolStripMenuItem2_Click); // // bar1 // this.bar1.AntiAlias = true; this.bar1.Dock = System.Windows.Forms.DockStyle.Top; - this.bar1.DockSide = DevComponents.DotNetBar.eDockSide.Document; this.bar1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.labelItem1, this.txt_no, @@ -84,14 +78,13 @@ this.combo_street, this.btn_query, this.btn_add_batch, - this.btn_add_menu, - this.btn_db}); - this.bar1.Location = new System.Drawing.Point(3, 3); + this.btn_add_menu}); + this.bar1.Location = new System.Drawing.Point(0, 0); this.bar1.Name = "bar1"; - this.bar1.Size = new System.Drawing.Size(875, 28); + this.bar1.Size = new System.Drawing.Size(881, 28); this.bar1.Stretch = true; this.bar1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.bar1.TabIndex = 1; + this.bar1.TabIndex = 8; this.bar1.TabStop = false; this.bar1.Text = "bar1"; // @@ -136,24 +129,34 @@ this.btn_add_menu.Text = "手工添加"; this.btn_add_menu.Click += new System.EventHandler(this.btn_add_menu_Click); // - // btn_db + // winGridViewPager1 // - this.btn_db.Name = "btn_db"; - this.btn_db.Text = "数据导出"; + this.winGridViewPager1.AppendedMenu = null; + this.winGridViewPager1.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; + this.winGridViewPager1.DataSource = null; + this.winGridViewPager1.DisplayColumns = ""; + this.winGridViewPager1.Dock = System.Windows.Forms.DockStyle.Fill; + this.winGridViewPager1.Location = new System.Drawing.Point(0, 28); + this.winGridViewPager1.MinimumSize = new System.Drawing.Size(540, 0); + this.winGridViewPager1.Name = "winGridViewPager1"; + this.winGridViewPager1.PrintTitle = ""; + this.winGridViewPager1.Size = new System.Drawing.Size(881, 446); + this.winGridViewPager1.TabIndex = 9; // // FrmFlagManagers // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(881, 474); - this.Controls.Add(this.tableLayoutPanel1); + this.Controls.Add(this.winGridViewPager1); + this.Controls.Add(this.bar1); this.DoubleBuffered = true; this.Name = "FrmFlagManagers"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "标识器管理"; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmFlagManagers_FormClosing); this.Load += new System.EventHandler(this.FrmFlagManagers_Load); - this.tableLayoutPanel1.ResumeLayout(false); + this.contextMenuStrip1.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.bar1)).EndInit(); this.ResumeLayout(false); @@ -161,8 +164,8 @@ #endregion - private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1; - private WHC.Pager.WinControl.WinGridViewPager winGridViewPager1; + private System.Windows.Forms.ContextMenuStrip contextMenuStrip1; + private System.Windows.Forms.ToolStripMenuItem 标识对象ToolStripMenuItem; private DevComponents.DotNetBar.Bar bar1; private DevComponents.DotNetBar.LabelItem labelItem1; private DevComponents.DotNetBar.TextBoxItem txt_no; @@ -171,6 +174,7 @@ private DevComponents.DotNetBar.ButtonItem btn_query; private DevComponents.DotNetBar.ButtonItem btn_add_batch; private DevComponents.DotNetBar.ButtonItem btn_add_menu; - private DevComponents.DotNetBar.ButtonItem btn_db; + private WHC.Pager.WinControl.WinGridViewPager winGridViewPager1; + private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem2; } } \ No newline at end of file diff --git a/FrmFlagManagers.cs b/FrmFlagManagers.cs index 38d4927..9bf9734 100644 --- a/FrmFlagManagers.cs +++ b/FrmFlagManagers.cs @@ -33,15 +33,13 @@ { this.globeControl1 = _globeControl1; InitializeComponent(); - winGridViewPager1.OnPageChanged += new EventHandler(winGridViewPager1_OnPageChanged); - this.winGridViewPager1.OnAddNew += new EventHandler(winGridViewPager1_OnAddNew); //右键定位 + winGridViewPager1.OnPageChanged += new EventHandler(winGridViewPager1_OnPageChanged); this.winGridViewPager1.OnEditSelected += new EventHandler(winGridViewPager1_OnEditSelected);//属性编辑 this.winGridViewPager1.OnDeleteSelected += new EventHandler(winGridViewPager1_OnDeleteSelected);//标识器报废 + this.winGridViewPager1.OnStartExport += new EventHandler(pager1_OnStartExport); this.winGridViewPager1.OnEndExport += new EventHandler(pager1_OnEndExport); - //this.winGridViewPager1.ExportCurrent += new ExportCurrentEventHandler(pager1_ExportCurrent); - //this.winGridViewPager1.ExportAll += new ExportAllEventHandler(pager1_ExportAll); winGridViewPager1.dataGridView1.MultiSelect = false; @@ -76,26 +74,25 @@ this.winGridViewPager1.AddColumnAlias("标识器型号", "标识器型号"); this.winGridViewPager1.AddColumnAlias("地面高程", "地面高程"); this.winGridViewPager1.AddColumnAlias("标识器埋深", "标识器埋深"); - this.winGridViewPager1.AddColumnAlias("对象编号", "对象编号"); - this.winGridViewPager1.AddColumnAlias("对象类型", "对象类型"); this.winGridViewPager1.AddColumnAlias("所属道路", "所属道路"); this.winGridViewPager1.AddColumnAlias("使用状态", "使用状态"); - this.winGridViewPager1.DisplayColumns = "编号,标识器ID号,标识器型号,地面高程,标识器埋深,对象编号,对象类型,所属道路,使用状态"; + this.winGridViewPager1.DisplayColumns = "编号,标识器ID号,标识器型号,地面高程,标识器埋深,所属道路,使用状态"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 //隐藏右键功能按钮 //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[1].Visible = false; - //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[4].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[5].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[6].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[7].Visible = false; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[1].Text = "定位查看"; + //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[1].Text = "定位查看"; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "属性编辑"; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Text = "标识器报废"; + winGridViewPager1.AppendedMenu = this.contextMenuStrip1; + //右键菜单宽度 winGridViewPager1.dataGridView1.ContextMenuStrip.AutoSize = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Width = 150; @@ -153,7 +150,7 @@ } /// - /// 右键定位 + /// 对象查看 /// /// /// @@ -306,20 +303,10 @@ string sqlCount = "select count(*) from 标识器 where 使用状态 = '使用中'"; - string sqlData = "select 编号,标识器ID号,标识器型号,地面高程,标识器埋深,对象编号,对象类型,所属道路,LSSYS_ID,X坐标,Y坐标,使用状态 " + + string sqlData = "select 编号,标识器ID号,标识器型号,地面高程,标识器埋深,所属道路,LSSYS_ID,X坐标,Y坐标,使用状态 " + "from (select t.*,rownum row_num from 标识器 t where 使用状态 = '使用中' order by 编号)b " + " where 1=1"; - if (!String.IsNullOrEmpty(txt_no.Text.Trim())) - { - sqlCount += " and 编号 like '%" + txt_no.Text.Trim() + "%'"; - sqlData += " and 编号 like '%" + txt_no.Text.Trim() + "%'"; - } - if (null != combo_street.SelectedItem && !String.IsNullOrEmpty(combo_street.SelectedItem.ToString().Trim())) - { - sqlData += " and 所属道路='" + combo_street.SelectedItem.ToString().Trim() + "'"; - sqlCount += " and 所属道路='" + combo_street.SelectedItem.ToString().Trim() + "'"; - } rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -332,9 +319,8 @@ int maxPage = pageIndex * maxPageIndex; string sqlCount = "select count(*) from 标识器 where 使用状态 = '使用中'"; - string sqlData = "select 编号,标识器ID号,标识器型号,地面高程,标识器埋深,对象编号,对象类型,所属道路,LSSYS_ID,X坐标,Y坐标,使用状态 " + - "from (select t.*,rownum row_num from 标识器 t where 使用状态 = '使用中' order by 编号)b "+ - " where(b.row_num between " + minPage + " and " + maxPage + ")"; + string sqlData = "select 编号,标识器ID号,标识器型号,地面高程,标识器埋深,所属道路,LSSYS_ID,X坐标,Y坐标,使用状态 " + + "from (select t.*,rownum row_num from 标识器 t where 使用状态 = '使用中'"; if (!String.IsNullOrEmpty(txt_no.Text.Trim())) { @@ -347,6 +333,8 @@ sqlCount += " and 所属道路='" + combo_street.SelectedItem.ToString().Trim() + "'"; } + sqlData += " order by 编号)b " + + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; @@ -372,9 +360,10 @@ private void FrmFlagManagers_FormClosing(object sender, FormClosingEventArgs e) { IS_OPEN = false; - Thread downloadJob = new Thread(new ParameterizedThreadStart(doSave)); - downloadJob.IsBackground = true; - downloadJob.Start(e); + //Thread downloadJob = new Thread(new ParameterizedThreadStart(doSave)); + //downloadJob.IsBackground = true; + //downloadJob.Start(e); + globeControl1.Globe.Layers["标识器"].Save(); globeControl1.Globe.MemoryLayer.RemoveAllFeature(); foreach (GSOFeature f in Features) { @@ -480,10 +469,88 @@ if (null != globeControl1) { FrmAddSinMark frm = new FrmAddSinMark(globeControl1); - frm.ShowDialog(); + frm.Show(); } } + private void 标识对象ToolStripMenuItem_Click(object sender, EventArgs e) + { + if (winGridViewPager1 != null && winGridViewPager1.dataGridView1 != null) + { + DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; + try + { + this.Hide(); + string id = row.Cells["编号"].Value.ToString(); + FrmFlagDetail p = new FrmFlagDetail(globeControl1, id); + p.showParentForm += new FrmFlagDetail.Handle(showThisForm);//改变值的事件 + p.Show(); + } + catch (Exception ex) + { + MessageBox.Show("失败:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } + + private void showThisForm() + { + this.Show(); + } + + private void toolStripMenuItem2_Click(object sender, EventArgs e) + { + if (winGridViewPager1 != null && winGridViewPager1.dataGridView1 != null) + { + DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; + try + { + this.WindowState = FormWindowState.Minimized; + string id = row.Cells["LSSYS_ID"].Value.ToString(); + string flagno = row.Cells["编号"].Value.ToString(); + string flagstreet = row.Cells["所属道路"].Value.ToString(); + double x = Convert.ToDouble(row.Cells["X坐标"].Value); + double y = Convert.ToDouble(row.Cells["Y坐标"].Value); + GSOFeature flagFeature = globeControl1.Globe.Layers.GetLayerByCaption("标识器").GetFeatureByID(int.Parse(id)); + + string type = ""; + string pipe = ""; + string sql = "select t.标识器型号,t.对象编号 from 标识器 t where t.编号='" + flagno + "'"; + using (OracleDataReader reader = OracleUtils.ExecuteReader(OracleUtils.ConnectionString, CommandType.Text, sql)) + { + while (reader.Read()) + { + type = reader.GetString(0); + pipe = reader.GetString(1); + } + } + + GSOLabel label = new GSOLabel(); + label.Text = "标识器编号：" + flagno + "\r\n" + + "标识器类型:" + type + "\r\n" + + //"标识对象编号:" + pipe + "\r\n" + + "所属道路:" + flagstreet; + label.Style = new GSOLabelStyle(); + label.Style.TextStyle.FontSize = 18; + label.Style.TextStyle.ForeColor = Color.FromArgb(0, 0, 0, 255); + label.Style.Opaque = 0.8; //设置标注的透明度，取值区间是0-1 + label.Style.TracktionLineType = EnumTracktionLineType.Solid; + label.Style.TextStyle.FontHeight = 10; + label.Style.TextStyle.FontName = "黑体"; + label.Style.TractionLineEndPos = new GSOPoint2d(80, 60); + + flagFeature.Label = label; + Features.Add(flagFeature); + globeControl1.Globe.JumpToFeature(flagFeature, 20); + this.globeControl1.Refresh(); + + } + catch (Exception ex) + { + MessageBox.Show("标识器定位失败:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } } diff --git a/FrmFlagManagers.resx b/FrmFlagManagers.resx index 1af7de1..ad53752 100644 --- a/FrmFlagManagers.resx +++ b/FrmFlagManagers.resx @@ -117,4 +117,7 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 17, 17 + \ No newline at end of file diff --git a/FrmPatrolerEdit.cs b/FrmPatrolerEdit.cs index dbd4fec..f45b5ae 100644 --- a/FrmPatrolerEdit.cs +++ b/FrmPatrolerEdit.cs @@ -46,7 +46,7 @@ txt_name.Focus(); return; } - if (String.IsNullOrEmpty(combo_sex.SelectedItem.ToString())) + if (combo_sex.SelectedItem == null ||String.IsNullOrEmpty(combo_sex.SelectedItem.ToString())) { MessageBox.Show("性别不能为空！", "警告", MessageBoxButtons.OK, MessageBoxIcon.Warning); combo_sex.Focus(); diff --git a/FrmPatrolerManager.Designer.cs b/FrmPatrolerManager.Designer.cs index bb8e5fb..10fac22 100644 --- a/FrmPatrolerManager.Designer.cs +++ b/FrmPatrolerManager.Designer.cs @@ -47,11 +47,13 @@ this.注销 = new DevComponents.Editors.ComboItem(); this.btn_query_person = new DevComponents.DotNetBar.ButtonItem(); this.btn_add_person = new DevComponents.DotNetBar.ButtonItem(); - this.winGridViewPager1 = new WHC.Pager.WinControl.WinGridViewPager(); this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components); this.日志ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.任务ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.定位ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.winGridViewPager1 = new WHC.Pager.WinControl.WinGridViewPager(); + this.编辑ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.注销ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); ((System.ComponentModel.ISupportInitialize)(this.bar1)).BeginInit(); this.contextMenuStrip1.SuspendLayout(); this.SuspendLayout(); @@ -173,9 +175,42 @@ this.btn_add_person.Text = "新增"; this.btn_add_person.Click += new System.EventHandler(this.btn_add_person_Click); // + // contextMenuStrip1 + // + this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.日志ToolStripMenuItem, + this.任务ToolStripMenuItem, + this.定位ToolStripMenuItem, + this.编辑ToolStripMenuItem, + this.注销ToolStripMenuItem}); + this.contextMenuStrip1.Name = "contextMenuStrip1"; + this.contextMenuStrip1.Size = new System.Drawing.Size(153, 136); + // + // 日志ToolStripMenuItem + // + this.日志ToolStripMenuItem.Name = "日志ToolStripMenuItem"; + this.日志ToolStripMenuItem.Size = new System.Drawing.Size(100, 22); + this.日志ToolStripMenuItem.Text = "日志"; + this.日志ToolStripMenuItem.Click += new System.EventHandler(this.日志ToolStripMenuItem_Click); + // + // 任务ToolStripMenuItem + // + this.任务ToolStripMenuItem.Name = "任务ToolStripMenuItem"; + this.任务ToolStripMenuItem.Size = new System.Drawing.Size(100, 22); + this.任务ToolStripMenuItem.Text = "任务"; + this.任务ToolStripMenuItem.Click += new System.EventHandler(this.任务ToolStripMenuItem_Click); + // + // 定位ToolStripMenuItem + // + this.定位ToolStripMenuItem.Name = "定位ToolStripMenuItem"; + this.定位ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.定位ToolStripMenuItem.Text = "定位"; + this.定位ToolStripMenuItem.Click += new System.EventHandler(this.定位ToolStripMenuItem_Click); + // // winGridViewPager1 // this.winGridViewPager1.AppendedMenu = null; + this.winGridViewPager1.ContextMenuStrip = this.contextMenuStrip1; this.winGridViewPager1.DataSource = null; this.winGridViewPager1.DisplayColumns = ""; this.winGridViewPager1.Dock = System.Windows.Forms.DockStyle.Fill; @@ -186,35 +221,19 @@ this.winGridViewPager1.Size = new System.Drawing.Size(756, 309); this.winGridViewPager1.TabIndex = 3; // - // contextMenuStrip1 + // 编辑ToolStripMenuItem // - this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.日志ToolStripMenuItem, - this.任务ToolStripMenuItem, - this.定位ToolStripMenuItem}); - this.contextMenuStrip1.Name = "contextMenuStrip1"; - this.contextMenuStrip1.Size = new System.Drawing.Size(101, 70); + this.编辑ToolStripMenuItem.Name = "编辑ToolStripMenuItem"; + this.编辑ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.编辑ToolStripMenuItem.Text = "编辑"; + this.编辑ToolStripMenuItem.Click += new System.EventHandler(this.编辑ToolStripMenuItem_Click); // - // 日志ToolStripMenuItem + // 注销ToolStripMenuItem // - this.日志ToolStripMenuItem.Name = "日志ToolStripMenuItem"; - this.日志ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); - this.日志ToolStripMenuItem.Text = "日志"; - this.日志ToolStripMenuItem.Click += new System.EventHandler(this.日志ToolStripMenuItem_Click); - // - // 任务ToolStripMenuItem - // - this.任务ToolStripMenuItem.Name = "任务ToolStripMenuItem"; - this.任务ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); - this.任务ToolStripMenuItem.Text = "任务"; - this.任务ToolStripMenuItem.Click += new System.EventHandler(this.任务ToolStripMenuItem_Click); - // - // 定位ToolStripMenuItem - // - this.定位ToolStripMenuItem.Name = "定位ToolStripMenuItem"; - this.定位ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); - this.定位ToolStripMenuItem.Text = "定位"; - this.定位ToolStripMenuItem.Click += new System.EventHandler(this.定位ToolStripMenuItem_Click); + this.注销ToolStripMenuItem.Name = "注销ToolStripMenuItem"; + this.注销ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.注销ToolStripMenuItem.Text = "注销"; + this.注销ToolStripMenuItem.Click += new System.EventHandler(this.注销ToolStripMenuItem_Click); // // FrmPatrolerManager // @@ -229,7 +248,7 @@ this.MinimizeBox = false; this.Name = "FrmPatrolerManager"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; - this.Text = "巡检人员维护"; + this.Text = "定位人员维护"; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmPatrolerManager_FormClosing); this.Load += new System.EventHandler(this.FrmPatrolerManager_Load); ((System.ComponentModel.ISupportInitialize)(this.bar1)).EndInit(); @@ -258,10 +277,12 @@ private DevComponents.Editors.ComboItem 注销; private DevComponents.Editors.ComboItem comboItem1; private DevComponents.Editors.ComboItem 不限; - private WHC.Pager.WinControl.WinGridViewPager winGridViewPager1; private System.Windows.Forms.ContextMenuStrip contextMenuStrip1; private System.Windows.Forms.ToolStripMenuItem 日志ToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem 任务ToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem 定位ToolStripMenuItem; + private WHC.Pager.WinControl.WinGridViewPager winGridViewPager1; + private System.Windows.Forms.ToolStripMenuItem 编辑ToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem 注销ToolStripMenuItem; } } \ No newline at end of file diff --git a/FrmPatrolerManager.cs b/FrmPatrolerManager.cs index 255a076..9c32f54 100644 --- a/FrmPatrolerManager.cs +++ b/FrmPatrolerManager.cs @@ -29,9 +29,7 @@ this.globeControl1 = globeControl1; winGridViewPager1.OnPageChanged += new EventHandler(winGridViewPager1_OnPageChanged); - this.winGridViewPager1.OnEditSelected += new EventHandler(winGridViewPager1_OnEditSelected);//编辑 - this.winGridViewPager1.OnDeleteSelected += new EventHandler(winGridViewPager1_OnDeleteSelected);//删除 - + this.winGridViewPager1.OnStartExport += new EventHandler(pager1_OnStartExport); this.winGridViewPager1.OnEndExport += new EventHandler(pager1_OnEndExport); @@ -47,26 +45,31 @@ //控制表格显示的列，以及每一列要显示的列名 this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - this.winGridViewPager1.AddColumnAlias("USERNAME", "姓名"); - this.winGridViewPager1.AddColumnAlias("DBID", "编号"); - this.winGridViewPager1.AddColumnAlias("SEX", "性别"); - this.winGridViewPager1.AddColumnAlias("AGE", "年龄"); - this.winGridViewPager1.AddColumnAlias("PHONENUM", "电话"); - this.winGridViewPager1.AddColumnAlias("ACCOUNTSTATE", "状态"); - this.winGridViewPager1.DisplayColumns = "USERNAME,SEX,AGE,PHONENUM,ACCOUNTSTATE"; + this.winGridViewPager1.AddColumnAlias("姓名", "姓名"); + this.winGridViewPager1.AddColumnAlias("编号", "编号"); + this.winGridViewPager1.AddColumnAlias("性别", "性别"); + this.winGridViewPager1.AddColumnAlias("年龄", "年龄"); + this.winGridViewPager1.AddColumnAlias("电话", "电话"); + this.winGridViewPager1.AddColumnAlias("状态", "状态"); + this.winGridViewPager1.DisplayColumns = "姓名,性别,年龄,电话,状态"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 + //隐藏右键功能按钮 //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[1].Visible = false; + winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Visible = false; + winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[4].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[5].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[6].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[7].Visible = false; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "编辑"; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Text = "注销"; + + //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "编辑"; + //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Text = "注销"; winGridViewPager1.AppendedMenu = this.contextMenuStrip1; + //右键菜单宽度 winGridViewPager1.dataGridView1.ContextMenuStrip.AutoSize = false; @@ -122,11 +125,11 @@ DataGridViewRow row = grid.SelectedRows[0]; try { - long dbid = long.Parse(row.Cells["dbid"].Value.ToString()); - String name = row.Cells["USERNAME"].Value.ToString(); - String sex = row.Cells["SEX"].Value.ToString(); - String age = row.Cells["AGE"].Value.ToString(); - string phone = row.Cells["PHONENUM"].Value.ToString(); + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); + String name = row.Cells["姓名"].Value.ToString(); + String sex = row.Cells["性别"].Value.ToString(); + String age = row.Cells["年龄"].Value.ToString(); + string phone = row.Cells["电话"].Value.ToString(); age = String.IsNullOrEmpty(age.ToString().Trim()) ? "1" : age.ToString().Trim(); FrmPatrolerEdit frm = new FrmPatrolerEdit(dbid.ToString(), name, age, sex, phone); frm.reloadGrid += new ReloadPatrolerGrid(LoadData); @@ -152,10 +155,10 @@ if (grid != null) { DataGridViewRow row = grid.SelectedRows[0]; - long dbid = long.Parse(row.Cells["DBID"].Value.ToString()); + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); try { - string state = row.Cells["ACCOUNTSTATE"].Value.ToString(); + string state = row.Cells["状态"].Value.ToString(); if ("在线".Equals(state)) { if (MessageBox.Show("确定注销？", "确认", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) @@ -180,60 +183,60 @@ { int pageIndex = winGridViewPager1.PagerInfo.CurrenetPageIndex; string sqlData = GetSql(pageIndex); - initlizeDatagrid(); + DataTable table = OracleUtils.ExecuteDataset(OracleUtils.ConnectionString, CommandType.Text, sqlData).Tables[0]; winGridViewPager1.DataSource = table.DefaultView; - for (int i = 0; i < winGridViewPager1.dataGridView1.Rows.Count; i++) - { - if (winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value.ToString() == "ONLINE") - { - winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value = "在线"; - } - else - { - if (winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value.ToString() == "OFFLINE") - { - winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value = "离线"; - } - else - { - if (winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value.ToString() == "LEAVER") - { - winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value = "注销"; - } - } - } - } + //for (int i = 0; i < winGridViewPager1.dataGridView1.Rows.Count; i++) + //{ + // if (winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value.ToString() == "ONLINE") + // { + // winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value = "在线"; + // } + // else + // { + // if (winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value.ToString() == "OFFLINE") + // { + // winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value = "离线"; + // } + // else + // { + // if (winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value.ToString() == "LEAVER") + // { + // winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value = "注销"; + // } + // } + // } + //} winGridViewPager1.Refresh(); } private void LoadData(int pageIndex) { string sqlData = GetSql(pageIndex); - initlizeDatagrid(); + DataTable table = OracleUtils.ExecuteDataset(OracleUtils.ConnectionString, CommandType.Text, sqlData).Tables[0]; winGridViewPager1.DataSource = table.DefaultView; - for (int i = 0; i < winGridViewPager1.dataGridView1.Rows.Count; i++) - { - if (winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value.ToString() == "ONLINE") - { - winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value = "在线"; - } - else - { - if (winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value.ToString() == "OFFLINE") - { - winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value = "离线"; - } - else - { - if (winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value.ToString() == "LEAVER") - { - winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value = "注销"; - } - } - } - } + //for (int i = 0; i < winGridViewPager1.dataGridView1.Rows.Count; i++) + //{ + // if (winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value.ToString() == "ONLINE") + // { + // winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value = "在线"; + // } + // else + // { + // if (winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value.ToString() == "OFFLINE") + // { + // winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value = "离线"; + // } + // else + // { + // if (winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value.ToString() == "LEAVER") + // { + // winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value = "注销"; + // } + // } + // } + //} winGridViewPager1.Refresh(); } @@ -241,7 +244,8 @@ { string sqlCount = "select count(*) from equipment where status = 'USING'"; - string sqlData = "select username,dbid,sex,age,phonenum,accountstate " + + string sqlData = "select username as 姓名,dbid as 编号,sex as 性别,age as 年龄,phonenum as 电话,"+ + "case when accountstate = 'ONLINE' then '在线' when accountstate = 'OFFLINE' then '离线' when accountstate = 'LEAVER' then '注销' end as 状态 " + "from (select t.*,rownum row_num from patroler t order by DBID desc)b " + " where 1=1"; @@ -255,9 +259,9 @@ int minPage = (pageIndex - 1) * maxPageIndex + 1; int maxPage = pageIndex * maxPageIndex; string sqlCount = "select count(*) from patroler where 1=1"; - string sqlData = "select username,dbid,sex,age,phonenum,accountstate " + - "from (select t.*,rownum row_num from patroler t order by DBID desc)b " + - " where(b.row_num between " + minPage + " and " + maxPage + ")"; + string sqlData = "select username as 姓名,dbid as 编号,sex as 性别,age as 年龄,phonenum as 电话,"+ + "case when accountstate = 'ONLINE' then '在线' when accountstate = 'OFFLINE' then '离线' when accountstate = 'LEAVER' then '注销' end as 状态 " + + "from (select t.*,rownum row_num from patroler t where 1=1"; if (!String.IsNullOrEmpty(txt_username.Text.Trim())) { @@ -281,7 +285,8 @@ sqlCount += " and accountstate='" + combo_stateText + "'"; sqlData += " and accountstate='" + combo_stateText + "'"; } - + sqlData += " order by DBID desc)b " + + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; @@ -291,6 +296,7 @@ { try { + initlizeDatagrid(); LoadData(); initForm(); IS_OPEN = true; @@ -310,11 +316,13 @@ } if (Utility.userRole.IndexOf("巡检员编辑") == -1) { - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Visible = false; + //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Visible = false; + 编辑ToolStripMenuItem.Visible = false; } if (Utility.userRole.IndexOf("巡检员注销") == -1) { - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Visible = false; + //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Visible = false; + 注销ToolStripMenuItem.Visible = false; } } @@ -376,7 +384,7 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - long dbid = long.Parse(row.Cells["dbid"].Value.ToString()); + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); Log p = new Log(dbid.ToString()); p.Show(); } @@ -395,8 +403,8 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - long dbid = long.Parse(row.Cells["dbid"].Value.ToString()); - String state = row.Cells["ACCOUNTSTATE"].Value.ToString(); + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); + String state = row.Cells["状态"].Value.ToString(); if ("在线".Equals(state)) { string sql = "select t.dbid " + @@ -435,8 +443,8 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - long dbid = long.Parse(row.Cells["dbid"].Value.ToString()); - String username = row.Cells["USERNAME"].Value.ToString(); + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); + String username = row.Cells["姓名"].Value.ToString(); string sql = "select t.latitude, t.longitude " + "from position t " + "where t.dbid = (select max(dbid) from position where patroler_id = " + dbid + ")"; @@ -489,6 +497,63 @@ } + private void 编辑ToolStripMenuItem_Click(object sender, EventArgs e) + { + if (winGridViewPager1 != null && winGridViewPager1.dataGridView1 != null) + { + DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; + try + { + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); + String name = row.Cells["姓名"].Value.ToString(); + String sex = row.Cells["性别"].Value.ToString(); + String age = row.Cells["年龄"].Value.ToString(); + string phone = row.Cells["电话"].Value.ToString(); + age = String.IsNullOrEmpty(age.ToString().Trim()) ? "1" : age.ToString().Trim(); + FrmPatrolerEdit frm = new FrmPatrolerEdit(dbid.ToString(), name, age, sex, phone); + frm.reloadGrid += new ReloadPatrolerGrid(LoadData); + frm.ShowDialog(); + winGridViewPager1.Refresh(); + } + catch (Exception ex) + { + MessageBox.Show("编辑失败:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } + + private void 注销ToolStripMenuItem_Click(object sender, EventArgs e) + { + if (winGridViewPager1 != null && winGridViewPager1.dataGridView1 != null) + { + DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); + try + { + if (MessageBox.Show("确定注销？", "确认", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) + { + String sql = "update patroler t set t.accountstate='LEAVER' where t.dbid=" + dbid; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + LoadData(); + MessageBox.Show("人员已注销", "信息", MessageBoxButtons.OK, MessageBoxIcon.Information); + } + //string state = row.Cells["状态"].Value.ToString(); + //if ("在线".Equals(state)) + //{ + + //} + //else + //{ + // MessageBox.Show("人员不在线，无法注销", "信息"); + //} + } + catch (Exception ex) + { + MessageBox.Show("人员注销失败:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } + } } diff --git a/FrmRoleInfoManager.cs b/FrmRoleInfoManager.cs index 8897133..35693cf 100644 --- a/FrmRoleInfoManager.cs +++ b/FrmRoleInfoManager.cs @@ -55,10 +55,10 @@ //控制表格显示的列，以及每一列要显示的列名 this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - this.winGridViewPager1.AddColumnAlias("NT", "角色名称"); - this.winGridViewPager1.AddColumnAlias("ID", "编号"); + this.winGridViewPager1.AddColumnAlias("角色名称", "角色名称"); + this.winGridViewPager1.AddColumnAlias("编号", "编号"); - this.winGridViewPager1.DisplayColumns = "NT"; + this.winGridViewPager1.DisplayColumns = "角色名称"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -131,7 +131,7 @@ { try { - string dbid = row.Cells["id"].Value.ToString(); + string dbid = row.Cells["编号"].Value.ToString(); string sql = "delete from casic_userroletest where id=" + dbid; OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); LoadData(); @@ -170,7 +170,7 @@ { string sqlCount = "select id,nt from casic_userroletest where sysname='EMS'"; - string sqlData = "select nt,id " + + string sqlData = "select nt as 角色名称,id as 编号 " + "from (select t.*,rownum row_num from casic_userroletest t order by id desc)b " + " where sysname='EMS'"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -183,7 +183,7 @@ int minPage = (pageIndex - 1) * maxPageIndex + 1; int maxPage = pageIndex * maxPageIndex; string sqlCount = "select id,nt from casic_userroletest where sysname='EMS'"; - string sqlData = "select nt,id " + + string sqlData = "select nt as 角色名称,id as 编号 " + "from (select t.*,rownum row_num from casic_userroletest t where sysname='EMS' order by id desc)b " + " where(b.row_num between " + minPage + " and " + maxPage + ")"; diff --git a/FrmSysUserInfoManger.cs b/FrmSysUserInfoManger.cs index 7903916..e193a61 100644 --- a/FrmSysUserInfoManger.cs +++ b/FrmSysUserInfoManger.cs @@ -28,6 +28,7 @@ this.winGridViewPager1.OnEndExport += new EventHandler(pager1_OnEndExport); winGridViewPager1.dataGridView1.MultiSelect = false; + } private void FrmSysUserInfoManger_Load(object sender, EventArgs e) @@ -59,10 +60,10 @@ //控制表格显示的列，以及每一列要显示的列名 this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - this.winGridViewPager1.AddColumnAlias("USERNAME", "账号"); - this.winGridViewPager1.AddColumnAlias("ID", "编号"); + this.winGridViewPager1.AddColumnAlias("账号", "账号"); + this.winGridViewPager1.AddColumnAlias("编号", "编号"); - this.winGridViewPager1.DisplayColumns = "USERNAME"; + this.winGridViewPager1.DisplayColumns = "账号"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -130,8 +131,8 @@ if (grid != null) { DataGridViewRow row = grid.SelectedRows[0]; - string dbid = row.Cells["id"].Value.ToString(); - string userName = row.Cells["USERNAME"].Value.ToString(); + string dbid = row.Cells["编号"].Value.ToString(); + string userName = row.Cells["账号"].Value.ToString(); if (userName.Equals("ems")) { MessageBox.Show("该用户为管理员用户，无法删除！", "信息"); @@ -184,7 +185,7 @@ { string sqlCount = "select count(*) from casic_userinfotest where sysname='EMS'"; - string sqlData = "select username,id " + + string sqlData = "select username as 账号,id as 编号 " + "from (select t.*,rownum row_num from casic_userinfotest t order by id desc)b " + " where sysname='EMS'"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -197,16 +198,16 @@ int minPage = (pageIndex - 1) * maxPageIndex + 1; int maxPage = pageIndex * maxPageIndex; string sqlCount = "select count(*) from casic_userinfotest where sysname='EMS'"; - string sqlData = "select username,id " + - "from (select t.*,rownum row_num from casic_userinfotest t where sysname='EMS' order by id desc)b " + - " where(b.row_num between " + minPage + " and " + maxPage + ")"; + string sqlData = "select username as 账号,id as 编号 " + + "from (select t.*,rownum row_num from casic_userinfotest t where sysname='EMS'"; if (!String.IsNullOrEmpty(txt_user_code.Text.Trim())) { sqlCount += " and username like '%" + txt_user_code.Text.Trim() + "%'"; sqlData += " and username like '%" + txt_user_code.Text.Trim() + "%'"; } - + sqlData += " order by id desc)b " + + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; diff --git a/MainFrm.cs b/MainFrm.cs index 39df646..0cd5881 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3310,10 +3310,10 @@ string str1 = ""; if (feature != null) { - if (feature.GetFieldDefn("图?片?编括?码?") != null) // + if (feature.GetFieldDefn("图片编码") != null) // { str1 = GetBubbleInfo(feature); - if (RemoteFileExists(Utility.PicRootURL + feature.GetValue("图?片?编括?码?").ToString())) + if (RemoteFileExists(Utility.PicRootURL + feature.GetValue("图片编码").ToString())) { str1 += ""; } @@ -3450,9 +3450,15 @@ string value1 = ""; if (field1 != null) { - if (field1.Name == "图片编码") + //if (field1.Name == "图片编码" || field1.Name == "对象编号" || field1.Name == "对象类型" || field1.Name == "对象名称") + //{ + // j++; + //} + while (field1.Name == "图片编码" || field1.Name == "对象编号" || field1.Name == "对象类型" || field1.Name == "对象名称") { j++; + fieldName = fieldNames[j].Trim(); + field1 = (GSOFieldDefn)feature.GetFieldDefn(fieldName); } if (j < rowCount) { @@ -3479,6 +3485,11 @@ if (!feature.IsFieldValueNull(j)) { value1 = feature.GetValue(j).ToString(); + if (name1 == "标识器埋深") + { + if (value1!=null&&value1.Length>4) + value1 = value1.Substring(0,4); + } } } } @@ -3491,9 +3502,14 @@ if (field2 != null) { - if (field2.Name == "图片编码") + //if (field2.Name == "图片编码" || field1.Name == "对象编号" || field1.Name == "对象类型" || field1.Name == "对象名称") + //{ + // j++; + //} + while (field2.Name == "图片编码" || field2.Name == "对象编号" || field2.Name == "对象类型" || field2.Name == "对象名称") { j++; + field2 = (GSOFieldDefn)feature.GetFieldDefn(j + 1); } if (j + 1 < rowCount) { @@ -3521,6 +3537,11 @@ if (!feature.IsFieldValueNull(j + 1)) { value2 = feature.GetValue(j + 1).ToString(); + if (name2 == "标识器埋深") + { + if (value2 != null && value2.Length > 4) + value2 = value2.Substring(0, 4); + } } } } @@ -15347,7 +15368,7 @@ return; } FrmFlagManagers frm = new FrmFlagManagers(globeControl1); - frm.Show(this); + frm.Show(); } private void ribbonTabItem2_MouseDown(object sender, MouseEventArgs e) diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index fddfb94..e5f0003 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -365,6 +365,16 @@ this.可编辑ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.保存ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.ribbonControl1 = new DevComponents.DotNetBar.RibbonControl(); + this.ribbonPanel3 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar3 = new DevComponents.DotNetBar.RibbonBar(); + this.btn_device = new DevComponents.DotNetBar.ButtonItem(); + this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); + this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel7 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); + this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); + this.slider4ground = new DevComponents.DotNetBar.SliderItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -374,12 +384,6 @@ this.btn_user_role = new DevComponents.DotNetBar.ButtonItem(); this.btn_password_edit = new DevComponents.DotNetBar.ButtonItem(); this.btn_reset_password = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel3 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar3 = new DevComponents.DotNetBar.RibbonBar(); - this.btn_device = new DevComponents.DotNetBar.ButtonItem(); - this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); - this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); @@ -551,10 +555,6 @@ this.buttonItemBZ9 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItemBZ10 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItemBZ11 = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel7 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); - this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); - this.slider4ground = new DevComponents.DotNetBar.SliderItem(); this.ribbonPanel12 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar18 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItem133 = new DevComponents.DotNetBar.ButtonItem(); @@ -690,11 +690,11 @@ this.contextMenuStrip3.SuspendLayout(); this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); - this.ribbonPanel8.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel7.SuspendLayout(); + this.ribbonPanel8.SuspendLayout(); this.ribbonPanel2.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); - this.ribbonPanel7.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); this.ribbonPanel5.SuspendLayout(); this.ribbonPanel6.SuspendLayout(); @@ -4162,10 +4162,10 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); - this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel2); - this.ribbonControl1.Controls.Add(this.ribbonPanel15); + this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel7); + this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); this.ribbonControl1.Controls.Add(this.ribbonPanel5); this.ribbonControl1.Controls.Add(this.ribbonPanel6); @@ -4216,135 +4216,6 @@ this.ribbonControl1.UseCustomizeDialog = false; this.ribbonControl1.Click += new System.EventHandler(this.ribbonControl1_Click); // - // ribbonPanel8 - // - this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel8.Controls.Add(this.ribbonBar_UserInfo); - this.ribbonPanel8.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel8.Location = new System.Drawing.Point(0, 33); - this.ribbonPanel8.Name = "ribbonPanel8"; - this.ribbonPanel8.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel8.Size = new System.Drawing.Size(1328, 62); - // - // - // - this.ribbonPanel8.Style.Class = ""; - this.ribbonPanel8.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel8.StyleMouseDown.Class = ""; - this.ribbonPanel8.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel8.StyleMouseOver.Class = ""; - this.ribbonPanel8.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel8.TabIndex = 42; - this.ribbonPanel8.Visible = false; - // - // ribbonBar_UserInfo - // - this.ribbonBar_UserInfo.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar_UserInfo.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar_UserInfo.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar_UserInfo.BackgroundStyle.Class = ""; - this.ribbonBar_UserInfo.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar_UserInfo.ContainerControlProcessDialogKey = true; - this.ribbonBar_UserInfo.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar_UserInfo.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.btn_user_info, - this.btn_role_info, - this.btn_resc_info, - this.btn_role_resc, - this.btn_user_role, - this.btn_password_edit, - this.btn_reset_password}); - this.ribbonBar_UserInfo.Location = new System.Drawing.Point(3, 0); - this.ribbonBar_UserInfo.Name = "ribbonBar_UserInfo"; - this.ribbonBar_UserInfo.Size = new System.Drawing.Size(427, 59); - this.ribbonBar_UserInfo.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar_UserInfo.TabIndex = 0; - // - // - // - this.ribbonBar_UserInfo.TitleStyle.Class = ""; - this.ribbonBar_UserInfo.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar_UserInfo.TitleStyleMouseOver.Class = ""; - this.ribbonBar_UserInfo.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // btn_user_info - // - this.btn_user_info.Image = global::Cyberpipe.Properties.Resources._24x24icon_13_hover; - this.btn_user_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_user_info.Name = "btn_user_info"; - this.btn_user_info.SubItemsExpandWidth = 14; - this.btn_user_info.Text = "用户管理"; - this.btn_user_info.Click += new System.EventHandler(this.btn_user_info_Click); - // - // btn_role_info - // - this.btn_role_info.Image = global::Cyberpipe.Properties.Resources._24x24icon_05_hover1; - this.btn_role_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_role_info.Name = "btn_role_info"; - this.btn_role_info.SubItemsExpandWidth = 14; - this.btn_role_info.Text = "角色管理"; - this.btn_role_info.Click += new System.EventHandler(this.btn_role_info_Click); - // - // btn_resc_info - // - this.btn_resc_info.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__09; - this.btn_resc_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_resc_info.Name = "btn_resc_info"; - this.btn_resc_info.SubItemsExpandWidth = 14; - this.btn_resc_info.Text = "资源管理"; - this.btn_resc_info.Click += new System.EventHandler(this.btn_resc_info_Click); - // - // btn_role_resc - // - this.btn_role_resc.Image = global::Cyberpipe.Properties.Resources.btnlegendSet_Image_副本; - this.btn_role_resc.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_role_resc.Name = "btn_role_resc"; - this.btn_role_resc.SubItemsExpandWidth = 14; - this.btn_role_resc.Text = "角色授权"; - this.btn_role_resc.Click += new System.EventHandler(this.btn_role_resc_Click); - // - // btn_user_role - // - this.btn_user_role.Image = global::Cyberpipe.Properties.Resources._24x24icon_08_hover; - this.btn_user_role.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_user_role.Name = "btn_user_role"; - this.btn_user_role.SubItemsExpandWidth = 14; - this.btn_user_role.Text = "用户授权"; - this.btn_user_role.Click += new System.EventHandler(this.btn_user_role_Click); - // - // btn_password_edit - // - this.btn_password_edit.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__67; - this.btn_password_edit.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_password_edit.Name = "btn_password_edit"; - this.btn_password_edit.SubItemsExpandWidth = 14; - this.btn_password_edit.Text = "密码修改"; - this.btn_password_edit.Click += new System.EventHandler(this.btn_password_edit_Click); - // - // btn_reset_password - // - this.btn_reset_password.Image = global::Cyberpipe.Properties.Resources.liuxiang; - this.btn_reset_password.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_reset_password.Name = "btn_reset_password"; - this.btn_reset_password.SubItemsExpandWidth = 14; - this.btn_reset_password.Text = "重置密码"; - this.btn_reset_password.Click += new System.EventHandler(this.btn_reset_password_Click); - // // ribbonPanel3 // this.ribbonPanel3.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4425,7 +4296,7 @@ this.btn_Person.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; this.btn_Person.Name = "btn_Person"; this.btn_Person.SubItemsExpandWidth = 14; - this.btn_Person.Text = "巡检人员维护"; + this.btn_Person.Text = "定位人员维护"; this.btn_Person.Click += new System.EventHandler(this.btn_Person_Click); // // btn_constructMap @@ -4446,6 +4317,214 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel7 + // + this.ribbonPanel7.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel7.Controls.Add(this.ribbonBar5); + this.ribbonPanel7.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel7.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel7.Name = "ribbonPanel7"; + this.ribbonPanel7.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel7.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel7.Style.Class = ""; + this.ribbonPanel7.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel7.StyleMouseDown.Class = ""; + this.ribbonPanel7.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel7.StyleMouseOver.Class = ""; + this.ribbonPanel7.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel7.TabIndex = 41; + this.ribbonPanel7.Visible = false; + // + // ribbonBar5 + // + this.ribbonBar5.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar5.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar5.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar5.BackgroundStyle.Class = ""; + this.ribbonBar5.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar5.ContainerControlProcessDialogKey = true; + this.ribbonBar5.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar5.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.btn_flag, + this.slider4ground}); + this.ribbonBar5.Location = new System.Drawing.Point(3, 0); + this.ribbonBar5.Name = "ribbonBar5"; + this.ribbonBar5.Size = new System.Drawing.Size(427, 92); + this.ribbonBar5.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar5.TabIndex = 0; + // + // + // + this.ribbonBar5.TitleStyle.Class = ""; + this.ribbonBar5.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar5.TitleStyleMouseOver.Class = ""; + this.ribbonBar5.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar5.TitleVisible = false; + // + // btn_flag + // + this.btn_flag.Image = global::Cyberpipe.Properties.Resources._24x24icon_03_hover; + this.btn_flag.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_flag.Name = "btn_flag"; + this.btn_flag.SubItemsExpandWidth = 14; + this.btn_flag.Text = "标识器管理"; + this.btn_flag.Click += new System.EventHandler(this.btn_flag_Click); + // + // slider4ground + // + this.slider4ground.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; + this.slider4ground.Name = "slider4ground"; + this.slider4ground.Text = "地面透明度"; + this.slider4ground.Value = 0; + this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); + // + // ribbonPanel8 + // + this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel8.Controls.Add(this.ribbonBar_UserInfo); + this.ribbonPanel8.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel8.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel8.Name = "ribbonPanel8"; + this.ribbonPanel8.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel8.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel8.Style.Class = ""; + this.ribbonPanel8.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel8.StyleMouseDown.Class = ""; + this.ribbonPanel8.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel8.StyleMouseOver.Class = ""; + this.ribbonPanel8.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel8.TabIndex = 42; + this.ribbonPanel8.Visible = false; + // + // ribbonBar_UserInfo + // + this.ribbonBar_UserInfo.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar_UserInfo.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar_UserInfo.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar_UserInfo.BackgroundStyle.Class = ""; + this.ribbonBar_UserInfo.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar_UserInfo.ContainerControlProcessDialogKey = true; + this.ribbonBar_UserInfo.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar_UserInfo.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.btn_user_info, + this.btn_role_info, + this.btn_resc_info, + this.btn_role_resc, + this.btn_user_role, + this.btn_password_edit, + this.btn_reset_password}); + this.ribbonBar_UserInfo.Location = new System.Drawing.Point(3, 0); + this.ribbonBar_UserInfo.Name = "ribbonBar_UserInfo"; + this.ribbonBar_UserInfo.Size = new System.Drawing.Size(427, 92); + this.ribbonBar_UserInfo.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar_UserInfo.TabIndex = 0; + // + // + // + this.ribbonBar_UserInfo.TitleStyle.Class = ""; + this.ribbonBar_UserInfo.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar_UserInfo.TitleStyleMouseOver.Class = ""; + this.ribbonBar_UserInfo.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // btn_user_info + // + this.btn_user_info.Image = global::Cyberpipe.Properties.Resources._24x24icon_13_hover; + this.btn_user_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_user_info.Name = "btn_user_info"; + this.btn_user_info.SubItemsExpandWidth = 14; + this.btn_user_info.Text = "用户管理"; + this.btn_user_info.Click += new System.EventHandler(this.btn_user_info_Click); + // + // btn_role_info + // + this.btn_role_info.Image = global::Cyberpipe.Properties.Resources._24x24icon_05_hover1; + this.btn_role_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_role_info.Name = "btn_role_info"; + this.btn_role_info.SubItemsExpandWidth = 14; + this.btn_role_info.Text = "角色管理"; + this.btn_role_info.Click += new System.EventHandler(this.btn_role_info_Click); + // + // btn_resc_info + // + this.btn_resc_info.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__09; + this.btn_resc_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_resc_info.Name = "btn_resc_info"; + this.btn_resc_info.SubItemsExpandWidth = 14; + this.btn_resc_info.Text = "资源管理"; + this.btn_resc_info.Click += new System.EventHandler(this.btn_resc_info_Click); + // + // btn_role_resc + // + this.btn_role_resc.Image = global::Cyberpipe.Properties.Resources.btnlegendSet_Image_副本; + this.btn_role_resc.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_role_resc.Name = "btn_role_resc"; + this.btn_role_resc.SubItemsExpandWidth = 14; + this.btn_role_resc.Text = "角色授权"; + this.btn_role_resc.Click += new System.EventHandler(this.btn_role_resc_Click); + // + // btn_user_role + // + this.btn_user_role.Image = global::Cyberpipe.Properties.Resources._24x24icon_08_hover; + this.btn_user_role.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_user_role.Name = "btn_user_role"; + this.btn_user_role.SubItemsExpandWidth = 14; + this.btn_user_role.Text = "用户授权"; + this.btn_user_role.Click += new System.EventHandler(this.btn_user_role_Click); + // + // btn_password_edit + // + this.btn_password_edit.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__67; + this.btn_password_edit.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_password_edit.Name = "btn_password_edit"; + this.btn_password_edit.SubItemsExpandWidth = 14; + this.btn_password_edit.Text = "密码修改"; + this.btn_password_edit.Click += new System.EventHandler(this.btn_password_edit_Click); + // + // btn_reset_password + // + this.btn_reset_password.Image = global::Cyberpipe.Properties.Resources.liuxiang; + this.btn_reset_password.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_reset_password.Name = "btn_reset_password"; + this.btn_reset_password.SubItemsExpandWidth = 14; + this.btn_reset_password.Text = "重置密码"; + this.btn_reset_password.Click += new System.EventHandler(this.btn_reset_password_Click); + // // ribbonPanel2 // this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -5891,85 +5970,6 @@ this.buttonItemBZ11.Text = "标注管理"; this.buttonItemBZ11.Click += new System.EventHandler(this.buttonItemBZ11_Click); // - // ribbonPanel7 - // - this.ribbonPanel7.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel7.Controls.Add(this.ribbonBar5); - this.ribbonPanel7.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel7.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel7.Name = "ribbonPanel7"; - this.ribbonPanel7.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel7.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel7.Style.Class = ""; - this.ribbonPanel7.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel7.StyleMouseDown.Class = ""; - this.ribbonPanel7.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel7.StyleMouseOver.Class = ""; - this.ribbonPanel7.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel7.TabIndex = 41; - this.ribbonPanel7.Visible = false; - // - // ribbonBar5 - // - this.ribbonBar5.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar5.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar5.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar5.BackgroundStyle.Class = ""; - this.ribbonBar5.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar5.ContainerControlProcessDialogKey = true; - this.ribbonBar5.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar5.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.btn_flag, - this.slider4ground}); - this.ribbonBar5.Location = new System.Drawing.Point(3, 0); - this.ribbonBar5.Name = "ribbonBar5"; - this.ribbonBar5.Size = new System.Drawing.Size(427, 92); - this.ribbonBar5.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar5.TabIndex = 0; - // - // - // - this.ribbonBar5.TitleStyle.Class = ""; - this.ribbonBar5.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar5.TitleStyleMouseOver.Class = ""; - this.ribbonBar5.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar5.TitleVisible = false; - // - // btn_flag - // - this.btn_flag.Image = global::Cyberpipe.Properties.Resources._24x24icon_03_hover; - this.btn_flag.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_flag.Name = "btn_flag"; - this.btn_flag.SubItemsExpandWidth = 14; - this.btn_flag.Text = "标识器管理"; - this.btn_flag.Click += new System.EventHandler(this.btn_flag_Click); - // - // slider4ground - // - this.slider4ground.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; - this.slider4ground.Name = "slider4ground"; - this.slider4ground.Text = "地面透明度"; - this.slider4ground.Value = 0; - this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); - // // ribbonPanel12 // this.ribbonPanel12.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7181,11 +7181,11 @@ this.contextMenuStripDeleteLayerNode.ResumeLayout(false); this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); - this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel7.ResumeLayout(false); + this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); - this.ribbonPanel7.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); this.ribbonPanel5.ResumeLayout(false); this.ribbonPanel6.ResumeLayout(false); diff --git a/SysRescInfoManager.cs b/SysRescInfoManager.cs index 3a84d95..fda6f3f 100644 --- a/SysRescInfoManager.cs +++ b/SysRescInfoManager.cs @@ -79,11 +79,11 @@ //控制表格显示的列，以及每一列要显示的列名 this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - - this.winGridViewPager1.AddColumnAlias("RESC", "资源名称"); - this.winGridViewPager1.AddColumnAlias("ID", "编号"); - this.winGridViewPager1.AddColumnAlias("DESP", "资源描述"); - this.winGridViewPager1.DisplayColumns = "RESC,DESP"; + + this.winGridViewPager1.AddColumnAlias("资源名称", "资源名称"); + this.winGridViewPager1.AddColumnAlias("编号", "编号"); + this.winGridViewPager1.AddColumnAlias("资源描述", "资源描述"); + this.winGridViewPager1.DisplayColumns = "资源名称,资源描述"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -153,8 +153,8 @@ DataGridViewRow row = grid.SelectedRows[0]; if (MessageBox.Show("确定删除？", "确认", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) { - string dbid = row.Cells["id"].Value.ToString(); - string resc = row.Cells["resc"].Value.ToString(); + string dbid = row.Cells["编号"].Value.ToString(); + string resc = row.Cells["资源名称"].Value.ToString(); OracleConnection conn = null; OracleTransaction tran = null; try @@ -229,7 +229,7 @@ private string GetSql() { string sqlCount = "select count(*) from casic_userresctest where sysname='EMS'"; - string sqlData = "select resc,id,desp " + + string sqlData = "select resc as 资源名称,id as 编号,desp as 资源描述 " + "from (select t.*,rownum row_num from casic_userresctest t order by id desc)b " + " where sysname='EMS'"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -242,7 +242,7 @@ int minPage = (pageIndex - 1) * maxPageIndex + 1; int maxPage = pageIndex * maxPageIndex; string sqlCount = "select count(*) from casic_userresctest where sysname='EMS'"; - string sqlData = "select resc,id,desp " + + string sqlData = "select resc as 资源名称,id as 编号,desp as 资源描述 " + "from (select t.*,rownum row_num from casic_userresctest t where sysname='EMS' order by id desc)b " + " where(b.row_num between " + minPage + " and " + maxPage + ")"; diff --git a/bin/x86/Debug/Config.xml b/bin/x86/Debug/Config.xml index e2d7b46..560a163 100644 --- a/bin/x86/Debug/Config.xml +++ b/bin/x86/Debug/Config.xml @@ -3,9 +3,9 @@ LocaSpace三维地下管线信息系统 scott - SZHTDB - 127.0.0.1 - scott + SZHTDB2 + 192.168.0.203 + SZHTDB2 127.0.0.1 1500 @@ -14,8 +14,8 @@ http://192.168.0.122:8088/UpDownFile.asmx - http://127.0.0.1/EMSCyberpipe.msi - http://127.0.0.1/EMSConfig.xml + http://192.168.10.229/EMSCyberpipe.msi + http://192.168.10.229/EMSConfig.xml diff --git a/Cyberpipe.csproj b/Cyberpipe.csproj index fe600e5..501fd09 100644 --- a/Cyberpipe.csproj +++ b/Cyberpipe.csproj @@ -246,6 +246,12 @@ Form_TaskManager.cs + + Form + + + FrmFlagDetail.cs + Form @@ -1368,6 +1374,9 @@ Form_TaskManager.cs + + FrmFlagDetail.cs + FormDocumentManager.cs diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 537b4c3..1acf22a 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 7d5dd95..3f178cb 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -90,20 +90,20 @@ this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - - this.winGridViewPager1.AddColumnAlias("ACCIDENTTIME", "上报时间"); - this.winGridViewPager1.AddColumnAlias("DBID", "编号"); - this.winGridViewPager1.AddColumnAlias("DESCRIBE", "事件描述"); - this.winGridViewPager1.AddColumnAlias("LATITUDE", "纬度"); - this.winGridViewPager1.AddColumnAlias("LOCALE", "事件地点"); - this.winGridViewPager1.AddColumnAlias("LONGITUDE", "经度"); - this.winGridViewPager1.AddColumnAlias("PATROLERNAME", "上报人员"); - this.winGridViewPager1.AddColumnAlias("PATROLER_ID", "人员ID"); - this.winGridViewPager1.AddColumnAlias("TASK_ID", "任务编号"); - this.winGridViewPager1.AddColumnAlias("RESULT", "处理结果"); - this.winGridViewPager1.AddColumnAlias("STATE", "处理状态"); - this.winGridViewPager1.DisplayColumns = "ACCIDENTTIME,DESCRIBE,LOCALE,PATROLERNAME,TASK_ID,RESULT,STATE"; + this.winGridViewPager1.AddColumnAlias("上报时间", "上报时间"); + this.winGridViewPager1.AddColumnAlias("编号", "编号"); + this.winGridViewPager1.AddColumnAlias("事件描述", "事件描述"); + this.winGridViewPager1.AddColumnAlias("纬度", "纬度"); + this.winGridViewPager1.AddColumnAlias("事件地点", "事件地点"); + this.winGridViewPager1.AddColumnAlias("经度", "经度"); + this.winGridViewPager1.AddColumnAlias("上报人员", "上报人员"); + this.winGridViewPager1.AddColumnAlias("人员ID", "人员ID"); + this.winGridViewPager1.AddColumnAlias("任务编号", "任务编号"); + this.winGridViewPager1.AddColumnAlias("处理结果", "处理结果"); + this.winGridViewPager1.AddColumnAlias("处理状态", "处理状态"); + + this.winGridViewPager1.DisplayColumns = "上报时间,事件描述,事件地点,上报人员,任务编号,处理结果,处理状态"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -114,8 +114,8 @@ winGridViewPager1.dataGridView1.ContextMenuStrip.Items[5].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[6].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[7].Visible = false; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[1].Text = "查看位置"; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "结果编辑"; + winGridViewPager1.dataGridView1.ContextMenuStrip.Items[1].Text = "结果编辑"; + winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "查看位置"; //右键菜单宽度 winGridViewPager1.dataGridView1.ContextMenuStrip.AutoSize = false; @@ -160,13 +160,12 @@ this.WindowState = FormWindowState.Minimized; globeControl1.Globe.MemoryLayer.RemoveAllFeature(); this.WindowState = FormWindowState.Minimized; - double x = Convert.ToDouble(row.Cells["LONGITUDE"].Value); - double y = Convert.ToDouble(row.Cells["LATITUDE"].Value); - - string username = Convert.ToString(row.Cells["PATROLERNAME"].Value); - string Atime = Convert.ToString(row.Cells["ACCIDENTTIME"].Value); - string location = Convert.ToString(row.Cells["LOCALE"].Value); - string descp = Convert.ToString(row.Cells["DESCRIBE"].Value); + double x = Convert.ToDouble(row.Cells["经度"].Value); + double y = Convert.ToDouble(row.Cells["纬度"].Value); + string username = Convert.ToString(row.Cells["上报人员"].Value); + string Atime = Convert.ToString(row.Cells["上报时间"].Value); + string location = Convert.ToString(row.Cells["事件地点"].Value); + string descp = Convert.ToString(row.Cells["事件描述"].Value); /////////////////////////////////////// /*******设置飞行与创建模型******/ @@ -228,8 +227,8 @@ DataGridViewRow row = grid.SelectedRows[0]; try { - int dbId = Convert.ToInt32(row.Cells["DBID"].Value); - string result = Convert.ToString(row.Cells["RESULT"].Value); + int dbId = Convert.ToInt32(row.Cells["编号"].Value); + string result = Convert.ToString(row.Cells["处理结果"].Value); EMS_Forms.Form_EventResult form = new Form_EventResult(dbId, result); form.refresh += new Form_EventResult.Handle(LoadData);//改变值的事件 form.ShowDialog(); @@ -276,9 +275,9 @@ } for (int i = 0; i < table.Rows.Count; i++) { - if (winGridViewPager1.dataGridView1.Rows[i].Cells["RESULT"].Value != null && !(winGridViewPager1.dataGridView1.Rows[i].Cells["RESULT"].Value.ToString().Trim().Equals(""))) + if (winGridViewPager1.dataGridView1.Rows[i].Cells["处理结果"].Value != null && !(winGridViewPager1.dataGridView1.Rows[i].Cells["处理结果"].Value.ToString().Trim().Equals(""))) { - winGridViewPager1.dataGridView1.Rows[i].Cells["STATE"].Value = "已处理"; + winGridViewPager1.dataGridView1.Rows[i].Cells["处理状态"].Value = "已处理"; } } @@ -307,9 +306,9 @@ } for (int i = 0; i < table.Rows.Count; i++) { - if (winGridViewPager1.dataGridView1.Rows[i].Cells["RESULT"].Value != null && !(winGridViewPager1.dataGridView1.Rows[i].Cells["RESULT"].Value.ToString().Trim().Equals(""))) + if (winGridViewPager1.dataGridView1.Rows[i].Cells["处理结果"].Value != null && !(winGridViewPager1.dataGridView1.Rows[i].Cells["处理结果"].Value.ToString().Trim().Equals(""))) { - winGridViewPager1.dataGridView1.Rows[i].Cells["STATE"].Value = "已处理"; + winGridViewPager1.dataGridView1.Rows[i].Cells["处理状态"].Value = "已处理"; } } @@ -320,10 +319,12 @@ { string sqlCount = "select count(*) from ACCIDENT where 1=1"; - string sqlData = "select ACCIDENTTIME,DBID,DESCRIBE,LATITUDE,LOCALE,LONGITUDE,PATROLERNAME,PATROLER_ID,TASK_ID,RESULT,'' as STATE " + + string sqlData = "select ACCIDENTTIME as 上报时间,DBID as 编号,DESCRIBE as 事件描述,"+ + "LATITUDE as 纬度,LOCALE as 事件地点,LONGITUDE as 经度,PATROLERNAME 上报人员,"+ + "PATROLER_ID as 人员ID,TASK_ID as 任务编号,RESULT as 处理结果,'' as 处理状态 " + "from (select t.*,rownum row_num from ACCIDENT t order by DBID)b " + " where 1=1"; - + rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; @@ -340,9 +341,10 @@ string sqlCount = "select count(*) from ACCIDENT where 1=1"; - string sqlData = "select ACCIDENTTIME,DBID,DESCRIBE,LATITUDE,LOCALE,LONGITUDE,PATROLERNAME,PATROLER_ID,TASK_ID,RESULT,'' as STATE " + - "from (select t.*,rownum row_num from ACCIDENT t order by DBID)b " + - " where(b.row_num between " + minPage + " and " + maxPage + ")"; + string sqlData = "select ACCIDENTTIME as 上报时间,DBID as 编号,DESCRIBE as 事件描述," + + "LATITUDE as 纬度,LOCALE as 事件地点,LONGITUDE as 经度,PATROLERNAME 上报人员," + + "PATROLER_ID as 人员ID,TASK_ID as 任务编号,RESULT as 处理结果,'' as 处理状态 " + + "from (select t.*,rownum row_num from ACCIDENT t where 1=1"; if (!String.IsNullOrEmpty(comboBox_name.Text.Trim())) { @@ -361,7 +363,8 @@ sqlCount += "and ACCIDENTTIME<=to_date('" + time.ToShortDateString() + "','yyyy-MM-dd') "; sqlData += "and ACCIDENTTIME<=to_date('" + time.ToShortDateString() + "','yyyy-MM-dd') "; } - + sqlData += " order by DBID desc)b " + + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 225c8d7..8bd9e48 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -120,8 +120,8 @@ private void flyToTask(DataGridViewRow row, int taskState) { int dbID = 0; - dbID = Convert.ToInt32(row.Cells["DBID"].Value); - string userName = Convert.ToString(row.Cells["USERNAME"].Value); + dbID = Convert.ToInt32(row.Cells["任务编号"].Value); + string userName = Convert.ToString(row.Cells["任务执行人员"].Value); System.DateTime t = new DateTime(); try { @@ -392,15 +392,15 @@ //控制表格显示的列，以及每一列要显示的列名 this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - this.winGridViewPager1.AddColumnAlias("DBID", "任务编号"); - this.winGridViewPager1.AddColumnAlias("DEPLOYTIME", "创建时间"); - this.winGridViewPager1.AddColumnAlias("DESCIRPTION", "任务描述"); - this.winGridViewPager1.AddColumnAlias("FINISHTIME", "完成时间"); - this.winGridViewPager1.AddColumnAlias("STREET", "任务执行区域"); - this.winGridViewPager1.AddColumnAlias("TASKSTATE", "任务状态"); - this.winGridViewPager1.AddColumnAlias("USERNAME", "任务执行人员"); + this.winGridViewPager1.AddColumnAlias("任务编号", "任务编号"); + this.winGridViewPager1.AddColumnAlias("创建时间", "创建时间"); + this.winGridViewPager1.AddColumnAlias("任务描述", "任务描述"); + this.winGridViewPager1.AddColumnAlias("完成时间", "完成时间"); + this.winGridViewPager1.AddColumnAlias("任务执行区域", "任务执行区域"); + this.winGridViewPager1.AddColumnAlias("任务状态", "任务状态"); + this.winGridViewPager1.AddColumnAlias("任务执行人员", "任务执行人员"); - this.winGridViewPager1.DisplayColumns = "DBID,DEPLOYTIME,DESCIRPTION,FINISHTIME,STREET,TASKSTATE,USERNAME"; + this.winGridViewPager1.DisplayColumns = "任务编号,创建时间,任务描述,完成时间,任务执行区域,任务状态,任务执行人员"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -464,8 +464,8 @@ { int dbID = 0; int taskStateInt = 0; - dbID = Convert.ToInt32(row.Cells["DBID"].Value); - string taskState = row.Cells["TASKSTATE"].Value.ToString(); + dbID = Convert.ToInt32(row.Cells["任务编号"].Value); + string taskState = row.Cells["任务状态"].Value.ToString(); if (taskState.Equals("开始任务")) { taskStateInt = 1; @@ -534,9 +534,10 @@ private string GetSql() { - string sqlCount = "select count(*) from taskinfo t where 1=1'"; + string sqlCount = "select count(*) from taskinfo t where 1=1"; - string sqlData = "select dbid,deploytime,descirption,finishtime,street,taskstate,username " + + 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"; @@ -550,9 +551,9 @@ int minPage = (pageIndex - 1) * maxPageIndex + 1; int maxPage = pageIndex * maxPageIndex; string sqlCount = "select count(*) from taskinfo t where 1=1"; - string sqlData = "select dbid,deploytime,descirption,finishtime,street,taskstate,username " + - "from (select t.*,rownum row_num from taskinfo t order by DBID desc)b " + - " where(b.row_num between " + minPage + " and " + maxPage + ")"; + 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"; if (!String.IsNullOrEmpty(comboBox_userName.Text.Trim()) && !comboBox_userName.Text.Trim().Equals("不限")) { @@ -581,6 +582,8 @@ sqlCount += "and street='" + combo_street.Text + "' "; sqlData += "and street='" + combo_street.Text + "' "; } + sqlData += " order by DBID desc)b " + + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index e65a4bd..58f5342 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -73,13 +73,13 @@ //控制表格显示的列，以及每一列要显示的列名 this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - this.winGridViewPager1.AddColumnAlias("FILENAME", "文档名称"); - this.winGridViewPager1.AddColumnAlias("DBID", "编号"); - this.winGridViewPager1.AddColumnAlias("TITLE", "文档标题"); - this.winGridViewPager1.AddColumnAlias("FILETYPE", "文档类型"); - this.winGridViewPager1.AddColumnAlias("UPDAY", "上传日期"); - this.winGridViewPager1.AddColumnAlias("WRITER", "上传人"); - this.winGridViewPager1.DisplayColumns = "FILENAME,TITLE,FILETYPE,UPDAY,WRITER"; + this.winGridViewPager1.AddColumnAlias("文档名称", "文档名称"); + this.winGridViewPager1.AddColumnAlias("编号", "编号"); + this.winGridViewPager1.AddColumnAlias("文档标题", "文档标题"); + this.winGridViewPager1.AddColumnAlias("文档类型", "文档类型"); + this.winGridViewPager1.AddColumnAlias("上传日期", "上传日期"); + this.winGridViewPager1.AddColumnAlias("上传人", "上传人"); + this.winGridViewPager1.DisplayColumns = "文档名称,文档标题,文档类型,上传日期,上传人"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -167,7 +167,7 @@ if (grid != null) { DataGridViewRow row = grid.SelectedRows[0]; - string dbid = row.Cells["dbid"].Value.ToString(); + string dbid = row.Cells["编号"].Value.ToString(); try { if (MessageBox.Show("确认删除吗？", "确认", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) @@ -212,7 +212,8 @@ { string sqlCount = "select count(*) from casic_userdocument where sysname = 'EMS'"; - string sqlData = "select filename,dbid,title,filetype,upday,writer " + + string sqlData = "select filename as 文档名称,dbid as 编号,title as 文档标题," + + "filetype as 文档类型,upday as 上传日期,writer as 上传人 " + "from (select t.*,rownum row_num from casic_userdocument t order by DBID desc)b " + " where sysname = 'EMS'"; @@ -226,9 +227,9 @@ int minPage = (pageIndex - 1) * maxPageIndex + 1; int maxPage = pageIndex * maxPageIndex; string sqlCount = "select count(*) from casic_userdocument where sysname = 'EMS'"; - string sqlData = "select filename,dbid,title,filetype,upday,writer " + - "from (select t.*,rownum row_num from casic_userdocument t where sysname = 'EMS' order by DBID desc)b " + - " where(b.row_num between " + minPage + " and " + maxPage + ")"; + string sqlData = "select filename as 文档名称,dbid as 编号,title as 文档标题,"+ + "filetype as 文档类型,upday as 上传日期,writer as 上传人 " + + "from (select t.*,rownum row_num from casic_userdocument t where sysname = 'EMS'"; string txtTitleText = null; string comboFileType = null; @@ -278,7 +279,8 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - + sqlData += " order by DBID desc)b " + + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; @@ -437,7 +439,7 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - string filename = row.Cells["filename"].Value.ToString(); + string filename = row.Cells["文档名称"].Value.ToString(); string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; string file = System.Environment.CurrentDirectory + "\\download\\" + filename; int result = DownloadFile(url, file, progressBar1); @@ -515,7 +517,7 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - string filename = row.Cells["filename"].Value.ToString(); + string filename = row.Cells["文档名称"].Value.ToString(); string ext = Path.GetExtension(filename); SaveFileDialog dlg = new SaveFileDialog(); dlg.Filter = "保存文档|*" + ext + ";"; diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 1d1201b..3902629 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -748,6 +748,7 @@ this.Name = "FrmAddSinMark"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "单个标识器添加"; + this.TopMost = true; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmAddSinMark_FormClosing); this.Load += new System.EventHandler(this.FrmAddSinMark_Load); this.groupPanel1.ResumeLayout(false); diff --git a/FrmEquipmentManage.cs b/FrmEquipmentManage.cs index 90bfdb2..a3cf55c 100644 --- a/FrmEquipmentManage.cs +++ b/FrmEquipmentManage.cs @@ -74,13 +74,13 @@ //控制表格显示的列，以及每一列要显示的列名 this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - this.winGridViewPager1.AddColumnAlias("DESCIRPTION", "设备描述"); - this.winGridViewPager1.AddColumnAlias("DBID", "编号"); - this.winGridViewPager1.AddColumnAlias("MACID", "MAC地址"); - this.winGridViewPager1.AddColumnAlias("OWNER", "设备所有人"); - this.winGridViewPager1.AddColumnAlias("STATUS", "设备状态"); + this.winGridViewPager1.AddColumnAlias("设备描述", "设备描述"); + this.winGridViewPager1.AddColumnAlias("编号", "编号"); + this.winGridViewPager1.AddColumnAlias("MAC地址", "MAC地址"); + this.winGridViewPager1.AddColumnAlias("设备所有人", "设备所有人"); + this.winGridViewPager1.AddColumnAlias("设备状态", "设备状态"); - this.winGridViewPager1.DisplayColumns = "DESCIRPTION,MACID,OWNER,STATUS"; + this.winGridViewPager1.DisplayColumns = "设备描述,MAC地址,设备所有人,设备状态"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -146,10 +146,10 @@ DataGridViewRow row = grid.SelectedRows[0]; try { - long dbid = long.Parse(row.Cells["DBID"].Value.ToString()); - String macId = row.Cells["MACID"].Value.ToString(); - String username = row.Cells["OWNER"].Value.ToString(); - String descn = row.Cells["DESCIRPTION"].Value.ToString(); + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); + String macId = row.Cells["MAC地址"].Value.ToString(); + String username = row.Cells["设备所有人"].Value.ToString(); + String descn = row.Cells["设备状态"].Value.ToString(); FrmEquipmentEdit frm = new FrmEquipmentEdit(dbid.ToString(), macId, username, descn); frm.reloadGrid += new ReloadEquipmentGrid(LoadData); frm.ShowDialog(); @@ -179,7 +179,7 @@ { return; } - String macId = row.Cells["MACID"].Value.ToString(); + String macId = row.Cells["MAC地址"].Value.ToString(); FrmLog frm = new FrmLog(macId); frm.Show(); } @@ -201,7 +201,7 @@ if (grid != null) { DataGridViewRow row = grid.SelectedRows[0]; - long dbid = long.Parse(row.Cells["DBID"].Value.ToString()); + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); try { if (MessageBox.Show("确定删除？", "确认", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) @@ -243,7 +243,8 @@ { string sqlCount = "select count(*) from equipment where status = 'USING'"; - string sqlData = "select descirption,DBID,macid,owner,case when status = 'USING' then '可用' when status = 'DAMAGE' then '损坏' end as status " + + string sqlData = "select descirption as 设备描述,DBID as 编号,macid as MAC地址,owner as 设备所有人,"+ + "case when status = 'USING' then '可用' when status = 'DAMAGE' then '损坏' end as 设备状态 " + "from (select t.*,rownum row_num from equipment t where status = 'USING' order by dbid desc)b " + " where 1=1"; @@ -258,16 +259,17 @@ int maxPage = pageIndex * maxPageIndex; string sqlCount = "select count(*) from equipment where status = 'USING' "; - string sqlData = "select descirption,DBID,macid,owner,case when status = 'USING' then '可用' when status = 'DAMAGE' then '损坏' end as status " + - "from (select t.*,rownum row_num from equipment t where status = 'USING' order by DBID desc)b " + - " where(b.row_num between " + minPage + " and " + maxPage + ")"; + string sqlData = "select descirption as 设备描述,DBID as 编号,macid as MAC地址,owner as 设备所有人," + + "case when status = 'USING' then '可用' when status = 'DAMAGE' then '损坏' end as 设备状态 " + + "from (select t.*,rownum row_num from equipment t where status = 'USING'"; if (!String.IsNullOrEmpty(txtMacId.Text.Trim())) { sqlData += " and macid like '%" + txtMacId.Text.Trim() + "%'"; sqlCount += " and macid like '%" + txtMacId.Text.Trim() + "%'"; } - + sqlData += " order by DBID desc)b " + + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; @@ -299,76 +301,6 @@ } } - //public void reloadGrid(int pageIndex) - //{ - // if (pageIndex <= 0) - // { - // pageIndex = 1; - // currentpage = 1; - // } - // String sqlrows = "select * from (select rownum as rowno,dbid,descirption,macid,owner,case when status = 'USING' then '可用' when status = 'DAMAGE' then '损坏' end as status,'编辑' as btnEdit,'删除' as btnDel from equipment t where status = 'USING' "; - // string sqlcount = "select count(*) from equipment where status = 'USING' "; - // if (!String.IsNullOrEmpty(txtMacId.Text.Trim())) - // { - // sqlrows += " and macid like '%" + txtMacId.Text.Trim() + "%'"; - // sqlcount += " and macid like '%" + txtMacId.Text.Trim() + "%'"; - // } - // sqlrows += " and rownum<=" + (pagesize * pageIndex) + ") table_alias where table_alias.rowno>=" + ((pageIndex - 1) * pagesize + 1); - - // int rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlcount).ToString()); - // int pages = 0; - // if (rows % pagesize == 0) - // { - // pages = rows / pagesize; - // } - // else - // { - // pages = rows / pagesize + 1; - // } - - // lastpage = pages; - - // lab_page_msg.Text = "共" + rows + "条记录，每页" + pagesize + "条，第" + pageIndex + "页，共" + pages + "页"; - // combo_page_num.Items.Clear(); - // for (int i = 1; i <= pages; i++) - // { - // combo_page_num.Items.Add(new ComboBoxItem(i.ToString(), i.ToString())); - // } - - // if (lastpage == 1) - // { - // btn_page_first.Enabled = false; - // btn_page_pre.Enabled = false; - // btn_page_last.Enabled = false; - // btn_page_next.Enabled = false; - // } - // else if (currentpage == 1) - // { - // btn_page_first.Enabled = false; - // btn_page_pre.Enabled = false; - // btn_page_last.Enabled = true; - // btn_page_next.Enabled = true; - // } - // else if (currentpage == lastpage) - // { - // btn_page_first.Enabled = true; - // btn_page_pre.Enabled = true; - // btn_page_last.Enabled = false; - // btn_page_next.Enabled = false; - // } - // else - // { - // btn_page_first.Enabled = true; - // btn_page_pre.Enabled = true; - // btn_page_last.Enabled = true; - // btn_page_next.Enabled = true; - // } - - // DataTable table = OracleUtils.ExecuteDataset(OracleUtils.ConnectionString, CommandType.Text, sqlrows).Tables[0]; - // dataGridViewX1.DataSource = table; - - //} - private void FrmEquipmentManage_FormClosing(object sender, FormClosingEventArgs e) diff --git a/FrmFlagDetail.Designer.cs b/FrmFlagDetail.Designer.cs new file mode 100644 index 0000000..982bfc6 --- /dev/null +++ b/FrmFlagDetail.Designer.cs @@ -0,0 +1,103 @@ +namespace Cyberpipe +{ + partial class FrmFlagDetail + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); + this.dataGridViewX_markDetail = new DevComponents.DotNetBar.Controls.DataGridViewX(); + this.对象类型 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.对象编号 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.对象名称 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX_markDetail)).BeginInit(); + this.SuspendLayout(); + // + // dataGridViewX_markDetail + // + this.dataGridViewX_markDetail.AllowUserToAddRows = false; + this.dataGridViewX_markDetail.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; + this.dataGridViewX_markDetail.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dataGridViewX_markDetail.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.对象类型, + this.对象编号, + this.对象名称}); + dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle3.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dataGridViewX_markDetail.DefaultCellStyle = dataGridViewCellStyle3; + this.dataGridViewX_markDetail.Dock = System.Windows.Forms.DockStyle.Fill; + this.dataGridViewX_markDetail.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(170)))), ((int)(((byte)(170)))), ((int)(((byte)(170))))); + this.dataGridViewX_markDetail.Location = new System.Drawing.Point(0, 0); + this.dataGridViewX_markDetail.Name = "dataGridViewX_markDetail"; + this.dataGridViewX_markDetail.RowTemplate.Height = 23; + this.dataGridViewX_markDetail.Size = new System.Drawing.Size(508, 321); + this.dataGridViewX_markDetail.TabIndex = 0; + // + // 对象类型 + // + this.对象类型.HeaderText = "对象类型"; + this.对象类型.Name = "对象类型"; + // + // 对象编号 + // + this.对象编号.HeaderText = "对象编号"; + this.对象编号.Name = "对象编号"; + // + // 对象名称 + // + this.对象名称.HeaderText = "对象名称"; + this.对象名称.Name = "对象名称"; + // + // FrmFlagDetail + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(508, 321); + this.Controls.Add(this.dataGridViewX_markDetail); + this.Name = "FrmFlagDetail"; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; + this.Text = "标识对象信息"; + this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmFlagDetail_FormClosing); + this.Load += new System.EventHandler(this.FrmFlagDetail_Load); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX_markDetail)).EndInit(); + this.ResumeLayout(false); + + } + + #endregion + + private DevComponents.DotNetBar.Controls.DataGridViewX dataGridViewX_markDetail; + private System.Windows.Forms.DataGridViewTextBoxColumn 对象类型; + private System.Windows.Forms.DataGridViewTextBoxColumn 对象编号; + private System.Windows.Forms.DataGridViewTextBoxColumn 对象名称; + + } +} \ No newline at end of file diff --git a/FrmFlagDetail.cs b/FrmFlagDetail.cs new file mode 100644 index 0000000..81de974 --- /dev/null +++ b/FrmFlagDetail.cs @@ -0,0 +1,77 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Windows.Forms; +using GeoScene.Globe; +using System.Data.OracleClient; + +namespace Cyberpipe +{ + public partial class FrmFlagDetail : Form + { + DataTable dt = new DataTable(); + private GSOGlobeControl globeControl1; + + public delegate void Handle(); + public event Handle showParentForm; + String markId; + + public FrmFlagDetail(GSOGlobeControl globeControl1, String id) + { + InitializeComponent(); + this.markId = id; + } + + private void FrmFlagDetail_FormClosing(object sender, FormClosingEventArgs e) + { + showParentForm(); + } + + private void FrmFlagDetail_Load(object sender, EventArgs e) + { + string objectIds = ""; + string objectTypeCodes = ""; + string sql = "select t.对象编号,t.对象类型 from 标识器 t where t.编号='" + markId + "'"; + using (OracleDataReader reader = OracleUtils.ExecuteReader(OracleUtils.ConnectionString, CommandType.Text, sql)) + { + while (reader.Read()) + { + objectIds = reader.GetString(0); + objectTypeCodes = reader.GetString(1); + } + } + + string[] codeTypes = objectTypeCodes.Split(','); + string[] codeIds = objectIds.Split(','); + int length = 0; + if (codeTypes.Length <= codeIds.Length) + { + length = codeTypes.Length; + } + else + { + length = codeIds.Length; + } + for (int n = 0; n < length; n++) + { + for (int i = 0; i < Utility1.listPipelineType.Count; i++) + { + if (Utility1.listPipelineType[i].code == codeTypes[n]) + { + //string objectId = codeIds[i]; + //string objectType = Utility1.listPipelineType[i].type; + //string objectName = Utility1.listPipelineType[i].name; + int index = this.dataGridViewX_markDetail.Rows.Add(); + this.dataGridViewX_markDetail.Rows[index].Cells[0].Value = Utility1.listPipelineType[i].type; + this.dataGridViewX_markDetail.Rows[index].Cells[1].Value = codeIds[n].ToString(); + this.dataGridViewX_markDetail.Rows[index].Cells[2].Value = Utility1.listPipelineType[i].name; + } + } + } + } + } +} diff --git a/FrmFlagDetail.resx b/FrmFlagDetail.resx new file mode 100644 index 0000000..e98a8fe --- /dev/null +++ b/FrmFlagDetail.resx @@ -0,0 +1,129 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + True + + + True + + + True + + \ No newline at end of file diff --git a/FrmFlagManagers.Designer.cs b/FrmFlagManagers.Designer.cs index d7e2f60..9fe14fb 100644 --- a/FrmFlagManagers.Designer.cs +++ b/FrmFlagManagers.Designer.cs @@ -28,8 +28,10 @@ /// private void InitializeComponent() { - this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); - this.winGridViewPager1 = new WHC.Pager.WinControl.WinGridViewPager(); + this.components = new System.ComponentModel.Container(); + this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components); + this.标识对象ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripMenuItem2 = new System.Windows.Forms.ToolStripMenuItem(); this.bar1 = new DevComponents.DotNetBar.Bar(); this.labelItem1 = new DevComponents.DotNetBar.LabelItem(); this.txt_no = new DevComponents.DotNetBar.TextBoxItem(); @@ -38,45 +40,37 @@ this.btn_query = new DevComponents.DotNetBar.ButtonItem(); this.btn_add_batch = new DevComponents.DotNetBar.ButtonItem(); this.btn_add_menu = new DevComponents.DotNetBar.ButtonItem(); - this.btn_db = new DevComponents.DotNetBar.ButtonItem(); - this.tableLayoutPanel1.SuspendLayout(); + this.winGridViewPager1 = new WHC.Pager.WinControl.WinGridViewPager(); + this.contextMenuStrip1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.bar1)).BeginInit(); this.SuspendLayout(); // - // tableLayoutPanel1 + // contextMenuStrip1 // - this.tableLayoutPanel1.ColumnCount = 1; - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel1.Controls.Add(this.winGridViewPager1, 0, 1); - this.tableLayoutPanel1.Controls.Add(this.bar1, 0, 0); - this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 0); - this.tableLayoutPanel1.Name = "tableLayoutPanel1"; - this.tableLayoutPanel1.RowCount = 2; - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 32F)); - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel1.Size = new System.Drawing.Size(881, 474); - this.tableLayoutPanel1.TabIndex = 6; + this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.标识对象ToolStripMenuItem, + this.toolStripMenuItem2}); + this.contextMenuStrip1.Name = "contextMenuStrip1"; + this.contextMenuStrip1.Size = new System.Drawing.Size(125, 48); // - // winGridViewPager1 + // 标识对象ToolStripMenuItem // - this.winGridViewPager1.AppendedMenu = null; - this.winGridViewPager1.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; - this.winGridViewPager1.DataSource = null; - this.winGridViewPager1.DisplayColumns = ""; - this.winGridViewPager1.Dock = System.Windows.Forms.DockStyle.Fill; - this.winGridViewPager1.Location = new System.Drawing.Point(3, 35); - this.winGridViewPager1.MinimumSize = new System.Drawing.Size(540, 0); - this.winGridViewPager1.Name = "winGridViewPager1"; - this.winGridViewPager1.PrintTitle = ""; - this.winGridViewPager1.Size = new System.Drawing.Size(875, 436); - this.winGridViewPager1.TabIndex = 5; + this.标识对象ToolStripMenuItem.Name = "标识对象ToolStripMenuItem"; + this.标识对象ToolStripMenuItem.Size = new System.Drawing.Size(124, 22); + this.标识对象ToolStripMenuItem.Text = "标识对象"; + this.标识对象ToolStripMenuItem.Click += new System.EventHandler(this.标识对象ToolStripMenuItem_Click); + // + // toolStripMenuItem2 + // + this.toolStripMenuItem2.Name = "toolStripMenuItem2"; + this.toolStripMenuItem2.Size = new System.Drawing.Size(152, 22); + this.toolStripMenuItem2.Text = "查看位置"; + this.toolStripMenuItem2.Click += new System.EventHandler(this.toolStripMenuItem2_Click); // // bar1 // this.bar1.AntiAlias = true; this.bar1.Dock = System.Windows.Forms.DockStyle.Top; - this.bar1.DockSide = DevComponents.DotNetBar.eDockSide.Document; this.bar1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.labelItem1, this.txt_no, @@ -84,14 +78,13 @@ this.combo_street, this.btn_query, this.btn_add_batch, - this.btn_add_menu, - this.btn_db}); - this.bar1.Location = new System.Drawing.Point(3, 3); + this.btn_add_menu}); + this.bar1.Location = new System.Drawing.Point(0, 0); this.bar1.Name = "bar1"; - this.bar1.Size = new System.Drawing.Size(875, 28); + this.bar1.Size = new System.Drawing.Size(881, 28); this.bar1.Stretch = true; this.bar1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.bar1.TabIndex = 1; + this.bar1.TabIndex = 8; this.bar1.TabStop = false; this.bar1.Text = "bar1"; // @@ -136,24 +129,34 @@ this.btn_add_menu.Text = "手工添加"; this.btn_add_menu.Click += new System.EventHandler(this.btn_add_menu_Click); // - // btn_db + // winGridViewPager1 // - this.btn_db.Name = "btn_db"; - this.btn_db.Text = "数据导出"; + this.winGridViewPager1.AppendedMenu = null; + this.winGridViewPager1.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; + this.winGridViewPager1.DataSource = null; + this.winGridViewPager1.DisplayColumns = ""; + this.winGridViewPager1.Dock = System.Windows.Forms.DockStyle.Fill; + this.winGridViewPager1.Location = new System.Drawing.Point(0, 28); + this.winGridViewPager1.MinimumSize = new System.Drawing.Size(540, 0); + this.winGridViewPager1.Name = "winGridViewPager1"; + this.winGridViewPager1.PrintTitle = ""; + this.winGridViewPager1.Size = new System.Drawing.Size(881, 446); + this.winGridViewPager1.TabIndex = 9; // // FrmFlagManagers // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(881, 474); - this.Controls.Add(this.tableLayoutPanel1); + this.Controls.Add(this.winGridViewPager1); + this.Controls.Add(this.bar1); this.DoubleBuffered = true; this.Name = "FrmFlagManagers"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "标识器管理"; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmFlagManagers_FormClosing); this.Load += new System.EventHandler(this.FrmFlagManagers_Load); - this.tableLayoutPanel1.ResumeLayout(false); + this.contextMenuStrip1.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.bar1)).EndInit(); this.ResumeLayout(false); @@ -161,8 +164,8 @@ #endregion - private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1; - private WHC.Pager.WinControl.WinGridViewPager winGridViewPager1; + private System.Windows.Forms.ContextMenuStrip contextMenuStrip1; + private System.Windows.Forms.ToolStripMenuItem 标识对象ToolStripMenuItem; private DevComponents.DotNetBar.Bar bar1; private DevComponents.DotNetBar.LabelItem labelItem1; private DevComponents.DotNetBar.TextBoxItem txt_no; @@ -171,6 +174,7 @@ private DevComponents.DotNetBar.ButtonItem btn_query; private DevComponents.DotNetBar.ButtonItem btn_add_batch; private DevComponents.DotNetBar.ButtonItem btn_add_menu; - private DevComponents.DotNetBar.ButtonItem btn_db; + private WHC.Pager.WinControl.WinGridViewPager winGridViewPager1; + private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem2; } } \ No newline at end of file diff --git a/FrmFlagManagers.cs b/FrmFlagManagers.cs index 38d4927..9bf9734 100644 --- a/FrmFlagManagers.cs +++ b/FrmFlagManagers.cs @@ -33,15 +33,13 @@ { this.globeControl1 = _globeControl1; InitializeComponent(); - winGridViewPager1.OnPageChanged += new EventHandler(winGridViewPager1_OnPageChanged); - this.winGridViewPager1.OnAddNew += new EventHandler(winGridViewPager1_OnAddNew); //右键定位 + winGridViewPager1.OnPageChanged += new EventHandler(winGridViewPager1_OnPageChanged); this.winGridViewPager1.OnEditSelected += new EventHandler(winGridViewPager1_OnEditSelected);//属性编辑 this.winGridViewPager1.OnDeleteSelected += new EventHandler(winGridViewPager1_OnDeleteSelected);//标识器报废 + this.winGridViewPager1.OnStartExport += new EventHandler(pager1_OnStartExport); this.winGridViewPager1.OnEndExport += new EventHandler(pager1_OnEndExport); - //this.winGridViewPager1.ExportCurrent += new ExportCurrentEventHandler(pager1_ExportCurrent); - //this.winGridViewPager1.ExportAll += new ExportAllEventHandler(pager1_ExportAll); winGridViewPager1.dataGridView1.MultiSelect = false; @@ -76,26 +74,25 @@ this.winGridViewPager1.AddColumnAlias("标识器型号", "标识器型号"); this.winGridViewPager1.AddColumnAlias("地面高程", "地面高程"); this.winGridViewPager1.AddColumnAlias("标识器埋深", "标识器埋深"); - this.winGridViewPager1.AddColumnAlias("对象编号", "对象编号"); - this.winGridViewPager1.AddColumnAlias("对象类型", "对象类型"); this.winGridViewPager1.AddColumnAlias("所属道路", "所属道路"); this.winGridViewPager1.AddColumnAlias("使用状态", "使用状态"); - this.winGridViewPager1.DisplayColumns = "编号,标识器ID号,标识器型号,地面高程,标识器埋深,对象编号,对象类型,所属道路,使用状态"; + this.winGridViewPager1.DisplayColumns = "编号,标识器ID号,标识器型号,地面高程,标识器埋深,所属道路,使用状态"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 //隐藏右键功能按钮 //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[1].Visible = false; - //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[4].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[5].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[6].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[7].Visible = false; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[1].Text = "定位查看"; + //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[1].Text = "定位查看"; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "属性编辑"; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Text = "标识器报废"; + winGridViewPager1.AppendedMenu = this.contextMenuStrip1; + //右键菜单宽度 winGridViewPager1.dataGridView1.ContextMenuStrip.AutoSize = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Width = 150; @@ -153,7 +150,7 @@ } /// - /// 右键定位 + /// 对象查看 /// /// /// @@ -306,20 +303,10 @@ string sqlCount = "select count(*) from 标识器 where 使用状态 = '使用中'"; - string sqlData = "select 编号,标识器ID号,标识器型号,地面高程,标识器埋深,对象编号,对象类型,所属道路,LSSYS_ID,X坐标,Y坐标,使用状态 " + + string sqlData = "select 编号,标识器ID号,标识器型号,地面高程,标识器埋深,所属道路,LSSYS_ID,X坐标,Y坐标,使用状态 " + "from (select t.*,rownum row_num from 标识器 t where 使用状态 = '使用中' order by 编号)b " + " where 1=1"; - if (!String.IsNullOrEmpty(txt_no.Text.Trim())) - { - sqlCount += " and 编号 like '%" + txt_no.Text.Trim() + "%'"; - sqlData += " and 编号 like '%" + txt_no.Text.Trim() + "%'"; - } - if (null != combo_street.SelectedItem && !String.IsNullOrEmpty(combo_street.SelectedItem.ToString().Trim())) - { - sqlData += " and 所属道路='" + combo_street.SelectedItem.ToString().Trim() + "'"; - sqlCount += " and 所属道路='" + combo_street.SelectedItem.ToString().Trim() + "'"; - } rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -332,9 +319,8 @@ int maxPage = pageIndex * maxPageIndex; string sqlCount = "select count(*) from 标识器 where 使用状态 = '使用中'"; - string sqlData = "select 编号,标识器ID号,标识器型号,地面高程,标识器埋深,对象编号,对象类型,所属道路,LSSYS_ID,X坐标,Y坐标,使用状态 " + - "from (select t.*,rownum row_num from 标识器 t where 使用状态 = '使用中' order by 编号)b "+ - " where(b.row_num between " + minPage + " and " + maxPage + ")"; + string sqlData = "select 编号,标识器ID号,标识器型号,地面高程,标识器埋深,所属道路,LSSYS_ID,X坐标,Y坐标,使用状态 " + + "from (select t.*,rownum row_num from 标识器 t where 使用状态 = '使用中'"; if (!String.IsNullOrEmpty(txt_no.Text.Trim())) { @@ -347,6 +333,8 @@ sqlCount += " and 所属道路='" + combo_street.SelectedItem.ToString().Trim() + "'"; } + sqlData += " order by 编号)b " + + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; @@ -372,9 +360,10 @@ private void FrmFlagManagers_FormClosing(object sender, FormClosingEventArgs e) { IS_OPEN = false; - Thread downloadJob = new Thread(new ParameterizedThreadStart(doSave)); - downloadJob.IsBackground = true; - downloadJob.Start(e); + //Thread downloadJob = new Thread(new ParameterizedThreadStart(doSave)); + //downloadJob.IsBackground = true; + //downloadJob.Start(e); + globeControl1.Globe.Layers["标识器"].Save(); globeControl1.Globe.MemoryLayer.RemoveAllFeature(); foreach (GSOFeature f in Features) { @@ -480,10 +469,88 @@ if (null != globeControl1) { FrmAddSinMark frm = new FrmAddSinMark(globeControl1); - frm.ShowDialog(); + frm.Show(); } } + private void 标识对象ToolStripMenuItem_Click(object sender, EventArgs e) + { + if (winGridViewPager1 != null && winGridViewPager1.dataGridView1 != null) + { + DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; + try + { + this.Hide(); + string id = row.Cells["编号"].Value.ToString(); + FrmFlagDetail p = new FrmFlagDetail(globeControl1, id); + p.showParentForm += new FrmFlagDetail.Handle(showThisForm);//改变值的事件 + p.Show(); + } + catch (Exception ex) + { + MessageBox.Show("失败:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } + + private void showThisForm() + { + this.Show(); + } + + private void toolStripMenuItem2_Click(object sender, EventArgs e) + { + if (winGridViewPager1 != null && winGridViewPager1.dataGridView1 != null) + { + DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; + try + { + this.WindowState = FormWindowState.Minimized; + string id = row.Cells["LSSYS_ID"].Value.ToString(); + string flagno = row.Cells["编号"].Value.ToString(); + string flagstreet = row.Cells["所属道路"].Value.ToString(); + double x = Convert.ToDouble(row.Cells["X坐标"].Value); + double y = Convert.ToDouble(row.Cells["Y坐标"].Value); + GSOFeature flagFeature = globeControl1.Globe.Layers.GetLayerByCaption("标识器").GetFeatureByID(int.Parse(id)); + + string type = ""; + string pipe = ""; + string sql = "select t.标识器型号,t.对象编号 from 标识器 t where t.编号='" + flagno + "'"; + using (OracleDataReader reader = OracleUtils.ExecuteReader(OracleUtils.ConnectionString, CommandType.Text, sql)) + { + while (reader.Read()) + { + type = reader.GetString(0); + pipe = reader.GetString(1); + } + } + + GSOLabel label = new GSOLabel(); + label.Text = "标识器编号：" + flagno + "\r\n" + + "标识器类型:" + type + "\r\n" + + //"标识对象编号:" + pipe + "\r\n" + + "所属道路:" + flagstreet; + label.Style = new GSOLabelStyle(); + label.Style.TextStyle.FontSize = 18; + label.Style.TextStyle.ForeColor = Color.FromArgb(0, 0, 0, 255); + label.Style.Opaque = 0.8; //设置标注的透明度，取值区间是0-1 + label.Style.TracktionLineType = EnumTracktionLineType.Solid; + label.Style.TextStyle.FontHeight = 10; + label.Style.TextStyle.FontName = "黑体"; + label.Style.TractionLineEndPos = new GSOPoint2d(80, 60); + + flagFeature.Label = label; + Features.Add(flagFeature); + globeControl1.Globe.JumpToFeature(flagFeature, 20); + this.globeControl1.Refresh(); + + } + catch (Exception ex) + { + MessageBox.Show("标识器定位失败:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } } diff --git a/FrmFlagManagers.resx b/FrmFlagManagers.resx index 1af7de1..ad53752 100644 --- a/FrmFlagManagers.resx +++ b/FrmFlagManagers.resx @@ -117,4 +117,7 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 17, 17 + \ No newline at end of file diff --git a/FrmPatrolerEdit.cs b/FrmPatrolerEdit.cs index dbd4fec..f45b5ae 100644 --- a/FrmPatrolerEdit.cs +++ b/FrmPatrolerEdit.cs @@ -46,7 +46,7 @@ txt_name.Focus(); return; } - if (String.IsNullOrEmpty(combo_sex.SelectedItem.ToString())) + if (combo_sex.SelectedItem == null ||String.IsNullOrEmpty(combo_sex.SelectedItem.ToString())) { MessageBox.Show("性别不能为空！", "警告", MessageBoxButtons.OK, MessageBoxIcon.Warning); combo_sex.Focus(); diff --git a/FrmPatrolerManager.Designer.cs b/FrmPatrolerManager.Designer.cs index bb8e5fb..10fac22 100644 --- a/FrmPatrolerManager.Designer.cs +++ b/FrmPatrolerManager.Designer.cs @@ -47,11 +47,13 @@ this.注销 = new DevComponents.Editors.ComboItem(); this.btn_query_person = new DevComponents.DotNetBar.ButtonItem(); this.btn_add_person = new DevComponents.DotNetBar.ButtonItem(); - this.winGridViewPager1 = new WHC.Pager.WinControl.WinGridViewPager(); this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components); this.日志ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.任务ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.定位ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.winGridViewPager1 = new WHC.Pager.WinControl.WinGridViewPager(); + this.编辑ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.注销ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); ((System.ComponentModel.ISupportInitialize)(this.bar1)).BeginInit(); this.contextMenuStrip1.SuspendLayout(); this.SuspendLayout(); @@ -173,9 +175,42 @@ this.btn_add_person.Text = "新增"; this.btn_add_person.Click += new System.EventHandler(this.btn_add_person_Click); // + // contextMenuStrip1 + // + this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.日志ToolStripMenuItem, + this.任务ToolStripMenuItem, + this.定位ToolStripMenuItem, + this.编辑ToolStripMenuItem, + this.注销ToolStripMenuItem}); + this.contextMenuStrip1.Name = "contextMenuStrip1"; + this.contextMenuStrip1.Size = new System.Drawing.Size(153, 136); + // + // 日志ToolStripMenuItem + // + this.日志ToolStripMenuItem.Name = "日志ToolStripMenuItem"; + this.日志ToolStripMenuItem.Size = new System.Drawing.Size(100, 22); + this.日志ToolStripMenuItem.Text = "日志"; + this.日志ToolStripMenuItem.Click += new System.EventHandler(this.日志ToolStripMenuItem_Click); + // + // 任务ToolStripMenuItem + // + this.任务ToolStripMenuItem.Name = "任务ToolStripMenuItem"; + this.任务ToolStripMenuItem.Size = new System.Drawing.Size(100, 22); + this.任务ToolStripMenuItem.Text = "任务"; + this.任务ToolStripMenuItem.Click += new System.EventHandler(this.任务ToolStripMenuItem_Click); + // + // 定位ToolStripMenuItem + // + this.定位ToolStripMenuItem.Name = "定位ToolStripMenuItem"; + this.定位ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.定位ToolStripMenuItem.Text = "定位"; + this.定位ToolStripMenuItem.Click += new System.EventHandler(this.定位ToolStripMenuItem_Click); + // // winGridViewPager1 // this.winGridViewPager1.AppendedMenu = null; + this.winGridViewPager1.ContextMenuStrip = this.contextMenuStrip1; this.winGridViewPager1.DataSource = null; this.winGridViewPager1.DisplayColumns = ""; this.winGridViewPager1.Dock = System.Windows.Forms.DockStyle.Fill; @@ -186,35 +221,19 @@ this.winGridViewPager1.Size = new System.Drawing.Size(756, 309); this.winGridViewPager1.TabIndex = 3; // - // contextMenuStrip1 + // 编辑ToolStripMenuItem // - this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.日志ToolStripMenuItem, - this.任务ToolStripMenuItem, - this.定位ToolStripMenuItem}); - this.contextMenuStrip1.Name = "contextMenuStrip1"; - this.contextMenuStrip1.Size = new System.Drawing.Size(101, 70); + this.编辑ToolStripMenuItem.Name = "编辑ToolStripMenuItem"; + this.编辑ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.编辑ToolStripMenuItem.Text = "编辑"; + this.编辑ToolStripMenuItem.Click += new System.EventHandler(this.编辑ToolStripMenuItem_Click); // - // 日志ToolStripMenuItem + // 注销ToolStripMenuItem // - this.日志ToolStripMenuItem.Name = "日志ToolStripMenuItem"; - this.日志ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); - this.日志ToolStripMenuItem.Text = "日志"; - this.日志ToolStripMenuItem.Click += new System.EventHandler(this.日志ToolStripMenuItem_Click); - // - // 任务ToolStripMenuItem - // - this.任务ToolStripMenuItem.Name = "任务ToolStripMenuItem"; - this.任务ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); - this.任务ToolStripMenuItem.Text = "任务"; - this.任务ToolStripMenuItem.Click += new System.EventHandler(this.任务ToolStripMenuItem_Click); - // - // 定位ToolStripMenuItem - // - this.定位ToolStripMenuItem.Name = "定位ToolStripMenuItem"; - this.定位ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); - this.定位ToolStripMenuItem.Text = "定位"; - this.定位ToolStripMenuItem.Click += new System.EventHandler(this.定位ToolStripMenuItem_Click); + this.注销ToolStripMenuItem.Name = "注销ToolStripMenuItem"; + this.注销ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.注销ToolStripMenuItem.Text = "注销"; + this.注销ToolStripMenuItem.Click += new System.EventHandler(this.注销ToolStripMenuItem_Click); // // FrmPatrolerManager // @@ -229,7 +248,7 @@ this.MinimizeBox = false; this.Name = "FrmPatrolerManager"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; - this.Text = "巡检人员维护"; + this.Text = "定位人员维护"; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmPatrolerManager_FormClosing); this.Load += new System.EventHandler(this.FrmPatrolerManager_Load); ((System.ComponentModel.ISupportInitialize)(this.bar1)).EndInit(); @@ -258,10 +277,12 @@ private DevComponents.Editors.ComboItem 注销; private DevComponents.Editors.ComboItem comboItem1; private DevComponents.Editors.ComboItem 不限; - private WHC.Pager.WinControl.WinGridViewPager winGridViewPager1; private System.Windows.Forms.ContextMenuStrip contextMenuStrip1; private System.Windows.Forms.ToolStripMenuItem 日志ToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem 任务ToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem 定位ToolStripMenuItem; + private WHC.Pager.WinControl.WinGridViewPager winGridViewPager1; + private System.Windows.Forms.ToolStripMenuItem 编辑ToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem 注销ToolStripMenuItem; } } \ No newline at end of file diff --git a/FrmPatrolerManager.cs b/FrmPatrolerManager.cs index 255a076..9c32f54 100644 --- a/FrmPatrolerManager.cs +++ b/FrmPatrolerManager.cs @@ -29,9 +29,7 @@ this.globeControl1 = globeControl1; winGridViewPager1.OnPageChanged += new EventHandler(winGridViewPager1_OnPageChanged); - this.winGridViewPager1.OnEditSelected += new EventHandler(winGridViewPager1_OnEditSelected);//编辑 - this.winGridViewPager1.OnDeleteSelected += new EventHandler(winGridViewPager1_OnDeleteSelected);//删除 - + this.winGridViewPager1.OnStartExport += new EventHandler(pager1_OnStartExport); this.winGridViewPager1.OnEndExport += new EventHandler(pager1_OnEndExport); @@ -47,26 +45,31 @@ //控制表格显示的列，以及每一列要显示的列名 this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - this.winGridViewPager1.AddColumnAlias("USERNAME", "姓名"); - this.winGridViewPager1.AddColumnAlias("DBID", "编号"); - this.winGridViewPager1.AddColumnAlias("SEX", "性别"); - this.winGridViewPager1.AddColumnAlias("AGE", "年龄"); - this.winGridViewPager1.AddColumnAlias("PHONENUM", "电话"); - this.winGridViewPager1.AddColumnAlias("ACCOUNTSTATE", "状态"); - this.winGridViewPager1.DisplayColumns = "USERNAME,SEX,AGE,PHONENUM,ACCOUNTSTATE"; + this.winGridViewPager1.AddColumnAlias("姓名", "姓名"); + this.winGridViewPager1.AddColumnAlias("编号", "编号"); + this.winGridViewPager1.AddColumnAlias("性别", "性别"); + this.winGridViewPager1.AddColumnAlias("年龄", "年龄"); + this.winGridViewPager1.AddColumnAlias("电话", "电话"); + this.winGridViewPager1.AddColumnAlias("状态", "状态"); + this.winGridViewPager1.DisplayColumns = "姓名,性别,年龄,电话,状态"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 + //隐藏右键功能按钮 //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[1].Visible = false; + winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Visible = false; + winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[4].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[5].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[6].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[7].Visible = false; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "编辑"; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Text = "注销"; + + //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "编辑"; + //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Text = "注销"; winGridViewPager1.AppendedMenu = this.contextMenuStrip1; + //右键菜单宽度 winGridViewPager1.dataGridView1.ContextMenuStrip.AutoSize = false; @@ -122,11 +125,11 @@ DataGridViewRow row = grid.SelectedRows[0]; try { - long dbid = long.Parse(row.Cells["dbid"].Value.ToString()); - String name = row.Cells["USERNAME"].Value.ToString(); - String sex = row.Cells["SEX"].Value.ToString(); - String age = row.Cells["AGE"].Value.ToString(); - string phone = row.Cells["PHONENUM"].Value.ToString(); + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); + String name = row.Cells["姓名"].Value.ToString(); + String sex = row.Cells["性别"].Value.ToString(); + String age = row.Cells["年龄"].Value.ToString(); + string phone = row.Cells["电话"].Value.ToString(); age = String.IsNullOrEmpty(age.ToString().Trim()) ? "1" : age.ToString().Trim(); FrmPatrolerEdit frm = new FrmPatrolerEdit(dbid.ToString(), name, age, sex, phone); frm.reloadGrid += new ReloadPatrolerGrid(LoadData); @@ -152,10 +155,10 @@ if (grid != null) { DataGridViewRow row = grid.SelectedRows[0]; - long dbid = long.Parse(row.Cells["DBID"].Value.ToString()); + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); try { - string state = row.Cells["ACCOUNTSTATE"].Value.ToString(); + string state = row.Cells["状态"].Value.ToString(); if ("在线".Equals(state)) { if (MessageBox.Show("确定注销？", "确认", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) @@ -180,60 +183,60 @@ { int pageIndex = winGridViewPager1.PagerInfo.CurrenetPageIndex; string sqlData = GetSql(pageIndex); - initlizeDatagrid(); + DataTable table = OracleUtils.ExecuteDataset(OracleUtils.ConnectionString, CommandType.Text, sqlData).Tables[0]; winGridViewPager1.DataSource = table.DefaultView; - for (int i = 0; i < winGridViewPager1.dataGridView1.Rows.Count; i++) - { - if (winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value.ToString() == "ONLINE") - { - winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value = "在线"; - } - else - { - if (winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value.ToString() == "OFFLINE") - { - winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value = "离线"; - } - else - { - if (winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value.ToString() == "LEAVER") - { - winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value = "注销"; - } - } - } - } + //for (int i = 0; i < winGridViewPager1.dataGridView1.Rows.Count; i++) + //{ + // if (winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value.ToString() == "ONLINE") + // { + // winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value = "在线"; + // } + // else + // { + // if (winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value.ToString() == "OFFLINE") + // { + // winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value = "离线"; + // } + // else + // { + // if (winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value.ToString() == "LEAVER") + // { + // winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value = "注销"; + // } + // } + // } + //} winGridViewPager1.Refresh(); } private void LoadData(int pageIndex) { string sqlData = GetSql(pageIndex); - initlizeDatagrid(); + DataTable table = OracleUtils.ExecuteDataset(OracleUtils.ConnectionString, CommandType.Text, sqlData).Tables[0]; winGridViewPager1.DataSource = table.DefaultView; - for (int i = 0; i < winGridViewPager1.dataGridView1.Rows.Count; i++) - { - if (winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value.ToString() == "ONLINE") - { - winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value = "在线"; - } - else - { - if (winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value.ToString() == "OFFLINE") - { - winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value = "离线"; - } - else - { - if (winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value.ToString() == "LEAVER") - { - winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value = "注销"; - } - } - } - } + //for (int i = 0; i < winGridViewPager1.dataGridView1.Rows.Count; i++) + //{ + // if (winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value.ToString() == "ONLINE") + // { + // winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value = "在线"; + // } + // else + // { + // if (winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value.ToString() == "OFFLINE") + // { + // winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value = "离线"; + // } + // else + // { + // if (winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value.ToString() == "LEAVER") + // { + // winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value = "注销"; + // } + // } + // } + //} winGridViewPager1.Refresh(); } @@ -241,7 +244,8 @@ { string sqlCount = "select count(*) from equipment where status = 'USING'"; - string sqlData = "select username,dbid,sex,age,phonenum,accountstate " + + string sqlData = "select username as 姓名,dbid as 编号,sex as 性别,age as 年龄,phonenum as 电话,"+ + "case when accountstate = 'ONLINE' then '在线' when accountstate = 'OFFLINE' then '离线' when accountstate = 'LEAVER' then '注销' end as 状态 " + "from (select t.*,rownum row_num from patroler t order by DBID desc)b " + " where 1=1"; @@ -255,9 +259,9 @@ int minPage = (pageIndex - 1) * maxPageIndex + 1; int maxPage = pageIndex * maxPageIndex; string sqlCount = "select count(*) from patroler where 1=1"; - string sqlData = "select username,dbid,sex,age,phonenum,accountstate " + - "from (select t.*,rownum row_num from patroler t order by DBID desc)b " + - " where(b.row_num between " + minPage + " and " + maxPage + ")"; + string sqlData = "select username as 姓名,dbid as 编号,sex as 性别,age as 年龄,phonenum as 电话,"+ + "case when accountstate = 'ONLINE' then '在线' when accountstate = 'OFFLINE' then '离线' when accountstate = 'LEAVER' then '注销' end as 状态 " + + "from (select t.*,rownum row_num from patroler t where 1=1"; if (!String.IsNullOrEmpty(txt_username.Text.Trim())) { @@ -281,7 +285,8 @@ sqlCount += " and accountstate='" + combo_stateText + "'"; sqlData += " and accountstate='" + combo_stateText + "'"; } - + sqlData += " order by DBID desc)b " + + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; @@ -291,6 +296,7 @@ { try { + initlizeDatagrid(); LoadData(); initForm(); IS_OPEN = true; @@ -310,11 +316,13 @@ } if (Utility.userRole.IndexOf("巡检员编辑") == -1) { - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Visible = false; + //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Visible = false; + 编辑ToolStripMenuItem.Visible = false; } if (Utility.userRole.IndexOf("巡检员注销") == -1) { - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Visible = false; + //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Visible = false; + 注销ToolStripMenuItem.Visible = false; } } @@ -376,7 +384,7 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - long dbid = long.Parse(row.Cells["dbid"].Value.ToString()); + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); Log p = new Log(dbid.ToString()); p.Show(); } @@ -395,8 +403,8 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - long dbid = long.Parse(row.Cells["dbid"].Value.ToString()); - String state = row.Cells["ACCOUNTSTATE"].Value.ToString(); + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); + String state = row.Cells["状态"].Value.ToString(); if ("在线".Equals(state)) { string sql = "select t.dbid " + @@ -435,8 +443,8 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - long dbid = long.Parse(row.Cells["dbid"].Value.ToString()); - String username = row.Cells["USERNAME"].Value.ToString(); + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); + String username = row.Cells["姓名"].Value.ToString(); string sql = "select t.latitude, t.longitude " + "from position t " + "where t.dbid = (select max(dbid) from position where patroler_id = " + dbid + ")"; @@ -489,6 +497,63 @@ } + private void 编辑ToolStripMenuItem_Click(object sender, EventArgs e) + { + if (winGridViewPager1 != null && winGridViewPager1.dataGridView1 != null) + { + DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; + try + { + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); + String name = row.Cells["姓名"].Value.ToString(); + String sex = row.Cells["性别"].Value.ToString(); + String age = row.Cells["年龄"].Value.ToString(); + string phone = row.Cells["电话"].Value.ToString(); + age = String.IsNullOrEmpty(age.ToString().Trim()) ? "1" : age.ToString().Trim(); + FrmPatrolerEdit frm = new FrmPatrolerEdit(dbid.ToString(), name, age, sex, phone); + frm.reloadGrid += new ReloadPatrolerGrid(LoadData); + frm.ShowDialog(); + winGridViewPager1.Refresh(); + } + catch (Exception ex) + { + MessageBox.Show("编辑失败:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } + + private void 注销ToolStripMenuItem_Click(object sender, EventArgs e) + { + if (winGridViewPager1 != null && winGridViewPager1.dataGridView1 != null) + { + DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); + try + { + if (MessageBox.Show("确定注销？", "确认", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) + { + String sql = "update patroler t set t.accountstate='LEAVER' where t.dbid=" + dbid; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + LoadData(); + MessageBox.Show("人员已注销", "信息", MessageBoxButtons.OK, MessageBoxIcon.Information); + } + //string state = row.Cells["状态"].Value.ToString(); + //if ("在线".Equals(state)) + //{ + + //} + //else + //{ + // MessageBox.Show("人员不在线，无法注销", "信息"); + //} + } + catch (Exception ex) + { + MessageBox.Show("人员注销失败:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } + } } diff --git a/FrmRoleInfoManager.cs b/FrmRoleInfoManager.cs index 8897133..35693cf 100644 --- a/FrmRoleInfoManager.cs +++ b/FrmRoleInfoManager.cs @@ -55,10 +55,10 @@ //控制表格显示的列，以及每一列要显示的列名 this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - this.winGridViewPager1.AddColumnAlias("NT", "角色名称"); - this.winGridViewPager1.AddColumnAlias("ID", "编号"); + this.winGridViewPager1.AddColumnAlias("角色名称", "角色名称"); + this.winGridViewPager1.AddColumnAlias("编号", "编号"); - this.winGridViewPager1.DisplayColumns = "NT"; + this.winGridViewPager1.DisplayColumns = "角色名称"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -131,7 +131,7 @@ { try { - string dbid = row.Cells["id"].Value.ToString(); + string dbid = row.Cells["编号"].Value.ToString(); string sql = "delete from casic_userroletest where id=" + dbid; OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); LoadData(); @@ -170,7 +170,7 @@ { string sqlCount = "select id,nt from casic_userroletest where sysname='EMS'"; - string sqlData = "select nt,id " + + string sqlData = "select nt as 角色名称,id as 编号 " + "from (select t.*,rownum row_num from casic_userroletest t order by id desc)b " + " where sysname='EMS'"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -183,7 +183,7 @@ int minPage = (pageIndex - 1) * maxPageIndex + 1; int maxPage = pageIndex * maxPageIndex; string sqlCount = "select id,nt from casic_userroletest where sysname='EMS'"; - string sqlData = "select nt,id " + + string sqlData = "select nt as 角色名称,id as 编号 " + "from (select t.*,rownum row_num from casic_userroletest t where sysname='EMS' order by id desc)b " + " where(b.row_num between " + minPage + " and " + maxPage + ")"; diff --git a/FrmSysUserInfoManger.cs b/FrmSysUserInfoManger.cs index 7903916..e193a61 100644 --- a/FrmSysUserInfoManger.cs +++ b/FrmSysUserInfoManger.cs @@ -28,6 +28,7 @@ this.winGridViewPager1.OnEndExport += new EventHandler(pager1_OnEndExport); winGridViewPager1.dataGridView1.MultiSelect = false; + } private void FrmSysUserInfoManger_Load(object sender, EventArgs e) @@ -59,10 +60,10 @@ //控制表格显示的列，以及每一列要显示的列名 this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - this.winGridViewPager1.AddColumnAlias("USERNAME", "账号"); - this.winGridViewPager1.AddColumnAlias("ID", "编号"); + this.winGridViewPager1.AddColumnAlias("账号", "账号"); + this.winGridViewPager1.AddColumnAlias("编号", "编号"); - this.winGridViewPager1.DisplayColumns = "USERNAME"; + this.winGridViewPager1.DisplayColumns = "账号"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -130,8 +131,8 @@ if (grid != null) { DataGridViewRow row = grid.SelectedRows[0]; - string dbid = row.Cells["id"].Value.ToString(); - string userName = row.Cells["USERNAME"].Value.ToString(); + string dbid = row.Cells["编号"].Value.ToString(); + string userName = row.Cells["账号"].Value.ToString(); if (userName.Equals("ems")) { MessageBox.Show("该用户为管理员用户，无法删除！", "信息"); @@ -184,7 +185,7 @@ { string sqlCount = "select count(*) from casic_userinfotest where sysname='EMS'"; - string sqlData = "select username,id " + + string sqlData = "select username as 账号,id as 编号 " + "from (select t.*,rownum row_num from casic_userinfotest t order by id desc)b " + " where sysname='EMS'"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -197,16 +198,16 @@ int minPage = (pageIndex - 1) * maxPageIndex + 1; int maxPage = pageIndex * maxPageIndex; string sqlCount = "select count(*) from casic_userinfotest where sysname='EMS'"; - string sqlData = "select username,id " + - "from (select t.*,rownum row_num from casic_userinfotest t where sysname='EMS' order by id desc)b " + - " where(b.row_num between " + minPage + " and " + maxPage + ")"; + string sqlData = "select username as 账号,id as 编号 " + + "from (select t.*,rownum row_num from casic_userinfotest t where sysname='EMS'"; if (!String.IsNullOrEmpty(txt_user_code.Text.Trim())) { sqlCount += " and username like '%" + txt_user_code.Text.Trim() + "%'"; sqlData += " and username like '%" + txt_user_code.Text.Trim() + "%'"; } - + sqlData += " order by id desc)b " + + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; diff --git a/MainFrm.cs b/MainFrm.cs index 39df646..0cd5881 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3310,10 +3310,10 @@ string str1 = ""; if (feature != null) { - if (feature.GetFieldDefn("图?片?编括?码?") != null) // + if (feature.GetFieldDefn("图片编码") != null) // { str1 = GetBubbleInfo(feature); - if (RemoteFileExists(Utility.PicRootURL + feature.GetValue("图?片?编括?码?").ToString())) + if (RemoteFileExists(Utility.PicRootURL + feature.GetValue("图片编码").ToString())) { str1 += ""; } @@ -3450,9 +3450,15 @@ string value1 = ""; if (field1 != null) { - if (field1.Name == "图片编码") + //if (field1.Name == "图片编码" || field1.Name == "对象编号" || field1.Name == "对象类型" || field1.Name == "对象名称") + //{ + // j++; + //} + while (field1.Name == "图片编码" || field1.Name == "对象编号" || field1.Name == "对象类型" || field1.Name == "对象名称") { j++; + fieldName = fieldNames[j].Trim(); + field1 = (GSOFieldDefn)feature.GetFieldDefn(fieldName); } if (j < rowCount) { @@ -3479,6 +3485,11 @@ if (!feature.IsFieldValueNull(j)) { value1 = feature.GetValue(j).ToString(); + if (name1 == "标识器埋深") + { + if (value1!=null&&value1.Length>4) + value1 = value1.Substring(0,4); + } } } } @@ -3491,9 +3502,14 @@ if (field2 != null) { - if (field2.Name == "图片编码") + //if (field2.Name == "图片编码" || field1.Name == "对象编号" || field1.Name == "对象类型" || field1.Name == "对象名称") + //{ + // j++; + //} + while (field2.Name == "图片编码" || field2.Name == "对象编号" || field2.Name == "对象类型" || field2.Name == "对象名称") { j++; + field2 = (GSOFieldDefn)feature.GetFieldDefn(j + 1); } if (j + 1 < rowCount) { @@ -3521,6 +3537,11 @@ if (!feature.IsFieldValueNull(j + 1)) { value2 = feature.GetValue(j + 1).ToString(); + if (name2 == "标识器埋深") + { + if (value2 != null && value2.Length > 4) + value2 = value2.Substring(0, 4); + } } } } @@ -15347,7 +15368,7 @@ return; } FrmFlagManagers frm = new FrmFlagManagers(globeControl1); - frm.Show(this); + frm.Show(); } private void ribbonTabItem2_MouseDown(object sender, MouseEventArgs e) diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index fddfb94..e5f0003 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -365,6 +365,16 @@ this.可编辑ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.保存ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.ribbonControl1 = new DevComponents.DotNetBar.RibbonControl(); + this.ribbonPanel3 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar3 = new DevComponents.DotNetBar.RibbonBar(); + this.btn_device = new DevComponents.DotNetBar.ButtonItem(); + this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); + this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel7 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); + this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); + this.slider4ground = new DevComponents.DotNetBar.SliderItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -374,12 +384,6 @@ this.btn_user_role = new DevComponents.DotNetBar.ButtonItem(); this.btn_password_edit = new DevComponents.DotNetBar.ButtonItem(); this.btn_reset_password = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel3 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar3 = new DevComponents.DotNetBar.RibbonBar(); - this.btn_device = new DevComponents.DotNetBar.ButtonItem(); - this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); - this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); @@ -551,10 +555,6 @@ this.buttonItemBZ9 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItemBZ10 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItemBZ11 = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel7 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); - this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); - this.slider4ground = new DevComponents.DotNetBar.SliderItem(); this.ribbonPanel12 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar18 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItem133 = new DevComponents.DotNetBar.ButtonItem(); @@ -690,11 +690,11 @@ this.contextMenuStrip3.SuspendLayout(); this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); - this.ribbonPanel8.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel7.SuspendLayout(); + this.ribbonPanel8.SuspendLayout(); this.ribbonPanel2.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); - this.ribbonPanel7.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); this.ribbonPanel5.SuspendLayout(); this.ribbonPanel6.SuspendLayout(); @@ -4162,10 +4162,10 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); - this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel2); - this.ribbonControl1.Controls.Add(this.ribbonPanel15); + this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel7); + this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); this.ribbonControl1.Controls.Add(this.ribbonPanel5); this.ribbonControl1.Controls.Add(this.ribbonPanel6); @@ -4216,135 +4216,6 @@ this.ribbonControl1.UseCustomizeDialog = false; this.ribbonControl1.Click += new System.EventHandler(this.ribbonControl1_Click); // - // ribbonPanel8 - // - this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel8.Controls.Add(this.ribbonBar_UserInfo); - this.ribbonPanel8.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel8.Location = new System.Drawing.Point(0, 33); - this.ribbonPanel8.Name = "ribbonPanel8"; - this.ribbonPanel8.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel8.Size = new System.Drawing.Size(1328, 62); - // - // - // - this.ribbonPanel8.Style.Class = ""; - this.ribbonPanel8.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel8.StyleMouseDown.Class = ""; - this.ribbonPanel8.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel8.StyleMouseOver.Class = ""; - this.ribbonPanel8.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel8.TabIndex = 42; - this.ribbonPanel8.Visible = false; - // - // ribbonBar_UserInfo - // - this.ribbonBar_UserInfo.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar_UserInfo.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar_UserInfo.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar_UserInfo.BackgroundStyle.Class = ""; - this.ribbonBar_UserInfo.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar_UserInfo.ContainerControlProcessDialogKey = true; - this.ribbonBar_UserInfo.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar_UserInfo.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.btn_user_info, - this.btn_role_info, - this.btn_resc_info, - this.btn_role_resc, - this.btn_user_role, - this.btn_password_edit, - this.btn_reset_password}); - this.ribbonBar_UserInfo.Location = new System.Drawing.Point(3, 0); - this.ribbonBar_UserInfo.Name = "ribbonBar_UserInfo"; - this.ribbonBar_UserInfo.Size = new System.Drawing.Size(427, 59); - this.ribbonBar_UserInfo.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar_UserInfo.TabIndex = 0; - // - // - // - this.ribbonBar_UserInfo.TitleStyle.Class = ""; - this.ribbonBar_UserInfo.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar_UserInfo.TitleStyleMouseOver.Class = ""; - this.ribbonBar_UserInfo.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // btn_user_info - // - this.btn_user_info.Image = global::Cyberpipe.Properties.Resources._24x24icon_13_hover; - this.btn_user_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_user_info.Name = "btn_user_info"; - this.btn_user_info.SubItemsExpandWidth = 14; - this.btn_user_info.Text = "用户管理"; - this.btn_user_info.Click += new System.EventHandler(this.btn_user_info_Click); - // - // btn_role_info - // - this.btn_role_info.Image = global::Cyberpipe.Properties.Resources._24x24icon_05_hover1; - this.btn_role_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_role_info.Name = "btn_role_info"; - this.btn_role_info.SubItemsExpandWidth = 14; - this.btn_role_info.Text = "角色管理"; - this.btn_role_info.Click += new System.EventHandler(this.btn_role_info_Click); - // - // btn_resc_info - // - this.btn_resc_info.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__09; - this.btn_resc_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_resc_info.Name = "btn_resc_info"; - this.btn_resc_info.SubItemsExpandWidth = 14; - this.btn_resc_info.Text = "资源管理"; - this.btn_resc_info.Click += new System.EventHandler(this.btn_resc_info_Click); - // - // btn_role_resc - // - this.btn_role_resc.Image = global::Cyberpipe.Properties.Resources.btnlegendSet_Image_副本; - this.btn_role_resc.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_role_resc.Name = "btn_role_resc"; - this.btn_role_resc.SubItemsExpandWidth = 14; - this.btn_role_resc.Text = "角色授权"; - this.btn_role_resc.Click += new System.EventHandler(this.btn_role_resc_Click); - // - // btn_user_role - // - this.btn_user_role.Image = global::Cyberpipe.Properties.Resources._24x24icon_08_hover; - this.btn_user_role.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_user_role.Name = "btn_user_role"; - this.btn_user_role.SubItemsExpandWidth = 14; - this.btn_user_role.Text = "用户授权"; - this.btn_user_role.Click += new System.EventHandler(this.btn_user_role_Click); - // - // btn_password_edit - // - this.btn_password_edit.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__67; - this.btn_password_edit.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_password_edit.Name = "btn_password_edit"; - this.btn_password_edit.SubItemsExpandWidth = 14; - this.btn_password_edit.Text = "密码修改"; - this.btn_password_edit.Click += new System.EventHandler(this.btn_password_edit_Click); - // - // btn_reset_password - // - this.btn_reset_password.Image = global::Cyberpipe.Properties.Resources.liuxiang; - this.btn_reset_password.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_reset_password.Name = "btn_reset_password"; - this.btn_reset_password.SubItemsExpandWidth = 14; - this.btn_reset_password.Text = "重置密码"; - this.btn_reset_password.Click += new System.EventHandler(this.btn_reset_password_Click); - // // ribbonPanel3 // this.ribbonPanel3.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4425,7 +4296,7 @@ this.btn_Person.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; this.btn_Person.Name = "btn_Person"; this.btn_Person.SubItemsExpandWidth = 14; - this.btn_Person.Text = "巡检人员维护"; + this.btn_Person.Text = "定位人员维护"; this.btn_Person.Click += new System.EventHandler(this.btn_Person_Click); // // btn_constructMap @@ -4446,6 +4317,214 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel7 + // + this.ribbonPanel7.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel7.Controls.Add(this.ribbonBar5); + this.ribbonPanel7.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel7.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel7.Name = "ribbonPanel7"; + this.ribbonPanel7.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel7.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel7.Style.Class = ""; + this.ribbonPanel7.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel7.StyleMouseDown.Class = ""; + this.ribbonPanel7.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel7.StyleMouseOver.Class = ""; + this.ribbonPanel7.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel7.TabIndex = 41; + this.ribbonPanel7.Visible = false; + // + // ribbonBar5 + // + this.ribbonBar5.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar5.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar5.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar5.BackgroundStyle.Class = ""; + this.ribbonBar5.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar5.ContainerControlProcessDialogKey = true; + this.ribbonBar5.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar5.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.btn_flag, + this.slider4ground}); + this.ribbonBar5.Location = new System.Drawing.Point(3, 0); + this.ribbonBar5.Name = "ribbonBar5"; + this.ribbonBar5.Size = new System.Drawing.Size(427, 92); + this.ribbonBar5.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar5.TabIndex = 0; + // + // + // + this.ribbonBar5.TitleStyle.Class = ""; + this.ribbonBar5.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar5.TitleStyleMouseOver.Class = ""; + this.ribbonBar5.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar5.TitleVisible = false; + // + // btn_flag + // + this.btn_flag.Image = global::Cyberpipe.Properties.Resources._24x24icon_03_hover; + this.btn_flag.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_flag.Name = "btn_flag"; + this.btn_flag.SubItemsExpandWidth = 14; + this.btn_flag.Text = "标识器管理"; + this.btn_flag.Click += new System.EventHandler(this.btn_flag_Click); + // + // slider4ground + // + this.slider4ground.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; + this.slider4ground.Name = "slider4ground"; + this.slider4ground.Text = "地面透明度"; + this.slider4ground.Value = 0; + this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); + // + // ribbonPanel8 + // + this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel8.Controls.Add(this.ribbonBar_UserInfo); + this.ribbonPanel8.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel8.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel8.Name = "ribbonPanel8"; + this.ribbonPanel8.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel8.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel8.Style.Class = ""; + this.ribbonPanel8.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel8.StyleMouseDown.Class = ""; + this.ribbonPanel8.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel8.StyleMouseOver.Class = ""; + this.ribbonPanel8.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel8.TabIndex = 42; + this.ribbonPanel8.Visible = false; + // + // ribbonBar_UserInfo + // + this.ribbonBar_UserInfo.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar_UserInfo.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar_UserInfo.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar_UserInfo.BackgroundStyle.Class = ""; + this.ribbonBar_UserInfo.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar_UserInfo.ContainerControlProcessDialogKey = true; + this.ribbonBar_UserInfo.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar_UserInfo.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.btn_user_info, + this.btn_role_info, + this.btn_resc_info, + this.btn_role_resc, + this.btn_user_role, + this.btn_password_edit, + this.btn_reset_password}); + this.ribbonBar_UserInfo.Location = new System.Drawing.Point(3, 0); + this.ribbonBar_UserInfo.Name = "ribbonBar_UserInfo"; + this.ribbonBar_UserInfo.Size = new System.Drawing.Size(427, 92); + this.ribbonBar_UserInfo.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar_UserInfo.TabIndex = 0; + // + // + // + this.ribbonBar_UserInfo.TitleStyle.Class = ""; + this.ribbonBar_UserInfo.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar_UserInfo.TitleStyleMouseOver.Class = ""; + this.ribbonBar_UserInfo.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // btn_user_info + // + this.btn_user_info.Image = global::Cyberpipe.Properties.Resources._24x24icon_13_hover; + this.btn_user_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_user_info.Name = "btn_user_info"; + this.btn_user_info.SubItemsExpandWidth = 14; + this.btn_user_info.Text = "用户管理"; + this.btn_user_info.Click += new System.EventHandler(this.btn_user_info_Click); + // + // btn_role_info + // + this.btn_role_info.Image = global::Cyberpipe.Properties.Resources._24x24icon_05_hover1; + this.btn_role_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_role_info.Name = "btn_role_info"; + this.btn_role_info.SubItemsExpandWidth = 14; + this.btn_role_info.Text = "角色管理"; + this.btn_role_info.Click += new System.EventHandler(this.btn_role_info_Click); + // + // btn_resc_info + // + this.btn_resc_info.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__09; + this.btn_resc_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_resc_info.Name = "btn_resc_info"; + this.btn_resc_info.SubItemsExpandWidth = 14; + this.btn_resc_info.Text = "资源管理"; + this.btn_resc_info.Click += new System.EventHandler(this.btn_resc_info_Click); + // + // btn_role_resc + // + this.btn_role_resc.Image = global::Cyberpipe.Properties.Resources.btnlegendSet_Image_副本; + this.btn_role_resc.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_role_resc.Name = "btn_role_resc"; + this.btn_role_resc.SubItemsExpandWidth = 14; + this.btn_role_resc.Text = "角色授权"; + this.btn_role_resc.Click += new System.EventHandler(this.btn_role_resc_Click); + // + // btn_user_role + // + this.btn_user_role.Image = global::Cyberpipe.Properties.Resources._24x24icon_08_hover; + this.btn_user_role.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_user_role.Name = "btn_user_role"; + this.btn_user_role.SubItemsExpandWidth = 14; + this.btn_user_role.Text = "用户授权"; + this.btn_user_role.Click += new System.EventHandler(this.btn_user_role_Click); + // + // btn_password_edit + // + this.btn_password_edit.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__67; + this.btn_password_edit.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_password_edit.Name = "btn_password_edit"; + this.btn_password_edit.SubItemsExpandWidth = 14; + this.btn_password_edit.Text = "密码修改"; + this.btn_password_edit.Click += new System.EventHandler(this.btn_password_edit_Click); + // + // btn_reset_password + // + this.btn_reset_password.Image = global::Cyberpipe.Properties.Resources.liuxiang; + this.btn_reset_password.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_reset_password.Name = "btn_reset_password"; + this.btn_reset_password.SubItemsExpandWidth = 14; + this.btn_reset_password.Text = "重置密码"; + this.btn_reset_password.Click += new System.EventHandler(this.btn_reset_password_Click); + // // ribbonPanel2 // this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -5891,85 +5970,6 @@ this.buttonItemBZ11.Text = "标注管理"; this.buttonItemBZ11.Click += new System.EventHandler(this.buttonItemBZ11_Click); // - // ribbonPanel7 - // - this.ribbonPanel7.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel7.Controls.Add(this.ribbonBar5); - this.ribbonPanel7.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel7.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel7.Name = "ribbonPanel7"; - this.ribbonPanel7.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel7.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel7.Style.Class = ""; - this.ribbonPanel7.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel7.StyleMouseDown.Class = ""; - this.ribbonPanel7.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel7.StyleMouseOver.Class = ""; - this.ribbonPanel7.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel7.TabIndex = 41; - this.ribbonPanel7.Visible = false; - // - // ribbonBar5 - // - this.ribbonBar5.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar5.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar5.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar5.BackgroundStyle.Class = ""; - this.ribbonBar5.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar5.ContainerControlProcessDialogKey = true; - this.ribbonBar5.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar5.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.btn_flag, - this.slider4ground}); - this.ribbonBar5.Location = new System.Drawing.Point(3, 0); - this.ribbonBar5.Name = "ribbonBar5"; - this.ribbonBar5.Size = new System.Drawing.Size(427, 92); - this.ribbonBar5.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar5.TabIndex = 0; - // - // - // - this.ribbonBar5.TitleStyle.Class = ""; - this.ribbonBar5.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar5.TitleStyleMouseOver.Class = ""; - this.ribbonBar5.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar5.TitleVisible = false; - // - // btn_flag - // - this.btn_flag.Image = global::Cyberpipe.Properties.Resources._24x24icon_03_hover; - this.btn_flag.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_flag.Name = "btn_flag"; - this.btn_flag.SubItemsExpandWidth = 14; - this.btn_flag.Text = "标识器管理"; - this.btn_flag.Click += new System.EventHandler(this.btn_flag_Click); - // - // slider4ground - // - this.slider4ground.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; - this.slider4ground.Name = "slider4ground"; - this.slider4ground.Text = "地面透明度"; - this.slider4ground.Value = 0; - this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); - // // ribbonPanel12 // this.ribbonPanel12.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7181,11 +7181,11 @@ this.contextMenuStripDeleteLayerNode.ResumeLayout(false); this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); - this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel7.ResumeLayout(false); + this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); - this.ribbonPanel7.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); this.ribbonPanel5.ResumeLayout(false); this.ribbonPanel6.ResumeLayout(false); diff --git a/SysRescInfoManager.cs b/SysRescInfoManager.cs index 3a84d95..fda6f3f 100644 --- a/SysRescInfoManager.cs +++ b/SysRescInfoManager.cs @@ -79,11 +79,11 @@ //控制表格显示的列，以及每一列要显示的列名 this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - - this.winGridViewPager1.AddColumnAlias("RESC", "资源名称"); - this.winGridViewPager1.AddColumnAlias("ID", "编号"); - this.winGridViewPager1.AddColumnAlias("DESP", "资源描述"); - this.winGridViewPager1.DisplayColumns = "RESC,DESP"; + + this.winGridViewPager1.AddColumnAlias("资源名称", "资源名称"); + this.winGridViewPager1.AddColumnAlias("编号", "编号"); + this.winGridViewPager1.AddColumnAlias("资源描述", "资源描述"); + this.winGridViewPager1.DisplayColumns = "资源名称,资源描述"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -153,8 +153,8 @@ DataGridViewRow row = grid.SelectedRows[0]; if (MessageBox.Show("确定删除？", "确认", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) { - string dbid = row.Cells["id"].Value.ToString(); - string resc = row.Cells["resc"].Value.ToString(); + string dbid = row.Cells["编号"].Value.ToString(); + string resc = row.Cells["资源名称"].Value.ToString(); OracleConnection conn = null; OracleTransaction tran = null; try @@ -229,7 +229,7 @@ private string GetSql() { string sqlCount = "select count(*) from casic_userresctest where sysname='EMS'"; - string sqlData = "select resc,id,desp " + + string sqlData = "select resc as 资源名称,id as 编号,desp as 资源描述 " + "from (select t.*,rownum row_num from casic_userresctest t order by id desc)b " + " where sysname='EMS'"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -242,7 +242,7 @@ int minPage = (pageIndex - 1) * maxPageIndex + 1; int maxPage = pageIndex * maxPageIndex; string sqlCount = "select count(*) from casic_userresctest where sysname='EMS'"; - string sqlData = "select resc,id,desp " + + string sqlData = "select resc as 资源名称,id as 编号,desp as 资源描述 " + "from (select t.*,rownum row_num from casic_userresctest t where sysname='EMS' order by id desc)b " + " where(b.row_num between " + minPage + " and " + maxPage + ")"; diff --git a/bin/x86/Debug/Config.xml b/bin/x86/Debug/Config.xml index e2d7b46..560a163 100644 --- a/bin/x86/Debug/Config.xml +++ b/bin/x86/Debug/Config.xml @@ -3,9 +3,9 @@ LocaSpace三维地下管线信息系统 scott - SZHTDB - 127.0.0.1 - scott + SZHTDB2 + 192.168.0.203 + SZHTDB2 127.0.0.1 1500 @@ -14,8 +14,8 @@ http://192.168.0.122:8088/UpDownFile.asmx - http://127.0.0.1/EMSCyberpipe.msi - http://127.0.0.1/EMSConfig.xml + http://192.168.10.229/EMSCyberpipe.msi + http://192.168.10.229/EMSConfig.xml diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index b19e2ab..b5e320f 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/Cyberpipe.csproj b/Cyberpipe.csproj index fe600e5..501fd09 100644 --- a/Cyberpipe.csproj +++ b/Cyberpipe.csproj @@ -246,6 +246,12 @@ Form_TaskManager.cs + + Form + + + FrmFlagDetail.cs + Form @@ -1368,6 +1374,9 @@ Form_TaskManager.cs + + FrmFlagDetail.cs + FormDocumentManager.cs diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 537b4c3..1acf22a 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 7d5dd95..3f178cb 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -90,20 +90,20 @@ this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - - this.winGridViewPager1.AddColumnAlias("ACCIDENTTIME", "上报时间"); - this.winGridViewPager1.AddColumnAlias("DBID", "编号"); - this.winGridViewPager1.AddColumnAlias("DESCRIBE", "事件描述"); - this.winGridViewPager1.AddColumnAlias("LATITUDE", "纬度"); - this.winGridViewPager1.AddColumnAlias("LOCALE", "事件地点"); - this.winGridViewPager1.AddColumnAlias("LONGITUDE", "经度"); - this.winGridViewPager1.AddColumnAlias("PATROLERNAME", "上报人员"); - this.winGridViewPager1.AddColumnAlias("PATROLER_ID", "人员ID"); - this.winGridViewPager1.AddColumnAlias("TASK_ID", "任务编号"); - this.winGridViewPager1.AddColumnAlias("RESULT", "处理结果"); - this.winGridViewPager1.AddColumnAlias("STATE", "处理状态"); - this.winGridViewPager1.DisplayColumns = "ACCIDENTTIME,DESCRIBE,LOCALE,PATROLERNAME,TASK_ID,RESULT,STATE"; + this.winGridViewPager1.AddColumnAlias("上报时间", "上报时间"); + this.winGridViewPager1.AddColumnAlias("编号", "编号"); + this.winGridViewPager1.AddColumnAlias("事件描述", "事件描述"); + this.winGridViewPager1.AddColumnAlias("纬度", "纬度"); + this.winGridViewPager1.AddColumnAlias("事件地点", "事件地点"); + this.winGridViewPager1.AddColumnAlias("经度", "经度"); + this.winGridViewPager1.AddColumnAlias("上报人员", "上报人员"); + this.winGridViewPager1.AddColumnAlias("人员ID", "人员ID"); + this.winGridViewPager1.AddColumnAlias("任务编号", "任务编号"); + this.winGridViewPager1.AddColumnAlias("处理结果", "处理结果"); + this.winGridViewPager1.AddColumnAlias("处理状态", "处理状态"); + + this.winGridViewPager1.DisplayColumns = "上报时间,事件描述,事件地点,上报人员,任务编号,处理结果,处理状态"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -114,8 +114,8 @@ winGridViewPager1.dataGridView1.ContextMenuStrip.Items[5].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[6].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[7].Visible = false; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[1].Text = "查看位置"; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "结果编辑"; + winGridViewPager1.dataGridView1.ContextMenuStrip.Items[1].Text = "结果编辑"; + winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "查看位置"; //右键菜单宽度 winGridViewPager1.dataGridView1.ContextMenuStrip.AutoSize = false; @@ -160,13 +160,12 @@ this.WindowState = FormWindowState.Minimized; globeControl1.Globe.MemoryLayer.RemoveAllFeature(); this.WindowState = FormWindowState.Minimized; - double x = Convert.ToDouble(row.Cells["LONGITUDE"].Value); - double y = Convert.ToDouble(row.Cells["LATITUDE"].Value); - - string username = Convert.ToString(row.Cells["PATROLERNAME"].Value); - string Atime = Convert.ToString(row.Cells["ACCIDENTTIME"].Value); - string location = Convert.ToString(row.Cells["LOCALE"].Value); - string descp = Convert.ToString(row.Cells["DESCRIBE"].Value); + double x = Convert.ToDouble(row.Cells["经度"].Value); + double y = Convert.ToDouble(row.Cells["纬度"].Value); + string username = Convert.ToString(row.Cells["上报人员"].Value); + string Atime = Convert.ToString(row.Cells["上报时间"].Value); + string location = Convert.ToString(row.Cells["事件地点"].Value); + string descp = Convert.ToString(row.Cells["事件描述"].Value); /////////////////////////////////////// /*******设置飞行与创建模型******/ @@ -228,8 +227,8 @@ DataGridViewRow row = grid.SelectedRows[0]; try { - int dbId = Convert.ToInt32(row.Cells["DBID"].Value); - string result = Convert.ToString(row.Cells["RESULT"].Value); + int dbId = Convert.ToInt32(row.Cells["编号"].Value); + string result = Convert.ToString(row.Cells["处理结果"].Value); EMS_Forms.Form_EventResult form = new Form_EventResult(dbId, result); form.refresh += new Form_EventResult.Handle(LoadData);//改变值的事件 form.ShowDialog(); @@ -276,9 +275,9 @@ } for (int i = 0; i < table.Rows.Count; i++) { - if (winGridViewPager1.dataGridView1.Rows[i].Cells["RESULT"].Value != null && !(winGridViewPager1.dataGridView1.Rows[i].Cells["RESULT"].Value.ToString().Trim().Equals(""))) + if (winGridViewPager1.dataGridView1.Rows[i].Cells["处理结果"].Value != null && !(winGridViewPager1.dataGridView1.Rows[i].Cells["处理结果"].Value.ToString().Trim().Equals(""))) { - winGridViewPager1.dataGridView1.Rows[i].Cells["STATE"].Value = "已处理"; + winGridViewPager1.dataGridView1.Rows[i].Cells["处理状态"].Value = "已处理"; } } @@ -307,9 +306,9 @@ } for (int i = 0; i < table.Rows.Count; i++) { - if (winGridViewPager1.dataGridView1.Rows[i].Cells["RESULT"].Value != null && !(winGridViewPager1.dataGridView1.Rows[i].Cells["RESULT"].Value.ToString().Trim().Equals(""))) + if (winGridViewPager1.dataGridView1.Rows[i].Cells["处理结果"].Value != null && !(winGridViewPager1.dataGridView1.Rows[i].Cells["处理结果"].Value.ToString().Trim().Equals(""))) { - winGridViewPager1.dataGridView1.Rows[i].Cells["STATE"].Value = "已处理"; + winGridViewPager1.dataGridView1.Rows[i].Cells["处理状态"].Value = "已处理"; } } @@ -320,10 +319,12 @@ { string sqlCount = "select count(*) from ACCIDENT where 1=1"; - string sqlData = "select ACCIDENTTIME,DBID,DESCRIBE,LATITUDE,LOCALE,LONGITUDE,PATROLERNAME,PATROLER_ID,TASK_ID,RESULT,'' as STATE " + + string sqlData = "select ACCIDENTTIME as 上报时间,DBID as 编号,DESCRIBE as 事件描述,"+ + "LATITUDE as 纬度,LOCALE as 事件地点,LONGITUDE as 经度,PATROLERNAME 上报人员,"+ + "PATROLER_ID as 人员ID,TASK_ID as 任务编号,RESULT as 处理结果,'' as 处理状态 " + "from (select t.*,rownum row_num from ACCIDENT t order by DBID)b " + " where 1=1"; - + rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; @@ -340,9 +341,10 @@ string sqlCount = "select count(*) from ACCIDENT where 1=1"; - string sqlData = "select ACCIDENTTIME,DBID,DESCRIBE,LATITUDE,LOCALE,LONGITUDE,PATROLERNAME,PATROLER_ID,TASK_ID,RESULT,'' as STATE " + - "from (select t.*,rownum row_num from ACCIDENT t order by DBID)b " + - " where(b.row_num between " + minPage + " and " + maxPage + ")"; + string sqlData = "select ACCIDENTTIME as 上报时间,DBID as 编号,DESCRIBE as 事件描述," + + "LATITUDE as 纬度,LOCALE as 事件地点,LONGITUDE as 经度,PATROLERNAME 上报人员," + + "PATROLER_ID as 人员ID,TASK_ID as 任务编号,RESULT as 处理结果,'' as 处理状态 " + + "from (select t.*,rownum row_num from ACCIDENT t where 1=1"; if (!String.IsNullOrEmpty(comboBox_name.Text.Trim())) { @@ -361,7 +363,8 @@ sqlCount += "and ACCIDENTTIME<=to_date('" + time.ToShortDateString() + "','yyyy-MM-dd') "; sqlData += "and ACCIDENTTIME<=to_date('" + time.ToShortDateString() + "','yyyy-MM-dd') "; } - + sqlData += " order by DBID desc)b " + + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 225c8d7..8bd9e48 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -120,8 +120,8 @@ private void flyToTask(DataGridViewRow row, int taskState) { int dbID = 0; - dbID = Convert.ToInt32(row.Cells["DBID"].Value); - string userName = Convert.ToString(row.Cells["USERNAME"].Value); + dbID = Convert.ToInt32(row.Cells["任务编号"].Value); + string userName = Convert.ToString(row.Cells["任务执行人员"].Value); System.DateTime t = new DateTime(); try { @@ -392,15 +392,15 @@ //控制表格显示的列，以及每一列要显示的列名 this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - this.winGridViewPager1.AddColumnAlias("DBID", "任务编号"); - this.winGridViewPager1.AddColumnAlias("DEPLOYTIME", "创建时间"); - this.winGridViewPager1.AddColumnAlias("DESCIRPTION", "任务描述"); - this.winGridViewPager1.AddColumnAlias("FINISHTIME", "完成时间"); - this.winGridViewPager1.AddColumnAlias("STREET", "任务执行区域"); - this.winGridViewPager1.AddColumnAlias("TASKSTATE", "任务状态"); - this.winGridViewPager1.AddColumnAlias("USERNAME", "任务执行人员"); + this.winGridViewPager1.AddColumnAlias("任务编号", "任务编号"); + this.winGridViewPager1.AddColumnAlias("创建时间", "创建时间"); + this.winGridViewPager1.AddColumnAlias("任务描述", "任务描述"); + this.winGridViewPager1.AddColumnAlias("完成时间", "完成时间"); + this.winGridViewPager1.AddColumnAlias("任务执行区域", "任务执行区域"); + this.winGridViewPager1.AddColumnAlias("任务状态", "任务状态"); + this.winGridViewPager1.AddColumnAlias("任务执行人员", "任务执行人员"); - this.winGridViewPager1.DisplayColumns = "DBID,DEPLOYTIME,DESCIRPTION,FINISHTIME,STREET,TASKSTATE,USERNAME"; + this.winGridViewPager1.DisplayColumns = "任务编号,创建时间,任务描述,完成时间,任务执行区域,任务状态,任务执行人员"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -464,8 +464,8 @@ { int dbID = 0; int taskStateInt = 0; - dbID = Convert.ToInt32(row.Cells["DBID"].Value); - string taskState = row.Cells["TASKSTATE"].Value.ToString(); + dbID = Convert.ToInt32(row.Cells["任务编号"].Value); + string taskState = row.Cells["任务状态"].Value.ToString(); if (taskState.Equals("开始任务")) { taskStateInt = 1; @@ -534,9 +534,10 @@ private string GetSql() { - string sqlCount = "select count(*) from taskinfo t where 1=1'"; + string sqlCount = "select count(*) from taskinfo t where 1=1"; - string sqlData = "select dbid,deploytime,descirption,finishtime,street,taskstate,username " + + 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"; @@ -550,9 +551,9 @@ int minPage = (pageIndex - 1) * maxPageIndex + 1; int maxPage = pageIndex * maxPageIndex; string sqlCount = "select count(*) from taskinfo t where 1=1"; - string sqlData = "select dbid,deploytime,descirption,finishtime,street,taskstate,username " + - "from (select t.*,rownum row_num from taskinfo t order by DBID desc)b " + - " where(b.row_num between " + minPage + " and " + maxPage + ")"; + 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"; if (!String.IsNullOrEmpty(comboBox_userName.Text.Trim()) && !comboBox_userName.Text.Trim().Equals("不限")) { @@ -581,6 +582,8 @@ sqlCount += "and street='" + combo_street.Text + "' "; sqlData += "and street='" + combo_street.Text + "' "; } + sqlData += " order by DBID desc)b " + + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index e65a4bd..58f5342 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -73,13 +73,13 @@ //控制表格显示的列，以及每一列要显示的列名 this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - this.winGridViewPager1.AddColumnAlias("FILENAME", "文档名称"); - this.winGridViewPager1.AddColumnAlias("DBID", "编号"); - this.winGridViewPager1.AddColumnAlias("TITLE", "文档标题"); - this.winGridViewPager1.AddColumnAlias("FILETYPE", "文档类型"); - this.winGridViewPager1.AddColumnAlias("UPDAY", "上传日期"); - this.winGridViewPager1.AddColumnAlias("WRITER", "上传人"); - this.winGridViewPager1.DisplayColumns = "FILENAME,TITLE,FILETYPE,UPDAY,WRITER"; + this.winGridViewPager1.AddColumnAlias("文档名称", "文档名称"); + this.winGridViewPager1.AddColumnAlias("编号", "编号"); + this.winGridViewPager1.AddColumnAlias("文档标题", "文档标题"); + this.winGridViewPager1.AddColumnAlias("文档类型", "文档类型"); + this.winGridViewPager1.AddColumnAlias("上传日期", "上传日期"); + this.winGridViewPager1.AddColumnAlias("上传人", "上传人"); + this.winGridViewPager1.DisplayColumns = "文档名称,文档标题,文档类型,上传日期,上传人"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -167,7 +167,7 @@ if (grid != null) { DataGridViewRow row = grid.SelectedRows[0]; - string dbid = row.Cells["dbid"].Value.ToString(); + string dbid = row.Cells["编号"].Value.ToString(); try { if (MessageBox.Show("确认删除吗？", "确认", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) @@ -212,7 +212,8 @@ { string sqlCount = "select count(*) from casic_userdocument where sysname = 'EMS'"; - string sqlData = "select filename,dbid,title,filetype,upday,writer " + + string sqlData = "select filename as 文档名称,dbid as 编号,title as 文档标题," + + "filetype as 文档类型,upday as 上传日期,writer as 上传人 " + "from (select t.*,rownum row_num from casic_userdocument t order by DBID desc)b " + " where sysname = 'EMS'"; @@ -226,9 +227,9 @@ int minPage = (pageIndex - 1) * maxPageIndex + 1; int maxPage = pageIndex * maxPageIndex; string sqlCount = "select count(*) from casic_userdocument where sysname = 'EMS'"; - string sqlData = "select filename,dbid,title,filetype,upday,writer " + - "from (select t.*,rownum row_num from casic_userdocument t where sysname = 'EMS' order by DBID desc)b " + - " where(b.row_num between " + minPage + " and " + maxPage + ")"; + string sqlData = "select filename as 文档名称,dbid as 编号,title as 文档标题,"+ + "filetype as 文档类型,upday as 上传日期,writer as 上传人 " + + "from (select t.*,rownum row_num from casic_userdocument t where sysname = 'EMS'"; string txtTitleText = null; string comboFileType = null; @@ -278,7 +279,8 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - + sqlData += " order by DBID desc)b " + + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; @@ -437,7 +439,7 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - string filename = row.Cells["filename"].Value.ToString(); + string filename = row.Cells["文档名称"].Value.ToString(); string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; string file = System.Environment.CurrentDirectory + "\\download\\" + filename; int result = DownloadFile(url, file, progressBar1); @@ -515,7 +517,7 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - string filename = row.Cells["filename"].Value.ToString(); + string filename = row.Cells["文档名称"].Value.ToString(); string ext = Path.GetExtension(filename); SaveFileDialog dlg = new SaveFileDialog(); dlg.Filter = "保存文档|*" + ext + ";"; diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 1d1201b..3902629 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -748,6 +748,7 @@ this.Name = "FrmAddSinMark"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "单个标识器添加"; + this.TopMost = true; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmAddSinMark_FormClosing); this.Load += new System.EventHandler(this.FrmAddSinMark_Load); this.groupPanel1.ResumeLayout(false); diff --git a/FrmEquipmentManage.cs b/FrmEquipmentManage.cs index 90bfdb2..a3cf55c 100644 --- a/FrmEquipmentManage.cs +++ b/FrmEquipmentManage.cs @@ -74,13 +74,13 @@ //控制表格显示的列，以及每一列要显示的列名 this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - this.winGridViewPager1.AddColumnAlias("DESCIRPTION", "设备描述"); - this.winGridViewPager1.AddColumnAlias("DBID", "编号"); - this.winGridViewPager1.AddColumnAlias("MACID", "MAC地址"); - this.winGridViewPager1.AddColumnAlias("OWNER", "设备所有人"); - this.winGridViewPager1.AddColumnAlias("STATUS", "设备状态"); + this.winGridViewPager1.AddColumnAlias("设备描述", "设备描述"); + this.winGridViewPager1.AddColumnAlias("编号", "编号"); + this.winGridViewPager1.AddColumnAlias("MAC地址", "MAC地址"); + this.winGridViewPager1.AddColumnAlias("设备所有人", "设备所有人"); + this.winGridViewPager1.AddColumnAlias("设备状态", "设备状态"); - this.winGridViewPager1.DisplayColumns = "DESCIRPTION,MACID,OWNER,STATUS"; + this.winGridViewPager1.DisplayColumns = "设备描述,MAC地址,设备所有人,设备状态"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -146,10 +146,10 @@ DataGridViewRow row = grid.SelectedRows[0]; try { - long dbid = long.Parse(row.Cells["DBID"].Value.ToString()); - String macId = row.Cells["MACID"].Value.ToString(); - String username = row.Cells["OWNER"].Value.ToString(); - String descn = row.Cells["DESCIRPTION"].Value.ToString(); + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); + String macId = row.Cells["MAC地址"].Value.ToString(); + String username = row.Cells["设备所有人"].Value.ToString(); + String descn = row.Cells["设备状态"].Value.ToString(); FrmEquipmentEdit frm = new FrmEquipmentEdit(dbid.ToString(), macId, username, descn); frm.reloadGrid += new ReloadEquipmentGrid(LoadData); frm.ShowDialog(); @@ -179,7 +179,7 @@ { return; } - String macId = row.Cells["MACID"].Value.ToString(); + String macId = row.Cells["MAC地址"].Value.ToString(); FrmLog frm = new FrmLog(macId); frm.Show(); } @@ -201,7 +201,7 @@ if (grid != null) { DataGridViewRow row = grid.SelectedRows[0]; - long dbid = long.Parse(row.Cells["DBID"].Value.ToString()); + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); try { if (MessageBox.Show("确定删除？", "确认", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) @@ -243,7 +243,8 @@ { string sqlCount = "select count(*) from equipment where status = 'USING'"; - string sqlData = "select descirption,DBID,macid,owner,case when status = 'USING' then '可用' when status = 'DAMAGE' then '损坏' end as status " + + string sqlData = "select descirption as 设备描述,DBID as 编号,macid as MAC地址,owner as 设备所有人,"+ + "case when status = 'USING' then '可用' when status = 'DAMAGE' then '损坏' end as 设备状态 " + "from (select t.*,rownum row_num from equipment t where status = 'USING' order by dbid desc)b " + " where 1=1"; @@ -258,16 +259,17 @@ int maxPage = pageIndex * maxPageIndex; string sqlCount = "select count(*) from equipment where status = 'USING' "; - string sqlData = "select descirption,DBID,macid,owner,case when status = 'USING' then '可用' when status = 'DAMAGE' then '损坏' end as status " + - "from (select t.*,rownum row_num from equipment t where status = 'USING' order by DBID desc)b " + - " where(b.row_num between " + minPage + " and " + maxPage + ")"; + string sqlData = "select descirption as 设备描述,DBID as 编号,macid as MAC地址,owner as 设备所有人," + + "case when status = 'USING' then '可用' when status = 'DAMAGE' then '损坏' end as 设备状态 " + + "from (select t.*,rownum row_num from equipment t where status = 'USING'"; if (!String.IsNullOrEmpty(txtMacId.Text.Trim())) { sqlData += " and macid like '%" + txtMacId.Text.Trim() + "%'"; sqlCount += " and macid like '%" + txtMacId.Text.Trim() + "%'"; } - + sqlData += " order by DBID desc)b " + + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; @@ -299,76 +301,6 @@ } } - //public void reloadGrid(int pageIndex) - //{ - // if (pageIndex <= 0) - // { - // pageIndex = 1; - // currentpage = 1; - // } - // String sqlrows = "select * from (select rownum as rowno,dbid,descirption,macid,owner,case when status = 'USING' then '可用' when status = 'DAMAGE' then '损坏' end as status,'编辑' as btnEdit,'删除' as btnDel from equipment t where status = 'USING' "; - // string sqlcount = "select count(*) from equipment where status = 'USING' "; - // if (!String.IsNullOrEmpty(txtMacId.Text.Trim())) - // { - // sqlrows += " and macid like '%" + txtMacId.Text.Trim() + "%'"; - // sqlcount += " and macid like '%" + txtMacId.Text.Trim() + "%'"; - // } - // sqlrows += " and rownum<=" + (pagesize * pageIndex) + ") table_alias where table_alias.rowno>=" + ((pageIndex - 1) * pagesize + 1); - - // int rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlcount).ToString()); - // int pages = 0; - // if (rows % pagesize == 0) - // { - // pages = rows / pagesize; - // } - // else - // { - // pages = rows / pagesize + 1; - // } - - // lastpage = pages; - - // lab_page_msg.Text = "共" + rows + "条记录，每页" + pagesize + "条，第" + pageIndex + "页，共" + pages + "页"; - // combo_page_num.Items.Clear(); - // for (int i = 1; i <= pages; i++) - // { - // combo_page_num.Items.Add(new ComboBoxItem(i.ToString(), i.ToString())); - // } - - // if (lastpage == 1) - // { - // btn_page_first.Enabled = false; - // btn_page_pre.Enabled = false; - // btn_page_last.Enabled = false; - // btn_page_next.Enabled = false; - // } - // else if (currentpage == 1) - // { - // btn_page_first.Enabled = false; - // btn_page_pre.Enabled = false; - // btn_page_last.Enabled = true; - // btn_page_next.Enabled = true; - // } - // else if (currentpage == lastpage) - // { - // btn_page_first.Enabled = true; - // btn_page_pre.Enabled = true; - // btn_page_last.Enabled = false; - // btn_page_next.Enabled = false; - // } - // else - // { - // btn_page_first.Enabled = true; - // btn_page_pre.Enabled = true; - // btn_page_last.Enabled = true; - // btn_page_next.Enabled = true; - // } - - // DataTable table = OracleUtils.ExecuteDataset(OracleUtils.ConnectionString, CommandType.Text, sqlrows).Tables[0]; - // dataGridViewX1.DataSource = table; - - //} - private void FrmEquipmentManage_FormClosing(object sender, FormClosingEventArgs e) diff --git a/FrmFlagDetail.Designer.cs b/FrmFlagDetail.Designer.cs new file mode 100644 index 0000000..982bfc6 --- /dev/null +++ b/FrmFlagDetail.Designer.cs @@ -0,0 +1,103 @@ +namespace Cyberpipe +{ + partial class FrmFlagDetail + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); + this.dataGridViewX_markDetail = new DevComponents.DotNetBar.Controls.DataGridViewX(); + this.对象类型 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.对象编号 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.对象名称 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX_markDetail)).BeginInit(); + this.SuspendLayout(); + // + // dataGridViewX_markDetail + // + this.dataGridViewX_markDetail.AllowUserToAddRows = false; + this.dataGridViewX_markDetail.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; + this.dataGridViewX_markDetail.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dataGridViewX_markDetail.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.对象类型, + this.对象编号, + this.对象名称}); + dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle3.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dataGridViewX_markDetail.DefaultCellStyle = dataGridViewCellStyle3; + this.dataGridViewX_markDetail.Dock = System.Windows.Forms.DockStyle.Fill; + this.dataGridViewX_markDetail.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(170)))), ((int)(((byte)(170)))), ((int)(((byte)(170))))); + this.dataGridViewX_markDetail.Location = new System.Drawing.Point(0, 0); + this.dataGridViewX_markDetail.Name = "dataGridViewX_markDetail"; + this.dataGridViewX_markDetail.RowTemplate.Height = 23; + this.dataGridViewX_markDetail.Size = new System.Drawing.Size(508, 321); + this.dataGridViewX_markDetail.TabIndex = 0; + // + // 对象类型 + // + this.对象类型.HeaderText = "对象类型"; + this.对象类型.Name = "对象类型"; + // + // 对象编号 + // + this.对象编号.HeaderText = "对象编号"; + this.对象编号.Name = "对象编号"; + // + // 对象名称 + // + this.对象名称.HeaderText = "对象名称"; + this.对象名称.Name = "对象名称"; + // + // FrmFlagDetail + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(508, 321); + this.Controls.Add(this.dataGridViewX_markDetail); + this.Name = "FrmFlagDetail"; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; + this.Text = "标识对象信息"; + this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmFlagDetail_FormClosing); + this.Load += new System.EventHandler(this.FrmFlagDetail_Load); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX_markDetail)).EndInit(); + this.ResumeLayout(false); + + } + + #endregion + + private DevComponents.DotNetBar.Controls.DataGridViewX dataGridViewX_markDetail; + private System.Windows.Forms.DataGridViewTextBoxColumn 对象类型; + private System.Windows.Forms.DataGridViewTextBoxColumn 对象编号; + private System.Windows.Forms.DataGridViewTextBoxColumn 对象名称; + + } +} \ No newline at end of file diff --git a/FrmFlagDetail.cs b/FrmFlagDetail.cs new file mode 100644 index 0000000..81de974 --- /dev/null +++ b/FrmFlagDetail.cs @@ -0,0 +1,77 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Windows.Forms; +using GeoScene.Globe; +using System.Data.OracleClient; + +namespace Cyberpipe +{ + public partial class FrmFlagDetail : Form + { + DataTable dt = new DataTable(); + private GSOGlobeControl globeControl1; + + public delegate void Handle(); + public event Handle showParentForm; + String markId; + + public FrmFlagDetail(GSOGlobeControl globeControl1, String id) + { + InitializeComponent(); + this.markId = id; + } + + private void FrmFlagDetail_FormClosing(object sender, FormClosingEventArgs e) + { + showParentForm(); + } + + private void FrmFlagDetail_Load(object sender, EventArgs e) + { + string objectIds = ""; + string objectTypeCodes = ""; + string sql = "select t.对象编号,t.对象类型 from 标识器 t where t.编号='" + markId + "'"; + using (OracleDataReader reader = OracleUtils.ExecuteReader(OracleUtils.ConnectionString, CommandType.Text, sql)) + { + while (reader.Read()) + { + objectIds = reader.GetString(0); + objectTypeCodes = reader.GetString(1); + } + } + + string[] codeTypes = objectTypeCodes.Split(','); + string[] codeIds = objectIds.Split(','); + int length = 0; + if (codeTypes.Length <= codeIds.Length) + { + length = codeTypes.Length; + } + else + { + length = codeIds.Length; + } + for (int n = 0; n < length; n++) + { + for (int i = 0; i < Utility1.listPipelineType.Count; i++) + { + if (Utility1.listPipelineType[i].code == codeTypes[n]) + { + //string objectId = codeIds[i]; + //string objectType = Utility1.listPipelineType[i].type; + //string objectName = Utility1.listPipelineType[i].name; + int index = this.dataGridViewX_markDetail.Rows.Add(); + this.dataGridViewX_markDetail.Rows[index].Cells[0].Value = Utility1.listPipelineType[i].type; + this.dataGridViewX_markDetail.Rows[index].Cells[1].Value = codeIds[n].ToString(); + this.dataGridViewX_markDetail.Rows[index].Cells[2].Value = Utility1.listPipelineType[i].name; + } + } + } + } + } +} diff --git a/FrmFlagDetail.resx b/FrmFlagDetail.resx new file mode 100644 index 0000000..e98a8fe --- /dev/null +++ b/FrmFlagDetail.resx @@ -0,0 +1,129 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + True + + + True + + + True + + \ No newline at end of file diff --git a/FrmFlagManagers.Designer.cs b/FrmFlagManagers.Designer.cs index d7e2f60..9fe14fb 100644 --- a/FrmFlagManagers.Designer.cs +++ b/FrmFlagManagers.Designer.cs @@ -28,8 +28,10 @@ /// private void InitializeComponent() { - this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); - this.winGridViewPager1 = new WHC.Pager.WinControl.WinGridViewPager(); + this.components = new System.ComponentModel.Container(); + this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components); + this.标识对象ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripMenuItem2 = new System.Windows.Forms.ToolStripMenuItem(); this.bar1 = new DevComponents.DotNetBar.Bar(); this.labelItem1 = new DevComponents.DotNetBar.LabelItem(); this.txt_no = new DevComponents.DotNetBar.TextBoxItem(); @@ -38,45 +40,37 @@ this.btn_query = new DevComponents.DotNetBar.ButtonItem(); this.btn_add_batch = new DevComponents.DotNetBar.ButtonItem(); this.btn_add_menu = new DevComponents.DotNetBar.ButtonItem(); - this.btn_db = new DevComponents.DotNetBar.ButtonItem(); - this.tableLayoutPanel1.SuspendLayout(); + this.winGridViewPager1 = new WHC.Pager.WinControl.WinGridViewPager(); + this.contextMenuStrip1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.bar1)).BeginInit(); this.SuspendLayout(); // - // tableLayoutPanel1 + // contextMenuStrip1 // - this.tableLayoutPanel1.ColumnCount = 1; - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel1.Controls.Add(this.winGridViewPager1, 0, 1); - this.tableLayoutPanel1.Controls.Add(this.bar1, 0, 0); - this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 0); - this.tableLayoutPanel1.Name = "tableLayoutPanel1"; - this.tableLayoutPanel1.RowCount = 2; - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 32F)); - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel1.Size = new System.Drawing.Size(881, 474); - this.tableLayoutPanel1.TabIndex = 6; + this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.标识对象ToolStripMenuItem, + this.toolStripMenuItem2}); + this.contextMenuStrip1.Name = "contextMenuStrip1"; + this.contextMenuStrip1.Size = new System.Drawing.Size(125, 48); // - // winGridViewPager1 + // 标识对象ToolStripMenuItem // - this.winGridViewPager1.AppendedMenu = null; - this.winGridViewPager1.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; - this.winGridViewPager1.DataSource = null; - this.winGridViewPager1.DisplayColumns = ""; - this.winGridViewPager1.Dock = System.Windows.Forms.DockStyle.Fill; - this.winGridViewPager1.Location = new System.Drawing.Point(3, 35); - this.winGridViewPager1.MinimumSize = new System.Drawing.Size(540, 0); - this.winGridViewPager1.Name = "winGridViewPager1"; - this.winGridViewPager1.PrintTitle = ""; - this.winGridViewPager1.Size = new System.Drawing.Size(875, 436); - this.winGridViewPager1.TabIndex = 5; + this.标识对象ToolStripMenuItem.Name = "标识对象ToolStripMenuItem"; + this.标识对象ToolStripMenuItem.Size = new System.Drawing.Size(124, 22); + this.标识对象ToolStripMenuItem.Text = "标识对象"; + this.标识对象ToolStripMenuItem.Click += new System.EventHandler(this.标识对象ToolStripMenuItem_Click); + // + // toolStripMenuItem2 + // + this.toolStripMenuItem2.Name = "toolStripMenuItem2"; + this.toolStripMenuItem2.Size = new System.Drawing.Size(152, 22); + this.toolStripMenuItem2.Text = "查看位置"; + this.toolStripMenuItem2.Click += new System.EventHandler(this.toolStripMenuItem2_Click); // // bar1 // this.bar1.AntiAlias = true; this.bar1.Dock = System.Windows.Forms.DockStyle.Top; - this.bar1.DockSide = DevComponents.DotNetBar.eDockSide.Document; this.bar1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.labelItem1, this.txt_no, @@ -84,14 +78,13 @@ this.combo_street, this.btn_query, this.btn_add_batch, - this.btn_add_menu, - this.btn_db}); - this.bar1.Location = new System.Drawing.Point(3, 3); + this.btn_add_menu}); + this.bar1.Location = new System.Drawing.Point(0, 0); this.bar1.Name = "bar1"; - this.bar1.Size = new System.Drawing.Size(875, 28); + this.bar1.Size = new System.Drawing.Size(881, 28); this.bar1.Stretch = true; this.bar1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.bar1.TabIndex = 1; + this.bar1.TabIndex = 8; this.bar1.TabStop = false; this.bar1.Text = "bar1"; // @@ -136,24 +129,34 @@ this.btn_add_menu.Text = "手工添加"; this.btn_add_menu.Click += new System.EventHandler(this.btn_add_menu_Click); // - // btn_db + // winGridViewPager1 // - this.btn_db.Name = "btn_db"; - this.btn_db.Text = "数据导出"; + this.winGridViewPager1.AppendedMenu = null; + this.winGridViewPager1.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; + this.winGridViewPager1.DataSource = null; + this.winGridViewPager1.DisplayColumns = ""; + this.winGridViewPager1.Dock = System.Windows.Forms.DockStyle.Fill; + this.winGridViewPager1.Location = new System.Drawing.Point(0, 28); + this.winGridViewPager1.MinimumSize = new System.Drawing.Size(540, 0); + this.winGridViewPager1.Name = "winGridViewPager1"; + this.winGridViewPager1.PrintTitle = ""; + this.winGridViewPager1.Size = new System.Drawing.Size(881, 446); + this.winGridViewPager1.TabIndex = 9; // // FrmFlagManagers // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(881, 474); - this.Controls.Add(this.tableLayoutPanel1); + this.Controls.Add(this.winGridViewPager1); + this.Controls.Add(this.bar1); this.DoubleBuffered = true; this.Name = "FrmFlagManagers"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "标识器管理"; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmFlagManagers_FormClosing); this.Load += new System.EventHandler(this.FrmFlagManagers_Load); - this.tableLayoutPanel1.ResumeLayout(false); + this.contextMenuStrip1.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.bar1)).EndInit(); this.ResumeLayout(false); @@ -161,8 +164,8 @@ #endregion - private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1; - private WHC.Pager.WinControl.WinGridViewPager winGridViewPager1; + private System.Windows.Forms.ContextMenuStrip contextMenuStrip1; + private System.Windows.Forms.ToolStripMenuItem 标识对象ToolStripMenuItem; private DevComponents.DotNetBar.Bar bar1; private DevComponents.DotNetBar.LabelItem labelItem1; private DevComponents.DotNetBar.TextBoxItem txt_no; @@ -171,6 +174,7 @@ private DevComponents.DotNetBar.ButtonItem btn_query; private DevComponents.DotNetBar.ButtonItem btn_add_batch; private DevComponents.DotNetBar.ButtonItem btn_add_menu; - private DevComponents.DotNetBar.ButtonItem btn_db; + private WHC.Pager.WinControl.WinGridViewPager winGridViewPager1; + private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem2; } } \ No newline at end of file diff --git a/FrmFlagManagers.cs b/FrmFlagManagers.cs index 38d4927..9bf9734 100644 --- a/FrmFlagManagers.cs +++ b/FrmFlagManagers.cs @@ -33,15 +33,13 @@ { this.globeControl1 = _globeControl1; InitializeComponent(); - winGridViewPager1.OnPageChanged += new EventHandler(winGridViewPager1_OnPageChanged); - this.winGridViewPager1.OnAddNew += new EventHandler(winGridViewPager1_OnAddNew); //右键定位 + winGridViewPager1.OnPageChanged += new EventHandler(winGridViewPager1_OnPageChanged); this.winGridViewPager1.OnEditSelected += new EventHandler(winGridViewPager1_OnEditSelected);//属性编辑 this.winGridViewPager1.OnDeleteSelected += new EventHandler(winGridViewPager1_OnDeleteSelected);//标识器报废 + this.winGridViewPager1.OnStartExport += new EventHandler(pager1_OnStartExport); this.winGridViewPager1.OnEndExport += new EventHandler(pager1_OnEndExport); - //this.winGridViewPager1.ExportCurrent += new ExportCurrentEventHandler(pager1_ExportCurrent); - //this.winGridViewPager1.ExportAll += new ExportAllEventHandler(pager1_ExportAll); winGridViewPager1.dataGridView1.MultiSelect = false; @@ -76,26 +74,25 @@ this.winGridViewPager1.AddColumnAlias("标识器型号", "标识器型号"); this.winGridViewPager1.AddColumnAlias("地面高程", "地面高程"); this.winGridViewPager1.AddColumnAlias("标识器埋深", "标识器埋深"); - this.winGridViewPager1.AddColumnAlias("对象编号", "对象编号"); - this.winGridViewPager1.AddColumnAlias("对象类型", "对象类型"); this.winGridViewPager1.AddColumnAlias("所属道路", "所属道路"); this.winGridViewPager1.AddColumnAlias("使用状态", "使用状态"); - this.winGridViewPager1.DisplayColumns = "编号,标识器ID号,标识器型号,地面高程,标识器埋深,对象编号,对象类型,所属道路,使用状态"; + this.winGridViewPager1.DisplayColumns = "编号,标识器ID号,标识器型号,地面高程,标识器埋深,所属道路,使用状态"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 //隐藏右键功能按钮 //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[1].Visible = false; - //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[4].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[5].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[6].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[7].Visible = false; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[1].Text = "定位查看"; + //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[1].Text = "定位查看"; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "属性编辑"; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Text = "标识器报废"; + winGridViewPager1.AppendedMenu = this.contextMenuStrip1; + //右键菜单宽度 winGridViewPager1.dataGridView1.ContextMenuStrip.AutoSize = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Width = 150; @@ -153,7 +150,7 @@ } /// - /// 右键定位 + /// 对象查看 /// /// /// @@ -306,20 +303,10 @@ string sqlCount = "select count(*) from 标识器 where 使用状态 = '使用中'"; - string sqlData = "select 编号,标识器ID号,标识器型号,地面高程,标识器埋深,对象编号,对象类型,所属道路,LSSYS_ID,X坐标,Y坐标,使用状态 " + + string sqlData = "select 编号,标识器ID号,标识器型号,地面高程,标识器埋深,所属道路,LSSYS_ID,X坐标,Y坐标,使用状态 " + "from (select t.*,rownum row_num from 标识器 t where 使用状态 = '使用中' order by 编号)b " + " where 1=1"; - if (!String.IsNullOrEmpty(txt_no.Text.Trim())) - { - sqlCount += " and 编号 like '%" + txt_no.Text.Trim() + "%'"; - sqlData += " and 编号 like '%" + txt_no.Text.Trim() + "%'"; - } - if (null != combo_street.SelectedItem && !String.IsNullOrEmpty(combo_street.SelectedItem.ToString().Trim())) - { - sqlData += " and 所属道路='" + combo_street.SelectedItem.ToString().Trim() + "'"; - sqlCount += " and 所属道路='" + combo_street.SelectedItem.ToString().Trim() + "'"; - } rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -332,9 +319,8 @@ int maxPage = pageIndex * maxPageIndex; string sqlCount = "select count(*) from 标识器 where 使用状态 = '使用中'"; - string sqlData = "select 编号,标识器ID号,标识器型号,地面高程,标识器埋深,对象编号,对象类型,所属道路,LSSYS_ID,X坐标,Y坐标,使用状态 " + - "from (select t.*,rownum row_num from 标识器 t where 使用状态 = '使用中' order by 编号)b "+ - " where(b.row_num between " + minPage + " and " + maxPage + ")"; + string sqlData = "select 编号,标识器ID号,标识器型号,地面高程,标识器埋深,所属道路,LSSYS_ID,X坐标,Y坐标,使用状态 " + + "from (select t.*,rownum row_num from 标识器 t where 使用状态 = '使用中'"; if (!String.IsNullOrEmpty(txt_no.Text.Trim())) { @@ -347,6 +333,8 @@ sqlCount += " and 所属道路='" + combo_street.SelectedItem.ToString().Trim() + "'"; } + sqlData += " order by 编号)b " + + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; @@ -372,9 +360,10 @@ private void FrmFlagManagers_FormClosing(object sender, FormClosingEventArgs e) { IS_OPEN = false; - Thread downloadJob = new Thread(new ParameterizedThreadStart(doSave)); - downloadJob.IsBackground = true; - downloadJob.Start(e); + //Thread downloadJob = new Thread(new ParameterizedThreadStart(doSave)); + //downloadJob.IsBackground = true; + //downloadJob.Start(e); + globeControl1.Globe.Layers["标识器"].Save(); globeControl1.Globe.MemoryLayer.RemoveAllFeature(); foreach (GSOFeature f in Features) { @@ -480,10 +469,88 @@ if (null != globeControl1) { FrmAddSinMark frm = new FrmAddSinMark(globeControl1); - frm.ShowDialog(); + frm.Show(); } } + private void 标识对象ToolStripMenuItem_Click(object sender, EventArgs e) + { + if (winGridViewPager1 != null && winGridViewPager1.dataGridView1 != null) + { + DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; + try + { + this.Hide(); + string id = row.Cells["编号"].Value.ToString(); + FrmFlagDetail p = new FrmFlagDetail(globeControl1, id); + p.showParentForm += new FrmFlagDetail.Handle(showThisForm);//改变值的事件 + p.Show(); + } + catch (Exception ex) + { + MessageBox.Show("失败:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } + + private void showThisForm() + { + this.Show(); + } + + private void toolStripMenuItem2_Click(object sender, EventArgs e) + { + if (winGridViewPager1 != null && winGridViewPager1.dataGridView1 != null) + { + DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; + try + { + this.WindowState = FormWindowState.Minimized; + string id = row.Cells["LSSYS_ID"].Value.ToString(); + string flagno = row.Cells["编号"].Value.ToString(); + string flagstreet = row.Cells["所属道路"].Value.ToString(); + double x = Convert.ToDouble(row.Cells["X坐标"].Value); + double y = Convert.ToDouble(row.Cells["Y坐标"].Value); + GSOFeature flagFeature = globeControl1.Globe.Layers.GetLayerByCaption("标识器").GetFeatureByID(int.Parse(id)); + + string type = ""; + string pipe = ""; + string sql = "select t.标识器型号,t.对象编号 from 标识器 t where t.编号='" + flagno + "'"; + using (OracleDataReader reader = OracleUtils.ExecuteReader(OracleUtils.ConnectionString, CommandType.Text, sql)) + { + while (reader.Read()) + { + type = reader.GetString(0); + pipe = reader.GetString(1); + } + } + + GSOLabel label = new GSOLabel(); + label.Text = "标识器编号：" + flagno + "\r\n" + + "标识器类型:" + type + "\r\n" + + //"标识对象编号:" + pipe + "\r\n" + + "所属道路:" + flagstreet; + label.Style = new GSOLabelStyle(); + label.Style.TextStyle.FontSize = 18; + label.Style.TextStyle.ForeColor = Color.FromArgb(0, 0, 0, 255); + label.Style.Opaque = 0.8; //设置标注的透明度，取值区间是0-1 + label.Style.TracktionLineType = EnumTracktionLineType.Solid; + label.Style.TextStyle.FontHeight = 10; + label.Style.TextStyle.FontName = "黑体"; + label.Style.TractionLineEndPos = new GSOPoint2d(80, 60); + + flagFeature.Label = label; + Features.Add(flagFeature); + globeControl1.Globe.JumpToFeature(flagFeature, 20); + this.globeControl1.Refresh(); + + } + catch (Exception ex) + { + MessageBox.Show("标识器定位失败:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } } diff --git a/FrmFlagManagers.resx b/FrmFlagManagers.resx index 1af7de1..ad53752 100644 --- a/FrmFlagManagers.resx +++ b/FrmFlagManagers.resx @@ -117,4 +117,7 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 17, 17 + \ No newline at end of file diff --git a/FrmPatrolerEdit.cs b/FrmPatrolerEdit.cs index dbd4fec..f45b5ae 100644 --- a/FrmPatrolerEdit.cs +++ b/FrmPatrolerEdit.cs @@ -46,7 +46,7 @@ txt_name.Focus(); return; } - if (String.IsNullOrEmpty(combo_sex.SelectedItem.ToString())) + if (combo_sex.SelectedItem == null ||String.IsNullOrEmpty(combo_sex.SelectedItem.ToString())) { MessageBox.Show("性别不能为空！", "警告", MessageBoxButtons.OK, MessageBoxIcon.Warning); combo_sex.Focus(); diff --git a/FrmPatrolerManager.Designer.cs b/FrmPatrolerManager.Designer.cs index bb8e5fb..10fac22 100644 --- a/FrmPatrolerManager.Designer.cs +++ b/FrmPatrolerManager.Designer.cs @@ -47,11 +47,13 @@ this.注销 = new DevComponents.Editors.ComboItem(); this.btn_query_person = new DevComponents.DotNetBar.ButtonItem(); this.btn_add_person = new DevComponents.DotNetBar.ButtonItem(); - this.winGridViewPager1 = new WHC.Pager.WinControl.WinGridViewPager(); this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components); this.日志ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.任务ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.定位ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.winGridViewPager1 = new WHC.Pager.WinControl.WinGridViewPager(); + this.编辑ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.注销ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); ((System.ComponentModel.ISupportInitialize)(this.bar1)).BeginInit(); this.contextMenuStrip1.SuspendLayout(); this.SuspendLayout(); @@ -173,9 +175,42 @@ this.btn_add_person.Text = "新增"; this.btn_add_person.Click += new System.EventHandler(this.btn_add_person_Click); // + // contextMenuStrip1 + // + this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.日志ToolStripMenuItem, + this.任务ToolStripMenuItem, + this.定位ToolStripMenuItem, + this.编辑ToolStripMenuItem, + this.注销ToolStripMenuItem}); + this.contextMenuStrip1.Name = "contextMenuStrip1"; + this.contextMenuStrip1.Size = new System.Drawing.Size(153, 136); + // + // 日志ToolStripMenuItem + // + this.日志ToolStripMenuItem.Name = "日志ToolStripMenuItem"; + this.日志ToolStripMenuItem.Size = new System.Drawing.Size(100, 22); + this.日志ToolStripMenuItem.Text = "日志"; + this.日志ToolStripMenuItem.Click += new System.EventHandler(this.日志ToolStripMenuItem_Click); + // + // 任务ToolStripMenuItem + // + this.任务ToolStripMenuItem.Name = "任务ToolStripMenuItem"; + this.任务ToolStripMenuItem.Size = new System.Drawing.Size(100, 22); + this.任务ToolStripMenuItem.Text = "任务"; + this.任务ToolStripMenuItem.Click += new System.EventHandler(this.任务ToolStripMenuItem_Click); + // + // 定位ToolStripMenuItem + // + this.定位ToolStripMenuItem.Name = "定位ToolStripMenuItem"; + this.定位ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.定位ToolStripMenuItem.Text = "定位"; + this.定位ToolStripMenuItem.Click += new System.EventHandler(this.定位ToolStripMenuItem_Click); + // // winGridViewPager1 // this.winGridViewPager1.AppendedMenu = null; + this.winGridViewPager1.ContextMenuStrip = this.contextMenuStrip1; this.winGridViewPager1.DataSource = null; this.winGridViewPager1.DisplayColumns = ""; this.winGridViewPager1.Dock = System.Windows.Forms.DockStyle.Fill; @@ -186,35 +221,19 @@ this.winGridViewPager1.Size = new System.Drawing.Size(756, 309); this.winGridViewPager1.TabIndex = 3; // - // contextMenuStrip1 + // 编辑ToolStripMenuItem // - this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.日志ToolStripMenuItem, - this.任务ToolStripMenuItem, - this.定位ToolStripMenuItem}); - this.contextMenuStrip1.Name = "contextMenuStrip1"; - this.contextMenuStrip1.Size = new System.Drawing.Size(101, 70); + this.编辑ToolStripMenuItem.Name = "编辑ToolStripMenuItem"; + this.编辑ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.编辑ToolStripMenuItem.Text = "编辑"; + this.编辑ToolStripMenuItem.Click += new System.EventHandler(this.编辑ToolStripMenuItem_Click); // - // 日志ToolStripMenuItem + // 注销ToolStripMenuItem // - this.日志ToolStripMenuItem.Name = "日志ToolStripMenuItem"; - this.日志ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); - this.日志ToolStripMenuItem.Text = "日志"; - this.日志ToolStripMenuItem.Click += new System.EventHandler(this.日志ToolStripMenuItem_Click); - // - // 任务ToolStripMenuItem - // - this.任务ToolStripMenuItem.Name = "任务ToolStripMenuItem"; - this.任务ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); - this.任务ToolStripMenuItem.Text = "任务"; - this.任务ToolStripMenuItem.Click += new System.EventHandler(this.任务ToolStripMenuItem_Click); - // - // 定位ToolStripMenuItem - // - this.定位ToolStripMenuItem.Name = "定位ToolStripMenuItem"; - this.定位ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); - this.定位ToolStripMenuItem.Text = "定位"; - this.定位ToolStripMenuItem.Click += new System.EventHandler(this.定位ToolStripMenuItem_Click); + this.注销ToolStripMenuItem.Name = "注销ToolStripMenuItem"; + this.注销ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.注销ToolStripMenuItem.Text = "注销"; + this.注销ToolStripMenuItem.Click += new System.EventHandler(this.注销ToolStripMenuItem_Click); // // FrmPatrolerManager // @@ -229,7 +248,7 @@ this.MinimizeBox = false; this.Name = "FrmPatrolerManager"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; - this.Text = "巡检人员维护"; + this.Text = "定位人员维护"; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmPatrolerManager_FormClosing); this.Load += new System.EventHandler(this.FrmPatrolerManager_Load); ((System.ComponentModel.ISupportInitialize)(this.bar1)).EndInit(); @@ -258,10 +277,12 @@ private DevComponents.Editors.ComboItem 注销; private DevComponents.Editors.ComboItem comboItem1; private DevComponents.Editors.ComboItem 不限; - private WHC.Pager.WinControl.WinGridViewPager winGridViewPager1; private System.Windows.Forms.ContextMenuStrip contextMenuStrip1; private System.Windows.Forms.ToolStripMenuItem 日志ToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem 任务ToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem 定位ToolStripMenuItem; + private WHC.Pager.WinControl.WinGridViewPager winGridViewPager1; + private System.Windows.Forms.ToolStripMenuItem 编辑ToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem 注销ToolStripMenuItem; } } \ No newline at end of file diff --git a/FrmPatrolerManager.cs b/FrmPatrolerManager.cs index 255a076..9c32f54 100644 --- a/FrmPatrolerManager.cs +++ b/FrmPatrolerManager.cs @@ -29,9 +29,7 @@ this.globeControl1 = globeControl1; winGridViewPager1.OnPageChanged += new EventHandler(winGridViewPager1_OnPageChanged); - this.winGridViewPager1.OnEditSelected += new EventHandler(winGridViewPager1_OnEditSelected);//编辑 - this.winGridViewPager1.OnDeleteSelected += new EventHandler(winGridViewPager1_OnDeleteSelected);//删除 - + this.winGridViewPager1.OnStartExport += new EventHandler(pager1_OnStartExport); this.winGridViewPager1.OnEndExport += new EventHandler(pager1_OnEndExport); @@ -47,26 +45,31 @@ //控制表格显示的列，以及每一列要显示的列名 this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - this.winGridViewPager1.AddColumnAlias("USERNAME", "姓名"); - this.winGridViewPager1.AddColumnAlias("DBID", "编号"); - this.winGridViewPager1.AddColumnAlias("SEX", "性别"); - this.winGridViewPager1.AddColumnAlias("AGE", "年龄"); - this.winGridViewPager1.AddColumnAlias("PHONENUM", "电话"); - this.winGridViewPager1.AddColumnAlias("ACCOUNTSTATE", "状态"); - this.winGridViewPager1.DisplayColumns = "USERNAME,SEX,AGE,PHONENUM,ACCOUNTSTATE"; + this.winGridViewPager1.AddColumnAlias("姓名", "姓名"); + this.winGridViewPager1.AddColumnAlias("编号", "编号"); + this.winGridViewPager1.AddColumnAlias("性别", "性别"); + this.winGridViewPager1.AddColumnAlias("年龄", "年龄"); + this.winGridViewPager1.AddColumnAlias("电话", "电话"); + this.winGridViewPager1.AddColumnAlias("状态", "状态"); + this.winGridViewPager1.DisplayColumns = "姓名,性别,年龄,电话,状态"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 + //隐藏右键功能按钮 //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[1].Visible = false; + winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Visible = false; + winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[4].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[5].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[6].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[7].Visible = false; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "编辑"; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Text = "注销"; + + //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "编辑"; + //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Text = "注销"; winGridViewPager1.AppendedMenu = this.contextMenuStrip1; + //右键菜单宽度 winGridViewPager1.dataGridView1.ContextMenuStrip.AutoSize = false; @@ -122,11 +125,11 @@ DataGridViewRow row = grid.SelectedRows[0]; try { - long dbid = long.Parse(row.Cells["dbid"].Value.ToString()); - String name = row.Cells["USERNAME"].Value.ToString(); - String sex = row.Cells["SEX"].Value.ToString(); - String age = row.Cells["AGE"].Value.ToString(); - string phone = row.Cells["PHONENUM"].Value.ToString(); + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); + String name = row.Cells["姓名"].Value.ToString(); + String sex = row.Cells["性别"].Value.ToString(); + String age = row.Cells["年龄"].Value.ToString(); + string phone = row.Cells["电话"].Value.ToString(); age = String.IsNullOrEmpty(age.ToString().Trim()) ? "1" : age.ToString().Trim(); FrmPatrolerEdit frm = new FrmPatrolerEdit(dbid.ToString(), name, age, sex, phone); frm.reloadGrid += new ReloadPatrolerGrid(LoadData); @@ -152,10 +155,10 @@ if (grid != null) { DataGridViewRow row = grid.SelectedRows[0]; - long dbid = long.Parse(row.Cells["DBID"].Value.ToString()); + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); try { - string state = row.Cells["ACCOUNTSTATE"].Value.ToString(); + string state = row.Cells["状态"].Value.ToString(); if ("在线".Equals(state)) { if (MessageBox.Show("确定注销？", "确认", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) @@ -180,60 +183,60 @@ { int pageIndex = winGridViewPager1.PagerInfo.CurrenetPageIndex; string sqlData = GetSql(pageIndex); - initlizeDatagrid(); + DataTable table = OracleUtils.ExecuteDataset(OracleUtils.ConnectionString, CommandType.Text, sqlData).Tables[0]; winGridViewPager1.DataSource = table.DefaultView; - for (int i = 0; i < winGridViewPager1.dataGridView1.Rows.Count; i++) - { - if (winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value.ToString() == "ONLINE") - { - winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value = "在线"; - } - else - { - if (winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value.ToString() == "OFFLINE") - { - winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value = "离线"; - } - else - { - if (winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value.ToString() == "LEAVER") - { - winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value = "注销"; - } - } - } - } + //for (int i = 0; i < winGridViewPager1.dataGridView1.Rows.Count; i++) + //{ + // if (winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value.ToString() == "ONLINE") + // { + // winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value = "在线"; + // } + // else + // { + // if (winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value.ToString() == "OFFLINE") + // { + // winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value = "离线"; + // } + // else + // { + // if (winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value.ToString() == "LEAVER") + // { + // winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value = "注销"; + // } + // } + // } + //} winGridViewPager1.Refresh(); } private void LoadData(int pageIndex) { string sqlData = GetSql(pageIndex); - initlizeDatagrid(); + DataTable table = OracleUtils.ExecuteDataset(OracleUtils.ConnectionString, CommandType.Text, sqlData).Tables[0]; winGridViewPager1.DataSource = table.DefaultView; - for (int i = 0; i < winGridViewPager1.dataGridView1.Rows.Count; i++) - { - if (winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value.ToString() == "ONLINE") - { - winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value = "在线"; - } - else - { - if (winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value.ToString() == "OFFLINE") - { - winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value = "离线"; - } - else - { - if (winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value.ToString() == "LEAVER") - { - winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value = "注销"; - } - } - } - } + //for (int i = 0; i < winGridViewPager1.dataGridView1.Rows.Count; i++) + //{ + // if (winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value.ToString() == "ONLINE") + // { + // winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value = "在线"; + // } + // else + // { + // if (winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value.ToString() == "OFFLINE") + // { + // winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value = "离线"; + // } + // else + // { + // if (winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value.ToString() == "LEAVER") + // { + // winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value = "注销"; + // } + // } + // } + //} winGridViewPager1.Refresh(); } @@ -241,7 +244,8 @@ { string sqlCount = "select count(*) from equipment where status = 'USING'"; - string sqlData = "select username,dbid,sex,age,phonenum,accountstate " + + string sqlData = "select username as 姓名,dbid as 编号,sex as 性别,age as 年龄,phonenum as 电话,"+ + "case when accountstate = 'ONLINE' then '在线' when accountstate = 'OFFLINE' then '离线' when accountstate = 'LEAVER' then '注销' end as 状态 " + "from (select t.*,rownum row_num from patroler t order by DBID desc)b " + " where 1=1"; @@ -255,9 +259,9 @@ int minPage = (pageIndex - 1) * maxPageIndex + 1; int maxPage = pageIndex * maxPageIndex; string sqlCount = "select count(*) from patroler where 1=1"; - string sqlData = "select username,dbid,sex,age,phonenum,accountstate " + - "from (select t.*,rownum row_num from patroler t order by DBID desc)b " + - " where(b.row_num between " + minPage + " and " + maxPage + ")"; + string sqlData = "select username as 姓名,dbid as 编号,sex as 性别,age as 年龄,phonenum as 电话,"+ + "case when accountstate = 'ONLINE' then '在线' when accountstate = 'OFFLINE' then '离线' when accountstate = 'LEAVER' then '注销' end as 状态 " + + "from (select t.*,rownum row_num from patroler t where 1=1"; if (!String.IsNullOrEmpty(txt_username.Text.Trim())) { @@ -281,7 +285,8 @@ sqlCount += " and accountstate='" + combo_stateText + "'"; sqlData += " and accountstate='" + combo_stateText + "'"; } - + sqlData += " order by DBID desc)b " + + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; @@ -291,6 +296,7 @@ { try { + initlizeDatagrid(); LoadData(); initForm(); IS_OPEN = true; @@ -310,11 +316,13 @@ } if (Utility.userRole.IndexOf("巡检员编辑") == -1) { - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Visible = false; + //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Visible = false; + 编辑ToolStripMenuItem.Visible = false; } if (Utility.userRole.IndexOf("巡检员注销") == -1) { - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Visible = false; + //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Visible = false; + 注销ToolStripMenuItem.Visible = false; } } @@ -376,7 +384,7 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - long dbid = long.Parse(row.Cells["dbid"].Value.ToString()); + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); Log p = new Log(dbid.ToString()); p.Show(); } @@ -395,8 +403,8 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - long dbid = long.Parse(row.Cells["dbid"].Value.ToString()); - String state = row.Cells["ACCOUNTSTATE"].Value.ToString(); + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); + String state = row.Cells["状态"].Value.ToString(); if ("在线".Equals(state)) { string sql = "select t.dbid " + @@ -435,8 +443,8 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - long dbid = long.Parse(row.Cells["dbid"].Value.ToString()); - String username = row.Cells["USERNAME"].Value.ToString(); + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); + String username = row.Cells["姓名"].Value.ToString(); string sql = "select t.latitude, t.longitude " + "from position t " + "where t.dbid = (select max(dbid) from position where patroler_id = " + dbid + ")"; @@ -489,6 +497,63 @@ } + private void 编辑ToolStripMenuItem_Click(object sender, EventArgs e) + { + if (winGridViewPager1 != null && winGridViewPager1.dataGridView1 != null) + { + DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; + try + { + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); + String name = row.Cells["姓名"].Value.ToString(); + String sex = row.Cells["性别"].Value.ToString(); + String age = row.Cells["年龄"].Value.ToString(); + string phone = row.Cells["电话"].Value.ToString(); + age = String.IsNullOrEmpty(age.ToString().Trim()) ? "1" : age.ToString().Trim(); + FrmPatrolerEdit frm = new FrmPatrolerEdit(dbid.ToString(), name, age, sex, phone); + frm.reloadGrid += new ReloadPatrolerGrid(LoadData); + frm.ShowDialog(); + winGridViewPager1.Refresh(); + } + catch (Exception ex) + { + MessageBox.Show("编辑失败:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } + + private void 注销ToolStripMenuItem_Click(object sender, EventArgs e) + { + if (winGridViewPager1 != null && winGridViewPager1.dataGridView1 != null) + { + DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); + try + { + if (MessageBox.Show("确定注销？", "确认", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) + { + String sql = "update patroler t set t.accountstate='LEAVER' where t.dbid=" + dbid; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + LoadData(); + MessageBox.Show("人员已注销", "信息", MessageBoxButtons.OK, MessageBoxIcon.Information); + } + //string state = row.Cells["状态"].Value.ToString(); + //if ("在线".Equals(state)) + //{ + + //} + //else + //{ + // MessageBox.Show("人员不在线，无法注销", "信息"); + //} + } + catch (Exception ex) + { + MessageBox.Show("人员注销失败:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } + } } diff --git a/FrmRoleInfoManager.cs b/FrmRoleInfoManager.cs index 8897133..35693cf 100644 --- a/FrmRoleInfoManager.cs +++ b/FrmRoleInfoManager.cs @@ -55,10 +55,10 @@ //控制表格显示的列，以及每一列要显示的列名 this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - this.winGridViewPager1.AddColumnAlias("NT", "角色名称"); - this.winGridViewPager1.AddColumnAlias("ID", "编号"); + this.winGridViewPager1.AddColumnAlias("角色名称", "角色名称"); + this.winGridViewPager1.AddColumnAlias("编号", "编号"); - this.winGridViewPager1.DisplayColumns = "NT"; + this.winGridViewPager1.DisplayColumns = "角色名称"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -131,7 +131,7 @@ { try { - string dbid = row.Cells["id"].Value.ToString(); + string dbid = row.Cells["编号"].Value.ToString(); string sql = "delete from casic_userroletest where id=" + dbid; OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); LoadData(); @@ -170,7 +170,7 @@ { string sqlCount = "select id,nt from casic_userroletest where sysname='EMS'"; - string sqlData = "select nt,id " + + string sqlData = "select nt as 角色名称,id as 编号 " + "from (select t.*,rownum row_num from casic_userroletest t order by id desc)b " + " where sysname='EMS'"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -183,7 +183,7 @@ int minPage = (pageIndex - 1) * maxPageIndex + 1; int maxPage = pageIndex * maxPageIndex; string sqlCount = "select id,nt from casic_userroletest where sysname='EMS'"; - string sqlData = "select nt,id " + + string sqlData = "select nt as 角色名称,id as 编号 " + "from (select t.*,rownum row_num from casic_userroletest t where sysname='EMS' order by id desc)b " + " where(b.row_num between " + minPage + " and " + maxPage + ")"; diff --git a/FrmSysUserInfoManger.cs b/FrmSysUserInfoManger.cs index 7903916..e193a61 100644 --- a/FrmSysUserInfoManger.cs +++ b/FrmSysUserInfoManger.cs @@ -28,6 +28,7 @@ this.winGridViewPager1.OnEndExport += new EventHandler(pager1_OnEndExport); winGridViewPager1.dataGridView1.MultiSelect = false; + } private void FrmSysUserInfoManger_Load(object sender, EventArgs e) @@ -59,10 +60,10 @@ //控制表格显示的列，以及每一列要显示的列名 this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - this.winGridViewPager1.AddColumnAlias("USERNAME", "账号"); - this.winGridViewPager1.AddColumnAlias("ID", "编号"); + this.winGridViewPager1.AddColumnAlias("账号", "账号"); + this.winGridViewPager1.AddColumnAlias("编号", "编号"); - this.winGridViewPager1.DisplayColumns = "USERNAME"; + this.winGridViewPager1.DisplayColumns = "账号"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -130,8 +131,8 @@ if (grid != null) { DataGridViewRow row = grid.SelectedRows[0]; - string dbid = row.Cells["id"].Value.ToString(); - string userName = row.Cells["USERNAME"].Value.ToString(); + string dbid = row.Cells["编号"].Value.ToString(); + string userName = row.Cells["账号"].Value.ToString(); if (userName.Equals("ems")) { MessageBox.Show("该用户为管理员用户，无法删除！", "信息"); @@ -184,7 +185,7 @@ { string sqlCount = "select count(*) from casic_userinfotest where sysname='EMS'"; - string sqlData = "select username,id " + + string sqlData = "select username as 账号,id as 编号 " + "from (select t.*,rownum row_num from casic_userinfotest t order by id desc)b " + " where sysname='EMS'"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -197,16 +198,16 @@ int minPage = (pageIndex - 1) * maxPageIndex + 1; int maxPage = pageIndex * maxPageIndex; string sqlCount = "select count(*) from casic_userinfotest where sysname='EMS'"; - string sqlData = "select username,id " + - "from (select t.*,rownum row_num from casic_userinfotest t where sysname='EMS' order by id desc)b " + - " where(b.row_num between " + minPage + " and " + maxPage + ")"; + string sqlData = "select username as 账号,id as 编号 " + + "from (select t.*,rownum row_num from casic_userinfotest t where sysname='EMS'"; if (!String.IsNullOrEmpty(txt_user_code.Text.Trim())) { sqlCount += " and username like '%" + txt_user_code.Text.Trim() + "%'"; sqlData += " and username like '%" + txt_user_code.Text.Trim() + "%'"; } - + sqlData += " order by id desc)b " + + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; diff --git a/MainFrm.cs b/MainFrm.cs index 39df646..0cd5881 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3310,10 +3310,10 @@ string str1 = ""; if (feature != null) { - if (feature.GetFieldDefn("图?片?编括?码?") != null) // + if (feature.GetFieldDefn("图片编码") != null) // { str1 = GetBubbleInfo(feature); - if (RemoteFileExists(Utility.PicRootURL + feature.GetValue("图?片?编括?码?").ToString())) + if (RemoteFileExists(Utility.PicRootURL + feature.GetValue("图片编码").ToString())) { str1 += ""; } @@ -3450,9 +3450,15 @@ string value1 = ""; if (field1 != null) { - if (field1.Name == "图片编码") + //if (field1.Name == "图片编码" || field1.Name == "对象编号" || field1.Name == "对象类型" || field1.Name == "对象名称") + //{ + // j++; + //} + while (field1.Name == "图片编码" || field1.Name == "对象编号" || field1.Name == "对象类型" || field1.Name == "对象名称") { j++; + fieldName = fieldNames[j].Trim(); + field1 = (GSOFieldDefn)feature.GetFieldDefn(fieldName); } if (j < rowCount) { @@ -3479,6 +3485,11 @@ if (!feature.IsFieldValueNull(j)) { value1 = feature.GetValue(j).ToString(); + if (name1 == "标识器埋深") + { + if (value1!=null&&value1.Length>4) + value1 = value1.Substring(0,4); + } } } } @@ -3491,9 +3502,14 @@ if (field2 != null) { - if (field2.Name == "图片编码") + //if (field2.Name == "图片编码" || field1.Name == "对象编号" || field1.Name == "对象类型" || field1.Name == "对象名称") + //{ + // j++; + //} + while (field2.Name == "图片编码" || field2.Name == "对象编号" || field2.Name == "对象类型" || field2.Name == "对象名称") { j++; + field2 = (GSOFieldDefn)feature.GetFieldDefn(j + 1); } if (j + 1 < rowCount) { @@ -3521,6 +3537,11 @@ if (!feature.IsFieldValueNull(j + 1)) { value2 = feature.GetValue(j + 1).ToString(); + if (name2 == "标识器埋深") + { + if (value2 != null && value2.Length > 4) + value2 = value2.Substring(0, 4); + } } } } @@ -15347,7 +15368,7 @@ return; } FrmFlagManagers frm = new FrmFlagManagers(globeControl1); - frm.Show(this); + frm.Show(); } private void ribbonTabItem2_MouseDown(object sender, MouseEventArgs e) diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index fddfb94..e5f0003 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -365,6 +365,16 @@ this.可编辑ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.保存ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.ribbonControl1 = new DevComponents.DotNetBar.RibbonControl(); + this.ribbonPanel3 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar3 = new DevComponents.DotNetBar.RibbonBar(); + this.btn_device = new DevComponents.DotNetBar.ButtonItem(); + this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); + this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel7 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); + this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); + this.slider4ground = new DevComponents.DotNetBar.SliderItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -374,12 +384,6 @@ this.btn_user_role = new DevComponents.DotNetBar.ButtonItem(); this.btn_password_edit = new DevComponents.DotNetBar.ButtonItem(); this.btn_reset_password = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel3 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar3 = new DevComponents.DotNetBar.RibbonBar(); - this.btn_device = new DevComponents.DotNetBar.ButtonItem(); - this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); - this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); @@ -551,10 +555,6 @@ this.buttonItemBZ9 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItemBZ10 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItemBZ11 = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel7 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); - this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); - this.slider4ground = new DevComponents.DotNetBar.SliderItem(); this.ribbonPanel12 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar18 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItem133 = new DevComponents.DotNetBar.ButtonItem(); @@ -690,11 +690,11 @@ this.contextMenuStrip3.SuspendLayout(); this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); - this.ribbonPanel8.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel7.SuspendLayout(); + this.ribbonPanel8.SuspendLayout(); this.ribbonPanel2.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); - this.ribbonPanel7.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); this.ribbonPanel5.SuspendLayout(); this.ribbonPanel6.SuspendLayout(); @@ -4162,10 +4162,10 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); - this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel2); - this.ribbonControl1.Controls.Add(this.ribbonPanel15); + this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel7); + this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); this.ribbonControl1.Controls.Add(this.ribbonPanel5); this.ribbonControl1.Controls.Add(this.ribbonPanel6); @@ -4216,135 +4216,6 @@ this.ribbonControl1.UseCustomizeDialog = false; this.ribbonControl1.Click += new System.EventHandler(this.ribbonControl1_Click); // - // ribbonPanel8 - // - this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel8.Controls.Add(this.ribbonBar_UserInfo); - this.ribbonPanel8.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel8.Location = new System.Drawing.Point(0, 33); - this.ribbonPanel8.Name = "ribbonPanel8"; - this.ribbonPanel8.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel8.Size = new System.Drawing.Size(1328, 62); - // - // - // - this.ribbonPanel8.Style.Class = ""; - this.ribbonPanel8.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel8.StyleMouseDown.Class = ""; - this.ribbonPanel8.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel8.StyleMouseOver.Class = ""; - this.ribbonPanel8.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel8.TabIndex = 42; - this.ribbonPanel8.Visible = false; - // - // ribbonBar_UserInfo - // - this.ribbonBar_UserInfo.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar_UserInfo.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar_UserInfo.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar_UserInfo.BackgroundStyle.Class = ""; - this.ribbonBar_UserInfo.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar_UserInfo.ContainerControlProcessDialogKey = true; - this.ribbonBar_UserInfo.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar_UserInfo.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.btn_user_info, - this.btn_role_info, - this.btn_resc_info, - this.btn_role_resc, - this.btn_user_role, - this.btn_password_edit, - this.btn_reset_password}); - this.ribbonBar_UserInfo.Location = new System.Drawing.Point(3, 0); - this.ribbonBar_UserInfo.Name = "ribbonBar_UserInfo"; - this.ribbonBar_UserInfo.Size = new System.Drawing.Size(427, 59); - this.ribbonBar_UserInfo.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar_UserInfo.TabIndex = 0; - // - // - // - this.ribbonBar_UserInfo.TitleStyle.Class = ""; - this.ribbonBar_UserInfo.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar_UserInfo.TitleStyleMouseOver.Class = ""; - this.ribbonBar_UserInfo.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // btn_user_info - // - this.btn_user_info.Image = global::Cyberpipe.Properties.Resources._24x24icon_13_hover; - this.btn_user_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_user_info.Name = "btn_user_info"; - this.btn_user_info.SubItemsExpandWidth = 14; - this.btn_user_info.Text = "用户管理"; - this.btn_user_info.Click += new System.EventHandler(this.btn_user_info_Click); - // - // btn_role_info - // - this.btn_role_info.Image = global::Cyberpipe.Properties.Resources._24x24icon_05_hover1; - this.btn_role_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_role_info.Name = "btn_role_info"; - this.btn_role_info.SubItemsExpandWidth = 14; - this.btn_role_info.Text = "角色管理"; - this.btn_role_info.Click += new System.EventHandler(this.btn_role_info_Click); - // - // btn_resc_info - // - this.btn_resc_info.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__09; - this.btn_resc_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_resc_info.Name = "btn_resc_info"; - this.btn_resc_info.SubItemsExpandWidth = 14; - this.btn_resc_info.Text = "资源管理"; - this.btn_resc_info.Click += new System.EventHandler(this.btn_resc_info_Click); - // - // btn_role_resc - // - this.btn_role_resc.Image = global::Cyberpipe.Properties.Resources.btnlegendSet_Image_副本; - this.btn_role_resc.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_role_resc.Name = "btn_role_resc"; - this.btn_role_resc.SubItemsExpandWidth = 14; - this.btn_role_resc.Text = "角色授权"; - this.btn_role_resc.Click += new System.EventHandler(this.btn_role_resc_Click); - // - // btn_user_role - // - this.btn_user_role.Image = global::Cyberpipe.Properties.Resources._24x24icon_08_hover; - this.btn_user_role.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_user_role.Name = "btn_user_role"; - this.btn_user_role.SubItemsExpandWidth = 14; - this.btn_user_role.Text = "用户授权"; - this.btn_user_role.Click += new System.EventHandler(this.btn_user_role_Click); - // - // btn_password_edit - // - this.btn_password_edit.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__67; - this.btn_password_edit.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_password_edit.Name = "btn_password_edit"; - this.btn_password_edit.SubItemsExpandWidth = 14; - this.btn_password_edit.Text = "密码修改"; - this.btn_password_edit.Click += new System.EventHandler(this.btn_password_edit_Click); - // - // btn_reset_password - // - this.btn_reset_password.Image = global::Cyberpipe.Properties.Resources.liuxiang; - this.btn_reset_password.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_reset_password.Name = "btn_reset_password"; - this.btn_reset_password.SubItemsExpandWidth = 14; - this.btn_reset_password.Text = "重置密码"; - this.btn_reset_password.Click += new System.EventHandler(this.btn_reset_password_Click); - // // ribbonPanel3 // this.ribbonPanel3.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4425,7 +4296,7 @@ this.btn_Person.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; this.btn_Person.Name = "btn_Person"; this.btn_Person.SubItemsExpandWidth = 14; - this.btn_Person.Text = "巡检人员维护"; + this.btn_Person.Text = "定位人员维护"; this.btn_Person.Click += new System.EventHandler(this.btn_Person_Click); // // btn_constructMap @@ -4446,6 +4317,214 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel7 + // + this.ribbonPanel7.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel7.Controls.Add(this.ribbonBar5); + this.ribbonPanel7.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel7.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel7.Name = "ribbonPanel7"; + this.ribbonPanel7.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel7.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel7.Style.Class = ""; + this.ribbonPanel7.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel7.StyleMouseDown.Class = ""; + this.ribbonPanel7.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel7.StyleMouseOver.Class = ""; + this.ribbonPanel7.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel7.TabIndex = 41; + this.ribbonPanel7.Visible = false; + // + // ribbonBar5 + // + this.ribbonBar5.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar5.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar5.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar5.BackgroundStyle.Class = ""; + this.ribbonBar5.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar5.ContainerControlProcessDialogKey = true; + this.ribbonBar5.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar5.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.btn_flag, + this.slider4ground}); + this.ribbonBar5.Location = new System.Drawing.Point(3, 0); + this.ribbonBar5.Name = "ribbonBar5"; + this.ribbonBar5.Size = new System.Drawing.Size(427, 92); + this.ribbonBar5.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar5.TabIndex = 0; + // + // + // + this.ribbonBar5.TitleStyle.Class = ""; + this.ribbonBar5.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar5.TitleStyleMouseOver.Class = ""; + this.ribbonBar5.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar5.TitleVisible = false; + // + // btn_flag + // + this.btn_flag.Image = global::Cyberpipe.Properties.Resources._24x24icon_03_hover; + this.btn_flag.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_flag.Name = "btn_flag"; + this.btn_flag.SubItemsExpandWidth = 14; + this.btn_flag.Text = "标识器管理"; + this.btn_flag.Click += new System.EventHandler(this.btn_flag_Click); + // + // slider4ground + // + this.slider4ground.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; + this.slider4ground.Name = "slider4ground"; + this.slider4ground.Text = "地面透明度"; + this.slider4ground.Value = 0; + this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); + // + // ribbonPanel8 + // + this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel8.Controls.Add(this.ribbonBar_UserInfo); + this.ribbonPanel8.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel8.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel8.Name = "ribbonPanel8"; + this.ribbonPanel8.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel8.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel8.Style.Class = ""; + this.ribbonPanel8.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel8.StyleMouseDown.Class = ""; + this.ribbonPanel8.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel8.StyleMouseOver.Class = ""; + this.ribbonPanel8.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel8.TabIndex = 42; + this.ribbonPanel8.Visible = false; + // + // ribbonBar_UserInfo + // + this.ribbonBar_UserInfo.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar_UserInfo.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar_UserInfo.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar_UserInfo.BackgroundStyle.Class = ""; + this.ribbonBar_UserInfo.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar_UserInfo.ContainerControlProcessDialogKey = true; + this.ribbonBar_UserInfo.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar_UserInfo.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.btn_user_info, + this.btn_role_info, + this.btn_resc_info, + this.btn_role_resc, + this.btn_user_role, + this.btn_password_edit, + this.btn_reset_password}); + this.ribbonBar_UserInfo.Location = new System.Drawing.Point(3, 0); + this.ribbonBar_UserInfo.Name = "ribbonBar_UserInfo"; + this.ribbonBar_UserInfo.Size = new System.Drawing.Size(427, 92); + this.ribbonBar_UserInfo.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar_UserInfo.TabIndex = 0; + // + // + // + this.ribbonBar_UserInfo.TitleStyle.Class = ""; + this.ribbonBar_UserInfo.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar_UserInfo.TitleStyleMouseOver.Class = ""; + this.ribbonBar_UserInfo.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // btn_user_info + // + this.btn_user_info.Image = global::Cyberpipe.Properties.Resources._24x24icon_13_hover; + this.btn_user_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_user_info.Name = "btn_user_info"; + this.btn_user_info.SubItemsExpandWidth = 14; + this.btn_user_info.Text = "用户管理"; + this.btn_user_info.Click += new System.EventHandler(this.btn_user_info_Click); + // + // btn_role_info + // + this.btn_role_info.Image = global::Cyberpipe.Properties.Resources._24x24icon_05_hover1; + this.btn_role_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_role_info.Name = "btn_role_info"; + this.btn_role_info.SubItemsExpandWidth = 14; + this.btn_role_info.Text = "角色管理"; + this.btn_role_info.Click += new System.EventHandler(this.btn_role_info_Click); + // + // btn_resc_info + // + this.btn_resc_info.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__09; + this.btn_resc_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_resc_info.Name = "btn_resc_info"; + this.btn_resc_info.SubItemsExpandWidth = 14; + this.btn_resc_info.Text = "资源管理"; + this.btn_resc_info.Click += new System.EventHandler(this.btn_resc_info_Click); + // + // btn_role_resc + // + this.btn_role_resc.Image = global::Cyberpipe.Properties.Resources.btnlegendSet_Image_副本; + this.btn_role_resc.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_role_resc.Name = "btn_role_resc"; + this.btn_role_resc.SubItemsExpandWidth = 14; + this.btn_role_resc.Text = "角色授权"; + this.btn_role_resc.Click += new System.EventHandler(this.btn_role_resc_Click); + // + // btn_user_role + // + this.btn_user_role.Image = global::Cyberpipe.Properties.Resources._24x24icon_08_hover; + this.btn_user_role.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_user_role.Name = "btn_user_role"; + this.btn_user_role.SubItemsExpandWidth = 14; + this.btn_user_role.Text = "用户授权"; + this.btn_user_role.Click += new System.EventHandler(this.btn_user_role_Click); + // + // btn_password_edit + // + this.btn_password_edit.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__67; + this.btn_password_edit.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_password_edit.Name = "btn_password_edit"; + this.btn_password_edit.SubItemsExpandWidth = 14; + this.btn_password_edit.Text = "密码修改"; + this.btn_password_edit.Click += new System.EventHandler(this.btn_password_edit_Click); + // + // btn_reset_password + // + this.btn_reset_password.Image = global::Cyberpipe.Properties.Resources.liuxiang; + this.btn_reset_password.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_reset_password.Name = "btn_reset_password"; + this.btn_reset_password.SubItemsExpandWidth = 14; + this.btn_reset_password.Text = "重置密码"; + this.btn_reset_password.Click += new System.EventHandler(this.btn_reset_password_Click); + // // ribbonPanel2 // this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -5891,85 +5970,6 @@ this.buttonItemBZ11.Text = "标注管理"; this.buttonItemBZ11.Click += new System.EventHandler(this.buttonItemBZ11_Click); // - // ribbonPanel7 - // - this.ribbonPanel7.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel7.Controls.Add(this.ribbonBar5); - this.ribbonPanel7.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel7.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel7.Name = "ribbonPanel7"; - this.ribbonPanel7.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel7.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel7.Style.Class = ""; - this.ribbonPanel7.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel7.StyleMouseDown.Class = ""; - this.ribbonPanel7.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel7.StyleMouseOver.Class = ""; - this.ribbonPanel7.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel7.TabIndex = 41; - this.ribbonPanel7.Visible = false; - // - // ribbonBar5 - // - this.ribbonBar5.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar5.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar5.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar5.BackgroundStyle.Class = ""; - this.ribbonBar5.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar5.ContainerControlProcessDialogKey = true; - this.ribbonBar5.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar5.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.btn_flag, - this.slider4ground}); - this.ribbonBar5.Location = new System.Drawing.Point(3, 0); - this.ribbonBar5.Name = "ribbonBar5"; - this.ribbonBar5.Size = new System.Drawing.Size(427, 92); - this.ribbonBar5.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar5.TabIndex = 0; - // - // - // - this.ribbonBar5.TitleStyle.Class = ""; - this.ribbonBar5.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar5.TitleStyleMouseOver.Class = ""; - this.ribbonBar5.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar5.TitleVisible = false; - // - // btn_flag - // - this.btn_flag.Image = global::Cyberpipe.Properties.Resources._24x24icon_03_hover; - this.btn_flag.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_flag.Name = "btn_flag"; - this.btn_flag.SubItemsExpandWidth = 14; - this.btn_flag.Text = "标识器管理"; - this.btn_flag.Click += new System.EventHandler(this.btn_flag_Click); - // - // slider4ground - // - this.slider4ground.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; - this.slider4ground.Name = "slider4ground"; - this.slider4ground.Text = "地面透明度"; - this.slider4ground.Value = 0; - this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); - // // ribbonPanel12 // this.ribbonPanel12.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7181,11 +7181,11 @@ this.contextMenuStripDeleteLayerNode.ResumeLayout(false); this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); - this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel7.ResumeLayout(false); + this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); - this.ribbonPanel7.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); this.ribbonPanel5.ResumeLayout(false); this.ribbonPanel6.ResumeLayout(false); diff --git a/SysRescInfoManager.cs b/SysRescInfoManager.cs index 3a84d95..fda6f3f 100644 --- a/SysRescInfoManager.cs +++ b/SysRescInfoManager.cs @@ -79,11 +79,11 @@ //控制表格显示的列，以及每一列要显示的列名 this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - - this.winGridViewPager1.AddColumnAlias("RESC", "资源名称"); - this.winGridViewPager1.AddColumnAlias("ID", "编号"); - this.winGridViewPager1.AddColumnAlias("DESP", "资源描述"); - this.winGridViewPager1.DisplayColumns = "RESC,DESP"; + + this.winGridViewPager1.AddColumnAlias("资源名称", "资源名称"); + this.winGridViewPager1.AddColumnAlias("编号", "编号"); + this.winGridViewPager1.AddColumnAlias("资源描述", "资源描述"); + this.winGridViewPager1.DisplayColumns = "资源名称,资源描述"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -153,8 +153,8 @@ DataGridViewRow row = grid.SelectedRows[0]; if (MessageBox.Show("确定删除？", "确认", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) { - string dbid = row.Cells["id"].Value.ToString(); - string resc = row.Cells["resc"].Value.ToString(); + string dbid = row.Cells["编号"].Value.ToString(); + string resc = row.Cells["资源名称"].Value.ToString(); OracleConnection conn = null; OracleTransaction tran = null; try @@ -229,7 +229,7 @@ private string GetSql() { string sqlCount = "select count(*) from casic_userresctest where sysname='EMS'"; - string sqlData = "select resc,id,desp " + + string sqlData = "select resc as 资源名称,id as 编号,desp as 资源描述 " + "from (select t.*,rownum row_num from casic_userresctest t order by id desc)b " + " where sysname='EMS'"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -242,7 +242,7 @@ int minPage = (pageIndex - 1) * maxPageIndex + 1; int maxPage = pageIndex * maxPageIndex; string sqlCount = "select count(*) from casic_userresctest where sysname='EMS'"; - string sqlData = "select resc,id,desp " + + string sqlData = "select resc as 资源名称,id as 编号,desp as 资源描述 " + "from (select t.*,rownum row_num from casic_userresctest t where sysname='EMS' order by id desc)b " + " where(b.row_num between " + minPage + " and " + maxPage + ")"; diff --git a/bin/x86/Debug/Config.xml b/bin/x86/Debug/Config.xml index e2d7b46..560a163 100644 --- a/bin/x86/Debug/Config.xml +++ b/bin/x86/Debug/Config.xml @@ -3,9 +3,9 @@ LocaSpace三维地下管线信息系统 scott - SZHTDB - 127.0.0.1 - scott + SZHTDB2 + 192.168.0.203 + SZHTDB2 127.0.0.1 1500 @@ -14,8 +14,8 @@ http://192.168.0.122:8088/UpDownFile.asmx - http://127.0.0.1/EMSCyberpipe.msi - http://127.0.0.1/EMSConfig.xml + http://192.168.10.229/EMSCyberpipe.msi + http://192.168.10.229/EMSConfig.xml diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index b19e2ab..b5e320f 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 1a4aeed..c20e54a 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/Cyberpipe.csproj b/Cyberpipe.csproj index fe600e5..501fd09 100644 --- a/Cyberpipe.csproj +++ b/Cyberpipe.csproj @@ -246,6 +246,12 @@ Form_TaskManager.cs + + Form + + + FrmFlagDetail.cs + Form @@ -1368,6 +1374,9 @@ Form_TaskManager.cs + + FrmFlagDetail.cs + FormDocumentManager.cs diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 537b4c3..1acf22a 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 7d5dd95..3f178cb 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -90,20 +90,20 @@ this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - - this.winGridViewPager1.AddColumnAlias("ACCIDENTTIME", "上报时间"); - this.winGridViewPager1.AddColumnAlias("DBID", "编号"); - this.winGridViewPager1.AddColumnAlias("DESCRIBE", "事件描述"); - this.winGridViewPager1.AddColumnAlias("LATITUDE", "纬度"); - this.winGridViewPager1.AddColumnAlias("LOCALE", "事件地点"); - this.winGridViewPager1.AddColumnAlias("LONGITUDE", "经度"); - this.winGridViewPager1.AddColumnAlias("PATROLERNAME", "上报人员"); - this.winGridViewPager1.AddColumnAlias("PATROLER_ID", "人员ID"); - this.winGridViewPager1.AddColumnAlias("TASK_ID", "任务编号"); - this.winGridViewPager1.AddColumnAlias("RESULT", "处理结果"); - this.winGridViewPager1.AddColumnAlias("STATE", "处理状态"); - this.winGridViewPager1.DisplayColumns = "ACCIDENTTIME,DESCRIBE,LOCALE,PATROLERNAME,TASK_ID,RESULT,STATE"; + this.winGridViewPager1.AddColumnAlias("上报时间", "上报时间"); + this.winGridViewPager1.AddColumnAlias("编号", "编号"); + this.winGridViewPager1.AddColumnAlias("事件描述", "事件描述"); + this.winGridViewPager1.AddColumnAlias("纬度", "纬度"); + this.winGridViewPager1.AddColumnAlias("事件地点", "事件地点"); + this.winGridViewPager1.AddColumnAlias("经度", "经度"); + this.winGridViewPager1.AddColumnAlias("上报人员", "上报人员"); + this.winGridViewPager1.AddColumnAlias("人员ID", "人员ID"); + this.winGridViewPager1.AddColumnAlias("任务编号", "任务编号"); + this.winGridViewPager1.AddColumnAlias("处理结果", "处理结果"); + this.winGridViewPager1.AddColumnAlias("处理状态", "处理状态"); + + this.winGridViewPager1.DisplayColumns = "上报时间,事件描述,事件地点,上报人员,任务编号,处理结果,处理状态"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -114,8 +114,8 @@ winGridViewPager1.dataGridView1.ContextMenuStrip.Items[5].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[6].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[7].Visible = false; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[1].Text = "查看位置"; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "结果编辑"; + winGridViewPager1.dataGridView1.ContextMenuStrip.Items[1].Text = "结果编辑"; + winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "查看位置"; //右键菜单宽度 winGridViewPager1.dataGridView1.ContextMenuStrip.AutoSize = false; @@ -160,13 +160,12 @@ this.WindowState = FormWindowState.Minimized; globeControl1.Globe.MemoryLayer.RemoveAllFeature(); this.WindowState = FormWindowState.Minimized; - double x = Convert.ToDouble(row.Cells["LONGITUDE"].Value); - double y = Convert.ToDouble(row.Cells["LATITUDE"].Value); - - string username = Convert.ToString(row.Cells["PATROLERNAME"].Value); - string Atime = Convert.ToString(row.Cells["ACCIDENTTIME"].Value); - string location = Convert.ToString(row.Cells["LOCALE"].Value); - string descp = Convert.ToString(row.Cells["DESCRIBE"].Value); + double x = Convert.ToDouble(row.Cells["经度"].Value); + double y = Convert.ToDouble(row.Cells["纬度"].Value); + string username = Convert.ToString(row.Cells["上报人员"].Value); + string Atime = Convert.ToString(row.Cells["上报时间"].Value); + string location = Convert.ToString(row.Cells["事件地点"].Value); + string descp = Convert.ToString(row.Cells["事件描述"].Value); /////////////////////////////////////// /*******设置飞行与创建模型******/ @@ -228,8 +227,8 @@ DataGridViewRow row = grid.SelectedRows[0]; try { - int dbId = Convert.ToInt32(row.Cells["DBID"].Value); - string result = Convert.ToString(row.Cells["RESULT"].Value); + int dbId = Convert.ToInt32(row.Cells["编号"].Value); + string result = Convert.ToString(row.Cells["处理结果"].Value); EMS_Forms.Form_EventResult form = new Form_EventResult(dbId, result); form.refresh += new Form_EventResult.Handle(LoadData);//改变值的事件 form.ShowDialog(); @@ -276,9 +275,9 @@ } for (int i = 0; i < table.Rows.Count; i++) { - if (winGridViewPager1.dataGridView1.Rows[i].Cells["RESULT"].Value != null && !(winGridViewPager1.dataGridView1.Rows[i].Cells["RESULT"].Value.ToString().Trim().Equals(""))) + if (winGridViewPager1.dataGridView1.Rows[i].Cells["处理结果"].Value != null && !(winGridViewPager1.dataGridView1.Rows[i].Cells["处理结果"].Value.ToString().Trim().Equals(""))) { - winGridViewPager1.dataGridView1.Rows[i].Cells["STATE"].Value = "已处理"; + winGridViewPager1.dataGridView1.Rows[i].Cells["处理状态"].Value = "已处理"; } } @@ -307,9 +306,9 @@ } for (int i = 0; i < table.Rows.Count; i++) { - if (winGridViewPager1.dataGridView1.Rows[i].Cells["RESULT"].Value != null && !(winGridViewPager1.dataGridView1.Rows[i].Cells["RESULT"].Value.ToString().Trim().Equals(""))) + if (winGridViewPager1.dataGridView1.Rows[i].Cells["处理结果"].Value != null && !(winGridViewPager1.dataGridView1.Rows[i].Cells["处理结果"].Value.ToString().Trim().Equals(""))) { - winGridViewPager1.dataGridView1.Rows[i].Cells["STATE"].Value = "已处理"; + winGridViewPager1.dataGridView1.Rows[i].Cells["处理状态"].Value = "已处理"; } } @@ -320,10 +319,12 @@ { string sqlCount = "select count(*) from ACCIDENT where 1=1"; - string sqlData = "select ACCIDENTTIME,DBID,DESCRIBE,LATITUDE,LOCALE,LONGITUDE,PATROLERNAME,PATROLER_ID,TASK_ID,RESULT,'' as STATE " + + string sqlData = "select ACCIDENTTIME as 上报时间,DBID as 编号,DESCRIBE as 事件描述,"+ + "LATITUDE as 纬度,LOCALE as 事件地点,LONGITUDE as 经度,PATROLERNAME 上报人员,"+ + "PATROLER_ID as 人员ID,TASK_ID as 任务编号,RESULT as 处理结果,'' as 处理状态 " + "from (select t.*,rownum row_num from ACCIDENT t order by DBID)b " + " where 1=1"; - + rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; @@ -340,9 +341,10 @@ string sqlCount = "select count(*) from ACCIDENT where 1=1"; - string sqlData = "select ACCIDENTTIME,DBID,DESCRIBE,LATITUDE,LOCALE,LONGITUDE,PATROLERNAME,PATROLER_ID,TASK_ID,RESULT,'' as STATE " + - "from (select t.*,rownum row_num from ACCIDENT t order by DBID)b " + - " where(b.row_num between " + minPage + " and " + maxPage + ")"; + string sqlData = "select ACCIDENTTIME as 上报时间,DBID as 编号,DESCRIBE as 事件描述," + + "LATITUDE as 纬度,LOCALE as 事件地点,LONGITUDE as 经度,PATROLERNAME 上报人员," + + "PATROLER_ID as 人员ID,TASK_ID as 任务编号,RESULT as 处理结果,'' as 处理状态 " + + "from (select t.*,rownum row_num from ACCIDENT t where 1=1"; if (!String.IsNullOrEmpty(comboBox_name.Text.Trim())) { @@ -361,7 +363,8 @@ sqlCount += "and ACCIDENTTIME<=to_date('" + time.ToShortDateString() + "','yyyy-MM-dd') "; sqlData += "and ACCIDENTTIME<=to_date('" + time.ToShortDateString() + "','yyyy-MM-dd') "; } - + sqlData += " order by DBID desc)b " + + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 225c8d7..8bd9e48 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -120,8 +120,8 @@ private void flyToTask(DataGridViewRow row, int taskState) { int dbID = 0; - dbID = Convert.ToInt32(row.Cells["DBID"].Value); - string userName = Convert.ToString(row.Cells["USERNAME"].Value); + dbID = Convert.ToInt32(row.Cells["任务编号"].Value); + string userName = Convert.ToString(row.Cells["任务执行人员"].Value); System.DateTime t = new DateTime(); try { @@ -392,15 +392,15 @@ //控制表格显示的列，以及每一列要显示的列名 this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - this.winGridViewPager1.AddColumnAlias("DBID", "任务编号"); - this.winGridViewPager1.AddColumnAlias("DEPLOYTIME", "创建时间"); - this.winGridViewPager1.AddColumnAlias("DESCIRPTION", "任务描述"); - this.winGridViewPager1.AddColumnAlias("FINISHTIME", "完成时间"); - this.winGridViewPager1.AddColumnAlias("STREET", "任务执行区域"); - this.winGridViewPager1.AddColumnAlias("TASKSTATE", "任务状态"); - this.winGridViewPager1.AddColumnAlias("USERNAME", "任务执行人员"); + this.winGridViewPager1.AddColumnAlias("任务编号", "任务编号"); + this.winGridViewPager1.AddColumnAlias("创建时间", "创建时间"); + this.winGridViewPager1.AddColumnAlias("任务描述", "任务描述"); + this.winGridViewPager1.AddColumnAlias("完成时间", "完成时间"); + this.winGridViewPager1.AddColumnAlias("任务执行区域", "任务执行区域"); + this.winGridViewPager1.AddColumnAlias("任务状态", "任务状态"); + this.winGridViewPager1.AddColumnAlias("任务执行人员", "任务执行人员"); - this.winGridViewPager1.DisplayColumns = "DBID,DEPLOYTIME,DESCIRPTION,FINISHTIME,STREET,TASKSTATE,USERNAME"; + this.winGridViewPager1.DisplayColumns = "任务编号,创建时间,任务描述,完成时间,任务执行区域,任务状态,任务执行人员"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -464,8 +464,8 @@ { int dbID = 0; int taskStateInt = 0; - dbID = Convert.ToInt32(row.Cells["DBID"].Value); - string taskState = row.Cells["TASKSTATE"].Value.ToString(); + dbID = Convert.ToInt32(row.Cells["任务编号"].Value); + string taskState = row.Cells["任务状态"].Value.ToString(); if (taskState.Equals("开始任务")) { taskStateInt = 1; @@ -534,9 +534,10 @@ private string GetSql() { - string sqlCount = "select count(*) from taskinfo t where 1=1'"; + string sqlCount = "select count(*) from taskinfo t where 1=1"; - string sqlData = "select dbid,deploytime,descirption,finishtime,street,taskstate,username " + + 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"; @@ -550,9 +551,9 @@ int minPage = (pageIndex - 1) * maxPageIndex + 1; int maxPage = pageIndex * maxPageIndex; string sqlCount = "select count(*) from taskinfo t where 1=1"; - string sqlData = "select dbid,deploytime,descirption,finishtime,street,taskstate,username " + - "from (select t.*,rownum row_num from taskinfo t order by DBID desc)b " + - " where(b.row_num between " + minPage + " and " + maxPage + ")"; + 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"; if (!String.IsNullOrEmpty(comboBox_userName.Text.Trim()) && !comboBox_userName.Text.Trim().Equals("不限")) { @@ -581,6 +582,8 @@ sqlCount += "and street='" + combo_street.Text + "' "; sqlData += "and street='" + combo_street.Text + "' "; } + sqlData += " order by DBID desc)b " + + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index e65a4bd..58f5342 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -73,13 +73,13 @@ //控制表格显示的列，以及每一列要显示的列名 this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - this.winGridViewPager1.AddColumnAlias("FILENAME", "文档名称"); - this.winGridViewPager1.AddColumnAlias("DBID", "编号"); - this.winGridViewPager1.AddColumnAlias("TITLE", "文档标题"); - this.winGridViewPager1.AddColumnAlias("FILETYPE", "文档类型"); - this.winGridViewPager1.AddColumnAlias("UPDAY", "上传日期"); - this.winGridViewPager1.AddColumnAlias("WRITER", "上传人"); - this.winGridViewPager1.DisplayColumns = "FILENAME,TITLE,FILETYPE,UPDAY,WRITER"; + this.winGridViewPager1.AddColumnAlias("文档名称", "文档名称"); + this.winGridViewPager1.AddColumnAlias("编号", "编号"); + this.winGridViewPager1.AddColumnAlias("文档标题", "文档标题"); + this.winGridViewPager1.AddColumnAlias("文档类型", "文档类型"); + this.winGridViewPager1.AddColumnAlias("上传日期", "上传日期"); + this.winGridViewPager1.AddColumnAlias("上传人", "上传人"); + this.winGridViewPager1.DisplayColumns = "文档名称,文档标题,文档类型,上传日期,上传人"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -167,7 +167,7 @@ if (grid != null) { DataGridViewRow row = grid.SelectedRows[0]; - string dbid = row.Cells["dbid"].Value.ToString(); + string dbid = row.Cells["编号"].Value.ToString(); try { if (MessageBox.Show("确认删除吗？", "确认", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) @@ -212,7 +212,8 @@ { string sqlCount = "select count(*) from casic_userdocument where sysname = 'EMS'"; - string sqlData = "select filename,dbid,title,filetype,upday,writer " + + string sqlData = "select filename as 文档名称,dbid as 编号,title as 文档标题," + + "filetype as 文档类型,upday as 上传日期,writer as 上传人 " + "from (select t.*,rownum row_num from casic_userdocument t order by DBID desc)b " + " where sysname = 'EMS'"; @@ -226,9 +227,9 @@ int minPage = (pageIndex - 1) * maxPageIndex + 1; int maxPage = pageIndex * maxPageIndex; string sqlCount = "select count(*) from casic_userdocument where sysname = 'EMS'"; - string sqlData = "select filename,dbid,title,filetype,upday,writer " + - "from (select t.*,rownum row_num from casic_userdocument t where sysname = 'EMS' order by DBID desc)b " + - " where(b.row_num between " + minPage + " and " + maxPage + ")"; + string sqlData = "select filename as 文档名称,dbid as 编号,title as 文档标题,"+ + "filetype as 文档类型,upday as 上传日期,writer as 上传人 " + + "from (select t.*,rownum row_num from casic_userdocument t where sysname = 'EMS'"; string txtTitleText = null; string comboFileType = null; @@ -278,7 +279,8 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - + sqlData += " order by DBID desc)b " + + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; @@ -437,7 +439,7 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - string filename = row.Cells["filename"].Value.ToString(); + string filename = row.Cells["文档名称"].Value.ToString(); string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; string file = System.Environment.CurrentDirectory + "\\download\\" + filename; int result = DownloadFile(url, file, progressBar1); @@ -515,7 +517,7 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - string filename = row.Cells["filename"].Value.ToString(); + string filename = row.Cells["文档名称"].Value.ToString(); string ext = Path.GetExtension(filename); SaveFileDialog dlg = new SaveFileDialog(); dlg.Filter = "保存文档|*" + ext + ";"; diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 1d1201b..3902629 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -748,6 +748,7 @@ this.Name = "FrmAddSinMark"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "单个标识器添加"; + this.TopMost = true; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmAddSinMark_FormClosing); this.Load += new System.EventHandler(this.FrmAddSinMark_Load); this.groupPanel1.ResumeLayout(false); diff --git a/FrmEquipmentManage.cs b/FrmEquipmentManage.cs index 90bfdb2..a3cf55c 100644 --- a/FrmEquipmentManage.cs +++ b/FrmEquipmentManage.cs @@ -74,13 +74,13 @@ //控制表格显示的列，以及每一列要显示的列名 this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - this.winGridViewPager1.AddColumnAlias("DESCIRPTION", "设备描述"); - this.winGridViewPager1.AddColumnAlias("DBID", "编号"); - this.winGridViewPager1.AddColumnAlias("MACID", "MAC地址"); - this.winGridViewPager1.AddColumnAlias("OWNER", "设备所有人"); - this.winGridViewPager1.AddColumnAlias("STATUS", "设备状态"); + this.winGridViewPager1.AddColumnAlias("设备描述", "设备描述"); + this.winGridViewPager1.AddColumnAlias("编号", "编号"); + this.winGridViewPager1.AddColumnAlias("MAC地址", "MAC地址"); + this.winGridViewPager1.AddColumnAlias("设备所有人", "设备所有人"); + this.winGridViewPager1.AddColumnAlias("设备状态", "设备状态"); - this.winGridViewPager1.DisplayColumns = "DESCIRPTION,MACID,OWNER,STATUS"; + this.winGridViewPager1.DisplayColumns = "设备描述,MAC地址,设备所有人,设备状态"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -146,10 +146,10 @@ DataGridViewRow row = grid.SelectedRows[0]; try { - long dbid = long.Parse(row.Cells["DBID"].Value.ToString()); - String macId = row.Cells["MACID"].Value.ToString(); - String username = row.Cells["OWNER"].Value.ToString(); - String descn = row.Cells["DESCIRPTION"].Value.ToString(); + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); + String macId = row.Cells["MAC地址"].Value.ToString(); + String username = row.Cells["设备所有人"].Value.ToString(); + String descn = row.Cells["设备状态"].Value.ToString(); FrmEquipmentEdit frm = new FrmEquipmentEdit(dbid.ToString(), macId, username, descn); frm.reloadGrid += new ReloadEquipmentGrid(LoadData); frm.ShowDialog(); @@ -179,7 +179,7 @@ { return; } - String macId = row.Cells["MACID"].Value.ToString(); + String macId = row.Cells["MAC地址"].Value.ToString(); FrmLog frm = new FrmLog(macId); frm.Show(); } @@ -201,7 +201,7 @@ if (grid != null) { DataGridViewRow row = grid.SelectedRows[0]; - long dbid = long.Parse(row.Cells["DBID"].Value.ToString()); + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); try { if (MessageBox.Show("确定删除？", "确认", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) @@ -243,7 +243,8 @@ { string sqlCount = "select count(*) from equipment where status = 'USING'"; - string sqlData = "select descirption,DBID,macid,owner,case when status = 'USING' then '可用' when status = 'DAMAGE' then '损坏' end as status " + + string sqlData = "select descirption as 设备描述,DBID as 编号,macid as MAC地址,owner as 设备所有人,"+ + "case when status = 'USING' then '可用' when status = 'DAMAGE' then '损坏' end as 设备状态 " + "from (select t.*,rownum row_num from equipment t where status = 'USING' order by dbid desc)b " + " where 1=1"; @@ -258,16 +259,17 @@ int maxPage = pageIndex * maxPageIndex; string sqlCount = "select count(*) from equipment where status = 'USING' "; - string sqlData = "select descirption,DBID,macid,owner,case when status = 'USING' then '可用' when status = 'DAMAGE' then '损坏' end as status " + - "from (select t.*,rownum row_num from equipment t where status = 'USING' order by DBID desc)b " + - " where(b.row_num between " + minPage + " and " + maxPage + ")"; + string sqlData = "select descirption as 设备描述,DBID as 编号,macid as MAC地址,owner as 设备所有人," + + "case when status = 'USING' then '可用' when status = 'DAMAGE' then '损坏' end as 设备状态 " + + "from (select t.*,rownum row_num from equipment t where status = 'USING'"; if (!String.IsNullOrEmpty(txtMacId.Text.Trim())) { sqlData += " and macid like '%" + txtMacId.Text.Trim() + "%'"; sqlCount += " and macid like '%" + txtMacId.Text.Trim() + "%'"; } - + sqlData += " order by DBID desc)b " + + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; @@ -299,76 +301,6 @@ } } - //public void reloadGrid(int pageIndex) - //{ - // if (pageIndex <= 0) - // { - // pageIndex = 1; - // currentpage = 1; - // } - // String sqlrows = "select * from (select rownum as rowno,dbid,descirption,macid,owner,case when status = 'USING' then '可用' when status = 'DAMAGE' then '损坏' end as status,'编辑' as btnEdit,'删除' as btnDel from equipment t where status = 'USING' "; - // string sqlcount = "select count(*) from equipment where status = 'USING' "; - // if (!String.IsNullOrEmpty(txtMacId.Text.Trim())) - // { - // sqlrows += " and macid like '%" + txtMacId.Text.Trim() + "%'"; - // sqlcount += " and macid like '%" + txtMacId.Text.Trim() + "%'"; - // } - // sqlrows += " and rownum<=" + (pagesize * pageIndex) + ") table_alias where table_alias.rowno>=" + ((pageIndex - 1) * pagesize + 1); - - // int rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlcount).ToString()); - // int pages = 0; - // if (rows % pagesize == 0) - // { - // pages = rows / pagesize; - // } - // else - // { - // pages = rows / pagesize + 1; - // } - - // lastpage = pages; - - // lab_page_msg.Text = "共" + rows + "条记录，每页" + pagesize + "条，第" + pageIndex + "页，共" + pages + "页"; - // combo_page_num.Items.Clear(); - // for (int i = 1; i <= pages; i++) - // { - // combo_page_num.Items.Add(new ComboBoxItem(i.ToString(), i.ToString())); - // } - - // if (lastpage == 1) - // { - // btn_page_first.Enabled = false; - // btn_page_pre.Enabled = false; - // btn_page_last.Enabled = false; - // btn_page_next.Enabled = false; - // } - // else if (currentpage == 1) - // { - // btn_page_first.Enabled = false; - // btn_page_pre.Enabled = false; - // btn_page_last.Enabled = true; - // btn_page_next.Enabled = true; - // } - // else if (currentpage == lastpage) - // { - // btn_page_first.Enabled = true; - // btn_page_pre.Enabled = true; - // btn_page_last.Enabled = false; - // btn_page_next.Enabled = false; - // } - // else - // { - // btn_page_first.Enabled = true; - // btn_page_pre.Enabled = true; - // btn_page_last.Enabled = true; - // btn_page_next.Enabled = true; - // } - - // DataTable table = OracleUtils.ExecuteDataset(OracleUtils.ConnectionString, CommandType.Text, sqlrows).Tables[0]; - // dataGridViewX1.DataSource = table; - - //} - private void FrmEquipmentManage_FormClosing(object sender, FormClosingEventArgs e) diff --git a/FrmFlagDetail.Designer.cs b/FrmFlagDetail.Designer.cs new file mode 100644 index 0000000..982bfc6 --- /dev/null +++ b/FrmFlagDetail.Designer.cs @@ -0,0 +1,103 @@ +namespace Cyberpipe +{ + partial class FrmFlagDetail + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); + this.dataGridViewX_markDetail = new DevComponents.DotNetBar.Controls.DataGridViewX(); + this.对象类型 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.对象编号 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.对象名称 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX_markDetail)).BeginInit(); + this.SuspendLayout(); + // + // dataGridViewX_markDetail + // + this.dataGridViewX_markDetail.AllowUserToAddRows = false; + this.dataGridViewX_markDetail.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; + this.dataGridViewX_markDetail.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dataGridViewX_markDetail.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.对象类型, + this.对象编号, + this.对象名称}); + dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle3.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dataGridViewX_markDetail.DefaultCellStyle = dataGridViewCellStyle3; + this.dataGridViewX_markDetail.Dock = System.Windows.Forms.DockStyle.Fill; + this.dataGridViewX_markDetail.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(170)))), ((int)(((byte)(170)))), ((int)(((byte)(170))))); + this.dataGridViewX_markDetail.Location = new System.Drawing.Point(0, 0); + this.dataGridViewX_markDetail.Name = "dataGridViewX_markDetail"; + this.dataGridViewX_markDetail.RowTemplate.Height = 23; + this.dataGridViewX_markDetail.Size = new System.Drawing.Size(508, 321); + this.dataGridViewX_markDetail.TabIndex = 0; + // + // 对象类型 + // + this.对象类型.HeaderText = "对象类型"; + this.对象类型.Name = "对象类型"; + // + // 对象编号 + // + this.对象编号.HeaderText = "对象编号"; + this.对象编号.Name = "对象编号"; + // + // 对象名称 + // + this.对象名称.HeaderText = "对象名称"; + this.对象名称.Name = "对象名称"; + // + // FrmFlagDetail + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(508, 321); + this.Controls.Add(this.dataGridViewX_markDetail); + this.Name = "FrmFlagDetail"; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; + this.Text = "标识对象信息"; + this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmFlagDetail_FormClosing); + this.Load += new System.EventHandler(this.FrmFlagDetail_Load); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX_markDetail)).EndInit(); + this.ResumeLayout(false); + + } + + #endregion + + private DevComponents.DotNetBar.Controls.DataGridViewX dataGridViewX_markDetail; + private System.Windows.Forms.DataGridViewTextBoxColumn 对象类型; + private System.Windows.Forms.DataGridViewTextBoxColumn 对象编号; + private System.Windows.Forms.DataGridViewTextBoxColumn 对象名称; + + } +} \ No newline at end of file diff --git a/FrmFlagDetail.cs b/FrmFlagDetail.cs new file mode 100644 index 0000000..81de974 --- /dev/null +++ b/FrmFlagDetail.cs @@ -0,0 +1,77 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Windows.Forms; +using GeoScene.Globe; +using System.Data.OracleClient; + +namespace Cyberpipe +{ + public partial class FrmFlagDetail : Form + { + DataTable dt = new DataTable(); + private GSOGlobeControl globeControl1; + + public delegate void Handle(); + public event Handle showParentForm; + String markId; + + public FrmFlagDetail(GSOGlobeControl globeControl1, String id) + { + InitializeComponent(); + this.markId = id; + } + + private void FrmFlagDetail_FormClosing(object sender, FormClosingEventArgs e) + { + showParentForm(); + } + + private void FrmFlagDetail_Load(object sender, EventArgs e) + { + string objectIds = ""; + string objectTypeCodes = ""; + string sql = "select t.对象编号,t.对象类型 from 标识器 t where t.编号='" + markId + "'"; + using (OracleDataReader reader = OracleUtils.ExecuteReader(OracleUtils.ConnectionString, CommandType.Text, sql)) + { + while (reader.Read()) + { + objectIds = reader.GetString(0); + objectTypeCodes = reader.GetString(1); + } + } + + string[] codeTypes = objectTypeCodes.Split(','); + string[] codeIds = objectIds.Split(','); + int length = 0; + if (codeTypes.Length <= codeIds.Length) + { + length = codeTypes.Length; + } + else + { + length = codeIds.Length; + } + for (int n = 0; n < length; n++) + { + for (int i = 0; i < Utility1.listPipelineType.Count; i++) + { + if (Utility1.listPipelineType[i].code == codeTypes[n]) + { + //string objectId = codeIds[i]; + //string objectType = Utility1.listPipelineType[i].type; + //string objectName = Utility1.listPipelineType[i].name; + int index = this.dataGridViewX_markDetail.Rows.Add(); + this.dataGridViewX_markDetail.Rows[index].Cells[0].Value = Utility1.listPipelineType[i].type; + this.dataGridViewX_markDetail.Rows[index].Cells[1].Value = codeIds[n].ToString(); + this.dataGridViewX_markDetail.Rows[index].Cells[2].Value = Utility1.listPipelineType[i].name; + } + } + } + } + } +} diff --git a/FrmFlagDetail.resx b/FrmFlagDetail.resx new file mode 100644 index 0000000..e98a8fe --- /dev/null +++ b/FrmFlagDetail.resx @@ -0,0 +1,129 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + True + + + True + + + True + + \ No newline at end of file diff --git a/FrmFlagManagers.Designer.cs b/FrmFlagManagers.Designer.cs index d7e2f60..9fe14fb 100644 --- a/FrmFlagManagers.Designer.cs +++ b/FrmFlagManagers.Designer.cs @@ -28,8 +28,10 @@ /// private void InitializeComponent() { - this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); - this.winGridViewPager1 = new WHC.Pager.WinControl.WinGridViewPager(); + this.components = new System.ComponentModel.Container(); + this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components); + this.标识对象ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripMenuItem2 = new System.Windows.Forms.ToolStripMenuItem(); this.bar1 = new DevComponents.DotNetBar.Bar(); this.labelItem1 = new DevComponents.DotNetBar.LabelItem(); this.txt_no = new DevComponents.DotNetBar.TextBoxItem(); @@ -38,45 +40,37 @@ this.btn_query = new DevComponents.DotNetBar.ButtonItem(); this.btn_add_batch = new DevComponents.DotNetBar.ButtonItem(); this.btn_add_menu = new DevComponents.DotNetBar.ButtonItem(); - this.btn_db = new DevComponents.DotNetBar.ButtonItem(); - this.tableLayoutPanel1.SuspendLayout(); + this.winGridViewPager1 = new WHC.Pager.WinControl.WinGridViewPager(); + this.contextMenuStrip1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.bar1)).BeginInit(); this.SuspendLayout(); // - // tableLayoutPanel1 + // contextMenuStrip1 // - this.tableLayoutPanel1.ColumnCount = 1; - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel1.Controls.Add(this.winGridViewPager1, 0, 1); - this.tableLayoutPanel1.Controls.Add(this.bar1, 0, 0); - this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 0); - this.tableLayoutPanel1.Name = "tableLayoutPanel1"; - this.tableLayoutPanel1.RowCount = 2; - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 32F)); - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel1.Size = new System.Drawing.Size(881, 474); - this.tableLayoutPanel1.TabIndex = 6; + this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.标识对象ToolStripMenuItem, + this.toolStripMenuItem2}); + this.contextMenuStrip1.Name = "contextMenuStrip1"; + this.contextMenuStrip1.Size = new System.Drawing.Size(125, 48); // - // winGridViewPager1 + // 标识对象ToolStripMenuItem // - this.winGridViewPager1.AppendedMenu = null; - this.winGridViewPager1.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; - this.winGridViewPager1.DataSource = null; - this.winGridViewPager1.DisplayColumns = ""; - this.winGridViewPager1.Dock = System.Windows.Forms.DockStyle.Fill; - this.winGridViewPager1.Location = new System.Drawing.Point(3, 35); - this.winGridViewPager1.MinimumSize = new System.Drawing.Size(540, 0); - this.winGridViewPager1.Name = "winGridViewPager1"; - this.winGridViewPager1.PrintTitle = ""; - this.winGridViewPager1.Size = new System.Drawing.Size(875, 436); - this.winGridViewPager1.TabIndex = 5; + this.标识对象ToolStripMenuItem.Name = "标识对象ToolStripMenuItem"; + this.标识对象ToolStripMenuItem.Size = new System.Drawing.Size(124, 22); + this.标识对象ToolStripMenuItem.Text = "标识对象"; + this.标识对象ToolStripMenuItem.Click += new System.EventHandler(this.标识对象ToolStripMenuItem_Click); + // + // toolStripMenuItem2 + // + this.toolStripMenuItem2.Name = "toolStripMenuItem2"; + this.toolStripMenuItem2.Size = new System.Drawing.Size(152, 22); + this.toolStripMenuItem2.Text = "查看位置"; + this.toolStripMenuItem2.Click += new System.EventHandler(this.toolStripMenuItem2_Click); // // bar1 // this.bar1.AntiAlias = true; this.bar1.Dock = System.Windows.Forms.DockStyle.Top; - this.bar1.DockSide = DevComponents.DotNetBar.eDockSide.Document; this.bar1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.labelItem1, this.txt_no, @@ -84,14 +78,13 @@ this.combo_street, this.btn_query, this.btn_add_batch, - this.btn_add_menu, - this.btn_db}); - this.bar1.Location = new System.Drawing.Point(3, 3); + this.btn_add_menu}); + this.bar1.Location = new System.Drawing.Point(0, 0); this.bar1.Name = "bar1"; - this.bar1.Size = new System.Drawing.Size(875, 28); + this.bar1.Size = new System.Drawing.Size(881, 28); this.bar1.Stretch = true; this.bar1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.bar1.TabIndex = 1; + this.bar1.TabIndex = 8; this.bar1.TabStop = false; this.bar1.Text = "bar1"; // @@ -136,24 +129,34 @@ this.btn_add_menu.Text = "手工添加"; this.btn_add_menu.Click += new System.EventHandler(this.btn_add_menu_Click); // - // btn_db + // winGridViewPager1 // - this.btn_db.Name = "btn_db"; - this.btn_db.Text = "数据导出"; + this.winGridViewPager1.AppendedMenu = null; + this.winGridViewPager1.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; + this.winGridViewPager1.DataSource = null; + this.winGridViewPager1.DisplayColumns = ""; + this.winGridViewPager1.Dock = System.Windows.Forms.DockStyle.Fill; + this.winGridViewPager1.Location = new System.Drawing.Point(0, 28); + this.winGridViewPager1.MinimumSize = new System.Drawing.Size(540, 0); + this.winGridViewPager1.Name = "winGridViewPager1"; + this.winGridViewPager1.PrintTitle = ""; + this.winGridViewPager1.Size = new System.Drawing.Size(881, 446); + this.winGridViewPager1.TabIndex = 9; // // FrmFlagManagers // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(881, 474); - this.Controls.Add(this.tableLayoutPanel1); + this.Controls.Add(this.winGridViewPager1); + this.Controls.Add(this.bar1); this.DoubleBuffered = true; this.Name = "FrmFlagManagers"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "标识器管理"; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmFlagManagers_FormClosing); this.Load += new System.EventHandler(this.FrmFlagManagers_Load); - this.tableLayoutPanel1.ResumeLayout(false); + this.contextMenuStrip1.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.bar1)).EndInit(); this.ResumeLayout(false); @@ -161,8 +164,8 @@ #endregion - private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1; - private WHC.Pager.WinControl.WinGridViewPager winGridViewPager1; + private System.Windows.Forms.ContextMenuStrip contextMenuStrip1; + private System.Windows.Forms.ToolStripMenuItem 标识对象ToolStripMenuItem; private DevComponents.DotNetBar.Bar bar1; private DevComponents.DotNetBar.LabelItem labelItem1; private DevComponents.DotNetBar.TextBoxItem txt_no; @@ -171,6 +174,7 @@ private DevComponents.DotNetBar.ButtonItem btn_query; private DevComponents.DotNetBar.ButtonItem btn_add_batch; private DevComponents.DotNetBar.ButtonItem btn_add_menu; - private DevComponents.DotNetBar.ButtonItem btn_db; + private WHC.Pager.WinControl.WinGridViewPager winGridViewPager1; + private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem2; } } \ No newline at end of file diff --git a/FrmFlagManagers.cs b/FrmFlagManagers.cs index 38d4927..9bf9734 100644 --- a/FrmFlagManagers.cs +++ b/FrmFlagManagers.cs @@ -33,15 +33,13 @@ { this.globeControl1 = _globeControl1; InitializeComponent(); - winGridViewPager1.OnPageChanged += new EventHandler(winGridViewPager1_OnPageChanged); - this.winGridViewPager1.OnAddNew += new EventHandler(winGridViewPager1_OnAddNew); //右键定位 + winGridViewPager1.OnPageChanged += new EventHandler(winGridViewPager1_OnPageChanged); this.winGridViewPager1.OnEditSelected += new EventHandler(winGridViewPager1_OnEditSelected);//属性编辑 this.winGridViewPager1.OnDeleteSelected += new EventHandler(winGridViewPager1_OnDeleteSelected);//标识器报废 + this.winGridViewPager1.OnStartExport += new EventHandler(pager1_OnStartExport); this.winGridViewPager1.OnEndExport += new EventHandler(pager1_OnEndExport); - //this.winGridViewPager1.ExportCurrent += new ExportCurrentEventHandler(pager1_ExportCurrent); - //this.winGridViewPager1.ExportAll += new ExportAllEventHandler(pager1_ExportAll); winGridViewPager1.dataGridView1.MultiSelect = false; @@ -76,26 +74,25 @@ this.winGridViewPager1.AddColumnAlias("标识器型号", "标识器型号"); this.winGridViewPager1.AddColumnAlias("地面高程", "地面高程"); this.winGridViewPager1.AddColumnAlias("标识器埋深", "标识器埋深"); - this.winGridViewPager1.AddColumnAlias("对象编号", "对象编号"); - this.winGridViewPager1.AddColumnAlias("对象类型", "对象类型"); this.winGridViewPager1.AddColumnAlias("所属道路", "所属道路"); this.winGridViewPager1.AddColumnAlias("使用状态", "使用状态"); - this.winGridViewPager1.DisplayColumns = "编号,标识器ID号,标识器型号,地面高程,标识器埋深,对象编号,对象类型,所属道路,使用状态"; + this.winGridViewPager1.DisplayColumns = "编号,标识器ID号,标识器型号,地面高程,标识器埋深,所属道路,使用状态"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 //隐藏右键功能按钮 //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[1].Visible = false; - //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[4].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[5].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[6].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[7].Visible = false; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[1].Text = "定位查看"; + //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[1].Text = "定位查看"; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "属性编辑"; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Text = "标识器报废"; + winGridViewPager1.AppendedMenu = this.contextMenuStrip1; + //右键菜单宽度 winGridViewPager1.dataGridView1.ContextMenuStrip.AutoSize = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Width = 150; @@ -153,7 +150,7 @@ } /// - /// 右键定位 + /// 对象查看 /// /// /// @@ -306,20 +303,10 @@ string sqlCount = "select count(*) from 标识器 where 使用状态 = '使用中'"; - string sqlData = "select 编号,标识器ID号,标识器型号,地面高程,标识器埋深,对象编号,对象类型,所属道路,LSSYS_ID,X坐标,Y坐标,使用状态 " + + string sqlData = "select 编号,标识器ID号,标识器型号,地面高程,标识器埋深,所属道路,LSSYS_ID,X坐标,Y坐标,使用状态 " + "from (select t.*,rownum row_num from 标识器 t where 使用状态 = '使用中' order by 编号)b " + " where 1=1"; - if (!String.IsNullOrEmpty(txt_no.Text.Trim())) - { - sqlCount += " and 编号 like '%" + txt_no.Text.Trim() + "%'"; - sqlData += " and 编号 like '%" + txt_no.Text.Trim() + "%'"; - } - if (null != combo_street.SelectedItem && !String.IsNullOrEmpty(combo_street.SelectedItem.ToString().Trim())) - { - sqlData += " and 所属道路='" + combo_street.SelectedItem.ToString().Trim() + "'"; - sqlCount += " and 所属道路='" + combo_street.SelectedItem.ToString().Trim() + "'"; - } rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -332,9 +319,8 @@ int maxPage = pageIndex * maxPageIndex; string sqlCount = "select count(*) from 标识器 where 使用状态 = '使用中'"; - string sqlData = "select 编号,标识器ID号,标识器型号,地面高程,标识器埋深,对象编号,对象类型,所属道路,LSSYS_ID,X坐标,Y坐标,使用状态 " + - "from (select t.*,rownum row_num from 标识器 t where 使用状态 = '使用中' order by 编号)b "+ - " where(b.row_num between " + minPage + " and " + maxPage + ")"; + string sqlData = "select 编号,标识器ID号,标识器型号,地面高程,标识器埋深,所属道路,LSSYS_ID,X坐标,Y坐标,使用状态 " + + "from (select t.*,rownum row_num from 标识器 t where 使用状态 = '使用中'"; if (!String.IsNullOrEmpty(txt_no.Text.Trim())) { @@ -347,6 +333,8 @@ sqlCount += " and 所属道路='" + combo_street.SelectedItem.ToString().Trim() + "'"; } + sqlData += " order by 编号)b " + + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; @@ -372,9 +360,10 @@ private void FrmFlagManagers_FormClosing(object sender, FormClosingEventArgs e) { IS_OPEN = false; - Thread downloadJob = new Thread(new ParameterizedThreadStart(doSave)); - downloadJob.IsBackground = true; - downloadJob.Start(e); + //Thread downloadJob = new Thread(new ParameterizedThreadStart(doSave)); + //downloadJob.IsBackground = true; + //downloadJob.Start(e); + globeControl1.Globe.Layers["标识器"].Save(); globeControl1.Globe.MemoryLayer.RemoveAllFeature(); foreach (GSOFeature f in Features) { @@ -480,10 +469,88 @@ if (null != globeControl1) { FrmAddSinMark frm = new FrmAddSinMark(globeControl1); - frm.ShowDialog(); + frm.Show(); } } + private void 标识对象ToolStripMenuItem_Click(object sender, EventArgs e) + { + if (winGridViewPager1 != null && winGridViewPager1.dataGridView1 != null) + { + DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; + try + { + this.Hide(); + string id = row.Cells["编号"].Value.ToString(); + FrmFlagDetail p = new FrmFlagDetail(globeControl1, id); + p.showParentForm += new FrmFlagDetail.Handle(showThisForm);//改变值的事件 + p.Show(); + } + catch (Exception ex) + { + MessageBox.Show("失败:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } + + private void showThisForm() + { + this.Show(); + } + + private void toolStripMenuItem2_Click(object sender, EventArgs e) + { + if (winGridViewPager1 != null && winGridViewPager1.dataGridView1 != null) + { + DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; + try + { + this.WindowState = FormWindowState.Minimized; + string id = row.Cells["LSSYS_ID"].Value.ToString(); + string flagno = row.Cells["编号"].Value.ToString(); + string flagstreet = row.Cells["所属道路"].Value.ToString(); + double x = Convert.ToDouble(row.Cells["X坐标"].Value); + double y = Convert.ToDouble(row.Cells["Y坐标"].Value); + GSOFeature flagFeature = globeControl1.Globe.Layers.GetLayerByCaption("标识器").GetFeatureByID(int.Parse(id)); + + string type = ""; + string pipe = ""; + string sql = "select t.标识器型号,t.对象编号 from 标识器 t where t.编号='" + flagno + "'"; + using (OracleDataReader reader = OracleUtils.ExecuteReader(OracleUtils.ConnectionString, CommandType.Text, sql)) + { + while (reader.Read()) + { + type = reader.GetString(0); + pipe = reader.GetString(1); + } + } + + GSOLabel label = new GSOLabel(); + label.Text = "标识器编号：" + flagno + "\r\n" + + "标识器类型:" + type + "\r\n" + + //"标识对象编号:" + pipe + "\r\n" + + "所属道路:" + flagstreet; + label.Style = new GSOLabelStyle(); + label.Style.TextStyle.FontSize = 18; + label.Style.TextStyle.ForeColor = Color.FromArgb(0, 0, 0, 255); + label.Style.Opaque = 0.8; //设置标注的透明度，取值区间是0-1 + label.Style.TracktionLineType = EnumTracktionLineType.Solid; + label.Style.TextStyle.FontHeight = 10; + label.Style.TextStyle.FontName = "黑体"; + label.Style.TractionLineEndPos = new GSOPoint2d(80, 60); + + flagFeature.Label = label; + Features.Add(flagFeature); + globeControl1.Globe.JumpToFeature(flagFeature, 20); + this.globeControl1.Refresh(); + + } + catch (Exception ex) + { + MessageBox.Show("标识器定位失败:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } } diff --git a/FrmFlagManagers.resx b/FrmFlagManagers.resx index 1af7de1..ad53752 100644 --- a/FrmFlagManagers.resx +++ b/FrmFlagManagers.resx @@ -117,4 +117,7 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 17, 17 + \ No newline at end of file diff --git a/FrmPatrolerEdit.cs b/FrmPatrolerEdit.cs index dbd4fec..f45b5ae 100644 --- a/FrmPatrolerEdit.cs +++ b/FrmPatrolerEdit.cs @@ -46,7 +46,7 @@ txt_name.Focus(); return; } - if (String.IsNullOrEmpty(combo_sex.SelectedItem.ToString())) + if (combo_sex.SelectedItem == null ||String.IsNullOrEmpty(combo_sex.SelectedItem.ToString())) { MessageBox.Show("性别不能为空！", "警告", MessageBoxButtons.OK, MessageBoxIcon.Warning); combo_sex.Focus(); diff --git a/FrmPatrolerManager.Designer.cs b/FrmPatrolerManager.Designer.cs index bb8e5fb..10fac22 100644 --- a/FrmPatrolerManager.Designer.cs +++ b/FrmPatrolerManager.Designer.cs @@ -47,11 +47,13 @@ this.注销 = new DevComponents.Editors.ComboItem(); this.btn_query_person = new DevComponents.DotNetBar.ButtonItem(); this.btn_add_person = new DevComponents.DotNetBar.ButtonItem(); - this.winGridViewPager1 = new WHC.Pager.WinControl.WinGridViewPager(); this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components); this.日志ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.任务ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.定位ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.winGridViewPager1 = new WHC.Pager.WinControl.WinGridViewPager(); + this.编辑ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.注销ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); ((System.ComponentModel.ISupportInitialize)(this.bar1)).BeginInit(); this.contextMenuStrip1.SuspendLayout(); this.SuspendLayout(); @@ -173,9 +175,42 @@ this.btn_add_person.Text = "新增"; this.btn_add_person.Click += new System.EventHandler(this.btn_add_person_Click); // + // contextMenuStrip1 + // + this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.日志ToolStripMenuItem, + this.任务ToolStripMenuItem, + this.定位ToolStripMenuItem, + this.编辑ToolStripMenuItem, + this.注销ToolStripMenuItem}); + this.contextMenuStrip1.Name = "contextMenuStrip1"; + this.contextMenuStrip1.Size = new System.Drawing.Size(153, 136); + // + // 日志ToolStripMenuItem + // + this.日志ToolStripMenuItem.Name = "日志ToolStripMenuItem"; + this.日志ToolStripMenuItem.Size = new System.Drawing.Size(100, 22); + this.日志ToolStripMenuItem.Text = "日志"; + this.日志ToolStripMenuItem.Click += new System.EventHandler(this.日志ToolStripMenuItem_Click); + // + // 任务ToolStripMenuItem + // + this.任务ToolStripMenuItem.Name = "任务ToolStripMenuItem"; + this.任务ToolStripMenuItem.Size = new System.Drawing.Size(100, 22); + this.任务ToolStripMenuItem.Text = "任务"; + this.任务ToolStripMenuItem.Click += new System.EventHandler(this.任务ToolStripMenuItem_Click); + // + // 定位ToolStripMenuItem + // + this.定位ToolStripMenuItem.Name = "定位ToolStripMenuItem"; + this.定位ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.定位ToolStripMenuItem.Text = "定位"; + this.定位ToolStripMenuItem.Click += new System.EventHandler(this.定位ToolStripMenuItem_Click); + // // winGridViewPager1 // this.winGridViewPager1.AppendedMenu = null; + this.winGridViewPager1.ContextMenuStrip = this.contextMenuStrip1; this.winGridViewPager1.DataSource = null; this.winGridViewPager1.DisplayColumns = ""; this.winGridViewPager1.Dock = System.Windows.Forms.DockStyle.Fill; @@ -186,35 +221,19 @@ this.winGridViewPager1.Size = new System.Drawing.Size(756, 309); this.winGridViewPager1.TabIndex = 3; // - // contextMenuStrip1 + // 编辑ToolStripMenuItem // - this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.日志ToolStripMenuItem, - this.任务ToolStripMenuItem, - this.定位ToolStripMenuItem}); - this.contextMenuStrip1.Name = "contextMenuStrip1"; - this.contextMenuStrip1.Size = new System.Drawing.Size(101, 70); + this.编辑ToolStripMenuItem.Name = "编辑ToolStripMenuItem"; + this.编辑ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.编辑ToolStripMenuItem.Text = "编辑"; + this.编辑ToolStripMenuItem.Click += new System.EventHandler(this.编辑ToolStripMenuItem_Click); // - // 日志ToolStripMenuItem + // 注销ToolStripMenuItem // - this.日志ToolStripMenuItem.Name = "日志ToolStripMenuItem"; - this.日志ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); - this.日志ToolStripMenuItem.Text = "日志"; - this.日志ToolStripMenuItem.Click += new System.EventHandler(this.日志ToolStripMenuItem_Click); - // - // 任务ToolStripMenuItem - // - this.任务ToolStripMenuItem.Name = "任务ToolStripMenuItem"; - this.任务ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); - this.任务ToolStripMenuItem.Text = "任务"; - this.任务ToolStripMenuItem.Click += new System.EventHandler(this.任务ToolStripMenuItem_Click); - // - // 定位ToolStripMenuItem - // - this.定位ToolStripMenuItem.Name = "定位ToolStripMenuItem"; - this.定位ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); - this.定位ToolStripMenuItem.Text = "定位"; - this.定位ToolStripMenuItem.Click += new System.EventHandler(this.定位ToolStripMenuItem_Click); + this.注销ToolStripMenuItem.Name = "注销ToolStripMenuItem"; + this.注销ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.注销ToolStripMenuItem.Text = "注销"; + this.注销ToolStripMenuItem.Click += new System.EventHandler(this.注销ToolStripMenuItem_Click); // // FrmPatrolerManager // @@ -229,7 +248,7 @@ this.MinimizeBox = false; this.Name = "FrmPatrolerManager"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; - this.Text = "巡检人员维护"; + this.Text = "定位人员维护"; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmPatrolerManager_FormClosing); this.Load += new System.EventHandler(this.FrmPatrolerManager_Load); ((System.ComponentModel.ISupportInitialize)(this.bar1)).EndInit(); @@ -258,10 +277,12 @@ private DevComponents.Editors.ComboItem 注销; private DevComponents.Editors.ComboItem comboItem1; private DevComponents.Editors.ComboItem 不限; - private WHC.Pager.WinControl.WinGridViewPager winGridViewPager1; private System.Windows.Forms.ContextMenuStrip contextMenuStrip1; private System.Windows.Forms.ToolStripMenuItem 日志ToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem 任务ToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem 定位ToolStripMenuItem; + private WHC.Pager.WinControl.WinGridViewPager winGridViewPager1; + private System.Windows.Forms.ToolStripMenuItem 编辑ToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem 注销ToolStripMenuItem; } } \ No newline at end of file diff --git a/FrmPatrolerManager.cs b/FrmPatrolerManager.cs index 255a076..9c32f54 100644 --- a/FrmPatrolerManager.cs +++ b/FrmPatrolerManager.cs @@ -29,9 +29,7 @@ this.globeControl1 = globeControl1; winGridViewPager1.OnPageChanged += new EventHandler(winGridViewPager1_OnPageChanged); - this.winGridViewPager1.OnEditSelected += new EventHandler(winGridViewPager1_OnEditSelected);//编辑 - this.winGridViewPager1.OnDeleteSelected += new EventHandler(winGridViewPager1_OnDeleteSelected);//删除 - + this.winGridViewPager1.OnStartExport += new EventHandler(pager1_OnStartExport); this.winGridViewPager1.OnEndExport += new EventHandler(pager1_OnEndExport); @@ -47,26 +45,31 @@ //控制表格显示的列，以及每一列要显示的列名 this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - this.winGridViewPager1.AddColumnAlias("USERNAME", "姓名"); - this.winGridViewPager1.AddColumnAlias("DBID", "编号"); - this.winGridViewPager1.AddColumnAlias("SEX", "性别"); - this.winGridViewPager1.AddColumnAlias("AGE", "年龄"); - this.winGridViewPager1.AddColumnAlias("PHONENUM", "电话"); - this.winGridViewPager1.AddColumnAlias("ACCOUNTSTATE", "状态"); - this.winGridViewPager1.DisplayColumns = "USERNAME,SEX,AGE,PHONENUM,ACCOUNTSTATE"; + this.winGridViewPager1.AddColumnAlias("姓名", "姓名"); + this.winGridViewPager1.AddColumnAlias("编号", "编号"); + this.winGridViewPager1.AddColumnAlias("性别", "性别"); + this.winGridViewPager1.AddColumnAlias("年龄", "年龄"); + this.winGridViewPager1.AddColumnAlias("电话", "电话"); + this.winGridViewPager1.AddColumnAlias("状态", "状态"); + this.winGridViewPager1.DisplayColumns = "姓名,性别,年龄,电话,状态"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 + //隐藏右键功能按钮 //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[1].Visible = false; + winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Visible = false; + winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[4].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[5].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[6].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[7].Visible = false; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "编辑"; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Text = "注销"; + + //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "编辑"; + //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Text = "注销"; winGridViewPager1.AppendedMenu = this.contextMenuStrip1; + //右键菜单宽度 winGridViewPager1.dataGridView1.ContextMenuStrip.AutoSize = false; @@ -122,11 +125,11 @@ DataGridViewRow row = grid.SelectedRows[0]; try { - long dbid = long.Parse(row.Cells["dbid"].Value.ToString()); - String name = row.Cells["USERNAME"].Value.ToString(); - String sex = row.Cells["SEX"].Value.ToString(); - String age = row.Cells["AGE"].Value.ToString(); - string phone = row.Cells["PHONENUM"].Value.ToString(); + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); + String name = row.Cells["姓名"].Value.ToString(); + String sex = row.Cells["性别"].Value.ToString(); + String age = row.Cells["年龄"].Value.ToString(); + string phone = row.Cells["电话"].Value.ToString(); age = String.IsNullOrEmpty(age.ToString().Trim()) ? "1" : age.ToString().Trim(); FrmPatrolerEdit frm = new FrmPatrolerEdit(dbid.ToString(), name, age, sex, phone); frm.reloadGrid += new ReloadPatrolerGrid(LoadData); @@ -152,10 +155,10 @@ if (grid != null) { DataGridViewRow row = grid.SelectedRows[0]; - long dbid = long.Parse(row.Cells["DBID"].Value.ToString()); + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); try { - string state = row.Cells["ACCOUNTSTATE"].Value.ToString(); + string state = row.Cells["状态"].Value.ToString(); if ("在线".Equals(state)) { if (MessageBox.Show("确定注销？", "确认", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) @@ -180,60 +183,60 @@ { int pageIndex = winGridViewPager1.PagerInfo.CurrenetPageIndex; string sqlData = GetSql(pageIndex); - initlizeDatagrid(); + DataTable table = OracleUtils.ExecuteDataset(OracleUtils.ConnectionString, CommandType.Text, sqlData).Tables[0]; winGridViewPager1.DataSource = table.DefaultView; - for (int i = 0; i < winGridViewPager1.dataGridView1.Rows.Count; i++) - { - if (winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value.ToString() == "ONLINE") - { - winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value = "在线"; - } - else - { - if (winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value.ToString() == "OFFLINE") - { - winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value = "离线"; - } - else - { - if (winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value.ToString() == "LEAVER") - { - winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value = "注销"; - } - } - } - } + //for (int i = 0; i < winGridViewPager1.dataGridView1.Rows.Count; i++) + //{ + // if (winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value.ToString() == "ONLINE") + // { + // winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value = "在线"; + // } + // else + // { + // if (winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value.ToString() == "OFFLINE") + // { + // winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value = "离线"; + // } + // else + // { + // if (winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value.ToString() == "LEAVER") + // { + // winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value = "注销"; + // } + // } + // } + //} winGridViewPager1.Refresh(); } private void LoadData(int pageIndex) { string sqlData = GetSql(pageIndex); - initlizeDatagrid(); + DataTable table = OracleUtils.ExecuteDataset(OracleUtils.ConnectionString, CommandType.Text, sqlData).Tables[0]; winGridViewPager1.DataSource = table.DefaultView; - for (int i = 0; i < winGridViewPager1.dataGridView1.Rows.Count; i++) - { - if (winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value.ToString() == "ONLINE") - { - winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value = "在线"; - } - else - { - if (winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value.ToString() == "OFFLINE") - { - winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value = "离线"; - } - else - { - if (winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value.ToString() == "LEAVER") - { - winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value = "注销"; - } - } - } - } + //for (int i = 0; i < winGridViewPager1.dataGridView1.Rows.Count; i++) + //{ + // if (winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value.ToString() == "ONLINE") + // { + // winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value = "在线"; + // } + // else + // { + // if (winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value.ToString() == "OFFLINE") + // { + // winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value = "离线"; + // } + // else + // { + // if (winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value.ToString() == "LEAVER") + // { + // winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value = "注销"; + // } + // } + // } + //} winGridViewPager1.Refresh(); } @@ -241,7 +244,8 @@ { string sqlCount = "select count(*) from equipment where status = 'USING'"; - string sqlData = "select username,dbid,sex,age,phonenum,accountstate " + + string sqlData = "select username as 姓名,dbid as 编号,sex as 性别,age as 年龄,phonenum as 电话,"+ + "case when accountstate = 'ONLINE' then '在线' when accountstate = 'OFFLINE' then '离线' when accountstate = 'LEAVER' then '注销' end as 状态 " + "from (select t.*,rownum row_num from patroler t order by DBID desc)b " + " where 1=1"; @@ -255,9 +259,9 @@ int minPage = (pageIndex - 1) * maxPageIndex + 1; int maxPage = pageIndex * maxPageIndex; string sqlCount = "select count(*) from patroler where 1=1"; - string sqlData = "select username,dbid,sex,age,phonenum,accountstate " + - "from (select t.*,rownum row_num from patroler t order by DBID desc)b " + - " where(b.row_num between " + minPage + " and " + maxPage + ")"; + string sqlData = "select username as 姓名,dbid as 编号,sex as 性别,age as 年龄,phonenum as 电话,"+ + "case when accountstate = 'ONLINE' then '在线' when accountstate = 'OFFLINE' then '离线' when accountstate = 'LEAVER' then '注销' end as 状态 " + + "from (select t.*,rownum row_num from patroler t where 1=1"; if (!String.IsNullOrEmpty(txt_username.Text.Trim())) { @@ -281,7 +285,8 @@ sqlCount += " and accountstate='" + combo_stateText + "'"; sqlData += " and accountstate='" + combo_stateText + "'"; } - + sqlData += " order by DBID desc)b " + + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; @@ -291,6 +296,7 @@ { try { + initlizeDatagrid(); LoadData(); initForm(); IS_OPEN = true; @@ -310,11 +316,13 @@ } if (Utility.userRole.IndexOf("巡检员编辑") == -1) { - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Visible = false; + //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Visible = false; + 编辑ToolStripMenuItem.Visible = false; } if (Utility.userRole.IndexOf("巡检员注销") == -1) { - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Visible = false; + //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Visible = false; + 注销ToolStripMenuItem.Visible = false; } } @@ -376,7 +384,7 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - long dbid = long.Parse(row.Cells["dbid"].Value.ToString()); + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); Log p = new Log(dbid.ToString()); p.Show(); } @@ -395,8 +403,8 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - long dbid = long.Parse(row.Cells["dbid"].Value.ToString()); - String state = row.Cells["ACCOUNTSTATE"].Value.ToString(); + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); + String state = row.Cells["状态"].Value.ToString(); if ("在线".Equals(state)) { string sql = "select t.dbid " + @@ -435,8 +443,8 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - long dbid = long.Parse(row.Cells["dbid"].Value.ToString()); - String username = row.Cells["USERNAME"].Value.ToString(); + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); + String username = row.Cells["姓名"].Value.ToString(); string sql = "select t.latitude, t.longitude " + "from position t " + "where t.dbid = (select max(dbid) from position where patroler_id = " + dbid + ")"; @@ -489,6 +497,63 @@ } + private void 编辑ToolStripMenuItem_Click(object sender, EventArgs e) + { + if (winGridViewPager1 != null && winGridViewPager1.dataGridView1 != null) + { + DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; + try + { + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); + String name = row.Cells["姓名"].Value.ToString(); + String sex = row.Cells["性别"].Value.ToString(); + String age = row.Cells["年龄"].Value.ToString(); + string phone = row.Cells["电话"].Value.ToString(); + age = String.IsNullOrEmpty(age.ToString().Trim()) ? "1" : age.ToString().Trim(); + FrmPatrolerEdit frm = new FrmPatrolerEdit(dbid.ToString(), name, age, sex, phone); + frm.reloadGrid += new ReloadPatrolerGrid(LoadData); + frm.ShowDialog(); + winGridViewPager1.Refresh(); + } + catch (Exception ex) + { + MessageBox.Show("编辑失败:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } + + private void 注销ToolStripMenuItem_Click(object sender, EventArgs e) + { + if (winGridViewPager1 != null && winGridViewPager1.dataGridView1 != null) + { + DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); + try + { + if (MessageBox.Show("确定注销？", "确认", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) + { + String sql = "update patroler t set t.accountstate='LEAVER' where t.dbid=" + dbid; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + LoadData(); + MessageBox.Show("人员已注销", "信息", MessageBoxButtons.OK, MessageBoxIcon.Information); + } + //string state = row.Cells["状态"].Value.ToString(); + //if ("在线".Equals(state)) + //{ + + //} + //else + //{ + // MessageBox.Show("人员不在线，无法注销", "信息"); + //} + } + catch (Exception ex) + { + MessageBox.Show("人员注销失败:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } + } } diff --git a/FrmRoleInfoManager.cs b/FrmRoleInfoManager.cs index 8897133..35693cf 100644 --- a/FrmRoleInfoManager.cs +++ b/FrmRoleInfoManager.cs @@ -55,10 +55,10 @@ //控制表格显示的列，以及每一列要显示的列名 this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - this.winGridViewPager1.AddColumnAlias("NT", "角色名称"); - this.winGridViewPager1.AddColumnAlias("ID", "编号"); + this.winGridViewPager1.AddColumnAlias("角色名称", "角色名称"); + this.winGridViewPager1.AddColumnAlias("编号", "编号"); - this.winGridViewPager1.DisplayColumns = "NT"; + this.winGridViewPager1.DisplayColumns = "角色名称"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -131,7 +131,7 @@ { try { - string dbid = row.Cells["id"].Value.ToString(); + string dbid = row.Cells["编号"].Value.ToString(); string sql = "delete from casic_userroletest where id=" + dbid; OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); LoadData(); @@ -170,7 +170,7 @@ { string sqlCount = "select id,nt from casic_userroletest where sysname='EMS'"; - string sqlData = "select nt,id " + + string sqlData = "select nt as 角色名称,id as 编号 " + "from (select t.*,rownum row_num from casic_userroletest t order by id desc)b " + " where sysname='EMS'"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -183,7 +183,7 @@ int minPage = (pageIndex - 1) * maxPageIndex + 1; int maxPage = pageIndex * maxPageIndex; string sqlCount = "select id,nt from casic_userroletest where sysname='EMS'"; - string sqlData = "select nt,id " + + string sqlData = "select nt as 角色名称,id as 编号 " + "from (select t.*,rownum row_num from casic_userroletest t where sysname='EMS' order by id desc)b " + " where(b.row_num between " + minPage + " and " + maxPage + ")"; diff --git a/FrmSysUserInfoManger.cs b/FrmSysUserInfoManger.cs index 7903916..e193a61 100644 --- a/FrmSysUserInfoManger.cs +++ b/FrmSysUserInfoManger.cs @@ -28,6 +28,7 @@ this.winGridViewPager1.OnEndExport += new EventHandler(pager1_OnEndExport); winGridViewPager1.dataGridView1.MultiSelect = false; + } private void FrmSysUserInfoManger_Load(object sender, EventArgs e) @@ -59,10 +60,10 @@ //控制表格显示的列，以及每一列要显示的列名 this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - this.winGridViewPager1.AddColumnAlias("USERNAME", "账号"); - this.winGridViewPager1.AddColumnAlias("ID", "编号"); + this.winGridViewPager1.AddColumnAlias("账号", "账号"); + this.winGridViewPager1.AddColumnAlias("编号", "编号"); - this.winGridViewPager1.DisplayColumns = "USERNAME"; + this.winGridViewPager1.DisplayColumns = "账号"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -130,8 +131,8 @@ if (grid != null) { DataGridViewRow row = grid.SelectedRows[0]; - string dbid = row.Cells["id"].Value.ToString(); - string userName = row.Cells["USERNAME"].Value.ToString(); + string dbid = row.Cells["编号"].Value.ToString(); + string userName = row.Cells["账号"].Value.ToString(); if (userName.Equals("ems")) { MessageBox.Show("该用户为管理员用户，无法删除！", "信息"); @@ -184,7 +185,7 @@ { string sqlCount = "select count(*) from casic_userinfotest where sysname='EMS'"; - string sqlData = "select username,id " + + string sqlData = "select username as 账号,id as 编号 " + "from (select t.*,rownum row_num from casic_userinfotest t order by id desc)b " + " where sysname='EMS'"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -197,16 +198,16 @@ int minPage = (pageIndex - 1) * maxPageIndex + 1; int maxPage = pageIndex * maxPageIndex; string sqlCount = "select count(*) from casic_userinfotest where sysname='EMS'"; - string sqlData = "select username,id " + - "from (select t.*,rownum row_num from casic_userinfotest t where sysname='EMS' order by id desc)b " + - " where(b.row_num between " + minPage + " and " + maxPage + ")"; + string sqlData = "select username as 账号,id as 编号 " + + "from (select t.*,rownum row_num from casic_userinfotest t where sysname='EMS'"; if (!String.IsNullOrEmpty(txt_user_code.Text.Trim())) { sqlCount += " and username like '%" + txt_user_code.Text.Trim() + "%'"; sqlData += " and username like '%" + txt_user_code.Text.Trim() + "%'"; } - + sqlData += " order by id desc)b " + + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; diff --git a/MainFrm.cs b/MainFrm.cs index 39df646..0cd5881 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3310,10 +3310,10 @@ string str1 = ""; if (feature != null) { - if (feature.GetFieldDefn("图?片?编括?码?") != null) // + if (feature.GetFieldDefn("图片编码") != null) // { str1 = GetBubbleInfo(feature); - if (RemoteFileExists(Utility.PicRootURL + feature.GetValue("图?片?编括?码?").ToString())) + if (RemoteFileExists(Utility.PicRootURL + feature.GetValue("图片编码").ToString())) { str1 += ""; } @@ -3450,9 +3450,15 @@ string value1 = ""; if (field1 != null) { - if (field1.Name == "图片编码") + //if (field1.Name == "图片编码" || field1.Name == "对象编号" || field1.Name == "对象类型" || field1.Name == "对象名称") + //{ + // j++; + //} + while (field1.Name == "图片编码" || field1.Name == "对象编号" || field1.Name == "对象类型" || field1.Name == "对象名称") { j++; + fieldName = fieldNames[j].Trim(); + field1 = (GSOFieldDefn)feature.GetFieldDefn(fieldName); } if (j < rowCount) { @@ -3479,6 +3485,11 @@ if (!feature.IsFieldValueNull(j)) { value1 = feature.GetValue(j).ToString(); + if (name1 == "标识器埋深") + { + if (value1!=null&&value1.Length>4) + value1 = value1.Substring(0,4); + } } } } @@ -3491,9 +3502,14 @@ if (field2 != null) { - if (field2.Name == "图片编码") + //if (field2.Name == "图片编码" || field1.Name == "对象编号" || field1.Name == "对象类型" || field1.Name == "对象名称") + //{ + // j++; + //} + while (field2.Name == "图片编码" || field2.Name == "对象编号" || field2.Name == "对象类型" || field2.Name == "对象名称") { j++; + field2 = (GSOFieldDefn)feature.GetFieldDefn(j + 1); } if (j + 1 < rowCount) { @@ -3521,6 +3537,11 @@ if (!feature.IsFieldValueNull(j + 1)) { value2 = feature.GetValue(j + 1).ToString(); + if (name2 == "标识器埋深") + { + if (value2 != null && value2.Length > 4) + value2 = value2.Substring(0, 4); + } } } } @@ -15347,7 +15368,7 @@ return; } FrmFlagManagers frm = new FrmFlagManagers(globeControl1); - frm.Show(this); + frm.Show(); } private void ribbonTabItem2_MouseDown(object sender, MouseEventArgs e) diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index fddfb94..e5f0003 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -365,6 +365,16 @@ this.可编辑ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.保存ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.ribbonControl1 = new DevComponents.DotNetBar.RibbonControl(); + this.ribbonPanel3 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar3 = new DevComponents.DotNetBar.RibbonBar(); + this.btn_device = new DevComponents.DotNetBar.ButtonItem(); + this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); + this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel7 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); + this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); + this.slider4ground = new DevComponents.DotNetBar.SliderItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -374,12 +384,6 @@ this.btn_user_role = new DevComponents.DotNetBar.ButtonItem(); this.btn_password_edit = new DevComponents.DotNetBar.ButtonItem(); this.btn_reset_password = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel3 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar3 = new DevComponents.DotNetBar.RibbonBar(); - this.btn_device = new DevComponents.DotNetBar.ButtonItem(); - this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); - this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); @@ -551,10 +555,6 @@ this.buttonItemBZ9 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItemBZ10 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItemBZ11 = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel7 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); - this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); - this.slider4ground = new DevComponents.DotNetBar.SliderItem(); this.ribbonPanel12 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar18 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItem133 = new DevComponents.DotNetBar.ButtonItem(); @@ -690,11 +690,11 @@ this.contextMenuStrip3.SuspendLayout(); this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); - this.ribbonPanel8.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel7.SuspendLayout(); + this.ribbonPanel8.SuspendLayout(); this.ribbonPanel2.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); - this.ribbonPanel7.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); this.ribbonPanel5.SuspendLayout(); this.ribbonPanel6.SuspendLayout(); @@ -4162,10 +4162,10 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); - this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel2); - this.ribbonControl1.Controls.Add(this.ribbonPanel15); + this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel7); + this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); this.ribbonControl1.Controls.Add(this.ribbonPanel5); this.ribbonControl1.Controls.Add(this.ribbonPanel6); @@ -4216,135 +4216,6 @@ this.ribbonControl1.UseCustomizeDialog = false; this.ribbonControl1.Click += new System.EventHandler(this.ribbonControl1_Click); // - // ribbonPanel8 - // - this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel8.Controls.Add(this.ribbonBar_UserInfo); - this.ribbonPanel8.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel8.Location = new System.Drawing.Point(0, 33); - this.ribbonPanel8.Name = "ribbonPanel8"; - this.ribbonPanel8.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel8.Size = new System.Drawing.Size(1328, 62); - // - // - // - this.ribbonPanel8.Style.Class = ""; - this.ribbonPanel8.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel8.StyleMouseDown.Class = ""; - this.ribbonPanel8.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel8.StyleMouseOver.Class = ""; - this.ribbonPanel8.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel8.TabIndex = 42; - this.ribbonPanel8.Visible = false; - // - // ribbonBar_UserInfo - // - this.ribbonBar_UserInfo.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar_UserInfo.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar_UserInfo.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar_UserInfo.BackgroundStyle.Class = ""; - this.ribbonBar_UserInfo.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar_UserInfo.ContainerControlProcessDialogKey = true; - this.ribbonBar_UserInfo.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar_UserInfo.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.btn_user_info, - this.btn_role_info, - this.btn_resc_info, - this.btn_role_resc, - this.btn_user_role, - this.btn_password_edit, - this.btn_reset_password}); - this.ribbonBar_UserInfo.Location = new System.Drawing.Point(3, 0); - this.ribbonBar_UserInfo.Name = "ribbonBar_UserInfo"; - this.ribbonBar_UserInfo.Size = new System.Drawing.Size(427, 59); - this.ribbonBar_UserInfo.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar_UserInfo.TabIndex = 0; - // - // - // - this.ribbonBar_UserInfo.TitleStyle.Class = ""; - this.ribbonBar_UserInfo.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar_UserInfo.TitleStyleMouseOver.Class = ""; - this.ribbonBar_UserInfo.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // btn_user_info - // - this.btn_user_info.Image = global::Cyberpipe.Properties.Resources._24x24icon_13_hover; - this.btn_user_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_user_info.Name = "btn_user_info"; - this.btn_user_info.SubItemsExpandWidth = 14; - this.btn_user_info.Text = "用户管理"; - this.btn_user_info.Click += new System.EventHandler(this.btn_user_info_Click); - // - // btn_role_info - // - this.btn_role_info.Image = global::Cyberpipe.Properties.Resources._24x24icon_05_hover1; - this.btn_role_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_role_info.Name = "btn_role_info"; - this.btn_role_info.SubItemsExpandWidth = 14; - this.btn_role_info.Text = "角色管理"; - this.btn_role_info.Click += new System.EventHandler(this.btn_role_info_Click); - // - // btn_resc_info - // - this.btn_resc_info.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__09; - this.btn_resc_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_resc_info.Name = "btn_resc_info"; - this.btn_resc_info.SubItemsExpandWidth = 14; - this.btn_resc_info.Text = "资源管理"; - this.btn_resc_info.Click += new System.EventHandler(this.btn_resc_info_Click); - // - // btn_role_resc - // - this.btn_role_resc.Image = global::Cyberpipe.Properties.Resources.btnlegendSet_Image_副本; - this.btn_role_resc.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_role_resc.Name = "btn_role_resc"; - this.btn_role_resc.SubItemsExpandWidth = 14; - this.btn_role_resc.Text = "角色授权"; - this.btn_role_resc.Click += new System.EventHandler(this.btn_role_resc_Click); - // - // btn_user_role - // - this.btn_user_role.Image = global::Cyberpipe.Properties.Resources._24x24icon_08_hover; - this.btn_user_role.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_user_role.Name = "btn_user_role"; - this.btn_user_role.SubItemsExpandWidth = 14; - this.btn_user_role.Text = "用户授权"; - this.btn_user_role.Click += new System.EventHandler(this.btn_user_role_Click); - // - // btn_password_edit - // - this.btn_password_edit.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__67; - this.btn_password_edit.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_password_edit.Name = "btn_password_edit"; - this.btn_password_edit.SubItemsExpandWidth = 14; - this.btn_password_edit.Text = "密码修改"; - this.btn_password_edit.Click += new System.EventHandler(this.btn_password_edit_Click); - // - // btn_reset_password - // - this.btn_reset_password.Image = global::Cyberpipe.Properties.Resources.liuxiang; - this.btn_reset_password.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_reset_password.Name = "btn_reset_password"; - this.btn_reset_password.SubItemsExpandWidth = 14; - this.btn_reset_password.Text = "重置密码"; - this.btn_reset_password.Click += new System.EventHandler(this.btn_reset_password_Click); - // // ribbonPanel3 // this.ribbonPanel3.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4425,7 +4296,7 @@ this.btn_Person.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; this.btn_Person.Name = "btn_Person"; this.btn_Person.SubItemsExpandWidth = 14; - this.btn_Person.Text = "巡检人员维护"; + this.btn_Person.Text = "定位人员维护"; this.btn_Person.Click += new System.EventHandler(this.btn_Person_Click); // // btn_constructMap @@ -4446,6 +4317,214 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel7 + // + this.ribbonPanel7.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel7.Controls.Add(this.ribbonBar5); + this.ribbonPanel7.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel7.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel7.Name = "ribbonPanel7"; + this.ribbonPanel7.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel7.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel7.Style.Class = ""; + this.ribbonPanel7.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel7.StyleMouseDown.Class = ""; + this.ribbonPanel7.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel7.StyleMouseOver.Class = ""; + this.ribbonPanel7.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel7.TabIndex = 41; + this.ribbonPanel7.Visible = false; + // + // ribbonBar5 + // + this.ribbonBar5.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar5.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar5.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar5.BackgroundStyle.Class = ""; + this.ribbonBar5.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar5.ContainerControlProcessDialogKey = true; + this.ribbonBar5.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar5.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.btn_flag, + this.slider4ground}); + this.ribbonBar5.Location = new System.Drawing.Point(3, 0); + this.ribbonBar5.Name = "ribbonBar5"; + this.ribbonBar5.Size = new System.Drawing.Size(427, 92); + this.ribbonBar5.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar5.TabIndex = 0; + // + // + // + this.ribbonBar5.TitleStyle.Class = ""; + this.ribbonBar5.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar5.TitleStyleMouseOver.Class = ""; + this.ribbonBar5.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar5.TitleVisible = false; + // + // btn_flag + // + this.btn_flag.Image = global::Cyberpipe.Properties.Resources._24x24icon_03_hover; + this.btn_flag.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_flag.Name = "btn_flag"; + this.btn_flag.SubItemsExpandWidth = 14; + this.btn_flag.Text = "标识器管理"; + this.btn_flag.Click += new System.EventHandler(this.btn_flag_Click); + // + // slider4ground + // + this.slider4ground.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; + this.slider4ground.Name = "slider4ground"; + this.slider4ground.Text = "地面透明度"; + this.slider4ground.Value = 0; + this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); + // + // ribbonPanel8 + // + this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel8.Controls.Add(this.ribbonBar_UserInfo); + this.ribbonPanel8.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel8.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel8.Name = "ribbonPanel8"; + this.ribbonPanel8.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel8.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel8.Style.Class = ""; + this.ribbonPanel8.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel8.StyleMouseDown.Class = ""; + this.ribbonPanel8.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel8.StyleMouseOver.Class = ""; + this.ribbonPanel8.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel8.TabIndex = 42; + this.ribbonPanel8.Visible = false; + // + // ribbonBar_UserInfo + // + this.ribbonBar_UserInfo.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar_UserInfo.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar_UserInfo.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar_UserInfo.BackgroundStyle.Class = ""; + this.ribbonBar_UserInfo.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar_UserInfo.ContainerControlProcessDialogKey = true; + this.ribbonBar_UserInfo.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar_UserInfo.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.btn_user_info, + this.btn_role_info, + this.btn_resc_info, + this.btn_role_resc, + this.btn_user_role, + this.btn_password_edit, + this.btn_reset_password}); + this.ribbonBar_UserInfo.Location = new System.Drawing.Point(3, 0); + this.ribbonBar_UserInfo.Name = "ribbonBar_UserInfo"; + this.ribbonBar_UserInfo.Size = new System.Drawing.Size(427, 92); + this.ribbonBar_UserInfo.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar_UserInfo.TabIndex = 0; + // + // + // + this.ribbonBar_UserInfo.TitleStyle.Class = ""; + this.ribbonBar_UserInfo.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar_UserInfo.TitleStyleMouseOver.Class = ""; + this.ribbonBar_UserInfo.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // btn_user_info + // + this.btn_user_info.Image = global::Cyberpipe.Properties.Resources._24x24icon_13_hover; + this.btn_user_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_user_info.Name = "btn_user_info"; + this.btn_user_info.SubItemsExpandWidth = 14; + this.btn_user_info.Text = "用户管理"; + this.btn_user_info.Click += new System.EventHandler(this.btn_user_info_Click); + // + // btn_role_info + // + this.btn_role_info.Image = global::Cyberpipe.Properties.Resources._24x24icon_05_hover1; + this.btn_role_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_role_info.Name = "btn_role_info"; + this.btn_role_info.SubItemsExpandWidth = 14; + this.btn_role_info.Text = "角色管理"; + this.btn_role_info.Click += new System.EventHandler(this.btn_role_info_Click); + // + // btn_resc_info + // + this.btn_resc_info.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__09; + this.btn_resc_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_resc_info.Name = "btn_resc_info"; + this.btn_resc_info.SubItemsExpandWidth = 14; + this.btn_resc_info.Text = "资源管理"; + this.btn_resc_info.Click += new System.EventHandler(this.btn_resc_info_Click); + // + // btn_role_resc + // + this.btn_role_resc.Image = global::Cyberpipe.Properties.Resources.btnlegendSet_Image_副本; + this.btn_role_resc.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_role_resc.Name = "btn_role_resc"; + this.btn_role_resc.SubItemsExpandWidth = 14; + this.btn_role_resc.Text = "角色授权"; + this.btn_role_resc.Click += new System.EventHandler(this.btn_role_resc_Click); + // + // btn_user_role + // + this.btn_user_role.Image = global::Cyberpipe.Properties.Resources._24x24icon_08_hover; + this.btn_user_role.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_user_role.Name = "btn_user_role"; + this.btn_user_role.SubItemsExpandWidth = 14; + this.btn_user_role.Text = "用户授权"; + this.btn_user_role.Click += new System.EventHandler(this.btn_user_role_Click); + // + // btn_password_edit + // + this.btn_password_edit.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__67; + this.btn_password_edit.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_password_edit.Name = "btn_password_edit"; + this.btn_password_edit.SubItemsExpandWidth = 14; + this.btn_password_edit.Text = "密码修改"; + this.btn_password_edit.Click += new System.EventHandler(this.btn_password_edit_Click); + // + // btn_reset_password + // + this.btn_reset_password.Image = global::Cyberpipe.Properties.Resources.liuxiang; + this.btn_reset_password.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_reset_password.Name = "btn_reset_password"; + this.btn_reset_password.SubItemsExpandWidth = 14; + this.btn_reset_password.Text = "重置密码"; + this.btn_reset_password.Click += new System.EventHandler(this.btn_reset_password_Click); + // // ribbonPanel2 // this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -5891,85 +5970,6 @@ this.buttonItemBZ11.Text = "标注管理"; this.buttonItemBZ11.Click += new System.EventHandler(this.buttonItemBZ11_Click); // - // ribbonPanel7 - // - this.ribbonPanel7.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel7.Controls.Add(this.ribbonBar5); - this.ribbonPanel7.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel7.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel7.Name = "ribbonPanel7"; - this.ribbonPanel7.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel7.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel7.Style.Class = ""; - this.ribbonPanel7.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel7.StyleMouseDown.Class = ""; - this.ribbonPanel7.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel7.StyleMouseOver.Class = ""; - this.ribbonPanel7.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel7.TabIndex = 41; - this.ribbonPanel7.Visible = false; - // - // ribbonBar5 - // - this.ribbonBar5.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar5.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar5.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar5.BackgroundStyle.Class = ""; - this.ribbonBar5.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar5.ContainerControlProcessDialogKey = true; - this.ribbonBar5.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar5.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.btn_flag, - this.slider4ground}); - this.ribbonBar5.Location = new System.Drawing.Point(3, 0); - this.ribbonBar5.Name = "ribbonBar5"; - this.ribbonBar5.Size = new System.Drawing.Size(427, 92); - this.ribbonBar5.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar5.TabIndex = 0; - // - // - // - this.ribbonBar5.TitleStyle.Class = ""; - this.ribbonBar5.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar5.TitleStyleMouseOver.Class = ""; - this.ribbonBar5.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar5.TitleVisible = false; - // - // btn_flag - // - this.btn_flag.Image = global::Cyberpipe.Properties.Resources._24x24icon_03_hover; - this.btn_flag.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_flag.Name = "btn_flag"; - this.btn_flag.SubItemsExpandWidth = 14; - this.btn_flag.Text = "标识器管理"; - this.btn_flag.Click += new System.EventHandler(this.btn_flag_Click); - // - // slider4ground - // - this.slider4ground.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; - this.slider4ground.Name = "slider4ground"; - this.slider4ground.Text = "地面透明度"; - this.slider4ground.Value = 0; - this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); - // // ribbonPanel12 // this.ribbonPanel12.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7181,11 +7181,11 @@ this.contextMenuStripDeleteLayerNode.ResumeLayout(false); this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); - this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel7.ResumeLayout(false); + this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); - this.ribbonPanel7.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); this.ribbonPanel5.ResumeLayout(false); this.ribbonPanel6.ResumeLayout(false); diff --git a/SysRescInfoManager.cs b/SysRescInfoManager.cs index 3a84d95..fda6f3f 100644 --- a/SysRescInfoManager.cs +++ b/SysRescInfoManager.cs @@ -79,11 +79,11 @@ //控制表格显示的列，以及每一列要显示的列名 this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - - this.winGridViewPager1.AddColumnAlias("RESC", "资源名称"); - this.winGridViewPager1.AddColumnAlias("ID", "编号"); - this.winGridViewPager1.AddColumnAlias("DESP", "资源描述"); - this.winGridViewPager1.DisplayColumns = "RESC,DESP"; + + this.winGridViewPager1.AddColumnAlias("资源名称", "资源名称"); + this.winGridViewPager1.AddColumnAlias("编号", "编号"); + this.winGridViewPager1.AddColumnAlias("资源描述", "资源描述"); + this.winGridViewPager1.DisplayColumns = "资源名称,资源描述"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -153,8 +153,8 @@ DataGridViewRow row = grid.SelectedRows[0]; if (MessageBox.Show("确定删除？", "确认", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) { - string dbid = row.Cells["id"].Value.ToString(); - string resc = row.Cells["resc"].Value.ToString(); + string dbid = row.Cells["编号"].Value.ToString(); + string resc = row.Cells["资源名称"].Value.ToString(); OracleConnection conn = null; OracleTransaction tran = null; try @@ -229,7 +229,7 @@ private string GetSql() { string sqlCount = "select count(*) from casic_userresctest where sysname='EMS'"; - string sqlData = "select resc,id,desp " + + string sqlData = "select resc as 资源名称,id as 编号,desp as 资源描述 " + "from (select t.*,rownum row_num from casic_userresctest t order by id desc)b " + " where sysname='EMS'"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -242,7 +242,7 @@ int minPage = (pageIndex - 1) * maxPageIndex + 1; int maxPage = pageIndex * maxPageIndex; string sqlCount = "select count(*) from casic_userresctest where sysname='EMS'"; - string sqlData = "select resc,id,desp " + + string sqlData = "select resc as 资源名称,id as 编号,desp as 资源描述 " + "from (select t.*,rownum row_num from casic_userresctest t where sysname='EMS' order by id desc)b " + " where(b.row_num between " + minPage + " and " + maxPage + ")"; diff --git a/bin/x86/Debug/Config.xml b/bin/x86/Debug/Config.xml index e2d7b46..560a163 100644 --- a/bin/x86/Debug/Config.xml +++ b/bin/x86/Debug/Config.xml @@ -3,9 +3,9 @@ LocaSpace三维地下管线信息系统 scott - SZHTDB - 127.0.0.1 - scott + SZHTDB2 + 192.168.0.203 + SZHTDB2 127.0.0.1 1500 @@ -14,8 +14,8 @@ http://192.168.0.122:8088/UpDownFile.asmx - http://127.0.0.1/EMSCyberpipe.msi - http://127.0.0.1/EMSConfig.xml + http://192.168.10.229/EMSCyberpipe.msi + http://192.168.10.229/EMSConfig.xml diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index b19e2ab..b5e320f 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 1a4aeed..c20e54a 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/PipelineType.xml b/bin/x86/Debug/PipelineType.xml index 51dc4b8..b1cbacc 100644 --- a/bin/x86/Debug/PipelineType.xml +++ b/bin/x86/Debug/PipelineType.xml @@ -1,6 +1,6 @@  - + @@ -42,7 +42,7 @@ - + @@ -83,7 +83,7 @@ - + @@ -115,7 +115,7 @@ - + @@ -159,7 +159,7 @@ - + @@ -200,7 +200,7 @@ - + @@ -236,7 +236,7 @@ - + @@ -278,7 +278,7 @@ - + @@ -320,7 +320,7 @@ - + @@ -363,7 +363,7 @@ - + @@ -408,7 +408,7 @@ - + @@ -448,7 +448,7 @@ - + @@ -485,7 +485,7 @@ - + @@ -527,7 +527,7 @@ - + @@ -565,7 +565,7 @@ - + @@ -595,7 +595,7 @@ - + @@ -625,7 +625,7 @@ - + @@ -657,7 +657,7 @@ - + @@ -691,7 +691,7 @@ - + @@ -728,7 +728,7 @@ - + @@ -763,7 +763,7 @@ - + @@ -799,7 +799,7 @@ - + @@ -824,7 +824,7 @@ - + @@ -846,7 +846,7 @@ - + diff --git a/Cyberpipe.csproj b/Cyberpipe.csproj index fe600e5..501fd09 100644 --- a/Cyberpipe.csproj +++ b/Cyberpipe.csproj @@ -246,6 +246,12 @@ Form_TaskManager.cs + + Form + + + FrmFlagDetail.cs + Form @@ -1368,6 +1374,9 @@ Form_TaskManager.cs + + FrmFlagDetail.cs + FormDocumentManager.cs diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 537b4c3..1acf22a 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 7d5dd95..3f178cb 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -90,20 +90,20 @@ this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - - this.winGridViewPager1.AddColumnAlias("ACCIDENTTIME", "上报时间"); - this.winGridViewPager1.AddColumnAlias("DBID", "编号"); - this.winGridViewPager1.AddColumnAlias("DESCRIBE", "事件描述"); - this.winGridViewPager1.AddColumnAlias("LATITUDE", "纬度"); - this.winGridViewPager1.AddColumnAlias("LOCALE", "事件地点"); - this.winGridViewPager1.AddColumnAlias("LONGITUDE", "经度"); - this.winGridViewPager1.AddColumnAlias("PATROLERNAME", "上报人员"); - this.winGridViewPager1.AddColumnAlias("PATROLER_ID", "人员ID"); - this.winGridViewPager1.AddColumnAlias("TASK_ID", "任务编号"); - this.winGridViewPager1.AddColumnAlias("RESULT", "处理结果"); - this.winGridViewPager1.AddColumnAlias("STATE", "处理状态"); - this.winGridViewPager1.DisplayColumns = "ACCIDENTTIME,DESCRIBE,LOCALE,PATROLERNAME,TASK_ID,RESULT,STATE"; + this.winGridViewPager1.AddColumnAlias("上报时间", "上报时间"); + this.winGridViewPager1.AddColumnAlias("编号", "编号"); + this.winGridViewPager1.AddColumnAlias("事件描述", "事件描述"); + this.winGridViewPager1.AddColumnAlias("纬度", "纬度"); + this.winGridViewPager1.AddColumnAlias("事件地点", "事件地点"); + this.winGridViewPager1.AddColumnAlias("经度", "经度"); + this.winGridViewPager1.AddColumnAlias("上报人员", "上报人员"); + this.winGridViewPager1.AddColumnAlias("人员ID", "人员ID"); + this.winGridViewPager1.AddColumnAlias("任务编号", "任务编号"); + this.winGridViewPager1.AddColumnAlias("处理结果", "处理结果"); + this.winGridViewPager1.AddColumnAlias("处理状态", "处理状态"); + + this.winGridViewPager1.DisplayColumns = "上报时间,事件描述,事件地点,上报人员,任务编号,处理结果,处理状态"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -114,8 +114,8 @@ winGridViewPager1.dataGridView1.ContextMenuStrip.Items[5].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[6].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[7].Visible = false; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[1].Text = "查看位置"; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "结果编辑"; + winGridViewPager1.dataGridView1.ContextMenuStrip.Items[1].Text = "结果编辑"; + winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "查看位置"; //右键菜单宽度 winGridViewPager1.dataGridView1.ContextMenuStrip.AutoSize = false; @@ -160,13 +160,12 @@ this.WindowState = FormWindowState.Minimized; globeControl1.Globe.MemoryLayer.RemoveAllFeature(); this.WindowState = FormWindowState.Minimized; - double x = Convert.ToDouble(row.Cells["LONGITUDE"].Value); - double y = Convert.ToDouble(row.Cells["LATITUDE"].Value); - - string username = Convert.ToString(row.Cells["PATROLERNAME"].Value); - string Atime = Convert.ToString(row.Cells["ACCIDENTTIME"].Value); - string location = Convert.ToString(row.Cells["LOCALE"].Value); - string descp = Convert.ToString(row.Cells["DESCRIBE"].Value); + double x = Convert.ToDouble(row.Cells["经度"].Value); + double y = Convert.ToDouble(row.Cells["纬度"].Value); + string username = Convert.ToString(row.Cells["上报人员"].Value); + string Atime = Convert.ToString(row.Cells["上报时间"].Value); + string location = Convert.ToString(row.Cells["事件地点"].Value); + string descp = Convert.ToString(row.Cells["事件描述"].Value); /////////////////////////////////////// /*******设置飞行与创建模型******/ @@ -228,8 +227,8 @@ DataGridViewRow row = grid.SelectedRows[0]; try { - int dbId = Convert.ToInt32(row.Cells["DBID"].Value); - string result = Convert.ToString(row.Cells["RESULT"].Value); + int dbId = Convert.ToInt32(row.Cells["编号"].Value); + string result = Convert.ToString(row.Cells["处理结果"].Value); EMS_Forms.Form_EventResult form = new Form_EventResult(dbId, result); form.refresh += new Form_EventResult.Handle(LoadData);//改变值的事件 form.ShowDialog(); @@ -276,9 +275,9 @@ } for (int i = 0; i < table.Rows.Count; i++) { - if (winGridViewPager1.dataGridView1.Rows[i].Cells["RESULT"].Value != null && !(winGridViewPager1.dataGridView1.Rows[i].Cells["RESULT"].Value.ToString().Trim().Equals(""))) + if (winGridViewPager1.dataGridView1.Rows[i].Cells["处理结果"].Value != null && !(winGridViewPager1.dataGridView1.Rows[i].Cells["处理结果"].Value.ToString().Trim().Equals(""))) { - winGridViewPager1.dataGridView1.Rows[i].Cells["STATE"].Value = "已处理"; + winGridViewPager1.dataGridView1.Rows[i].Cells["处理状态"].Value = "已处理"; } } @@ -307,9 +306,9 @@ } for (int i = 0; i < table.Rows.Count; i++) { - if (winGridViewPager1.dataGridView1.Rows[i].Cells["RESULT"].Value != null && !(winGridViewPager1.dataGridView1.Rows[i].Cells["RESULT"].Value.ToString().Trim().Equals(""))) + if (winGridViewPager1.dataGridView1.Rows[i].Cells["处理结果"].Value != null && !(winGridViewPager1.dataGridView1.Rows[i].Cells["处理结果"].Value.ToString().Trim().Equals(""))) { - winGridViewPager1.dataGridView1.Rows[i].Cells["STATE"].Value = "已处理"; + winGridViewPager1.dataGridView1.Rows[i].Cells["处理状态"].Value = "已处理"; } } @@ -320,10 +319,12 @@ { string sqlCount = "select count(*) from ACCIDENT where 1=1"; - string sqlData = "select ACCIDENTTIME,DBID,DESCRIBE,LATITUDE,LOCALE,LONGITUDE,PATROLERNAME,PATROLER_ID,TASK_ID,RESULT,'' as STATE " + + string sqlData = "select ACCIDENTTIME as 上报时间,DBID as 编号,DESCRIBE as 事件描述,"+ + "LATITUDE as 纬度,LOCALE as 事件地点,LONGITUDE as 经度,PATROLERNAME 上报人员,"+ + "PATROLER_ID as 人员ID,TASK_ID as 任务编号,RESULT as 处理结果,'' as 处理状态 " + "from (select t.*,rownum row_num from ACCIDENT t order by DBID)b " + " where 1=1"; - + rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; @@ -340,9 +341,10 @@ string sqlCount = "select count(*) from ACCIDENT where 1=1"; - string sqlData = "select ACCIDENTTIME,DBID,DESCRIBE,LATITUDE,LOCALE,LONGITUDE,PATROLERNAME,PATROLER_ID,TASK_ID,RESULT,'' as STATE " + - "from (select t.*,rownum row_num from ACCIDENT t order by DBID)b " + - " where(b.row_num between " + minPage + " and " + maxPage + ")"; + string sqlData = "select ACCIDENTTIME as 上报时间,DBID as 编号,DESCRIBE as 事件描述," + + "LATITUDE as 纬度,LOCALE as 事件地点,LONGITUDE as 经度,PATROLERNAME 上报人员," + + "PATROLER_ID as 人员ID,TASK_ID as 任务编号,RESULT as 处理结果,'' as 处理状态 " + + "from (select t.*,rownum row_num from ACCIDENT t where 1=1"; if (!String.IsNullOrEmpty(comboBox_name.Text.Trim())) { @@ -361,7 +363,8 @@ sqlCount += "and ACCIDENTTIME<=to_date('" + time.ToShortDateString() + "','yyyy-MM-dd') "; sqlData += "and ACCIDENTTIME<=to_date('" + time.ToShortDateString() + "','yyyy-MM-dd') "; } - + sqlData += " order by DBID desc)b " + + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 225c8d7..8bd9e48 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -120,8 +120,8 @@ private void flyToTask(DataGridViewRow row, int taskState) { int dbID = 0; - dbID = Convert.ToInt32(row.Cells["DBID"].Value); - string userName = Convert.ToString(row.Cells["USERNAME"].Value); + dbID = Convert.ToInt32(row.Cells["任务编号"].Value); + string userName = Convert.ToString(row.Cells["任务执行人员"].Value); System.DateTime t = new DateTime(); try { @@ -392,15 +392,15 @@ //控制表格显示的列，以及每一列要显示的列名 this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - this.winGridViewPager1.AddColumnAlias("DBID", "任务编号"); - this.winGridViewPager1.AddColumnAlias("DEPLOYTIME", "创建时间"); - this.winGridViewPager1.AddColumnAlias("DESCIRPTION", "任务描述"); - this.winGridViewPager1.AddColumnAlias("FINISHTIME", "完成时间"); - this.winGridViewPager1.AddColumnAlias("STREET", "任务执行区域"); - this.winGridViewPager1.AddColumnAlias("TASKSTATE", "任务状态"); - this.winGridViewPager1.AddColumnAlias("USERNAME", "任务执行人员"); + this.winGridViewPager1.AddColumnAlias("任务编号", "任务编号"); + this.winGridViewPager1.AddColumnAlias("创建时间", "创建时间"); + this.winGridViewPager1.AddColumnAlias("任务描述", "任务描述"); + this.winGridViewPager1.AddColumnAlias("完成时间", "完成时间"); + this.winGridViewPager1.AddColumnAlias("任务执行区域", "任务执行区域"); + this.winGridViewPager1.AddColumnAlias("任务状态", "任务状态"); + this.winGridViewPager1.AddColumnAlias("任务执行人员", "任务执行人员"); - this.winGridViewPager1.DisplayColumns = "DBID,DEPLOYTIME,DESCIRPTION,FINISHTIME,STREET,TASKSTATE,USERNAME"; + this.winGridViewPager1.DisplayColumns = "任务编号,创建时间,任务描述,完成时间,任务执行区域,任务状态,任务执行人员"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -464,8 +464,8 @@ { int dbID = 0; int taskStateInt = 0; - dbID = Convert.ToInt32(row.Cells["DBID"].Value); - string taskState = row.Cells["TASKSTATE"].Value.ToString(); + dbID = Convert.ToInt32(row.Cells["任务编号"].Value); + string taskState = row.Cells["任务状态"].Value.ToString(); if (taskState.Equals("开始任务")) { taskStateInt = 1; @@ -534,9 +534,10 @@ private string GetSql() { - string sqlCount = "select count(*) from taskinfo t where 1=1'"; + string sqlCount = "select count(*) from taskinfo t where 1=1"; - string sqlData = "select dbid,deploytime,descirption,finishtime,street,taskstate,username " + + 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"; @@ -550,9 +551,9 @@ int minPage = (pageIndex - 1) * maxPageIndex + 1; int maxPage = pageIndex * maxPageIndex; string sqlCount = "select count(*) from taskinfo t where 1=1"; - string sqlData = "select dbid,deploytime,descirption,finishtime,street,taskstate,username " + - "from (select t.*,rownum row_num from taskinfo t order by DBID desc)b " + - " where(b.row_num between " + minPage + " and " + maxPage + ")"; + 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"; if (!String.IsNullOrEmpty(comboBox_userName.Text.Trim()) && !comboBox_userName.Text.Trim().Equals("不限")) { @@ -581,6 +582,8 @@ sqlCount += "and street='" + combo_street.Text + "' "; sqlData += "and street='" + combo_street.Text + "' "; } + sqlData += " order by DBID desc)b " + + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index e65a4bd..58f5342 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -73,13 +73,13 @@ //控制表格显示的列，以及每一列要显示的列名 this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - this.winGridViewPager1.AddColumnAlias("FILENAME", "文档名称"); - this.winGridViewPager1.AddColumnAlias("DBID", "编号"); - this.winGridViewPager1.AddColumnAlias("TITLE", "文档标题"); - this.winGridViewPager1.AddColumnAlias("FILETYPE", "文档类型"); - this.winGridViewPager1.AddColumnAlias("UPDAY", "上传日期"); - this.winGridViewPager1.AddColumnAlias("WRITER", "上传人"); - this.winGridViewPager1.DisplayColumns = "FILENAME,TITLE,FILETYPE,UPDAY,WRITER"; + this.winGridViewPager1.AddColumnAlias("文档名称", "文档名称"); + this.winGridViewPager1.AddColumnAlias("编号", "编号"); + this.winGridViewPager1.AddColumnAlias("文档标题", "文档标题"); + this.winGridViewPager1.AddColumnAlias("文档类型", "文档类型"); + this.winGridViewPager1.AddColumnAlias("上传日期", "上传日期"); + this.winGridViewPager1.AddColumnAlias("上传人", "上传人"); + this.winGridViewPager1.DisplayColumns = "文档名称,文档标题,文档类型,上传日期,上传人"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -167,7 +167,7 @@ if (grid != null) { DataGridViewRow row = grid.SelectedRows[0]; - string dbid = row.Cells["dbid"].Value.ToString(); + string dbid = row.Cells["编号"].Value.ToString(); try { if (MessageBox.Show("确认删除吗？", "确认", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) @@ -212,7 +212,8 @@ { string sqlCount = "select count(*) from casic_userdocument where sysname = 'EMS'"; - string sqlData = "select filename,dbid,title,filetype,upday,writer " + + string sqlData = "select filename as 文档名称,dbid as 编号,title as 文档标题," + + "filetype as 文档类型,upday as 上传日期,writer as 上传人 " + "from (select t.*,rownum row_num from casic_userdocument t order by DBID desc)b " + " where sysname = 'EMS'"; @@ -226,9 +227,9 @@ int minPage = (pageIndex - 1) * maxPageIndex + 1; int maxPage = pageIndex * maxPageIndex; string sqlCount = "select count(*) from casic_userdocument where sysname = 'EMS'"; - string sqlData = "select filename,dbid,title,filetype,upday,writer " + - "from (select t.*,rownum row_num from casic_userdocument t where sysname = 'EMS' order by DBID desc)b " + - " where(b.row_num between " + minPage + " and " + maxPage + ")"; + string sqlData = "select filename as 文档名称,dbid as 编号,title as 文档标题,"+ + "filetype as 文档类型,upday as 上传日期,writer as 上传人 " + + "from (select t.*,rownum row_num from casic_userdocument t where sysname = 'EMS'"; string txtTitleText = null; string comboFileType = null; @@ -278,7 +279,8 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - + sqlData += " order by DBID desc)b " + + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; @@ -437,7 +439,7 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - string filename = row.Cells["filename"].Value.ToString(); + string filename = row.Cells["文档名称"].Value.ToString(); string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; string file = System.Environment.CurrentDirectory + "\\download\\" + filename; int result = DownloadFile(url, file, progressBar1); @@ -515,7 +517,7 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - string filename = row.Cells["filename"].Value.ToString(); + string filename = row.Cells["文档名称"].Value.ToString(); string ext = Path.GetExtension(filename); SaveFileDialog dlg = new SaveFileDialog(); dlg.Filter = "保存文档|*" + ext + ";"; diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 1d1201b..3902629 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -748,6 +748,7 @@ this.Name = "FrmAddSinMark"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "单个标识器添加"; + this.TopMost = true; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmAddSinMark_FormClosing); this.Load += new System.EventHandler(this.FrmAddSinMark_Load); this.groupPanel1.ResumeLayout(false); diff --git a/FrmEquipmentManage.cs b/FrmEquipmentManage.cs index 90bfdb2..a3cf55c 100644 --- a/FrmEquipmentManage.cs +++ b/FrmEquipmentManage.cs @@ -74,13 +74,13 @@ //控制表格显示的列，以及每一列要显示的列名 this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - this.winGridViewPager1.AddColumnAlias("DESCIRPTION", "设备描述"); - this.winGridViewPager1.AddColumnAlias("DBID", "编号"); - this.winGridViewPager1.AddColumnAlias("MACID", "MAC地址"); - this.winGridViewPager1.AddColumnAlias("OWNER", "设备所有人"); - this.winGridViewPager1.AddColumnAlias("STATUS", "设备状态"); + this.winGridViewPager1.AddColumnAlias("设备描述", "设备描述"); + this.winGridViewPager1.AddColumnAlias("编号", "编号"); + this.winGridViewPager1.AddColumnAlias("MAC地址", "MAC地址"); + this.winGridViewPager1.AddColumnAlias("设备所有人", "设备所有人"); + this.winGridViewPager1.AddColumnAlias("设备状态", "设备状态"); - this.winGridViewPager1.DisplayColumns = "DESCIRPTION,MACID,OWNER,STATUS"; + this.winGridViewPager1.DisplayColumns = "设备描述,MAC地址,设备所有人,设备状态"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -146,10 +146,10 @@ DataGridViewRow row = grid.SelectedRows[0]; try { - long dbid = long.Parse(row.Cells["DBID"].Value.ToString()); - String macId = row.Cells["MACID"].Value.ToString(); - String username = row.Cells["OWNER"].Value.ToString(); - String descn = row.Cells["DESCIRPTION"].Value.ToString(); + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); + String macId = row.Cells["MAC地址"].Value.ToString(); + String username = row.Cells["设备所有人"].Value.ToString(); + String descn = row.Cells["设备状态"].Value.ToString(); FrmEquipmentEdit frm = new FrmEquipmentEdit(dbid.ToString(), macId, username, descn); frm.reloadGrid += new ReloadEquipmentGrid(LoadData); frm.ShowDialog(); @@ -179,7 +179,7 @@ { return; } - String macId = row.Cells["MACID"].Value.ToString(); + String macId = row.Cells["MAC地址"].Value.ToString(); FrmLog frm = new FrmLog(macId); frm.Show(); } @@ -201,7 +201,7 @@ if (grid != null) { DataGridViewRow row = grid.SelectedRows[0]; - long dbid = long.Parse(row.Cells["DBID"].Value.ToString()); + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); try { if (MessageBox.Show("确定删除？", "确认", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) @@ -243,7 +243,8 @@ { string sqlCount = "select count(*) from equipment where status = 'USING'"; - string sqlData = "select descirption,DBID,macid,owner,case when status = 'USING' then '可用' when status = 'DAMAGE' then '损坏' end as status " + + string sqlData = "select descirption as 设备描述,DBID as 编号,macid as MAC地址,owner as 设备所有人,"+ + "case when status = 'USING' then '可用' when status = 'DAMAGE' then '损坏' end as 设备状态 " + "from (select t.*,rownum row_num from equipment t where status = 'USING' order by dbid desc)b " + " where 1=1"; @@ -258,16 +259,17 @@ int maxPage = pageIndex * maxPageIndex; string sqlCount = "select count(*) from equipment where status = 'USING' "; - string sqlData = "select descirption,DBID,macid,owner,case when status = 'USING' then '可用' when status = 'DAMAGE' then '损坏' end as status " + - "from (select t.*,rownum row_num from equipment t where status = 'USING' order by DBID desc)b " + - " where(b.row_num between " + minPage + " and " + maxPage + ")"; + string sqlData = "select descirption as 设备描述,DBID as 编号,macid as MAC地址,owner as 设备所有人," + + "case when status = 'USING' then '可用' when status = 'DAMAGE' then '损坏' end as 设备状态 " + + "from (select t.*,rownum row_num from equipment t where status = 'USING'"; if (!String.IsNullOrEmpty(txtMacId.Text.Trim())) { sqlData += " and macid like '%" + txtMacId.Text.Trim() + "%'"; sqlCount += " and macid like '%" + txtMacId.Text.Trim() + "%'"; } - + sqlData += " order by DBID desc)b " + + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; @@ -299,76 +301,6 @@ } } - //public void reloadGrid(int pageIndex) - //{ - // if (pageIndex <= 0) - // { - // pageIndex = 1; - // currentpage = 1; - // } - // String sqlrows = "select * from (select rownum as rowno,dbid,descirption,macid,owner,case when status = 'USING' then '可用' when status = 'DAMAGE' then '损坏' end as status,'编辑' as btnEdit,'删除' as btnDel from equipment t where status = 'USING' "; - // string sqlcount = "select count(*) from equipment where status = 'USING' "; - // if (!String.IsNullOrEmpty(txtMacId.Text.Trim())) - // { - // sqlrows += " and macid like '%" + txtMacId.Text.Trim() + "%'"; - // sqlcount += " and macid like '%" + txtMacId.Text.Trim() + "%'"; - // } - // sqlrows += " and rownum<=" + (pagesize * pageIndex) + ") table_alias where table_alias.rowno>=" + ((pageIndex - 1) * pagesize + 1); - - // int rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlcount).ToString()); - // int pages = 0; - // if (rows % pagesize == 0) - // { - // pages = rows / pagesize; - // } - // else - // { - // pages = rows / pagesize + 1; - // } - - // lastpage = pages; - - // lab_page_msg.Text = "共" + rows + "条记录，每页" + pagesize + "条，第" + pageIndex + "页，共" + pages + "页"; - // combo_page_num.Items.Clear(); - // for (int i = 1; i <= pages; i++) - // { - // combo_page_num.Items.Add(new ComboBoxItem(i.ToString(), i.ToString())); - // } - - // if (lastpage == 1) - // { - // btn_page_first.Enabled = false; - // btn_page_pre.Enabled = false; - // btn_page_last.Enabled = false; - // btn_page_next.Enabled = false; - // } - // else if (currentpage == 1) - // { - // btn_page_first.Enabled = false; - // btn_page_pre.Enabled = false; - // btn_page_last.Enabled = true; - // btn_page_next.Enabled = true; - // } - // else if (currentpage == lastpage) - // { - // btn_page_first.Enabled = true; - // btn_page_pre.Enabled = true; - // btn_page_last.Enabled = false; - // btn_page_next.Enabled = false; - // } - // else - // { - // btn_page_first.Enabled = true; - // btn_page_pre.Enabled = true; - // btn_page_last.Enabled = true; - // btn_page_next.Enabled = true; - // } - - // DataTable table = OracleUtils.ExecuteDataset(OracleUtils.ConnectionString, CommandType.Text, sqlrows).Tables[0]; - // dataGridViewX1.DataSource = table; - - //} - private void FrmEquipmentManage_FormClosing(object sender, FormClosingEventArgs e) diff --git a/FrmFlagDetail.Designer.cs b/FrmFlagDetail.Designer.cs new file mode 100644 index 0000000..982bfc6 --- /dev/null +++ b/FrmFlagDetail.Designer.cs @@ -0,0 +1,103 @@ +namespace Cyberpipe +{ + partial class FrmFlagDetail + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); + this.dataGridViewX_markDetail = new DevComponents.DotNetBar.Controls.DataGridViewX(); + this.对象类型 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.对象编号 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.对象名称 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX_markDetail)).BeginInit(); + this.SuspendLayout(); + // + // dataGridViewX_markDetail + // + this.dataGridViewX_markDetail.AllowUserToAddRows = false; + this.dataGridViewX_markDetail.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; + this.dataGridViewX_markDetail.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dataGridViewX_markDetail.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.对象类型, + this.对象编号, + this.对象名称}); + dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle3.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dataGridViewX_markDetail.DefaultCellStyle = dataGridViewCellStyle3; + this.dataGridViewX_markDetail.Dock = System.Windows.Forms.DockStyle.Fill; + this.dataGridViewX_markDetail.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(170)))), ((int)(((byte)(170)))), ((int)(((byte)(170))))); + this.dataGridViewX_markDetail.Location = new System.Drawing.Point(0, 0); + this.dataGridViewX_markDetail.Name = "dataGridViewX_markDetail"; + this.dataGridViewX_markDetail.RowTemplate.Height = 23; + this.dataGridViewX_markDetail.Size = new System.Drawing.Size(508, 321); + this.dataGridViewX_markDetail.TabIndex = 0; + // + // 对象类型 + // + this.对象类型.HeaderText = "对象类型"; + this.对象类型.Name = "对象类型"; + // + // 对象编号 + // + this.对象编号.HeaderText = "对象编号"; + this.对象编号.Name = "对象编号"; + // + // 对象名称 + // + this.对象名称.HeaderText = "对象名称"; + this.对象名称.Name = "对象名称"; + // + // FrmFlagDetail + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(508, 321); + this.Controls.Add(this.dataGridViewX_markDetail); + this.Name = "FrmFlagDetail"; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; + this.Text = "标识对象信息"; + this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmFlagDetail_FormClosing); + this.Load += new System.EventHandler(this.FrmFlagDetail_Load); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX_markDetail)).EndInit(); + this.ResumeLayout(false); + + } + + #endregion + + private DevComponents.DotNetBar.Controls.DataGridViewX dataGridViewX_markDetail; + private System.Windows.Forms.DataGridViewTextBoxColumn 对象类型; + private System.Windows.Forms.DataGridViewTextBoxColumn 对象编号; + private System.Windows.Forms.DataGridViewTextBoxColumn 对象名称; + + } +} \ No newline at end of file diff --git a/FrmFlagDetail.cs b/FrmFlagDetail.cs new file mode 100644 index 0000000..81de974 --- /dev/null +++ b/FrmFlagDetail.cs @@ -0,0 +1,77 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Windows.Forms; +using GeoScene.Globe; +using System.Data.OracleClient; + +namespace Cyberpipe +{ + public partial class FrmFlagDetail : Form + { + DataTable dt = new DataTable(); + private GSOGlobeControl globeControl1; + + public delegate void Handle(); + public event Handle showParentForm; + String markId; + + public FrmFlagDetail(GSOGlobeControl globeControl1, String id) + { + InitializeComponent(); + this.markId = id; + } + + private void FrmFlagDetail_FormClosing(object sender, FormClosingEventArgs e) + { + showParentForm(); + } + + private void FrmFlagDetail_Load(object sender, EventArgs e) + { + string objectIds = ""; + string objectTypeCodes = ""; + string sql = "select t.对象编号,t.对象类型 from 标识器 t where t.编号='" + markId + "'"; + using (OracleDataReader reader = OracleUtils.ExecuteReader(OracleUtils.ConnectionString, CommandType.Text, sql)) + { + while (reader.Read()) + { + objectIds = reader.GetString(0); + objectTypeCodes = reader.GetString(1); + } + } + + string[] codeTypes = objectTypeCodes.Split(','); + string[] codeIds = objectIds.Split(','); + int length = 0; + if (codeTypes.Length <= codeIds.Length) + { + length = codeTypes.Length; + } + else + { + length = codeIds.Length; + } + for (int n = 0; n < length; n++) + { + for (int i = 0; i < Utility1.listPipelineType.Count; i++) + { + if (Utility1.listPipelineType[i].code == codeTypes[n]) + { + //string objectId = codeIds[i]; + //string objectType = Utility1.listPipelineType[i].type; + //string objectName = Utility1.listPipelineType[i].name; + int index = this.dataGridViewX_markDetail.Rows.Add(); + this.dataGridViewX_markDetail.Rows[index].Cells[0].Value = Utility1.listPipelineType[i].type; + this.dataGridViewX_markDetail.Rows[index].Cells[1].Value = codeIds[n].ToString(); + this.dataGridViewX_markDetail.Rows[index].Cells[2].Value = Utility1.listPipelineType[i].name; + } + } + } + } + } +} diff --git a/FrmFlagDetail.resx b/FrmFlagDetail.resx new file mode 100644 index 0000000..e98a8fe --- /dev/null +++ b/FrmFlagDetail.resx @@ -0,0 +1,129 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + True + + + True + + + True + + \ No newline at end of file diff --git a/FrmFlagManagers.Designer.cs b/FrmFlagManagers.Designer.cs index d7e2f60..9fe14fb 100644 --- a/FrmFlagManagers.Designer.cs +++ b/FrmFlagManagers.Designer.cs @@ -28,8 +28,10 @@ /// private void InitializeComponent() { - this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); - this.winGridViewPager1 = new WHC.Pager.WinControl.WinGridViewPager(); + this.components = new System.ComponentModel.Container(); + this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components); + this.标识对象ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripMenuItem2 = new System.Windows.Forms.ToolStripMenuItem(); this.bar1 = new DevComponents.DotNetBar.Bar(); this.labelItem1 = new DevComponents.DotNetBar.LabelItem(); this.txt_no = new DevComponents.DotNetBar.TextBoxItem(); @@ -38,45 +40,37 @@ this.btn_query = new DevComponents.DotNetBar.ButtonItem(); this.btn_add_batch = new DevComponents.DotNetBar.ButtonItem(); this.btn_add_menu = new DevComponents.DotNetBar.ButtonItem(); - this.btn_db = new DevComponents.DotNetBar.ButtonItem(); - this.tableLayoutPanel1.SuspendLayout(); + this.winGridViewPager1 = new WHC.Pager.WinControl.WinGridViewPager(); + this.contextMenuStrip1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.bar1)).BeginInit(); this.SuspendLayout(); // - // tableLayoutPanel1 + // contextMenuStrip1 // - this.tableLayoutPanel1.ColumnCount = 1; - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel1.Controls.Add(this.winGridViewPager1, 0, 1); - this.tableLayoutPanel1.Controls.Add(this.bar1, 0, 0); - this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 0); - this.tableLayoutPanel1.Name = "tableLayoutPanel1"; - this.tableLayoutPanel1.RowCount = 2; - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 32F)); - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel1.Size = new System.Drawing.Size(881, 474); - this.tableLayoutPanel1.TabIndex = 6; + this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.标识对象ToolStripMenuItem, + this.toolStripMenuItem2}); + this.contextMenuStrip1.Name = "contextMenuStrip1"; + this.contextMenuStrip1.Size = new System.Drawing.Size(125, 48); // - // winGridViewPager1 + // 标识对象ToolStripMenuItem // - this.winGridViewPager1.AppendedMenu = null; - this.winGridViewPager1.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; - this.winGridViewPager1.DataSource = null; - this.winGridViewPager1.DisplayColumns = ""; - this.winGridViewPager1.Dock = System.Windows.Forms.DockStyle.Fill; - this.winGridViewPager1.Location = new System.Drawing.Point(3, 35); - this.winGridViewPager1.MinimumSize = new System.Drawing.Size(540, 0); - this.winGridViewPager1.Name = "winGridViewPager1"; - this.winGridViewPager1.PrintTitle = ""; - this.winGridViewPager1.Size = new System.Drawing.Size(875, 436); - this.winGridViewPager1.TabIndex = 5; + this.标识对象ToolStripMenuItem.Name = "标识对象ToolStripMenuItem"; + this.标识对象ToolStripMenuItem.Size = new System.Drawing.Size(124, 22); + this.标识对象ToolStripMenuItem.Text = "标识对象"; + this.标识对象ToolStripMenuItem.Click += new System.EventHandler(this.标识对象ToolStripMenuItem_Click); + // + // toolStripMenuItem2 + // + this.toolStripMenuItem2.Name = "toolStripMenuItem2"; + this.toolStripMenuItem2.Size = new System.Drawing.Size(152, 22); + this.toolStripMenuItem2.Text = "查看位置"; + this.toolStripMenuItem2.Click += new System.EventHandler(this.toolStripMenuItem2_Click); // // bar1 // this.bar1.AntiAlias = true; this.bar1.Dock = System.Windows.Forms.DockStyle.Top; - this.bar1.DockSide = DevComponents.DotNetBar.eDockSide.Document; this.bar1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.labelItem1, this.txt_no, @@ -84,14 +78,13 @@ this.combo_street, this.btn_query, this.btn_add_batch, - this.btn_add_menu, - this.btn_db}); - this.bar1.Location = new System.Drawing.Point(3, 3); + this.btn_add_menu}); + this.bar1.Location = new System.Drawing.Point(0, 0); this.bar1.Name = "bar1"; - this.bar1.Size = new System.Drawing.Size(875, 28); + this.bar1.Size = new System.Drawing.Size(881, 28); this.bar1.Stretch = true; this.bar1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.bar1.TabIndex = 1; + this.bar1.TabIndex = 8; this.bar1.TabStop = false; this.bar1.Text = "bar1"; // @@ -136,24 +129,34 @@ this.btn_add_menu.Text = "手工添加"; this.btn_add_menu.Click += new System.EventHandler(this.btn_add_menu_Click); // - // btn_db + // winGridViewPager1 // - this.btn_db.Name = "btn_db"; - this.btn_db.Text = "数据导出"; + this.winGridViewPager1.AppendedMenu = null; + this.winGridViewPager1.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; + this.winGridViewPager1.DataSource = null; + this.winGridViewPager1.DisplayColumns = ""; + this.winGridViewPager1.Dock = System.Windows.Forms.DockStyle.Fill; + this.winGridViewPager1.Location = new System.Drawing.Point(0, 28); + this.winGridViewPager1.MinimumSize = new System.Drawing.Size(540, 0); + this.winGridViewPager1.Name = "winGridViewPager1"; + this.winGridViewPager1.PrintTitle = ""; + this.winGridViewPager1.Size = new System.Drawing.Size(881, 446); + this.winGridViewPager1.TabIndex = 9; // // FrmFlagManagers // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(881, 474); - this.Controls.Add(this.tableLayoutPanel1); + this.Controls.Add(this.winGridViewPager1); + this.Controls.Add(this.bar1); this.DoubleBuffered = true; this.Name = "FrmFlagManagers"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "标识器管理"; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmFlagManagers_FormClosing); this.Load += new System.EventHandler(this.FrmFlagManagers_Load); - this.tableLayoutPanel1.ResumeLayout(false); + this.contextMenuStrip1.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.bar1)).EndInit(); this.ResumeLayout(false); @@ -161,8 +164,8 @@ #endregion - private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1; - private WHC.Pager.WinControl.WinGridViewPager winGridViewPager1; + private System.Windows.Forms.ContextMenuStrip contextMenuStrip1; + private System.Windows.Forms.ToolStripMenuItem 标识对象ToolStripMenuItem; private DevComponents.DotNetBar.Bar bar1; private DevComponents.DotNetBar.LabelItem labelItem1; private DevComponents.DotNetBar.TextBoxItem txt_no; @@ -171,6 +174,7 @@ private DevComponents.DotNetBar.ButtonItem btn_query; private DevComponents.DotNetBar.ButtonItem btn_add_batch; private DevComponents.DotNetBar.ButtonItem btn_add_menu; - private DevComponents.DotNetBar.ButtonItem btn_db; + private WHC.Pager.WinControl.WinGridViewPager winGridViewPager1; + private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem2; } } \ No newline at end of file diff --git a/FrmFlagManagers.cs b/FrmFlagManagers.cs index 38d4927..9bf9734 100644 --- a/FrmFlagManagers.cs +++ b/FrmFlagManagers.cs @@ -33,15 +33,13 @@ { this.globeControl1 = _globeControl1; InitializeComponent(); - winGridViewPager1.OnPageChanged += new EventHandler(winGridViewPager1_OnPageChanged); - this.winGridViewPager1.OnAddNew += new EventHandler(winGridViewPager1_OnAddNew); //右键定位 + winGridViewPager1.OnPageChanged += new EventHandler(winGridViewPager1_OnPageChanged); this.winGridViewPager1.OnEditSelected += new EventHandler(winGridViewPager1_OnEditSelected);//属性编辑 this.winGridViewPager1.OnDeleteSelected += new EventHandler(winGridViewPager1_OnDeleteSelected);//标识器报废 + this.winGridViewPager1.OnStartExport += new EventHandler(pager1_OnStartExport); this.winGridViewPager1.OnEndExport += new EventHandler(pager1_OnEndExport); - //this.winGridViewPager1.ExportCurrent += new ExportCurrentEventHandler(pager1_ExportCurrent); - //this.winGridViewPager1.ExportAll += new ExportAllEventHandler(pager1_ExportAll); winGridViewPager1.dataGridView1.MultiSelect = false; @@ -76,26 +74,25 @@ this.winGridViewPager1.AddColumnAlias("标识器型号", "标识器型号"); this.winGridViewPager1.AddColumnAlias("地面高程", "地面高程"); this.winGridViewPager1.AddColumnAlias("标识器埋深", "标识器埋深"); - this.winGridViewPager1.AddColumnAlias("对象编号", "对象编号"); - this.winGridViewPager1.AddColumnAlias("对象类型", "对象类型"); this.winGridViewPager1.AddColumnAlias("所属道路", "所属道路"); this.winGridViewPager1.AddColumnAlias("使用状态", "使用状态"); - this.winGridViewPager1.DisplayColumns = "编号,标识器ID号,标识器型号,地面高程,标识器埋深,对象编号,对象类型,所属道路,使用状态"; + this.winGridViewPager1.DisplayColumns = "编号,标识器ID号,标识器型号,地面高程,标识器埋深,所属道路,使用状态"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 //隐藏右键功能按钮 //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[1].Visible = false; - //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[4].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[5].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[6].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[7].Visible = false; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[1].Text = "定位查看"; + //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[1].Text = "定位查看"; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "属性编辑"; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Text = "标识器报废"; + winGridViewPager1.AppendedMenu = this.contextMenuStrip1; + //右键菜单宽度 winGridViewPager1.dataGridView1.ContextMenuStrip.AutoSize = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Width = 150; @@ -153,7 +150,7 @@ } /// - /// 右键定位 + /// 对象查看 /// /// /// @@ -306,20 +303,10 @@ string sqlCount = "select count(*) from 标识器 where 使用状态 = '使用中'"; - string sqlData = "select 编号,标识器ID号,标识器型号,地面高程,标识器埋深,对象编号,对象类型,所属道路,LSSYS_ID,X坐标,Y坐标,使用状态 " + + string sqlData = "select 编号,标识器ID号,标识器型号,地面高程,标识器埋深,所属道路,LSSYS_ID,X坐标,Y坐标,使用状态 " + "from (select t.*,rownum row_num from 标识器 t where 使用状态 = '使用中' order by 编号)b " + " where 1=1"; - if (!String.IsNullOrEmpty(txt_no.Text.Trim())) - { - sqlCount += " and 编号 like '%" + txt_no.Text.Trim() + "%'"; - sqlData += " and 编号 like '%" + txt_no.Text.Trim() + "%'"; - } - if (null != combo_street.SelectedItem && !String.IsNullOrEmpty(combo_street.SelectedItem.ToString().Trim())) - { - sqlData += " and 所属道路='" + combo_street.SelectedItem.ToString().Trim() + "'"; - sqlCount += " and 所属道路='" + combo_street.SelectedItem.ToString().Trim() + "'"; - } rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -332,9 +319,8 @@ int maxPage = pageIndex * maxPageIndex; string sqlCount = "select count(*) from 标识器 where 使用状态 = '使用中'"; - string sqlData = "select 编号,标识器ID号,标识器型号,地面高程,标识器埋深,对象编号,对象类型,所属道路,LSSYS_ID,X坐标,Y坐标,使用状态 " + - "from (select t.*,rownum row_num from 标识器 t where 使用状态 = '使用中' order by 编号)b "+ - " where(b.row_num between " + minPage + " and " + maxPage + ")"; + string sqlData = "select 编号,标识器ID号,标识器型号,地面高程,标识器埋深,所属道路,LSSYS_ID,X坐标,Y坐标,使用状态 " + + "from (select t.*,rownum row_num from 标识器 t where 使用状态 = '使用中'"; if (!String.IsNullOrEmpty(txt_no.Text.Trim())) { @@ -347,6 +333,8 @@ sqlCount += " and 所属道路='" + combo_street.SelectedItem.ToString().Trim() + "'"; } + sqlData += " order by 编号)b " + + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; @@ -372,9 +360,10 @@ private void FrmFlagManagers_FormClosing(object sender, FormClosingEventArgs e) { IS_OPEN = false; - Thread downloadJob = new Thread(new ParameterizedThreadStart(doSave)); - downloadJob.IsBackground = true; - downloadJob.Start(e); + //Thread downloadJob = new Thread(new ParameterizedThreadStart(doSave)); + //downloadJob.IsBackground = true; + //downloadJob.Start(e); + globeControl1.Globe.Layers["标识器"].Save(); globeControl1.Globe.MemoryLayer.RemoveAllFeature(); foreach (GSOFeature f in Features) { @@ -480,10 +469,88 @@ if (null != globeControl1) { FrmAddSinMark frm = new FrmAddSinMark(globeControl1); - frm.ShowDialog(); + frm.Show(); } } + private void 标识对象ToolStripMenuItem_Click(object sender, EventArgs e) + { + if (winGridViewPager1 != null && winGridViewPager1.dataGridView1 != null) + { + DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; + try + { + this.Hide(); + string id = row.Cells["编号"].Value.ToString(); + FrmFlagDetail p = new FrmFlagDetail(globeControl1, id); + p.showParentForm += new FrmFlagDetail.Handle(showThisForm);//改变值的事件 + p.Show(); + } + catch (Exception ex) + { + MessageBox.Show("失败:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } + + private void showThisForm() + { + this.Show(); + } + + private void toolStripMenuItem2_Click(object sender, EventArgs e) + { + if (winGridViewPager1 != null && winGridViewPager1.dataGridView1 != null) + { + DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; + try + { + this.WindowState = FormWindowState.Minimized; + string id = row.Cells["LSSYS_ID"].Value.ToString(); + string flagno = row.Cells["编号"].Value.ToString(); + string flagstreet = row.Cells["所属道路"].Value.ToString(); + double x = Convert.ToDouble(row.Cells["X坐标"].Value); + double y = Convert.ToDouble(row.Cells["Y坐标"].Value); + GSOFeature flagFeature = globeControl1.Globe.Layers.GetLayerByCaption("标识器").GetFeatureByID(int.Parse(id)); + + string type = ""; + string pipe = ""; + string sql = "select t.标识器型号,t.对象编号 from 标识器 t where t.编号='" + flagno + "'"; + using (OracleDataReader reader = OracleUtils.ExecuteReader(OracleUtils.ConnectionString, CommandType.Text, sql)) + { + while (reader.Read()) + { + type = reader.GetString(0); + pipe = reader.GetString(1); + } + } + + GSOLabel label = new GSOLabel(); + label.Text = "标识器编号：" + flagno + "\r\n" + + "标识器类型:" + type + "\r\n" + + //"标识对象编号:" + pipe + "\r\n" + + "所属道路:" + flagstreet; + label.Style = new GSOLabelStyle(); + label.Style.TextStyle.FontSize = 18; + label.Style.TextStyle.ForeColor = Color.FromArgb(0, 0, 0, 255); + label.Style.Opaque = 0.8; //设置标注的透明度，取值区间是0-1 + label.Style.TracktionLineType = EnumTracktionLineType.Solid; + label.Style.TextStyle.FontHeight = 10; + label.Style.TextStyle.FontName = "黑体"; + label.Style.TractionLineEndPos = new GSOPoint2d(80, 60); + + flagFeature.Label = label; + Features.Add(flagFeature); + globeControl1.Globe.JumpToFeature(flagFeature, 20); + this.globeControl1.Refresh(); + + } + catch (Exception ex) + { + MessageBox.Show("标识器定位失败:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } } diff --git a/FrmFlagManagers.resx b/FrmFlagManagers.resx index 1af7de1..ad53752 100644 --- a/FrmFlagManagers.resx +++ b/FrmFlagManagers.resx @@ -117,4 +117,7 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 17, 17 + \ No newline at end of file diff --git a/FrmPatrolerEdit.cs b/FrmPatrolerEdit.cs index dbd4fec..f45b5ae 100644 --- a/FrmPatrolerEdit.cs +++ b/FrmPatrolerEdit.cs @@ -46,7 +46,7 @@ txt_name.Focus(); return; } - if (String.IsNullOrEmpty(combo_sex.SelectedItem.ToString())) + if (combo_sex.SelectedItem == null ||String.IsNullOrEmpty(combo_sex.SelectedItem.ToString())) { MessageBox.Show("性别不能为空！", "警告", MessageBoxButtons.OK, MessageBoxIcon.Warning); combo_sex.Focus(); diff --git a/FrmPatrolerManager.Designer.cs b/FrmPatrolerManager.Designer.cs index bb8e5fb..10fac22 100644 --- a/FrmPatrolerManager.Designer.cs +++ b/FrmPatrolerManager.Designer.cs @@ -47,11 +47,13 @@ this.注销 = new DevComponents.Editors.ComboItem(); this.btn_query_person = new DevComponents.DotNetBar.ButtonItem(); this.btn_add_person = new DevComponents.DotNetBar.ButtonItem(); - this.winGridViewPager1 = new WHC.Pager.WinControl.WinGridViewPager(); this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components); this.日志ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.任务ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.定位ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.winGridViewPager1 = new WHC.Pager.WinControl.WinGridViewPager(); + this.编辑ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.注销ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); ((System.ComponentModel.ISupportInitialize)(this.bar1)).BeginInit(); this.contextMenuStrip1.SuspendLayout(); this.SuspendLayout(); @@ -173,9 +175,42 @@ this.btn_add_person.Text = "新增"; this.btn_add_person.Click += new System.EventHandler(this.btn_add_person_Click); // + // contextMenuStrip1 + // + this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.日志ToolStripMenuItem, + this.任务ToolStripMenuItem, + this.定位ToolStripMenuItem, + this.编辑ToolStripMenuItem, + this.注销ToolStripMenuItem}); + this.contextMenuStrip1.Name = "contextMenuStrip1"; + this.contextMenuStrip1.Size = new System.Drawing.Size(153, 136); + // + // 日志ToolStripMenuItem + // + this.日志ToolStripMenuItem.Name = "日志ToolStripMenuItem"; + this.日志ToolStripMenuItem.Size = new System.Drawing.Size(100, 22); + this.日志ToolStripMenuItem.Text = "日志"; + this.日志ToolStripMenuItem.Click += new System.EventHandler(this.日志ToolStripMenuItem_Click); + // + // 任务ToolStripMenuItem + // + this.任务ToolStripMenuItem.Name = "任务ToolStripMenuItem"; + this.任务ToolStripMenuItem.Size = new System.Drawing.Size(100, 22); + this.任务ToolStripMenuItem.Text = "任务"; + this.任务ToolStripMenuItem.Click += new System.EventHandler(this.任务ToolStripMenuItem_Click); + // + // 定位ToolStripMenuItem + // + this.定位ToolStripMenuItem.Name = "定位ToolStripMenuItem"; + this.定位ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.定位ToolStripMenuItem.Text = "定位"; + this.定位ToolStripMenuItem.Click += new System.EventHandler(this.定位ToolStripMenuItem_Click); + // // winGridViewPager1 // this.winGridViewPager1.AppendedMenu = null; + this.winGridViewPager1.ContextMenuStrip = this.contextMenuStrip1; this.winGridViewPager1.DataSource = null; this.winGridViewPager1.DisplayColumns = ""; this.winGridViewPager1.Dock = System.Windows.Forms.DockStyle.Fill; @@ -186,35 +221,19 @@ this.winGridViewPager1.Size = new System.Drawing.Size(756, 309); this.winGridViewPager1.TabIndex = 3; // - // contextMenuStrip1 + // 编辑ToolStripMenuItem // - this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.日志ToolStripMenuItem, - this.任务ToolStripMenuItem, - this.定位ToolStripMenuItem}); - this.contextMenuStrip1.Name = "contextMenuStrip1"; - this.contextMenuStrip1.Size = new System.Drawing.Size(101, 70); + this.编辑ToolStripMenuItem.Name = "编辑ToolStripMenuItem"; + this.编辑ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.编辑ToolStripMenuItem.Text = "编辑"; + this.编辑ToolStripMenuItem.Click += new System.EventHandler(this.编辑ToolStripMenuItem_Click); // - // 日志ToolStripMenuItem + // 注销ToolStripMenuItem // - this.日志ToolStripMenuItem.Name = "日志ToolStripMenuItem"; - this.日志ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); - this.日志ToolStripMenuItem.Text = "日志"; - this.日志ToolStripMenuItem.Click += new System.EventHandler(this.日志ToolStripMenuItem_Click); - // - // 任务ToolStripMenuItem - // - this.任务ToolStripMenuItem.Name = "任务ToolStripMenuItem"; - this.任务ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); - this.任务ToolStripMenuItem.Text = "任务"; - this.任务ToolStripMenuItem.Click += new System.EventHandler(this.任务ToolStripMenuItem_Click); - // - // 定位ToolStripMenuItem - // - this.定位ToolStripMenuItem.Name = "定位ToolStripMenuItem"; - this.定位ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); - this.定位ToolStripMenuItem.Text = "定位"; - this.定位ToolStripMenuItem.Click += new System.EventHandler(this.定位ToolStripMenuItem_Click); + this.注销ToolStripMenuItem.Name = "注销ToolStripMenuItem"; + this.注销ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.注销ToolStripMenuItem.Text = "注销"; + this.注销ToolStripMenuItem.Click += new System.EventHandler(this.注销ToolStripMenuItem_Click); // // FrmPatrolerManager // @@ -229,7 +248,7 @@ this.MinimizeBox = false; this.Name = "FrmPatrolerManager"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; - this.Text = "巡检人员维护"; + this.Text = "定位人员维护"; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmPatrolerManager_FormClosing); this.Load += new System.EventHandler(this.FrmPatrolerManager_Load); ((System.ComponentModel.ISupportInitialize)(this.bar1)).EndInit(); @@ -258,10 +277,12 @@ private DevComponents.Editors.ComboItem 注销; private DevComponents.Editors.ComboItem comboItem1; private DevComponents.Editors.ComboItem 不限; - private WHC.Pager.WinControl.WinGridViewPager winGridViewPager1; private System.Windows.Forms.ContextMenuStrip contextMenuStrip1; private System.Windows.Forms.ToolStripMenuItem 日志ToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem 任务ToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem 定位ToolStripMenuItem; + private WHC.Pager.WinControl.WinGridViewPager winGridViewPager1; + private System.Windows.Forms.ToolStripMenuItem 编辑ToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem 注销ToolStripMenuItem; } } \ No newline at end of file diff --git a/FrmPatrolerManager.cs b/FrmPatrolerManager.cs index 255a076..9c32f54 100644 --- a/FrmPatrolerManager.cs +++ b/FrmPatrolerManager.cs @@ -29,9 +29,7 @@ this.globeControl1 = globeControl1; winGridViewPager1.OnPageChanged += new EventHandler(winGridViewPager1_OnPageChanged); - this.winGridViewPager1.OnEditSelected += new EventHandler(winGridViewPager1_OnEditSelected);//编辑 - this.winGridViewPager1.OnDeleteSelected += new EventHandler(winGridViewPager1_OnDeleteSelected);//删除 - + this.winGridViewPager1.OnStartExport += new EventHandler(pager1_OnStartExport); this.winGridViewPager1.OnEndExport += new EventHandler(pager1_OnEndExport); @@ -47,26 +45,31 @@ //控制表格显示的列，以及每一列要显示的列名 this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - this.winGridViewPager1.AddColumnAlias("USERNAME", "姓名"); - this.winGridViewPager1.AddColumnAlias("DBID", "编号"); - this.winGridViewPager1.AddColumnAlias("SEX", "性别"); - this.winGridViewPager1.AddColumnAlias("AGE", "年龄"); - this.winGridViewPager1.AddColumnAlias("PHONENUM", "电话"); - this.winGridViewPager1.AddColumnAlias("ACCOUNTSTATE", "状态"); - this.winGridViewPager1.DisplayColumns = "USERNAME,SEX,AGE,PHONENUM,ACCOUNTSTATE"; + this.winGridViewPager1.AddColumnAlias("姓名", "姓名"); + this.winGridViewPager1.AddColumnAlias("编号", "编号"); + this.winGridViewPager1.AddColumnAlias("性别", "性别"); + this.winGridViewPager1.AddColumnAlias("年龄", "年龄"); + this.winGridViewPager1.AddColumnAlias("电话", "电话"); + this.winGridViewPager1.AddColumnAlias("状态", "状态"); + this.winGridViewPager1.DisplayColumns = "姓名,性别,年龄,电话,状态"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 + //隐藏右键功能按钮 //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[1].Visible = false; + winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Visible = false; + winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[4].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[5].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[6].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[7].Visible = false; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "编辑"; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Text = "注销"; + + //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "编辑"; + //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Text = "注销"; winGridViewPager1.AppendedMenu = this.contextMenuStrip1; + //右键菜单宽度 winGridViewPager1.dataGridView1.ContextMenuStrip.AutoSize = false; @@ -122,11 +125,11 @@ DataGridViewRow row = grid.SelectedRows[0]; try { - long dbid = long.Parse(row.Cells["dbid"].Value.ToString()); - String name = row.Cells["USERNAME"].Value.ToString(); - String sex = row.Cells["SEX"].Value.ToString(); - String age = row.Cells["AGE"].Value.ToString(); - string phone = row.Cells["PHONENUM"].Value.ToString(); + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); + String name = row.Cells["姓名"].Value.ToString(); + String sex = row.Cells["性别"].Value.ToString(); + String age = row.Cells["年龄"].Value.ToString(); + string phone = row.Cells["电话"].Value.ToString(); age = String.IsNullOrEmpty(age.ToString().Trim()) ? "1" : age.ToString().Trim(); FrmPatrolerEdit frm = new FrmPatrolerEdit(dbid.ToString(), name, age, sex, phone); frm.reloadGrid += new ReloadPatrolerGrid(LoadData); @@ -152,10 +155,10 @@ if (grid != null) { DataGridViewRow row = grid.SelectedRows[0]; - long dbid = long.Parse(row.Cells["DBID"].Value.ToString()); + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); try { - string state = row.Cells["ACCOUNTSTATE"].Value.ToString(); + string state = row.Cells["状态"].Value.ToString(); if ("在线".Equals(state)) { if (MessageBox.Show("确定注销？", "确认", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) @@ -180,60 +183,60 @@ { int pageIndex = winGridViewPager1.PagerInfo.CurrenetPageIndex; string sqlData = GetSql(pageIndex); - initlizeDatagrid(); + DataTable table = OracleUtils.ExecuteDataset(OracleUtils.ConnectionString, CommandType.Text, sqlData).Tables[0]; winGridViewPager1.DataSource = table.DefaultView; - for (int i = 0; i < winGridViewPager1.dataGridView1.Rows.Count; i++) - { - if (winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value.ToString() == "ONLINE") - { - winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value = "在线"; - } - else - { - if (winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value.ToString() == "OFFLINE") - { - winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value = "离线"; - } - else - { - if (winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value.ToString() == "LEAVER") - { - winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value = "注销"; - } - } - } - } + //for (int i = 0; i < winGridViewPager1.dataGridView1.Rows.Count; i++) + //{ + // if (winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value.ToString() == "ONLINE") + // { + // winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value = "在线"; + // } + // else + // { + // if (winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value.ToString() == "OFFLINE") + // { + // winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value = "离线"; + // } + // else + // { + // if (winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value.ToString() == "LEAVER") + // { + // winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value = "注销"; + // } + // } + // } + //} winGridViewPager1.Refresh(); } private void LoadData(int pageIndex) { string sqlData = GetSql(pageIndex); - initlizeDatagrid(); + DataTable table = OracleUtils.ExecuteDataset(OracleUtils.ConnectionString, CommandType.Text, sqlData).Tables[0]; winGridViewPager1.DataSource = table.DefaultView; - for (int i = 0; i < winGridViewPager1.dataGridView1.Rows.Count; i++) - { - if (winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value.ToString() == "ONLINE") - { - winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value = "在线"; - } - else - { - if (winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value.ToString() == "OFFLINE") - { - winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value = "离线"; - } - else - { - if (winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value.ToString() == "LEAVER") - { - winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value = "注销"; - } - } - } - } + //for (int i = 0; i < winGridViewPager1.dataGridView1.Rows.Count; i++) + //{ + // if (winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value.ToString() == "ONLINE") + // { + // winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value = "在线"; + // } + // else + // { + // if (winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value.ToString() == "OFFLINE") + // { + // winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value = "离线"; + // } + // else + // { + // if (winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value.ToString() == "LEAVER") + // { + // winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value = "注销"; + // } + // } + // } + //} winGridViewPager1.Refresh(); } @@ -241,7 +244,8 @@ { string sqlCount = "select count(*) from equipment where status = 'USING'"; - string sqlData = "select username,dbid,sex,age,phonenum,accountstate " + + string sqlData = "select username as 姓名,dbid as 编号,sex as 性别,age as 年龄,phonenum as 电话,"+ + "case when accountstate = 'ONLINE' then '在线' when accountstate = 'OFFLINE' then '离线' when accountstate = 'LEAVER' then '注销' end as 状态 " + "from (select t.*,rownum row_num from patroler t order by DBID desc)b " + " where 1=1"; @@ -255,9 +259,9 @@ int minPage = (pageIndex - 1) * maxPageIndex + 1; int maxPage = pageIndex * maxPageIndex; string sqlCount = "select count(*) from patroler where 1=1"; - string sqlData = "select username,dbid,sex,age,phonenum,accountstate " + - "from (select t.*,rownum row_num from patroler t order by DBID desc)b " + - " where(b.row_num between " + minPage + " and " + maxPage + ")"; + string sqlData = "select username as 姓名,dbid as 编号,sex as 性别,age as 年龄,phonenum as 电话,"+ + "case when accountstate = 'ONLINE' then '在线' when accountstate = 'OFFLINE' then '离线' when accountstate = 'LEAVER' then '注销' end as 状态 " + + "from (select t.*,rownum row_num from patroler t where 1=1"; if (!String.IsNullOrEmpty(txt_username.Text.Trim())) { @@ -281,7 +285,8 @@ sqlCount += " and accountstate='" + combo_stateText + "'"; sqlData += " and accountstate='" + combo_stateText + "'"; } - + sqlData += " order by DBID desc)b " + + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; @@ -291,6 +296,7 @@ { try { + initlizeDatagrid(); LoadData(); initForm(); IS_OPEN = true; @@ -310,11 +316,13 @@ } if (Utility.userRole.IndexOf("巡检员编辑") == -1) { - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Visible = false; + //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Visible = false; + 编辑ToolStripMenuItem.Visible = false; } if (Utility.userRole.IndexOf("巡检员注销") == -1) { - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Visible = false; + //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Visible = false; + 注销ToolStripMenuItem.Visible = false; } } @@ -376,7 +384,7 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - long dbid = long.Parse(row.Cells["dbid"].Value.ToString()); + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); Log p = new Log(dbid.ToString()); p.Show(); } @@ -395,8 +403,8 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - long dbid = long.Parse(row.Cells["dbid"].Value.ToString()); - String state = row.Cells["ACCOUNTSTATE"].Value.ToString(); + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); + String state = row.Cells["状态"].Value.ToString(); if ("在线".Equals(state)) { string sql = "select t.dbid " + @@ -435,8 +443,8 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - long dbid = long.Parse(row.Cells["dbid"].Value.ToString()); - String username = row.Cells["USERNAME"].Value.ToString(); + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); + String username = row.Cells["姓名"].Value.ToString(); string sql = "select t.latitude, t.longitude " + "from position t " + "where t.dbid = (select max(dbid) from position where patroler_id = " + dbid + ")"; @@ -489,6 +497,63 @@ } + private void 编辑ToolStripMenuItem_Click(object sender, EventArgs e) + { + if (winGridViewPager1 != null && winGridViewPager1.dataGridView1 != null) + { + DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; + try + { + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); + String name = row.Cells["姓名"].Value.ToString(); + String sex = row.Cells["性别"].Value.ToString(); + String age = row.Cells["年龄"].Value.ToString(); + string phone = row.Cells["电话"].Value.ToString(); + age = String.IsNullOrEmpty(age.ToString().Trim()) ? "1" : age.ToString().Trim(); + FrmPatrolerEdit frm = new FrmPatrolerEdit(dbid.ToString(), name, age, sex, phone); + frm.reloadGrid += new ReloadPatrolerGrid(LoadData); + frm.ShowDialog(); + winGridViewPager1.Refresh(); + } + catch (Exception ex) + { + MessageBox.Show("编辑失败:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } + + private void 注销ToolStripMenuItem_Click(object sender, EventArgs e) + { + if (winGridViewPager1 != null && winGridViewPager1.dataGridView1 != null) + { + DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); + try + { + if (MessageBox.Show("确定注销？", "确认", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) + { + String sql = "update patroler t set t.accountstate='LEAVER' where t.dbid=" + dbid; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + LoadData(); + MessageBox.Show("人员已注销", "信息", MessageBoxButtons.OK, MessageBoxIcon.Information); + } + //string state = row.Cells["状态"].Value.ToString(); + //if ("在线".Equals(state)) + //{ + + //} + //else + //{ + // MessageBox.Show("人员不在线，无法注销", "信息"); + //} + } + catch (Exception ex) + { + MessageBox.Show("人员注销失败:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } + } } diff --git a/FrmRoleInfoManager.cs b/FrmRoleInfoManager.cs index 8897133..35693cf 100644 --- a/FrmRoleInfoManager.cs +++ b/FrmRoleInfoManager.cs @@ -55,10 +55,10 @@ //控制表格显示的列，以及每一列要显示的列名 this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - this.winGridViewPager1.AddColumnAlias("NT", "角色名称"); - this.winGridViewPager1.AddColumnAlias("ID", "编号"); + this.winGridViewPager1.AddColumnAlias("角色名称", "角色名称"); + this.winGridViewPager1.AddColumnAlias("编号", "编号"); - this.winGridViewPager1.DisplayColumns = "NT"; + this.winGridViewPager1.DisplayColumns = "角色名称"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -131,7 +131,7 @@ { try { - string dbid = row.Cells["id"].Value.ToString(); + string dbid = row.Cells["编号"].Value.ToString(); string sql = "delete from casic_userroletest where id=" + dbid; OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); LoadData(); @@ -170,7 +170,7 @@ { string sqlCount = "select id,nt from casic_userroletest where sysname='EMS'"; - string sqlData = "select nt,id " + + string sqlData = "select nt as 角色名称,id as 编号 " + "from (select t.*,rownum row_num from casic_userroletest t order by id desc)b " + " where sysname='EMS'"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -183,7 +183,7 @@ int minPage = (pageIndex - 1) * maxPageIndex + 1; int maxPage = pageIndex * maxPageIndex; string sqlCount = "select id,nt from casic_userroletest where sysname='EMS'"; - string sqlData = "select nt,id " + + string sqlData = "select nt as 角色名称,id as 编号 " + "from (select t.*,rownum row_num from casic_userroletest t where sysname='EMS' order by id desc)b " + " where(b.row_num between " + minPage + " and " + maxPage + ")"; diff --git a/FrmSysUserInfoManger.cs b/FrmSysUserInfoManger.cs index 7903916..e193a61 100644 --- a/FrmSysUserInfoManger.cs +++ b/FrmSysUserInfoManger.cs @@ -28,6 +28,7 @@ this.winGridViewPager1.OnEndExport += new EventHandler(pager1_OnEndExport); winGridViewPager1.dataGridView1.MultiSelect = false; + } private void FrmSysUserInfoManger_Load(object sender, EventArgs e) @@ -59,10 +60,10 @@ //控制表格显示的列，以及每一列要显示的列名 this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - this.winGridViewPager1.AddColumnAlias("USERNAME", "账号"); - this.winGridViewPager1.AddColumnAlias("ID", "编号"); + this.winGridViewPager1.AddColumnAlias("账号", "账号"); + this.winGridViewPager1.AddColumnAlias("编号", "编号"); - this.winGridViewPager1.DisplayColumns = "USERNAME"; + this.winGridViewPager1.DisplayColumns = "账号"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -130,8 +131,8 @@ if (grid != null) { DataGridViewRow row = grid.SelectedRows[0]; - string dbid = row.Cells["id"].Value.ToString(); - string userName = row.Cells["USERNAME"].Value.ToString(); + string dbid = row.Cells["编号"].Value.ToString(); + string userName = row.Cells["账号"].Value.ToString(); if (userName.Equals("ems")) { MessageBox.Show("该用户为管理员用户，无法删除！", "信息"); @@ -184,7 +185,7 @@ { string sqlCount = "select count(*) from casic_userinfotest where sysname='EMS'"; - string sqlData = "select username,id " + + string sqlData = "select username as 账号,id as 编号 " + "from (select t.*,rownum row_num from casic_userinfotest t order by id desc)b " + " where sysname='EMS'"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -197,16 +198,16 @@ int minPage = (pageIndex - 1) * maxPageIndex + 1; int maxPage = pageIndex * maxPageIndex; string sqlCount = "select count(*) from casic_userinfotest where sysname='EMS'"; - string sqlData = "select username,id " + - "from (select t.*,rownum row_num from casic_userinfotest t where sysname='EMS' order by id desc)b " + - " where(b.row_num between " + minPage + " and " + maxPage + ")"; + string sqlData = "select username as 账号,id as 编号 " + + "from (select t.*,rownum row_num from casic_userinfotest t where sysname='EMS'"; if (!String.IsNullOrEmpty(txt_user_code.Text.Trim())) { sqlCount += " and username like '%" + txt_user_code.Text.Trim() + "%'"; sqlData += " and username like '%" + txt_user_code.Text.Trim() + "%'"; } - + sqlData += " order by id desc)b " + + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; diff --git a/MainFrm.cs b/MainFrm.cs index 39df646..0cd5881 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3310,10 +3310,10 @@ string str1 = ""; if (feature != null) { - if (feature.GetFieldDefn("图?片?编括?码?") != null) // + if (feature.GetFieldDefn("图片编码") != null) // { str1 = GetBubbleInfo(feature); - if (RemoteFileExists(Utility.PicRootURL + feature.GetValue("图?片?编括?码?").ToString())) + if (RemoteFileExists(Utility.PicRootURL + feature.GetValue("图片编码").ToString())) { str1 += ""; } @@ -3450,9 +3450,15 @@ string value1 = ""; if (field1 != null) { - if (field1.Name == "图片编码") + //if (field1.Name == "图片编码" || field1.Name == "对象编号" || field1.Name == "对象类型" || field1.Name == "对象名称") + //{ + // j++; + //} + while (field1.Name == "图片编码" || field1.Name == "对象编号" || field1.Name == "对象类型" || field1.Name == "对象名称") { j++; + fieldName = fieldNames[j].Trim(); + field1 = (GSOFieldDefn)feature.GetFieldDefn(fieldName); } if (j < rowCount) { @@ -3479,6 +3485,11 @@ if (!feature.IsFieldValueNull(j)) { value1 = feature.GetValue(j).ToString(); + if (name1 == "标识器埋深") + { + if (value1!=null&&value1.Length>4) + value1 = value1.Substring(0,4); + } } } } @@ -3491,9 +3502,14 @@ if (field2 != null) { - if (field2.Name == "图片编码") + //if (field2.Name == "图片编码" || field1.Name == "对象编号" || field1.Name == "对象类型" || field1.Name == "对象名称") + //{ + // j++; + //} + while (field2.Name == "图片编码" || field2.Name == "对象编号" || field2.Name == "对象类型" || field2.Name == "对象名称") { j++; + field2 = (GSOFieldDefn)feature.GetFieldDefn(j + 1); } if (j + 1 < rowCount) { @@ -3521,6 +3537,11 @@ if (!feature.IsFieldValueNull(j + 1)) { value2 = feature.GetValue(j + 1).ToString(); + if (name2 == "标识器埋深") + { + if (value2 != null && value2.Length > 4) + value2 = value2.Substring(0, 4); + } } } } @@ -15347,7 +15368,7 @@ return; } FrmFlagManagers frm = new FrmFlagManagers(globeControl1); - frm.Show(this); + frm.Show(); } private void ribbonTabItem2_MouseDown(object sender, MouseEventArgs e) diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index fddfb94..e5f0003 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -365,6 +365,16 @@ this.可编辑ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.保存ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.ribbonControl1 = new DevComponents.DotNetBar.RibbonControl(); + this.ribbonPanel3 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar3 = new DevComponents.DotNetBar.RibbonBar(); + this.btn_device = new DevComponents.DotNetBar.ButtonItem(); + this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); + this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel7 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); + this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); + this.slider4ground = new DevComponents.DotNetBar.SliderItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -374,12 +384,6 @@ this.btn_user_role = new DevComponents.DotNetBar.ButtonItem(); this.btn_password_edit = new DevComponents.DotNetBar.ButtonItem(); this.btn_reset_password = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel3 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar3 = new DevComponents.DotNetBar.RibbonBar(); - this.btn_device = new DevComponents.DotNetBar.ButtonItem(); - this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); - this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); @@ -551,10 +555,6 @@ this.buttonItemBZ9 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItemBZ10 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItemBZ11 = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel7 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); - this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); - this.slider4ground = new DevComponents.DotNetBar.SliderItem(); this.ribbonPanel12 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar18 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItem133 = new DevComponents.DotNetBar.ButtonItem(); @@ -690,11 +690,11 @@ this.contextMenuStrip3.SuspendLayout(); this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); - this.ribbonPanel8.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel7.SuspendLayout(); + this.ribbonPanel8.SuspendLayout(); this.ribbonPanel2.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); - this.ribbonPanel7.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); this.ribbonPanel5.SuspendLayout(); this.ribbonPanel6.SuspendLayout(); @@ -4162,10 +4162,10 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); - this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel2); - this.ribbonControl1.Controls.Add(this.ribbonPanel15); + this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel7); + this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); this.ribbonControl1.Controls.Add(this.ribbonPanel5); this.ribbonControl1.Controls.Add(this.ribbonPanel6); @@ -4216,135 +4216,6 @@ this.ribbonControl1.UseCustomizeDialog = false; this.ribbonControl1.Click += new System.EventHandler(this.ribbonControl1_Click); // - // ribbonPanel8 - // - this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel8.Controls.Add(this.ribbonBar_UserInfo); - this.ribbonPanel8.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel8.Location = new System.Drawing.Point(0, 33); - this.ribbonPanel8.Name = "ribbonPanel8"; - this.ribbonPanel8.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel8.Size = new System.Drawing.Size(1328, 62); - // - // - // - this.ribbonPanel8.Style.Class = ""; - this.ribbonPanel8.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel8.StyleMouseDown.Class = ""; - this.ribbonPanel8.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel8.StyleMouseOver.Class = ""; - this.ribbonPanel8.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel8.TabIndex = 42; - this.ribbonPanel8.Visible = false; - // - // ribbonBar_UserInfo - // - this.ribbonBar_UserInfo.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar_UserInfo.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar_UserInfo.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar_UserInfo.BackgroundStyle.Class = ""; - this.ribbonBar_UserInfo.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar_UserInfo.ContainerControlProcessDialogKey = true; - this.ribbonBar_UserInfo.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar_UserInfo.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.btn_user_info, - this.btn_role_info, - this.btn_resc_info, - this.btn_role_resc, - this.btn_user_role, - this.btn_password_edit, - this.btn_reset_password}); - this.ribbonBar_UserInfo.Location = new System.Drawing.Point(3, 0); - this.ribbonBar_UserInfo.Name = "ribbonBar_UserInfo"; - this.ribbonBar_UserInfo.Size = new System.Drawing.Size(427, 59); - this.ribbonBar_UserInfo.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar_UserInfo.TabIndex = 0; - // - // - // - this.ribbonBar_UserInfo.TitleStyle.Class = ""; - this.ribbonBar_UserInfo.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar_UserInfo.TitleStyleMouseOver.Class = ""; - this.ribbonBar_UserInfo.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // btn_user_info - // - this.btn_user_info.Image = global::Cyberpipe.Properties.Resources._24x24icon_13_hover; - this.btn_user_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_user_info.Name = "btn_user_info"; - this.btn_user_info.SubItemsExpandWidth = 14; - this.btn_user_info.Text = "用户管理"; - this.btn_user_info.Click += new System.EventHandler(this.btn_user_info_Click); - // - // btn_role_info - // - this.btn_role_info.Image = global::Cyberpipe.Properties.Resources._24x24icon_05_hover1; - this.btn_role_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_role_info.Name = "btn_role_info"; - this.btn_role_info.SubItemsExpandWidth = 14; - this.btn_role_info.Text = "角色管理"; - this.btn_role_info.Click += new System.EventHandler(this.btn_role_info_Click); - // - // btn_resc_info - // - this.btn_resc_info.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__09; - this.btn_resc_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_resc_info.Name = "btn_resc_info"; - this.btn_resc_info.SubItemsExpandWidth = 14; - this.btn_resc_info.Text = "资源管理"; - this.btn_resc_info.Click += new System.EventHandler(this.btn_resc_info_Click); - // - // btn_role_resc - // - this.btn_role_resc.Image = global::Cyberpipe.Properties.Resources.btnlegendSet_Image_副本; - this.btn_role_resc.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_role_resc.Name = "btn_role_resc"; - this.btn_role_resc.SubItemsExpandWidth = 14; - this.btn_role_resc.Text = "角色授权"; - this.btn_role_resc.Click += new System.EventHandler(this.btn_role_resc_Click); - // - // btn_user_role - // - this.btn_user_role.Image = global::Cyberpipe.Properties.Resources._24x24icon_08_hover; - this.btn_user_role.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_user_role.Name = "btn_user_role"; - this.btn_user_role.SubItemsExpandWidth = 14; - this.btn_user_role.Text = "用户授权"; - this.btn_user_role.Click += new System.EventHandler(this.btn_user_role_Click); - // - // btn_password_edit - // - this.btn_password_edit.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__67; - this.btn_password_edit.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_password_edit.Name = "btn_password_edit"; - this.btn_password_edit.SubItemsExpandWidth = 14; - this.btn_password_edit.Text = "密码修改"; - this.btn_password_edit.Click += new System.EventHandler(this.btn_password_edit_Click); - // - // btn_reset_password - // - this.btn_reset_password.Image = global::Cyberpipe.Properties.Resources.liuxiang; - this.btn_reset_password.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_reset_password.Name = "btn_reset_password"; - this.btn_reset_password.SubItemsExpandWidth = 14; - this.btn_reset_password.Text = "重置密码"; - this.btn_reset_password.Click += new System.EventHandler(this.btn_reset_password_Click); - // // ribbonPanel3 // this.ribbonPanel3.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4425,7 +4296,7 @@ this.btn_Person.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; this.btn_Person.Name = "btn_Person"; this.btn_Person.SubItemsExpandWidth = 14; - this.btn_Person.Text = "巡检人员维护"; + this.btn_Person.Text = "定位人员维护"; this.btn_Person.Click += new System.EventHandler(this.btn_Person_Click); // // btn_constructMap @@ -4446,6 +4317,214 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel7 + // + this.ribbonPanel7.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel7.Controls.Add(this.ribbonBar5); + this.ribbonPanel7.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel7.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel7.Name = "ribbonPanel7"; + this.ribbonPanel7.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel7.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel7.Style.Class = ""; + this.ribbonPanel7.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel7.StyleMouseDown.Class = ""; + this.ribbonPanel7.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel7.StyleMouseOver.Class = ""; + this.ribbonPanel7.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel7.TabIndex = 41; + this.ribbonPanel7.Visible = false; + // + // ribbonBar5 + // + this.ribbonBar5.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar5.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar5.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar5.BackgroundStyle.Class = ""; + this.ribbonBar5.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar5.ContainerControlProcessDialogKey = true; + this.ribbonBar5.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar5.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.btn_flag, + this.slider4ground}); + this.ribbonBar5.Location = new System.Drawing.Point(3, 0); + this.ribbonBar5.Name = "ribbonBar5"; + this.ribbonBar5.Size = new System.Drawing.Size(427, 92); + this.ribbonBar5.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar5.TabIndex = 0; + // + // + // + this.ribbonBar5.TitleStyle.Class = ""; + this.ribbonBar5.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar5.TitleStyleMouseOver.Class = ""; + this.ribbonBar5.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar5.TitleVisible = false; + // + // btn_flag + // + this.btn_flag.Image = global::Cyberpipe.Properties.Resources._24x24icon_03_hover; + this.btn_flag.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_flag.Name = "btn_flag"; + this.btn_flag.SubItemsExpandWidth = 14; + this.btn_flag.Text = "标识器管理"; + this.btn_flag.Click += new System.EventHandler(this.btn_flag_Click); + // + // slider4ground + // + this.slider4ground.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; + this.slider4ground.Name = "slider4ground"; + this.slider4ground.Text = "地面透明度"; + this.slider4ground.Value = 0; + this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); + // + // ribbonPanel8 + // + this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel8.Controls.Add(this.ribbonBar_UserInfo); + this.ribbonPanel8.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel8.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel8.Name = "ribbonPanel8"; + this.ribbonPanel8.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel8.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel8.Style.Class = ""; + this.ribbonPanel8.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel8.StyleMouseDown.Class = ""; + this.ribbonPanel8.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel8.StyleMouseOver.Class = ""; + this.ribbonPanel8.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel8.TabIndex = 42; + this.ribbonPanel8.Visible = false; + // + // ribbonBar_UserInfo + // + this.ribbonBar_UserInfo.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar_UserInfo.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar_UserInfo.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar_UserInfo.BackgroundStyle.Class = ""; + this.ribbonBar_UserInfo.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar_UserInfo.ContainerControlProcessDialogKey = true; + this.ribbonBar_UserInfo.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar_UserInfo.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.btn_user_info, + this.btn_role_info, + this.btn_resc_info, + this.btn_role_resc, + this.btn_user_role, + this.btn_password_edit, + this.btn_reset_password}); + this.ribbonBar_UserInfo.Location = new System.Drawing.Point(3, 0); + this.ribbonBar_UserInfo.Name = "ribbonBar_UserInfo"; + this.ribbonBar_UserInfo.Size = new System.Drawing.Size(427, 92); + this.ribbonBar_UserInfo.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar_UserInfo.TabIndex = 0; + // + // + // + this.ribbonBar_UserInfo.TitleStyle.Class = ""; + this.ribbonBar_UserInfo.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar_UserInfo.TitleStyleMouseOver.Class = ""; + this.ribbonBar_UserInfo.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // btn_user_info + // + this.btn_user_info.Image = global::Cyberpipe.Properties.Resources._24x24icon_13_hover; + this.btn_user_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_user_info.Name = "btn_user_info"; + this.btn_user_info.SubItemsExpandWidth = 14; + this.btn_user_info.Text = "用户管理"; + this.btn_user_info.Click += new System.EventHandler(this.btn_user_info_Click); + // + // btn_role_info + // + this.btn_role_info.Image = global::Cyberpipe.Properties.Resources._24x24icon_05_hover1; + this.btn_role_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_role_info.Name = "btn_role_info"; + this.btn_role_info.SubItemsExpandWidth = 14; + this.btn_role_info.Text = "角色管理"; + this.btn_role_info.Click += new System.EventHandler(this.btn_role_info_Click); + // + // btn_resc_info + // + this.btn_resc_info.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__09; + this.btn_resc_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_resc_info.Name = "btn_resc_info"; + this.btn_resc_info.SubItemsExpandWidth = 14; + this.btn_resc_info.Text = "资源管理"; + this.btn_resc_info.Click += new System.EventHandler(this.btn_resc_info_Click); + // + // btn_role_resc + // + this.btn_role_resc.Image = global::Cyberpipe.Properties.Resources.btnlegendSet_Image_副本; + this.btn_role_resc.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_role_resc.Name = "btn_role_resc"; + this.btn_role_resc.SubItemsExpandWidth = 14; + this.btn_role_resc.Text = "角色授权"; + this.btn_role_resc.Click += new System.EventHandler(this.btn_role_resc_Click); + // + // btn_user_role + // + this.btn_user_role.Image = global::Cyberpipe.Properties.Resources._24x24icon_08_hover; + this.btn_user_role.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_user_role.Name = "btn_user_role"; + this.btn_user_role.SubItemsExpandWidth = 14; + this.btn_user_role.Text = "用户授权"; + this.btn_user_role.Click += new System.EventHandler(this.btn_user_role_Click); + // + // btn_password_edit + // + this.btn_password_edit.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__67; + this.btn_password_edit.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_password_edit.Name = "btn_password_edit"; + this.btn_password_edit.SubItemsExpandWidth = 14; + this.btn_password_edit.Text = "密码修改"; + this.btn_password_edit.Click += new System.EventHandler(this.btn_password_edit_Click); + // + // btn_reset_password + // + this.btn_reset_password.Image = global::Cyberpipe.Properties.Resources.liuxiang; + this.btn_reset_password.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_reset_password.Name = "btn_reset_password"; + this.btn_reset_password.SubItemsExpandWidth = 14; + this.btn_reset_password.Text = "重置密码"; + this.btn_reset_password.Click += new System.EventHandler(this.btn_reset_password_Click); + // // ribbonPanel2 // this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -5891,85 +5970,6 @@ this.buttonItemBZ11.Text = "标注管理"; this.buttonItemBZ11.Click += new System.EventHandler(this.buttonItemBZ11_Click); // - // ribbonPanel7 - // - this.ribbonPanel7.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel7.Controls.Add(this.ribbonBar5); - this.ribbonPanel7.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel7.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel7.Name = "ribbonPanel7"; - this.ribbonPanel7.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel7.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel7.Style.Class = ""; - this.ribbonPanel7.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel7.StyleMouseDown.Class = ""; - this.ribbonPanel7.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel7.StyleMouseOver.Class = ""; - this.ribbonPanel7.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel7.TabIndex = 41; - this.ribbonPanel7.Visible = false; - // - // ribbonBar5 - // - this.ribbonBar5.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar5.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar5.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar5.BackgroundStyle.Class = ""; - this.ribbonBar5.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar5.ContainerControlProcessDialogKey = true; - this.ribbonBar5.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar5.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.btn_flag, - this.slider4ground}); - this.ribbonBar5.Location = new System.Drawing.Point(3, 0); - this.ribbonBar5.Name = "ribbonBar5"; - this.ribbonBar5.Size = new System.Drawing.Size(427, 92); - this.ribbonBar5.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar5.TabIndex = 0; - // - // - // - this.ribbonBar5.TitleStyle.Class = ""; - this.ribbonBar5.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar5.TitleStyleMouseOver.Class = ""; - this.ribbonBar5.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar5.TitleVisible = false; - // - // btn_flag - // - this.btn_flag.Image = global::Cyberpipe.Properties.Resources._24x24icon_03_hover; - this.btn_flag.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_flag.Name = "btn_flag"; - this.btn_flag.SubItemsExpandWidth = 14; - this.btn_flag.Text = "标识器管理"; - this.btn_flag.Click += new System.EventHandler(this.btn_flag_Click); - // - // slider4ground - // - this.slider4ground.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; - this.slider4ground.Name = "slider4ground"; - this.slider4ground.Text = "地面透明度"; - this.slider4ground.Value = 0; - this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); - // // ribbonPanel12 // this.ribbonPanel12.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7181,11 +7181,11 @@ this.contextMenuStripDeleteLayerNode.ResumeLayout(false); this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); - this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel7.ResumeLayout(false); + this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); - this.ribbonPanel7.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); this.ribbonPanel5.ResumeLayout(false); this.ribbonPanel6.ResumeLayout(false); diff --git a/SysRescInfoManager.cs b/SysRescInfoManager.cs index 3a84d95..fda6f3f 100644 --- a/SysRescInfoManager.cs +++ b/SysRescInfoManager.cs @@ -79,11 +79,11 @@ //控制表格显示的列，以及每一列要显示的列名 this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - - this.winGridViewPager1.AddColumnAlias("RESC", "资源名称"); - this.winGridViewPager1.AddColumnAlias("ID", "编号"); - this.winGridViewPager1.AddColumnAlias("DESP", "资源描述"); - this.winGridViewPager1.DisplayColumns = "RESC,DESP"; + + this.winGridViewPager1.AddColumnAlias("资源名称", "资源名称"); + this.winGridViewPager1.AddColumnAlias("编号", "编号"); + this.winGridViewPager1.AddColumnAlias("资源描述", "资源描述"); + this.winGridViewPager1.DisplayColumns = "资源名称,资源描述"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -153,8 +153,8 @@ DataGridViewRow row = grid.SelectedRows[0]; if (MessageBox.Show("确定删除？", "确认", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) { - string dbid = row.Cells["id"].Value.ToString(); - string resc = row.Cells["resc"].Value.ToString(); + string dbid = row.Cells["编号"].Value.ToString(); + string resc = row.Cells["资源名称"].Value.ToString(); OracleConnection conn = null; OracleTransaction tran = null; try @@ -229,7 +229,7 @@ private string GetSql() { string sqlCount = "select count(*) from casic_userresctest where sysname='EMS'"; - string sqlData = "select resc,id,desp " + + string sqlData = "select resc as 资源名称,id as 编号,desp as 资源描述 " + "from (select t.*,rownum row_num from casic_userresctest t order by id desc)b " + " where sysname='EMS'"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -242,7 +242,7 @@ int minPage = (pageIndex - 1) * maxPageIndex + 1; int maxPage = pageIndex * maxPageIndex; string sqlCount = "select count(*) from casic_userresctest where sysname='EMS'"; - string sqlData = "select resc,id,desp " + + string sqlData = "select resc as 资源名称,id as 编号,desp as 资源描述 " + "from (select t.*,rownum row_num from casic_userresctest t where sysname='EMS' order by id desc)b " + " where(b.row_num between " + minPage + " and " + maxPage + ")"; diff --git a/bin/x86/Debug/Config.xml b/bin/x86/Debug/Config.xml index e2d7b46..560a163 100644 --- a/bin/x86/Debug/Config.xml +++ b/bin/x86/Debug/Config.xml @@ -3,9 +3,9 @@ LocaSpace三维地下管线信息系统 scott - SZHTDB - 127.0.0.1 - scott + SZHTDB2 + 192.168.0.203 + SZHTDB2 127.0.0.1 1500 @@ -14,8 +14,8 @@ http://192.168.0.122:8088/UpDownFile.asmx - http://127.0.0.1/EMSCyberpipe.msi - http://127.0.0.1/EMSConfig.xml + http://192.168.10.229/EMSCyberpipe.msi + http://192.168.10.229/EMSConfig.xml diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index b19e2ab..b5e320f 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 1a4aeed..c20e54a 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/PipelineType.xml b/bin/x86/Debug/PipelineType.xml index 51dc4b8..b1cbacc 100644 --- a/bin/x86/Debug/PipelineType.xml +++ b/bin/x86/Debug/PipelineType.xml @@ -1,6 +1,6 @@  - + @@ -42,7 +42,7 @@ - + @@ -83,7 +83,7 @@ - + @@ -115,7 +115,7 @@ - + @@ -159,7 +159,7 @@ - + @@ -200,7 +200,7 @@ - + @@ -236,7 +236,7 @@ - + @@ -278,7 +278,7 @@ - + @@ -320,7 +320,7 @@ - + @@ -363,7 +363,7 @@ - + @@ -408,7 +408,7 @@ - + @@ -448,7 +448,7 @@ - + @@ -485,7 +485,7 @@ - + @@ -527,7 +527,7 @@ - + @@ -565,7 +565,7 @@ - + @@ -595,7 +595,7 @@ - + @@ -625,7 +625,7 @@ - + @@ -657,7 +657,7 @@ - + @@ -691,7 +691,7 @@ - + @@ -728,7 +728,7 @@ - + @@ -763,7 +763,7 @@ - + @@ -799,7 +799,7 @@ - + @@ -824,7 +824,7 @@ - + @@ -846,7 +846,7 @@ - + diff --git a/obj/x86/Debug/Cyberpipe.csproj.FileListAbsolute.txt b/obj/x86/Debug/Cyberpipe.csproj.FileListAbsolute.txt index 42dc58c..b78c534 100644 --- a/obj/x86/Debug/Cyberpipe.csproj.FileListAbsolute.txt +++ b/obj/x86/Debug/Cyberpipe.csproj.FileListAbsolute.txt @@ -203,3 +203,4 @@ D:\ym\EMS+GHFX\EMS\obj\x86\Debug\EMSCyberpipe.pdb D:\ym\EMS+GHFX\EMS\obj\x86\Debug\Cyberpipe.FrmFlagManagers.resources D:\ym\EMS+GHFX\EMS\obj\x86\Debug\Cyberpipe.FrmFlagEdits.resources +D:\ym\EMS+GHFX\EMS\obj\x86\Debug\Cyberpipe.FrmFlagDetail.resources diff --git a/Cyberpipe.csproj b/Cyberpipe.csproj index fe600e5..501fd09 100644 --- a/Cyberpipe.csproj +++ b/Cyberpipe.csproj @@ -246,6 +246,12 @@ Form_TaskManager.cs + + Form + + + FrmFlagDetail.cs + Form @@ -1368,6 +1374,9 @@ Form_TaskManager.cs + + FrmFlagDetail.cs + FormDocumentManager.cs diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 537b4c3..1acf22a 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 7d5dd95..3f178cb 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -90,20 +90,20 @@ this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - - this.winGridViewPager1.AddColumnAlias("ACCIDENTTIME", "上报时间"); - this.winGridViewPager1.AddColumnAlias("DBID", "编号"); - this.winGridViewPager1.AddColumnAlias("DESCRIBE", "事件描述"); - this.winGridViewPager1.AddColumnAlias("LATITUDE", "纬度"); - this.winGridViewPager1.AddColumnAlias("LOCALE", "事件地点"); - this.winGridViewPager1.AddColumnAlias("LONGITUDE", "经度"); - this.winGridViewPager1.AddColumnAlias("PATROLERNAME", "上报人员"); - this.winGridViewPager1.AddColumnAlias("PATROLER_ID", "人员ID"); - this.winGridViewPager1.AddColumnAlias("TASK_ID", "任务编号"); - this.winGridViewPager1.AddColumnAlias("RESULT", "处理结果"); - this.winGridViewPager1.AddColumnAlias("STATE", "处理状态"); - this.winGridViewPager1.DisplayColumns = "ACCIDENTTIME,DESCRIBE,LOCALE,PATROLERNAME,TASK_ID,RESULT,STATE"; + this.winGridViewPager1.AddColumnAlias("上报时间", "上报时间"); + this.winGridViewPager1.AddColumnAlias("编号", "编号"); + this.winGridViewPager1.AddColumnAlias("事件描述", "事件描述"); + this.winGridViewPager1.AddColumnAlias("纬度", "纬度"); + this.winGridViewPager1.AddColumnAlias("事件地点", "事件地点"); + this.winGridViewPager1.AddColumnAlias("经度", "经度"); + this.winGridViewPager1.AddColumnAlias("上报人员", "上报人员"); + this.winGridViewPager1.AddColumnAlias("人员ID", "人员ID"); + this.winGridViewPager1.AddColumnAlias("任务编号", "任务编号"); + this.winGridViewPager1.AddColumnAlias("处理结果", "处理结果"); + this.winGridViewPager1.AddColumnAlias("处理状态", "处理状态"); + + this.winGridViewPager1.DisplayColumns = "上报时间,事件描述,事件地点,上报人员,任务编号,处理结果,处理状态"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -114,8 +114,8 @@ winGridViewPager1.dataGridView1.ContextMenuStrip.Items[5].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[6].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[7].Visible = false; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[1].Text = "查看位置"; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "结果编辑"; + winGridViewPager1.dataGridView1.ContextMenuStrip.Items[1].Text = "结果编辑"; + winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "查看位置"; //右键菜单宽度 winGridViewPager1.dataGridView1.ContextMenuStrip.AutoSize = false; @@ -160,13 +160,12 @@ this.WindowState = FormWindowState.Minimized; globeControl1.Globe.MemoryLayer.RemoveAllFeature(); this.WindowState = FormWindowState.Minimized; - double x = Convert.ToDouble(row.Cells["LONGITUDE"].Value); - double y = Convert.ToDouble(row.Cells["LATITUDE"].Value); - - string username = Convert.ToString(row.Cells["PATROLERNAME"].Value); - string Atime = Convert.ToString(row.Cells["ACCIDENTTIME"].Value); - string location = Convert.ToString(row.Cells["LOCALE"].Value); - string descp = Convert.ToString(row.Cells["DESCRIBE"].Value); + double x = Convert.ToDouble(row.Cells["经度"].Value); + double y = Convert.ToDouble(row.Cells["纬度"].Value); + string username = Convert.ToString(row.Cells["上报人员"].Value); + string Atime = Convert.ToString(row.Cells["上报时间"].Value); + string location = Convert.ToString(row.Cells["事件地点"].Value); + string descp = Convert.ToString(row.Cells["事件描述"].Value); /////////////////////////////////////// /*******设置飞行与创建模型******/ @@ -228,8 +227,8 @@ DataGridViewRow row = grid.SelectedRows[0]; try { - int dbId = Convert.ToInt32(row.Cells["DBID"].Value); - string result = Convert.ToString(row.Cells["RESULT"].Value); + int dbId = Convert.ToInt32(row.Cells["编号"].Value); + string result = Convert.ToString(row.Cells["处理结果"].Value); EMS_Forms.Form_EventResult form = new Form_EventResult(dbId, result); form.refresh += new Form_EventResult.Handle(LoadData);//改变值的事件 form.ShowDialog(); @@ -276,9 +275,9 @@ } for (int i = 0; i < table.Rows.Count; i++) { - if (winGridViewPager1.dataGridView1.Rows[i].Cells["RESULT"].Value != null && !(winGridViewPager1.dataGridView1.Rows[i].Cells["RESULT"].Value.ToString().Trim().Equals(""))) + if (winGridViewPager1.dataGridView1.Rows[i].Cells["处理结果"].Value != null && !(winGridViewPager1.dataGridView1.Rows[i].Cells["处理结果"].Value.ToString().Trim().Equals(""))) { - winGridViewPager1.dataGridView1.Rows[i].Cells["STATE"].Value = "已处理"; + winGridViewPager1.dataGridView1.Rows[i].Cells["处理状态"].Value = "已处理"; } } @@ -307,9 +306,9 @@ } for (int i = 0; i < table.Rows.Count; i++) { - if (winGridViewPager1.dataGridView1.Rows[i].Cells["RESULT"].Value != null && !(winGridViewPager1.dataGridView1.Rows[i].Cells["RESULT"].Value.ToString().Trim().Equals(""))) + if (winGridViewPager1.dataGridView1.Rows[i].Cells["处理结果"].Value != null && !(winGridViewPager1.dataGridView1.Rows[i].Cells["处理结果"].Value.ToString().Trim().Equals(""))) { - winGridViewPager1.dataGridView1.Rows[i].Cells["STATE"].Value = "已处理"; + winGridViewPager1.dataGridView1.Rows[i].Cells["处理状态"].Value = "已处理"; } } @@ -320,10 +319,12 @@ { string sqlCount = "select count(*) from ACCIDENT where 1=1"; - string sqlData = "select ACCIDENTTIME,DBID,DESCRIBE,LATITUDE,LOCALE,LONGITUDE,PATROLERNAME,PATROLER_ID,TASK_ID,RESULT,'' as STATE " + + string sqlData = "select ACCIDENTTIME as 上报时间,DBID as 编号,DESCRIBE as 事件描述,"+ + "LATITUDE as 纬度,LOCALE as 事件地点,LONGITUDE as 经度,PATROLERNAME 上报人员,"+ + "PATROLER_ID as 人员ID,TASK_ID as 任务编号,RESULT as 处理结果,'' as 处理状态 " + "from (select t.*,rownum row_num from ACCIDENT t order by DBID)b " + " where 1=1"; - + rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; @@ -340,9 +341,10 @@ string sqlCount = "select count(*) from ACCIDENT where 1=1"; - string sqlData = "select ACCIDENTTIME,DBID,DESCRIBE,LATITUDE,LOCALE,LONGITUDE,PATROLERNAME,PATROLER_ID,TASK_ID,RESULT,'' as STATE " + - "from (select t.*,rownum row_num from ACCIDENT t order by DBID)b " + - " where(b.row_num between " + minPage + " and " + maxPage + ")"; + string sqlData = "select ACCIDENTTIME as 上报时间,DBID as 编号,DESCRIBE as 事件描述," + + "LATITUDE as 纬度,LOCALE as 事件地点,LONGITUDE as 经度,PATROLERNAME 上报人员," + + "PATROLER_ID as 人员ID,TASK_ID as 任务编号,RESULT as 处理结果,'' as 处理状态 " + + "from (select t.*,rownum row_num from ACCIDENT t where 1=1"; if (!String.IsNullOrEmpty(comboBox_name.Text.Trim())) { @@ -361,7 +363,8 @@ sqlCount += "and ACCIDENTTIME<=to_date('" + time.ToShortDateString() + "','yyyy-MM-dd') "; sqlData += "and ACCIDENTTIME<=to_date('" + time.ToShortDateString() + "','yyyy-MM-dd') "; } - + sqlData += " order by DBID desc)b " + + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 225c8d7..8bd9e48 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -120,8 +120,8 @@ private void flyToTask(DataGridViewRow row, int taskState) { int dbID = 0; - dbID = Convert.ToInt32(row.Cells["DBID"].Value); - string userName = Convert.ToString(row.Cells["USERNAME"].Value); + dbID = Convert.ToInt32(row.Cells["任务编号"].Value); + string userName = Convert.ToString(row.Cells["任务执行人员"].Value); System.DateTime t = new DateTime(); try { @@ -392,15 +392,15 @@ //控制表格显示的列，以及每一列要显示的列名 this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - this.winGridViewPager1.AddColumnAlias("DBID", "任务编号"); - this.winGridViewPager1.AddColumnAlias("DEPLOYTIME", "创建时间"); - this.winGridViewPager1.AddColumnAlias("DESCIRPTION", "任务描述"); - this.winGridViewPager1.AddColumnAlias("FINISHTIME", "完成时间"); - this.winGridViewPager1.AddColumnAlias("STREET", "任务执行区域"); - this.winGridViewPager1.AddColumnAlias("TASKSTATE", "任务状态"); - this.winGridViewPager1.AddColumnAlias("USERNAME", "任务执行人员"); + this.winGridViewPager1.AddColumnAlias("任务编号", "任务编号"); + this.winGridViewPager1.AddColumnAlias("创建时间", "创建时间"); + this.winGridViewPager1.AddColumnAlias("任务描述", "任务描述"); + this.winGridViewPager1.AddColumnAlias("完成时间", "完成时间"); + this.winGridViewPager1.AddColumnAlias("任务执行区域", "任务执行区域"); + this.winGridViewPager1.AddColumnAlias("任务状态", "任务状态"); + this.winGridViewPager1.AddColumnAlias("任务执行人员", "任务执行人员"); - this.winGridViewPager1.DisplayColumns = "DBID,DEPLOYTIME,DESCIRPTION,FINISHTIME,STREET,TASKSTATE,USERNAME"; + this.winGridViewPager1.DisplayColumns = "任务编号,创建时间,任务描述,完成时间,任务执行区域,任务状态,任务执行人员"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -464,8 +464,8 @@ { int dbID = 0; int taskStateInt = 0; - dbID = Convert.ToInt32(row.Cells["DBID"].Value); - string taskState = row.Cells["TASKSTATE"].Value.ToString(); + dbID = Convert.ToInt32(row.Cells["任务编号"].Value); + string taskState = row.Cells["任务状态"].Value.ToString(); if (taskState.Equals("开始任务")) { taskStateInt = 1; @@ -534,9 +534,10 @@ private string GetSql() { - string sqlCount = "select count(*) from taskinfo t where 1=1'"; + string sqlCount = "select count(*) from taskinfo t where 1=1"; - string sqlData = "select dbid,deploytime,descirption,finishtime,street,taskstate,username " + + 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"; @@ -550,9 +551,9 @@ int minPage = (pageIndex - 1) * maxPageIndex + 1; int maxPage = pageIndex * maxPageIndex; string sqlCount = "select count(*) from taskinfo t where 1=1"; - string sqlData = "select dbid,deploytime,descirption,finishtime,street,taskstate,username " + - "from (select t.*,rownum row_num from taskinfo t order by DBID desc)b " + - " where(b.row_num between " + minPage + " and " + maxPage + ")"; + 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"; if (!String.IsNullOrEmpty(comboBox_userName.Text.Trim()) && !comboBox_userName.Text.Trim().Equals("不限")) { @@ -581,6 +582,8 @@ sqlCount += "and street='" + combo_street.Text + "' "; sqlData += "and street='" + combo_street.Text + "' "; } + sqlData += " order by DBID desc)b " + + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index e65a4bd..58f5342 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -73,13 +73,13 @@ //控制表格显示的列，以及每一列要显示的列名 this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - this.winGridViewPager1.AddColumnAlias("FILENAME", "文档名称"); - this.winGridViewPager1.AddColumnAlias("DBID", "编号"); - this.winGridViewPager1.AddColumnAlias("TITLE", "文档标题"); - this.winGridViewPager1.AddColumnAlias("FILETYPE", "文档类型"); - this.winGridViewPager1.AddColumnAlias("UPDAY", "上传日期"); - this.winGridViewPager1.AddColumnAlias("WRITER", "上传人"); - this.winGridViewPager1.DisplayColumns = "FILENAME,TITLE,FILETYPE,UPDAY,WRITER"; + this.winGridViewPager1.AddColumnAlias("文档名称", "文档名称"); + this.winGridViewPager1.AddColumnAlias("编号", "编号"); + this.winGridViewPager1.AddColumnAlias("文档标题", "文档标题"); + this.winGridViewPager1.AddColumnAlias("文档类型", "文档类型"); + this.winGridViewPager1.AddColumnAlias("上传日期", "上传日期"); + this.winGridViewPager1.AddColumnAlias("上传人", "上传人"); + this.winGridViewPager1.DisplayColumns = "文档名称,文档标题,文档类型,上传日期,上传人"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -167,7 +167,7 @@ if (grid != null) { DataGridViewRow row = grid.SelectedRows[0]; - string dbid = row.Cells["dbid"].Value.ToString(); + string dbid = row.Cells["编号"].Value.ToString(); try { if (MessageBox.Show("确认删除吗？", "确认", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) @@ -212,7 +212,8 @@ { string sqlCount = "select count(*) from casic_userdocument where sysname = 'EMS'"; - string sqlData = "select filename,dbid,title,filetype,upday,writer " + + string sqlData = "select filename as 文档名称,dbid as 编号,title as 文档标题," + + "filetype as 文档类型,upday as 上传日期,writer as 上传人 " + "from (select t.*,rownum row_num from casic_userdocument t order by DBID desc)b " + " where sysname = 'EMS'"; @@ -226,9 +227,9 @@ int minPage = (pageIndex - 1) * maxPageIndex + 1; int maxPage = pageIndex * maxPageIndex; string sqlCount = "select count(*) from casic_userdocument where sysname = 'EMS'"; - string sqlData = "select filename,dbid,title,filetype,upday,writer " + - "from (select t.*,rownum row_num from casic_userdocument t where sysname = 'EMS' order by DBID desc)b " + - " where(b.row_num between " + minPage + " and " + maxPage + ")"; + string sqlData = "select filename as 文档名称,dbid as 编号,title as 文档标题,"+ + "filetype as 文档类型,upday as 上传日期,writer as 上传人 " + + "from (select t.*,rownum row_num from casic_userdocument t where sysname = 'EMS'"; string txtTitleText = null; string comboFileType = null; @@ -278,7 +279,8 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - + sqlData += " order by DBID desc)b " + + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; @@ -437,7 +439,7 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - string filename = row.Cells["filename"].Value.ToString(); + string filename = row.Cells["文档名称"].Value.ToString(); string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; string file = System.Environment.CurrentDirectory + "\\download\\" + filename; int result = DownloadFile(url, file, progressBar1); @@ -515,7 +517,7 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - string filename = row.Cells["filename"].Value.ToString(); + string filename = row.Cells["文档名称"].Value.ToString(); string ext = Path.GetExtension(filename); SaveFileDialog dlg = new SaveFileDialog(); dlg.Filter = "保存文档|*" + ext + ";"; diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 1d1201b..3902629 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -748,6 +748,7 @@ this.Name = "FrmAddSinMark"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "单个标识器添加"; + this.TopMost = true; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmAddSinMark_FormClosing); this.Load += new System.EventHandler(this.FrmAddSinMark_Load); this.groupPanel1.ResumeLayout(false); diff --git a/FrmEquipmentManage.cs b/FrmEquipmentManage.cs index 90bfdb2..a3cf55c 100644 --- a/FrmEquipmentManage.cs +++ b/FrmEquipmentManage.cs @@ -74,13 +74,13 @@ //控制表格显示的列，以及每一列要显示的列名 this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - this.winGridViewPager1.AddColumnAlias("DESCIRPTION", "设备描述"); - this.winGridViewPager1.AddColumnAlias("DBID", "编号"); - this.winGridViewPager1.AddColumnAlias("MACID", "MAC地址"); - this.winGridViewPager1.AddColumnAlias("OWNER", "设备所有人"); - this.winGridViewPager1.AddColumnAlias("STATUS", "设备状态"); + this.winGridViewPager1.AddColumnAlias("设备描述", "设备描述"); + this.winGridViewPager1.AddColumnAlias("编号", "编号"); + this.winGridViewPager1.AddColumnAlias("MAC地址", "MAC地址"); + this.winGridViewPager1.AddColumnAlias("设备所有人", "设备所有人"); + this.winGridViewPager1.AddColumnAlias("设备状态", "设备状态"); - this.winGridViewPager1.DisplayColumns = "DESCIRPTION,MACID,OWNER,STATUS"; + this.winGridViewPager1.DisplayColumns = "设备描述,MAC地址,设备所有人,设备状态"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -146,10 +146,10 @@ DataGridViewRow row = grid.SelectedRows[0]; try { - long dbid = long.Parse(row.Cells["DBID"].Value.ToString()); - String macId = row.Cells["MACID"].Value.ToString(); - String username = row.Cells["OWNER"].Value.ToString(); - String descn = row.Cells["DESCIRPTION"].Value.ToString(); + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); + String macId = row.Cells["MAC地址"].Value.ToString(); + String username = row.Cells["设备所有人"].Value.ToString(); + String descn = row.Cells["设备状态"].Value.ToString(); FrmEquipmentEdit frm = new FrmEquipmentEdit(dbid.ToString(), macId, username, descn); frm.reloadGrid += new ReloadEquipmentGrid(LoadData); frm.ShowDialog(); @@ -179,7 +179,7 @@ { return; } - String macId = row.Cells["MACID"].Value.ToString(); + String macId = row.Cells["MAC地址"].Value.ToString(); FrmLog frm = new FrmLog(macId); frm.Show(); } @@ -201,7 +201,7 @@ if (grid != null) { DataGridViewRow row = grid.SelectedRows[0]; - long dbid = long.Parse(row.Cells["DBID"].Value.ToString()); + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); try { if (MessageBox.Show("确定删除？", "确认", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) @@ -243,7 +243,8 @@ { string sqlCount = "select count(*) from equipment where status = 'USING'"; - string sqlData = "select descirption,DBID,macid,owner,case when status = 'USING' then '可用' when status = 'DAMAGE' then '损坏' end as status " + + string sqlData = "select descirption as 设备描述,DBID as 编号,macid as MAC地址,owner as 设备所有人,"+ + "case when status = 'USING' then '可用' when status = 'DAMAGE' then '损坏' end as 设备状态 " + "from (select t.*,rownum row_num from equipment t where status = 'USING' order by dbid desc)b " + " where 1=1"; @@ -258,16 +259,17 @@ int maxPage = pageIndex * maxPageIndex; string sqlCount = "select count(*) from equipment where status = 'USING' "; - string sqlData = "select descirption,DBID,macid,owner,case when status = 'USING' then '可用' when status = 'DAMAGE' then '损坏' end as status " + - "from (select t.*,rownum row_num from equipment t where status = 'USING' order by DBID desc)b " + - " where(b.row_num between " + minPage + " and " + maxPage + ")"; + string sqlData = "select descirption as 设备描述,DBID as 编号,macid as MAC地址,owner as 设备所有人," + + "case when status = 'USING' then '可用' when status = 'DAMAGE' then '损坏' end as 设备状态 " + + "from (select t.*,rownum row_num from equipment t where status = 'USING'"; if (!String.IsNullOrEmpty(txtMacId.Text.Trim())) { sqlData += " and macid like '%" + txtMacId.Text.Trim() + "%'"; sqlCount += " and macid like '%" + txtMacId.Text.Trim() + "%'"; } - + sqlData += " order by DBID desc)b " + + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; @@ -299,76 +301,6 @@ } } - //public void reloadGrid(int pageIndex) - //{ - // if (pageIndex <= 0) - // { - // pageIndex = 1; - // currentpage = 1; - // } - // String sqlrows = "select * from (select rownum as rowno,dbid,descirption,macid,owner,case when status = 'USING' then '可用' when status = 'DAMAGE' then '损坏' end as status,'编辑' as btnEdit,'删除' as btnDel from equipment t where status = 'USING' "; - // string sqlcount = "select count(*) from equipment where status = 'USING' "; - // if (!String.IsNullOrEmpty(txtMacId.Text.Trim())) - // { - // sqlrows += " and macid like '%" + txtMacId.Text.Trim() + "%'"; - // sqlcount += " and macid like '%" + txtMacId.Text.Trim() + "%'"; - // } - // sqlrows += " and rownum<=" + (pagesize * pageIndex) + ") table_alias where table_alias.rowno>=" + ((pageIndex - 1) * pagesize + 1); - - // int rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlcount).ToString()); - // int pages = 0; - // if (rows % pagesize == 0) - // { - // pages = rows / pagesize; - // } - // else - // { - // pages = rows / pagesize + 1; - // } - - // lastpage = pages; - - // lab_page_msg.Text = "共" + rows + "条记录，每页" + pagesize + "条，第" + pageIndex + "页，共" + pages + "页"; - // combo_page_num.Items.Clear(); - // for (int i = 1; i <= pages; i++) - // { - // combo_page_num.Items.Add(new ComboBoxItem(i.ToString(), i.ToString())); - // } - - // if (lastpage == 1) - // { - // btn_page_first.Enabled = false; - // btn_page_pre.Enabled = false; - // btn_page_last.Enabled = false; - // btn_page_next.Enabled = false; - // } - // else if (currentpage == 1) - // { - // btn_page_first.Enabled = false; - // btn_page_pre.Enabled = false; - // btn_page_last.Enabled = true; - // btn_page_next.Enabled = true; - // } - // else if (currentpage == lastpage) - // { - // btn_page_first.Enabled = true; - // btn_page_pre.Enabled = true; - // btn_page_last.Enabled = false; - // btn_page_next.Enabled = false; - // } - // else - // { - // btn_page_first.Enabled = true; - // btn_page_pre.Enabled = true; - // btn_page_last.Enabled = true; - // btn_page_next.Enabled = true; - // } - - // DataTable table = OracleUtils.ExecuteDataset(OracleUtils.ConnectionString, CommandType.Text, sqlrows).Tables[0]; - // dataGridViewX1.DataSource = table; - - //} - private void FrmEquipmentManage_FormClosing(object sender, FormClosingEventArgs e) diff --git a/FrmFlagDetail.Designer.cs b/FrmFlagDetail.Designer.cs new file mode 100644 index 0000000..982bfc6 --- /dev/null +++ b/FrmFlagDetail.Designer.cs @@ -0,0 +1,103 @@ +namespace Cyberpipe +{ + partial class FrmFlagDetail + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); + this.dataGridViewX_markDetail = new DevComponents.DotNetBar.Controls.DataGridViewX(); + this.对象类型 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.对象编号 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.对象名称 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX_markDetail)).BeginInit(); + this.SuspendLayout(); + // + // dataGridViewX_markDetail + // + this.dataGridViewX_markDetail.AllowUserToAddRows = false; + this.dataGridViewX_markDetail.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; + this.dataGridViewX_markDetail.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dataGridViewX_markDetail.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.对象类型, + this.对象编号, + this.对象名称}); + dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle3.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dataGridViewX_markDetail.DefaultCellStyle = dataGridViewCellStyle3; + this.dataGridViewX_markDetail.Dock = System.Windows.Forms.DockStyle.Fill; + this.dataGridViewX_markDetail.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(170)))), ((int)(((byte)(170)))), ((int)(((byte)(170))))); + this.dataGridViewX_markDetail.Location = new System.Drawing.Point(0, 0); + this.dataGridViewX_markDetail.Name = "dataGridViewX_markDetail"; + this.dataGridViewX_markDetail.RowTemplate.Height = 23; + this.dataGridViewX_markDetail.Size = new System.Drawing.Size(508, 321); + this.dataGridViewX_markDetail.TabIndex = 0; + // + // 对象类型 + // + this.对象类型.HeaderText = "对象类型"; + this.对象类型.Name = "对象类型"; + // + // 对象编号 + // + this.对象编号.HeaderText = "对象编号"; + this.对象编号.Name = "对象编号"; + // + // 对象名称 + // + this.对象名称.HeaderText = "对象名称"; + this.对象名称.Name = "对象名称"; + // + // FrmFlagDetail + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(508, 321); + this.Controls.Add(this.dataGridViewX_markDetail); + this.Name = "FrmFlagDetail"; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; + this.Text = "标识对象信息"; + this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmFlagDetail_FormClosing); + this.Load += new System.EventHandler(this.FrmFlagDetail_Load); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX_markDetail)).EndInit(); + this.ResumeLayout(false); + + } + + #endregion + + private DevComponents.DotNetBar.Controls.DataGridViewX dataGridViewX_markDetail; + private System.Windows.Forms.DataGridViewTextBoxColumn 对象类型; + private System.Windows.Forms.DataGridViewTextBoxColumn 对象编号; + private System.Windows.Forms.DataGridViewTextBoxColumn 对象名称; + + } +} \ No newline at end of file diff --git a/FrmFlagDetail.cs b/FrmFlagDetail.cs new file mode 100644 index 0000000..81de974 --- /dev/null +++ b/FrmFlagDetail.cs @@ -0,0 +1,77 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Windows.Forms; +using GeoScene.Globe; +using System.Data.OracleClient; + +namespace Cyberpipe +{ + public partial class FrmFlagDetail : Form + { + DataTable dt = new DataTable(); + private GSOGlobeControl globeControl1; + + public delegate void Handle(); + public event Handle showParentForm; + String markId; + + public FrmFlagDetail(GSOGlobeControl globeControl1, String id) + { + InitializeComponent(); + this.markId = id; + } + + private void FrmFlagDetail_FormClosing(object sender, FormClosingEventArgs e) + { + showParentForm(); + } + + private void FrmFlagDetail_Load(object sender, EventArgs e) + { + string objectIds = ""; + string objectTypeCodes = ""; + string sql = "select t.对象编号,t.对象类型 from 标识器 t where t.编号='" + markId + "'"; + using (OracleDataReader reader = OracleUtils.ExecuteReader(OracleUtils.ConnectionString, CommandType.Text, sql)) + { + while (reader.Read()) + { + objectIds = reader.GetString(0); + objectTypeCodes = reader.GetString(1); + } + } + + string[] codeTypes = objectTypeCodes.Split(','); + string[] codeIds = objectIds.Split(','); + int length = 0; + if (codeTypes.Length <= codeIds.Length) + { + length = codeTypes.Length; + } + else + { + length = codeIds.Length; + } + for (int n = 0; n < length; n++) + { + for (int i = 0; i < Utility1.listPipelineType.Count; i++) + { + if (Utility1.listPipelineType[i].code == codeTypes[n]) + { + //string objectId = codeIds[i]; + //string objectType = Utility1.listPipelineType[i].type; + //string objectName = Utility1.listPipelineType[i].name; + int index = this.dataGridViewX_markDetail.Rows.Add(); + this.dataGridViewX_markDetail.Rows[index].Cells[0].Value = Utility1.listPipelineType[i].type; + this.dataGridViewX_markDetail.Rows[index].Cells[1].Value = codeIds[n].ToString(); + this.dataGridViewX_markDetail.Rows[index].Cells[2].Value = Utility1.listPipelineType[i].name; + } + } + } + } + } +} diff --git a/FrmFlagDetail.resx b/FrmFlagDetail.resx new file mode 100644 index 0000000..e98a8fe --- /dev/null +++ b/FrmFlagDetail.resx @@ -0,0 +1,129 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + True + + + True + + + True + + \ No newline at end of file diff --git a/FrmFlagManagers.Designer.cs b/FrmFlagManagers.Designer.cs index d7e2f60..9fe14fb 100644 --- a/FrmFlagManagers.Designer.cs +++ b/FrmFlagManagers.Designer.cs @@ -28,8 +28,10 @@ /// private void InitializeComponent() { - this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); - this.winGridViewPager1 = new WHC.Pager.WinControl.WinGridViewPager(); + this.components = new System.ComponentModel.Container(); + this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components); + this.标识对象ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripMenuItem2 = new System.Windows.Forms.ToolStripMenuItem(); this.bar1 = new DevComponents.DotNetBar.Bar(); this.labelItem1 = new DevComponents.DotNetBar.LabelItem(); this.txt_no = new DevComponents.DotNetBar.TextBoxItem(); @@ -38,45 +40,37 @@ this.btn_query = new DevComponents.DotNetBar.ButtonItem(); this.btn_add_batch = new DevComponents.DotNetBar.ButtonItem(); this.btn_add_menu = new DevComponents.DotNetBar.ButtonItem(); - this.btn_db = new DevComponents.DotNetBar.ButtonItem(); - this.tableLayoutPanel1.SuspendLayout(); + this.winGridViewPager1 = new WHC.Pager.WinControl.WinGridViewPager(); + this.contextMenuStrip1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.bar1)).BeginInit(); this.SuspendLayout(); // - // tableLayoutPanel1 + // contextMenuStrip1 // - this.tableLayoutPanel1.ColumnCount = 1; - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel1.Controls.Add(this.winGridViewPager1, 0, 1); - this.tableLayoutPanel1.Controls.Add(this.bar1, 0, 0); - this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 0); - this.tableLayoutPanel1.Name = "tableLayoutPanel1"; - this.tableLayoutPanel1.RowCount = 2; - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 32F)); - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel1.Size = new System.Drawing.Size(881, 474); - this.tableLayoutPanel1.TabIndex = 6; + this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.标识对象ToolStripMenuItem, + this.toolStripMenuItem2}); + this.contextMenuStrip1.Name = "contextMenuStrip1"; + this.contextMenuStrip1.Size = new System.Drawing.Size(125, 48); // - // winGridViewPager1 + // 标识对象ToolStripMenuItem // - this.winGridViewPager1.AppendedMenu = null; - this.winGridViewPager1.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; - this.winGridViewPager1.DataSource = null; - this.winGridViewPager1.DisplayColumns = ""; - this.winGridViewPager1.Dock = System.Windows.Forms.DockStyle.Fill; - this.winGridViewPager1.Location = new System.Drawing.Point(3, 35); - this.winGridViewPager1.MinimumSize = new System.Drawing.Size(540, 0); - this.winGridViewPager1.Name = "winGridViewPager1"; - this.winGridViewPager1.PrintTitle = ""; - this.winGridViewPager1.Size = new System.Drawing.Size(875, 436); - this.winGridViewPager1.TabIndex = 5; + this.标识对象ToolStripMenuItem.Name = "标识对象ToolStripMenuItem"; + this.标识对象ToolStripMenuItem.Size = new System.Drawing.Size(124, 22); + this.标识对象ToolStripMenuItem.Text = "标识对象"; + this.标识对象ToolStripMenuItem.Click += new System.EventHandler(this.标识对象ToolStripMenuItem_Click); + // + // toolStripMenuItem2 + // + this.toolStripMenuItem2.Name = "toolStripMenuItem2"; + this.toolStripMenuItem2.Size = new System.Drawing.Size(152, 22); + this.toolStripMenuItem2.Text = "查看位置"; + this.toolStripMenuItem2.Click += new System.EventHandler(this.toolStripMenuItem2_Click); // // bar1 // this.bar1.AntiAlias = true; this.bar1.Dock = System.Windows.Forms.DockStyle.Top; - this.bar1.DockSide = DevComponents.DotNetBar.eDockSide.Document; this.bar1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.labelItem1, this.txt_no, @@ -84,14 +78,13 @@ this.combo_street, this.btn_query, this.btn_add_batch, - this.btn_add_menu, - this.btn_db}); - this.bar1.Location = new System.Drawing.Point(3, 3); + this.btn_add_menu}); + this.bar1.Location = new System.Drawing.Point(0, 0); this.bar1.Name = "bar1"; - this.bar1.Size = new System.Drawing.Size(875, 28); + this.bar1.Size = new System.Drawing.Size(881, 28); this.bar1.Stretch = true; this.bar1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.bar1.TabIndex = 1; + this.bar1.TabIndex = 8; this.bar1.TabStop = false; this.bar1.Text = "bar1"; // @@ -136,24 +129,34 @@ this.btn_add_menu.Text = "手工添加"; this.btn_add_menu.Click += new System.EventHandler(this.btn_add_menu_Click); // - // btn_db + // winGridViewPager1 // - this.btn_db.Name = "btn_db"; - this.btn_db.Text = "数据导出"; + this.winGridViewPager1.AppendedMenu = null; + this.winGridViewPager1.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; + this.winGridViewPager1.DataSource = null; + this.winGridViewPager1.DisplayColumns = ""; + this.winGridViewPager1.Dock = System.Windows.Forms.DockStyle.Fill; + this.winGridViewPager1.Location = new System.Drawing.Point(0, 28); + this.winGridViewPager1.MinimumSize = new System.Drawing.Size(540, 0); + this.winGridViewPager1.Name = "winGridViewPager1"; + this.winGridViewPager1.PrintTitle = ""; + this.winGridViewPager1.Size = new System.Drawing.Size(881, 446); + this.winGridViewPager1.TabIndex = 9; // // FrmFlagManagers // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(881, 474); - this.Controls.Add(this.tableLayoutPanel1); + this.Controls.Add(this.winGridViewPager1); + this.Controls.Add(this.bar1); this.DoubleBuffered = true; this.Name = "FrmFlagManagers"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "标识器管理"; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmFlagManagers_FormClosing); this.Load += new System.EventHandler(this.FrmFlagManagers_Load); - this.tableLayoutPanel1.ResumeLayout(false); + this.contextMenuStrip1.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.bar1)).EndInit(); this.ResumeLayout(false); @@ -161,8 +164,8 @@ #endregion - private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1; - private WHC.Pager.WinControl.WinGridViewPager winGridViewPager1; + private System.Windows.Forms.ContextMenuStrip contextMenuStrip1; + private System.Windows.Forms.ToolStripMenuItem 标识对象ToolStripMenuItem; private DevComponents.DotNetBar.Bar bar1; private DevComponents.DotNetBar.LabelItem labelItem1; private DevComponents.DotNetBar.TextBoxItem txt_no; @@ -171,6 +174,7 @@ private DevComponents.DotNetBar.ButtonItem btn_query; private DevComponents.DotNetBar.ButtonItem btn_add_batch; private DevComponents.DotNetBar.ButtonItem btn_add_menu; - private DevComponents.DotNetBar.ButtonItem btn_db; + private WHC.Pager.WinControl.WinGridViewPager winGridViewPager1; + private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem2; } } \ No newline at end of file diff --git a/FrmFlagManagers.cs b/FrmFlagManagers.cs index 38d4927..9bf9734 100644 --- a/FrmFlagManagers.cs +++ b/FrmFlagManagers.cs @@ -33,15 +33,13 @@ { this.globeControl1 = _globeControl1; InitializeComponent(); - winGridViewPager1.OnPageChanged += new EventHandler(winGridViewPager1_OnPageChanged); - this.winGridViewPager1.OnAddNew += new EventHandler(winGridViewPager1_OnAddNew); //右键定位 + winGridViewPager1.OnPageChanged += new EventHandler(winGridViewPager1_OnPageChanged); this.winGridViewPager1.OnEditSelected += new EventHandler(winGridViewPager1_OnEditSelected);//属性编辑 this.winGridViewPager1.OnDeleteSelected += new EventHandler(winGridViewPager1_OnDeleteSelected);//标识器报废 + this.winGridViewPager1.OnStartExport += new EventHandler(pager1_OnStartExport); this.winGridViewPager1.OnEndExport += new EventHandler(pager1_OnEndExport); - //this.winGridViewPager1.ExportCurrent += new ExportCurrentEventHandler(pager1_ExportCurrent); - //this.winGridViewPager1.ExportAll += new ExportAllEventHandler(pager1_ExportAll); winGridViewPager1.dataGridView1.MultiSelect = false; @@ -76,26 +74,25 @@ this.winGridViewPager1.AddColumnAlias("标识器型号", "标识器型号"); this.winGridViewPager1.AddColumnAlias("地面高程", "地面高程"); this.winGridViewPager1.AddColumnAlias("标识器埋深", "标识器埋深"); - this.winGridViewPager1.AddColumnAlias("对象编号", "对象编号"); - this.winGridViewPager1.AddColumnAlias("对象类型", "对象类型"); this.winGridViewPager1.AddColumnAlias("所属道路", "所属道路"); this.winGridViewPager1.AddColumnAlias("使用状态", "使用状态"); - this.winGridViewPager1.DisplayColumns = "编号,标识器ID号,标识器型号,地面高程,标识器埋深,对象编号,对象类型,所属道路,使用状态"; + this.winGridViewPager1.DisplayColumns = "编号,标识器ID号,标识器型号,地面高程,标识器埋深,所属道路,使用状态"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 //隐藏右键功能按钮 //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[1].Visible = false; - //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[4].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[5].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[6].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[7].Visible = false; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[1].Text = "定位查看"; + //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[1].Text = "定位查看"; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "属性编辑"; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Text = "标识器报废"; + winGridViewPager1.AppendedMenu = this.contextMenuStrip1; + //右键菜单宽度 winGridViewPager1.dataGridView1.ContextMenuStrip.AutoSize = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Width = 150; @@ -153,7 +150,7 @@ } /// - /// 右键定位 + /// 对象查看 /// /// /// @@ -306,20 +303,10 @@ string sqlCount = "select count(*) from 标识器 where 使用状态 = '使用中'"; - string sqlData = "select 编号,标识器ID号,标识器型号,地面高程,标识器埋深,对象编号,对象类型,所属道路,LSSYS_ID,X坐标,Y坐标,使用状态 " + + string sqlData = "select 编号,标识器ID号,标识器型号,地面高程,标识器埋深,所属道路,LSSYS_ID,X坐标,Y坐标,使用状态 " + "from (select t.*,rownum row_num from 标识器 t where 使用状态 = '使用中' order by 编号)b " + " where 1=1"; - if (!String.IsNullOrEmpty(txt_no.Text.Trim())) - { - sqlCount += " and 编号 like '%" + txt_no.Text.Trim() + "%'"; - sqlData += " and 编号 like '%" + txt_no.Text.Trim() + "%'"; - } - if (null != combo_street.SelectedItem && !String.IsNullOrEmpty(combo_street.SelectedItem.ToString().Trim())) - { - sqlData += " and 所属道路='" + combo_street.SelectedItem.ToString().Trim() + "'"; - sqlCount += " and 所属道路='" + combo_street.SelectedItem.ToString().Trim() + "'"; - } rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -332,9 +319,8 @@ int maxPage = pageIndex * maxPageIndex; string sqlCount = "select count(*) from 标识器 where 使用状态 = '使用中'"; - string sqlData = "select 编号,标识器ID号,标识器型号,地面高程,标识器埋深,对象编号,对象类型,所属道路,LSSYS_ID,X坐标,Y坐标,使用状态 " + - "from (select t.*,rownum row_num from 标识器 t where 使用状态 = '使用中' order by 编号)b "+ - " where(b.row_num between " + minPage + " and " + maxPage + ")"; + string sqlData = "select 编号,标识器ID号,标识器型号,地面高程,标识器埋深,所属道路,LSSYS_ID,X坐标,Y坐标,使用状态 " + + "from (select t.*,rownum row_num from 标识器 t where 使用状态 = '使用中'"; if (!String.IsNullOrEmpty(txt_no.Text.Trim())) { @@ -347,6 +333,8 @@ sqlCount += " and 所属道路='" + combo_street.SelectedItem.ToString().Trim() + "'"; } + sqlData += " order by 编号)b " + + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; @@ -372,9 +360,10 @@ private void FrmFlagManagers_FormClosing(object sender, FormClosingEventArgs e) { IS_OPEN = false; - Thread downloadJob = new Thread(new ParameterizedThreadStart(doSave)); - downloadJob.IsBackground = true; - downloadJob.Start(e); + //Thread downloadJob = new Thread(new ParameterizedThreadStart(doSave)); + //downloadJob.IsBackground = true; + //downloadJob.Start(e); + globeControl1.Globe.Layers["标识器"].Save(); globeControl1.Globe.MemoryLayer.RemoveAllFeature(); foreach (GSOFeature f in Features) { @@ -480,10 +469,88 @@ if (null != globeControl1) { FrmAddSinMark frm = new FrmAddSinMark(globeControl1); - frm.ShowDialog(); + frm.Show(); } } + private void 标识对象ToolStripMenuItem_Click(object sender, EventArgs e) + { + if (winGridViewPager1 != null && winGridViewPager1.dataGridView1 != null) + { + DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; + try + { + this.Hide(); + string id = row.Cells["编号"].Value.ToString(); + FrmFlagDetail p = new FrmFlagDetail(globeControl1, id); + p.showParentForm += new FrmFlagDetail.Handle(showThisForm);//改变值的事件 + p.Show(); + } + catch (Exception ex) + { + MessageBox.Show("失败:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } + + private void showThisForm() + { + this.Show(); + } + + private void toolStripMenuItem2_Click(object sender, EventArgs e) + { + if (winGridViewPager1 != null && winGridViewPager1.dataGridView1 != null) + { + DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; + try + { + this.WindowState = FormWindowState.Minimized; + string id = row.Cells["LSSYS_ID"].Value.ToString(); + string flagno = row.Cells["编号"].Value.ToString(); + string flagstreet = row.Cells["所属道路"].Value.ToString(); + double x = Convert.ToDouble(row.Cells["X坐标"].Value); + double y = Convert.ToDouble(row.Cells["Y坐标"].Value); + GSOFeature flagFeature = globeControl1.Globe.Layers.GetLayerByCaption("标识器").GetFeatureByID(int.Parse(id)); + + string type = ""; + string pipe = ""; + string sql = "select t.标识器型号,t.对象编号 from 标识器 t where t.编号='" + flagno + "'"; + using (OracleDataReader reader = OracleUtils.ExecuteReader(OracleUtils.ConnectionString, CommandType.Text, sql)) + { + while (reader.Read()) + { + type = reader.GetString(0); + pipe = reader.GetString(1); + } + } + + GSOLabel label = new GSOLabel(); + label.Text = "标识器编号：" + flagno + "\r\n" + + "标识器类型:" + type + "\r\n" + + //"标识对象编号:" + pipe + "\r\n" + + "所属道路:" + flagstreet; + label.Style = new GSOLabelStyle(); + label.Style.TextStyle.FontSize = 18; + label.Style.TextStyle.ForeColor = Color.FromArgb(0, 0, 0, 255); + label.Style.Opaque = 0.8; //设置标注的透明度，取值区间是0-1 + label.Style.TracktionLineType = EnumTracktionLineType.Solid; + label.Style.TextStyle.FontHeight = 10; + label.Style.TextStyle.FontName = "黑体"; + label.Style.TractionLineEndPos = new GSOPoint2d(80, 60); + + flagFeature.Label = label; + Features.Add(flagFeature); + globeControl1.Globe.JumpToFeature(flagFeature, 20); + this.globeControl1.Refresh(); + + } + catch (Exception ex) + { + MessageBox.Show("标识器定位失败:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } } diff --git a/FrmFlagManagers.resx b/FrmFlagManagers.resx index 1af7de1..ad53752 100644 --- a/FrmFlagManagers.resx +++ b/FrmFlagManagers.resx @@ -117,4 +117,7 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 17, 17 + \ No newline at end of file diff --git a/FrmPatrolerEdit.cs b/FrmPatrolerEdit.cs index dbd4fec..f45b5ae 100644 --- a/FrmPatrolerEdit.cs +++ b/FrmPatrolerEdit.cs @@ -46,7 +46,7 @@ txt_name.Focus(); return; } - if (String.IsNullOrEmpty(combo_sex.SelectedItem.ToString())) + if (combo_sex.SelectedItem == null ||String.IsNullOrEmpty(combo_sex.SelectedItem.ToString())) { MessageBox.Show("性别不能为空！", "警告", MessageBoxButtons.OK, MessageBoxIcon.Warning); combo_sex.Focus(); diff --git a/FrmPatrolerManager.Designer.cs b/FrmPatrolerManager.Designer.cs index bb8e5fb..10fac22 100644 --- a/FrmPatrolerManager.Designer.cs +++ b/FrmPatrolerManager.Designer.cs @@ -47,11 +47,13 @@ this.注销 = new DevComponents.Editors.ComboItem(); this.btn_query_person = new DevComponents.DotNetBar.ButtonItem(); this.btn_add_person = new DevComponents.DotNetBar.ButtonItem(); - this.winGridViewPager1 = new WHC.Pager.WinControl.WinGridViewPager(); this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components); this.日志ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.任务ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.定位ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.winGridViewPager1 = new WHC.Pager.WinControl.WinGridViewPager(); + this.编辑ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.注销ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); ((System.ComponentModel.ISupportInitialize)(this.bar1)).BeginInit(); this.contextMenuStrip1.SuspendLayout(); this.SuspendLayout(); @@ -173,9 +175,42 @@ this.btn_add_person.Text = "新增"; this.btn_add_person.Click += new System.EventHandler(this.btn_add_person_Click); // + // contextMenuStrip1 + // + this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.日志ToolStripMenuItem, + this.任务ToolStripMenuItem, + this.定位ToolStripMenuItem, + this.编辑ToolStripMenuItem, + this.注销ToolStripMenuItem}); + this.contextMenuStrip1.Name = "contextMenuStrip1"; + this.contextMenuStrip1.Size = new System.Drawing.Size(153, 136); + // + // 日志ToolStripMenuItem + // + this.日志ToolStripMenuItem.Name = "日志ToolStripMenuItem"; + this.日志ToolStripMenuItem.Size = new System.Drawing.Size(100, 22); + this.日志ToolStripMenuItem.Text = "日志"; + this.日志ToolStripMenuItem.Click += new System.EventHandler(this.日志ToolStripMenuItem_Click); + // + // 任务ToolStripMenuItem + // + this.任务ToolStripMenuItem.Name = "任务ToolStripMenuItem"; + this.任务ToolStripMenuItem.Size = new System.Drawing.Size(100, 22); + this.任务ToolStripMenuItem.Text = "任务"; + this.任务ToolStripMenuItem.Click += new System.EventHandler(this.任务ToolStripMenuItem_Click); + // + // 定位ToolStripMenuItem + // + this.定位ToolStripMenuItem.Name = "定位ToolStripMenuItem"; + this.定位ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.定位ToolStripMenuItem.Text = "定位"; + this.定位ToolStripMenuItem.Click += new System.EventHandler(this.定位ToolStripMenuItem_Click); + // // winGridViewPager1 // this.winGridViewPager1.AppendedMenu = null; + this.winGridViewPager1.ContextMenuStrip = this.contextMenuStrip1; this.winGridViewPager1.DataSource = null; this.winGridViewPager1.DisplayColumns = ""; this.winGridViewPager1.Dock = System.Windows.Forms.DockStyle.Fill; @@ -186,35 +221,19 @@ this.winGridViewPager1.Size = new System.Drawing.Size(756, 309); this.winGridViewPager1.TabIndex = 3; // - // contextMenuStrip1 + // 编辑ToolStripMenuItem // - this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.日志ToolStripMenuItem, - this.任务ToolStripMenuItem, - this.定位ToolStripMenuItem}); - this.contextMenuStrip1.Name = "contextMenuStrip1"; - this.contextMenuStrip1.Size = new System.Drawing.Size(101, 70); + this.编辑ToolStripMenuItem.Name = "编辑ToolStripMenuItem"; + this.编辑ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.编辑ToolStripMenuItem.Text = "编辑"; + this.编辑ToolStripMenuItem.Click += new System.EventHandler(this.编辑ToolStripMenuItem_Click); // - // 日志ToolStripMenuItem + // 注销ToolStripMenuItem // - this.日志ToolStripMenuItem.Name = "日志ToolStripMenuItem"; - this.日志ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); - this.日志ToolStripMenuItem.Text = "日志"; - this.日志ToolStripMenuItem.Click += new System.EventHandler(this.日志ToolStripMenuItem_Click); - // - // 任务ToolStripMenuItem - // - this.任务ToolStripMenuItem.Name = "任务ToolStripMenuItem"; - this.任务ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); - this.任务ToolStripMenuItem.Text = "任务"; - this.任务ToolStripMenuItem.Click += new System.EventHandler(this.任务ToolStripMenuItem_Click); - // - // 定位ToolStripMenuItem - // - this.定位ToolStripMenuItem.Name = "定位ToolStripMenuItem"; - this.定位ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); - this.定位ToolStripMenuItem.Text = "定位"; - this.定位ToolStripMenuItem.Click += new System.EventHandler(this.定位ToolStripMenuItem_Click); + this.注销ToolStripMenuItem.Name = "注销ToolStripMenuItem"; + this.注销ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.注销ToolStripMenuItem.Text = "注销"; + this.注销ToolStripMenuItem.Click += new System.EventHandler(this.注销ToolStripMenuItem_Click); // // FrmPatrolerManager // @@ -229,7 +248,7 @@ this.MinimizeBox = false; this.Name = "FrmPatrolerManager"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; - this.Text = "巡检人员维护"; + this.Text = "定位人员维护"; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmPatrolerManager_FormClosing); this.Load += new System.EventHandler(this.FrmPatrolerManager_Load); ((System.ComponentModel.ISupportInitialize)(this.bar1)).EndInit(); @@ -258,10 +277,12 @@ private DevComponents.Editors.ComboItem 注销; private DevComponents.Editors.ComboItem comboItem1; private DevComponents.Editors.ComboItem 不限; - private WHC.Pager.WinControl.WinGridViewPager winGridViewPager1; private System.Windows.Forms.ContextMenuStrip contextMenuStrip1; private System.Windows.Forms.ToolStripMenuItem 日志ToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem 任务ToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem 定位ToolStripMenuItem; + private WHC.Pager.WinControl.WinGridViewPager winGridViewPager1; + private System.Windows.Forms.ToolStripMenuItem 编辑ToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem 注销ToolStripMenuItem; } } \ No newline at end of file diff --git a/FrmPatrolerManager.cs b/FrmPatrolerManager.cs index 255a076..9c32f54 100644 --- a/FrmPatrolerManager.cs +++ b/FrmPatrolerManager.cs @@ -29,9 +29,7 @@ this.globeControl1 = globeControl1; winGridViewPager1.OnPageChanged += new EventHandler(winGridViewPager1_OnPageChanged); - this.winGridViewPager1.OnEditSelected += new EventHandler(winGridViewPager1_OnEditSelected);//编辑 - this.winGridViewPager1.OnDeleteSelected += new EventHandler(winGridViewPager1_OnDeleteSelected);//删除 - + this.winGridViewPager1.OnStartExport += new EventHandler(pager1_OnStartExport); this.winGridViewPager1.OnEndExport += new EventHandler(pager1_OnEndExport); @@ -47,26 +45,31 @@ //控制表格显示的列，以及每一列要显示的列名 this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - this.winGridViewPager1.AddColumnAlias("USERNAME", "姓名"); - this.winGridViewPager1.AddColumnAlias("DBID", "编号"); - this.winGridViewPager1.AddColumnAlias("SEX", "性别"); - this.winGridViewPager1.AddColumnAlias("AGE", "年龄"); - this.winGridViewPager1.AddColumnAlias("PHONENUM", "电话"); - this.winGridViewPager1.AddColumnAlias("ACCOUNTSTATE", "状态"); - this.winGridViewPager1.DisplayColumns = "USERNAME,SEX,AGE,PHONENUM,ACCOUNTSTATE"; + this.winGridViewPager1.AddColumnAlias("姓名", "姓名"); + this.winGridViewPager1.AddColumnAlias("编号", "编号"); + this.winGridViewPager1.AddColumnAlias("性别", "性别"); + this.winGridViewPager1.AddColumnAlias("年龄", "年龄"); + this.winGridViewPager1.AddColumnAlias("电话", "电话"); + this.winGridViewPager1.AddColumnAlias("状态", "状态"); + this.winGridViewPager1.DisplayColumns = "姓名,性别,年龄,电话,状态"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 + //隐藏右键功能按钮 //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[1].Visible = false; + winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Visible = false; + winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[4].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[5].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[6].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[7].Visible = false; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "编辑"; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Text = "注销"; + + //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "编辑"; + //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Text = "注销"; winGridViewPager1.AppendedMenu = this.contextMenuStrip1; + //右键菜单宽度 winGridViewPager1.dataGridView1.ContextMenuStrip.AutoSize = false; @@ -122,11 +125,11 @@ DataGridViewRow row = grid.SelectedRows[0]; try { - long dbid = long.Parse(row.Cells["dbid"].Value.ToString()); - String name = row.Cells["USERNAME"].Value.ToString(); - String sex = row.Cells["SEX"].Value.ToString(); - String age = row.Cells["AGE"].Value.ToString(); - string phone = row.Cells["PHONENUM"].Value.ToString(); + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); + String name = row.Cells["姓名"].Value.ToString(); + String sex = row.Cells["性别"].Value.ToString(); + String age = row.Cells["年龄"].Value.ToString(); + string phone = row.Cells["电话"].Value.ToString(); age = String.IsNullOrEmpty(age.ToString().Trim()) ? "1" : age.ToString().Trim(); FrmPatrolerEdit frm = new FrmPatrolerEdit(dbid.ToString(), name, age, sex, phone); frm.reloadGrid += new ReloadPatrolerGrid(LoadData); @@ -152,10 +155,10 @@ if (grid != null) { DataGridViewRow row = grid.SelectedRows[0]; - long dbid = long.Parse(row.Cells["DBID"].Value.ToString()); + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); try { - string state = row.Cells["ACCOUNTSTATE"].Value.ToString(); + string state = row.Cells["状态"].Value.ToString(); if ("在线".Equals(state)) { if (MessageBox.Show("确定注销？", "确认", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) @@ -180,60 +183,60 @@ { int pageIndex = winGridViewPager1.PagerInfo.CurrenetPageIndex; string sqlData = GetSql(pageIndex); - initlizeDatagrid(); + DataTable table = OracleUtils.ExecuteDataset(OracleUtils.ConnectionString, CommandType.Text, sqlData).Tables[0]; winGridViewPager1.DataSource = table.DefaultView; - for (int i = 0; i < winGridViewPager1.dataGridView1.Rows.Count; i++) - { - if (winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value.ToString() == "ONLINE") - { - winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value = "在线"; - } - else - { - if (winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value.ToString() == "OFFLINE") - { - winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value = "离线"; - } - else - { - if (winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value.ToString() == "LEAVER") - { - winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value = "注销"; - } - } - } - } + //for (int i = 0; i < winGridViewPager1.dataGridView1.Rows.Count; i++) + //{ + // if (winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value.ToString() == "ONLINE") + // { + // winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value = "在线"; + // } + // else + // { + // if (winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value.ToString() == "OFFLINE") + // { + // winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value = "离线"; + // } + // else + // { + // if (winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value.ToString() == "LEAVER") + // { + // winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value = "注销"; + // } + // } + // } + //} winGridViewPager1.Refresh(); } private void LoadData(int pageIndex) { string sqlData = GetSql(pageIndex); - initlizeDatagrid(); + DataTable table = OracleUtils.ExecuteDataset(OracleUtils.ConnectionString, CommandType.Text, sqlData).Tables[0]; winGridViewPager1.DataSource = table.DefaultView; - for (int i = 0; i < winGridViewPager1.dataGridView1.Rows.Count; i++) - { - if (winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value.ToString() == "ONLINE") - { - winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value = "在线"; - } - else - { - if (winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value.ToString() == "OFFLINE") - { - winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value = "离线"; - } - else - { - if (winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value.ToString() == "LEAVER") - { - winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value = "注销"; - } - } - } - } + //for (int i = 0; i < winGridViewPager1.dataGridView1.Rows.Count; i++) + //{ + // if (winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value.ToString() == "ONLINE") + // { + // winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value = "在线"; + // } + // else + // { + // if (winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value.ToString() == "OFFLINE") + // { + // winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value = "离线"; + // } + // else + // { + // if (winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value.ToString() == "LEAVER") + // { + // winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value = "注销"; + // } + // } + // } + //} winGridViewPager1.Refresh(); } @@ -241,7 +244,8 @@ { string sqlCount = "select count(*) from equipment where status = 'USING'"; - string sqlData = "select username,dbid,sex,age,phonenum,accountstate " + + string sqlData = "select username as 姓名,dbid as 编号,sex as 性别,age as 年龄,phonenum as 电话,"+ + "case when accountstate = 'ONLINE' then '在线' when accountstate = 'OFFLINE' then '离线' when accountstate = 'LEAVER' then '注销' end as 状态 " + "from (select t.*,rownum row_num from patroler t order by DBID desc)b " + " where 1=1"; @@ -255,9 +259,9 @@ int minPage = (pageIndex - 1) * maxPageIndex + 1; int maxPage = pageIndex * maxPageIndex; string sqlCount = "select count(*) from patroler where 1=1"; - string sqlData = "select username,dbid,sex,age,phonenum,accountstate " + - "from (select t.*,rownum row_num from patroler t order by DBID desc)b " + - " where(b.row_num between " + minPage + " and " + maxPage + ")"; + string sqlData = "select username as 姓名,dbid as 编号,sex as 性别,age as 年龄,phonenum as 电话,"+ + "case when accountstate = 'ONLINE' then '在线' when accountstate = 'OFFLINE' then '离线' when accountstate = 'LEAVER' then '注销' end as 状态 " + + "from (select t.*,rownum row_num from patroler t where 1=1"; if (!String.IsNullOrEmpty(txt_username.Text.Trim())) { @@ -281,7 +285,8 @@ sqlCount += " and accountstate='" + combo_stateText + "'"; sqlData += " and accountstate='" + combo_stateText + "'"; } - + sqlData += " order by DBID desc)b " + + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; @@ -291,6 +296,7 @@ { try { + initlizeDatagrid(); LoadData(); initForm(); IS_OPEN = true; @@ -310,11 +316,13 @@ } if (Utility.userRole.IndexOf("巡检员编辑") == -1) { - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Visible = false; + //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Visible = false; + 编辑ToolStripMenuItem.Visible = false; } if (Utility.userRole.IndexOf("巡检员注销") == -1) { - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Visible = false; + //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Visible = false; + 注销ToolStripMenuItem.Visible = false; } } @@ -376,7 +384,7 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - long dbid = long.Parse(row.Cells["dbid"].Value.ToString()); + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); Log p = new Log(dbid.ToString()); p.Show(); } @@ -395,8 +403,8 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - long dbid = long.Parse(row.Cells["dbid"].Value.ToString()); - String state = row.Cells["ACCOUNTSTATE"].Value.ToString(); + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); + String state = row.Cells["状态"].Value.ToString(); if ("在线".Equals(state)) { string sql = "select t.dbid " + @@ -435,8 +443,8 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - long dbid = long.Parse(row.Cells["dbid"].Value.ToString()); - String username = row.Cells["USERNAME"].Value.ToString(); + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); + String username = row.Cells["姓名"].Value.ToString(); string sql = "select t.latitude, t.longitude " + "from position t " + "where t.dbid = (select max(dbid) from position where patroler_id = " + dbid + ")"; @@ -489,6 +497,63 @@ } + private void 编辑ToolStripMenuItem_Click(object sender, EventArgs e) + { + if (winGridViewPager1 != null && winGridViewPager1.dataGridView1 != null) + { + DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; + try + { + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); + String name = row.Cells["姓名"].Value.ToString(); + String sex = row.Cells["性别"].Value.ToString(); + String age = row.Cells["年龄"].Value.ToString(); + string phone = row.Cells["电话"].Value.ToString(); + age = String.IsNullOrEmpty(age.ToString().Trim()) ? "1" : age.ToString().Trim(); + FrmPatrolerEdit frm = new FrmPatrolerEdit(dbid.ToString(), name, age, sex, phone); + frm.reloadGrid += new ReloadPatrolerGrid(LoadData); + frm.ShowDialog(); + winGridViewPager1.Refresh(); + } + catch (Exception ex) + { + MessageBox.Show("编辑失败:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } + + private void 注销ToolStripMenuItem_Click(object sender, EventArgs e) + { + if (winGridViewPager1 != null && winGridViewPager1.dataGridView1 != null) + { + DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); + try + { + if (MessageBox.Show("确定注销？", "确认", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) + { + String sql = "update patroler t set t.accountstate='LEAVER' where t.dbid=" + dbid; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + LoadData(); + MessageBox.Show("人员已注销", "信息", MessageBoxButtons.OK, MessageBoxIcon.Information); + } + //string state = row.Cells["状态"].Value.ToString(); + //if ("在线".Equals(state)) + //{ + + //} + //else + //{ + // MessageBox.Show("人员不在线，无法注销", "信息"); + //} + } + catch (Exception ex) + { + MessageBox.Show("人员注销失败:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } + } } diff --git a/FrmRoleInfoManager.cs b/FrmRoleInfoManager.cs index 8897133..35693cf 100644 --- a/FrmRoleInfoManager.cs +++ b/FrmRoleInfoManager.cs @@ -55,10 +55,10 @@ //控制表格显示的列，以及每一列要显示的列名 this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - this.winGridViewPager1.AddColumnAlias("NT", "角色名称"); - this.winGridViewPager1.AddColumnAlias("ID", "编号"); + this.winGridViewPager1.AddColumnAlias("角色名称", "角色名称"); + this.winGridViewPager1.AddColumnAlias("编号", "编号"); - this.winGridViewPager1.DisplayColumns = "NT"; + this.winGridViewPager1.DisplayColumns = "角色名称"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -131,7 +131,7 @@ { try { - string dbid = row.Cells["id"].Value.ToString(); + string dbid = row.Cells["编号"].Value.ToString(); string sql = "delete from casic_userroletest where id=" + dbid; OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); LoadData(); @@ -170,7 +170,7 @@ { string sqlCount = "select id,nt from casic_userroletest where sysname='EMS'"; - string sqlData = "select nt,id " + + string sqlData = "select nt as 角色名称,id as 编号 " + "from (select t.*,rownum row_num from casic_userroletest t order by id desc)b " + " where sysname='EMS'"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -183,7 +183,7 @@ int minPage = (pageIndex - 1) * maxPageIndex + 1; int maxPage = pageIndex * maxPageIndex; string sqlCount = "select id,nt from casic_userroletest where sysname='EMS'"; - string sqlData = "select nt,id " + + string sqlData = "select nt as 角色名称,id as 编号 " + "from (select t.*,rownum row_num from casic_userroletest t where sysname='EMS' order by id desc)b " + " where(b.row_num between " + minPage + " and " + maxPage + ")"; diff --git a/FrmSysUserInfoManger.cs b/FrmSysUserInfoManger.cs index 7903916..e193a61 100644 --- a/FrmSysUserInfoManger.cs +++ b/FrmSysUserInfoManger.cs @@ -28,6 +28,7 @@ this.winGridViewPager1.OnEndExport += new EventHandler(pager1_OnEndExport); winGridViewPager1.dataGridView1.MultiSelect = false; + } private void FrmSysUserInfoManger_Load(object sender, EventArgs e) @@ -59,10 +60,10 @@ //控制表格显示的列，以及每一列要显示的列名 this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - this.winGridViewPager1.AddColumnAlias("USERNAME", "账号"); - this.winGridViewPager1.AddColumnAlias("ID", "编号"); + this.winGridViewPager1.AddColumnAlias("账号", "账号"); + this.winGridViewPager1.AddColumnAlias("编号", "编号"); - this.winGridViewPager1.DisplayColumns = "USERNAME"; + this.winGridViewPager1.DisplayColumns = "账号"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -130,8 +131,8 @@ if (grid != null) { DataGridViewRow row = grid.SelectedRows[0]; - string dbid = row.Cells["id"].Value.ToString(); - string userName = row.Cells["USERNAME"].Value.ToString(); + string dbid = row.Cells["编号"].Value.ToString(); + string userName = row.Cells["账号"].Value.ToString(); if (userName.Equals("ems")) { MessageBox.Show("该用户为管理员用户，无法删除！", "信息"); @@ -184,7 +185,7 @@ { string sqlCount = "select count(*) from casic_userinfotest where sysname='EMS'"; - string sqlData = "select username,id " + + string sqlData = "select username as 账号,id as 编号 " + "from (select t.*,rownum row_num from casic_userinfotest t order by id desc)b " + " where sysname='EMS'"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -197,16 +198,16 @@ int minPage = (pageIndex - 1) * maxPageIndex + 1; int maxPage = pageIndex * maxPageIndex; string sqlCount = "select count(*) from casic_userinfotest where sysname='EMS'"; - string sqlData = "select username,id " + - "from (select t.*,rownum row_num from casic_userinfotest t where sysname='EMS' order by id desc)b " + - " where(b.row_num between " + minPage + " and " + maxPage + ")"; + string sqlData = "select username as 账号,id as 编号 " + + "from (select t.*,rownum row_num from casic_userinfotest t where sysname='EMS'"; if (!String.IsNullOrEmpty(txt_user_code.Text.Trim())) { sqlCount += " and username like '%" + txt_user_code.Text.Trim() + "%'"; sqlData += " and username like '%" + txt_user_code.Text.Trim() + "%'"; } - + sqlData += " order by id desc)b " + + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; diff --git a/MainFrm.cs b/MainFrm.cs index 39df646..0cd5881 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3310,10 +3310,10 @@ string str1 = ""; if (feature != null) { - if (feature.GetFieldDefn("图?片?编括?码?") != null) // + if (feature.GetFieldDefn("图片编码") != null) // { str1 = GetBubbleInfo(feature); - if (RemoteFileExists(Utility.PicRootURL + feature.GetValue("图?片?编括?码?").ToString())) + if (RemoteFileExists(Utility.PicRootURL + feature.GetValue("图片编码").ToString())) { str1 += ""; } @@ -3450,9 +3450,15 @@ string value1 = ""; if (field1 != null) { - if (field1.Name == "图片编码") + //if (field1.Name == "图片编码" || field1.Name == "对象编号" || field1.Name == "对象类型" || field1.Name == "对象名称") + //{ + // j++; + //} + while (field1.Name == "图片编码" || field1.Name == "对象编号" || field1.Name == "对象类型" || field1.Name == "对象名称") { j++; + fieldName = fieldNames[j].Trim(); + field1 = (GSOFieldDefn)feature.GetFieldDefn(fieldName); } if (j < rowCount) { @@ -3479,6 +3485,11 @@ if (!feature.IsFieldValueNull(j)) { value1 = feature.GetValue(j).ToString(); + if (name1 == "标识器埋深") + { + if (value1!=null&&value1.Length>4) + value1 = value1.Substring(0,4); + } } } } @@ -3491,9 +3502,14 @@ if (field2 != null) { - if (field2.Name == "图片编码") + //if (field2.Name == "图片编码" || field1.Name == "对象编号" || field1.Name == "对象类型" || field1.Name == "对象名称") + //{ + // j++; + //} + while (field2.Name == "图片编码" || field2.Name == "对象编号" || field2.Name == "对象类型" || field2.Name == "对象名称") { j++; + field2 = (GSOFieldDefn)feature.GetFieldDefn(j + 1); } if (j + 1 < rowCount) { @@ -3521,6 +3537,11 @@ if (!feature.IsFieldValueNull(j + 1)) { value2 = feature.GetValue(j + 1).ToString(); + if (name2 == "标识器埋深") + { + if (value2 != null && value2.Length > 4) + value2 = value2.Substring(0, 4); + } } } } @@ -15347,7 +15368,7 @@ return; } FrmFlagManagers frm = new FrmFlagManagers(globeControl1); - frm.Show(this); + frm.Show(); } private void ribbonTabItem2_MouseDown(object sender, MouseEventArgs e) diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index fddfb94..e5f0003 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -365,6 +365,16 @@ this.可编辑ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.保存ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.ribbonControl1 = new DevComponents.DotNetBar.RibbonControl(); + this.ribbonPanel3 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar3 = new DevComponents.DotNetBar.RibbonBar(); + this.btn_device = new DevComponents.DotNetBar.ButtonItem(); + this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); + this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel7 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); + this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); + this.slider4ground = new DevComponents.DotNetBar.SliderItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -374,12 +384,6 @@ this.btn_user_role = new DevComponents.DotNetBar.ButtonItem(); this.btn_password_edit = new DevComponents.DotNetBar.ButtonItem(); this.btn_reset_password = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel3 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar3 = new DevComponents.DotNetBar.RibbonBar(); - this.btn_device = new DevComponents.DotNetBar.ButtonItem(); - this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); - this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); @@ -551,10 +555,6 @@ this.buttonItemBZ9 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItemBZ10 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItemBZ11 = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel7 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); - this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); - this.slider4ground = new DevComponents.DotNetBar.SliderItem(); this.ribbonPanel12 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar18 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItem133 = new DevComponents.DotNetBar.ButtonItem(); @@ -690,11 +690,11 @@ this.contextMenuStrip3.SuspendLayout(); this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); - this.ribbonPanel8.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel7.SuspendLayout(); + this.ribbonPanel8.SuspendLayout(); this.ribbonPanel2.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); - this.ribbonPanel7.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); this.ribbonPanel5.SuspendLayout(); this.ribbonPanel6.SuspendLayout(); @@ -4162,10 +4162,10 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); - this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel2); - this.ribbonControl1.Controls.Add(this.ribbonPanel15); + this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel7); + this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); this.ribbonControl1.Controls.Add(this.ribbonPanel5); this.ribbonControl1.Controls.Add(this.ribbonPanel6); @@ -4216,135 +4216,6 @@ this.ribbonControl1.UseCustomizeDialog = false; this.ribbonControl1.Click += new System.EventHandler(this.ribbonControl1_Click); // - // ribbonPanel8 - // - this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel8.Controls.Add(this.ribbonBar_UserInfo); - this.ribbonPanel8.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel8.Location = new System.Drawing.Point(0, 33); - this.ribbonPanel8.Name = "ribbonPanel8"; - this.ribbonPanel8.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel8.Size = new System.Drawing.Size(1328, 62); - // - // - // - this.ribbonPanel8.Style.Class = ""; - this.ribbonPanel8.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel8.StyleMouseDown.Class = ""; - this.ribbonPanel8.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel8.StyleMouseOver.Class = ""; - this.ribbonPanel8.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel8.TabIndex = 42; - this.ribbonPanel8.Visible = false; - // - // ribbonBar_UserInfo - // - this.ribbonBar_UserInfo.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar_UserInfo.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar_UserInfo.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar_UserInfo.BackgroundStyle.Class = ""; - this.ribbonBar_UserInfo.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar_UserInfo.ContainerControlProcessDialogKey = true; - this.ribbonBar_UserInfo.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar_UserInfo.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.btn_user_info, - this.btn_role_info, - this.btn_resc_info, - this.btn_role_resc, - this.btn_user_role, - this.btn_password_edit, - this.btn_reset_password}); - this.ribbonBar_UserInfo.Location = new System.Drawing.Point(3, 0); - this.ribbonBar_UserInfo.Name = "ribbonBar_UserInfo"; - this.ribbonBar_UserInfo.Size = new System.Drawing.Size(427, 59); - this.ribbonBar_UserInfo.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar_UserInfo.TabIndex = 0; - // - // - // - this.ribbonBar_UserInfo.TitleStyle.Class = ""; - this.ribbonBar_UserInfo.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar_UserInfo.TitleStyleMouseOver.Class = ""; - this.ribbonBar_UserInfo.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // btn_user_info - // - this.btn_user_info.Image = global::Cyberpipe.Properties.Resources._24x24icon_13_hover; - this.btn_user_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_user_info.Name = "btn_user_info"; - this.btn_user_info.SubItemsExpandWidth = 14; - this.btn_user_info.Text = "用户管理"; - this.btn_user_info.Click += new System.EventHandler(this.btn_user_info_Click); - // - // btn_role_info - // - this.btn_role_info.Image = global::Cyberpipe.Properties.Resources._24x24icon_05_hover1; - this.btn_role_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_role_info.Name = "btn_role_info"; - this.btn_role_info.SubItemsExpandWidth = 14; - this.btn_role_info.Text = "角色管理"; - this.btn_role_info.Click += new System.EventHandler(this.btn_role_info_Click); - // - // btn_resc_info - // - this.btn_resc_info.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__09; - this.btn_resc_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_resc_info.Name = "btn_resc_info"; - this.btn_resc_info.SubItemsExpandWidth = 14; - this.btn_resc_info.Text = "资源管理"; - this.btn_resc_info.Click += new System.EventHandler(this.btn_resc_info_Click); - // - // btn_role_resc - // - this.btn_role_resc.Image = global::Cyberpipe.Properties.Resources.btnlegendSet_Image_副本; - this.btn_role_resc.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_role_resc.Name = "btn_role_resc"; - this.btn_role_resc.SubItemsExpandWidth = 14; - this.btn_role_resc.Text = "角色授权"; - this.btn_role_resc.Click += new System.EventHandler(this.btn_role_resc_Click); - // - // btn_user_role - // - this.btn_user_role.Image = global::Cyberpipe.Properties.Resources._24x24icon_08_hover; - this.btn_user_role.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_user_role.Name = "btn_user_role"; - this.btn_user_role.SubItemsExpandWidth = 14; - this.btn_user_role.Text = "用户授权"; - this.btn_user_role.Click += new System.EventHandler(this.btn_user_role_Click); - // - // btn_password_edit - // - this.btn_password_edit.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__67; - this.btn_password_edit.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_password_edit.Name = "btn_password_edit"; - this.btn_password_edit.SubItemsExpandWidth = 14; - this.btn_password_edit.Text = "密码修改"; - this.btn_password_edit.Click += new System.EventHandler(this.btn_password_edit_Click); - // - // btn_reset_password - // - this.btn_reset_password.Image = global::Cyberpipe.Properties.Resources.liuxiang; - this.btn_reset_password.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_reset_password.Name = "btn_reset_password"; - this.btn_reset_password.SubItemsExpandWidth = 14; - this.btn_reset_password.Text = "重置密码"; - this.btn_reset_password.Click += new System.EventHandler(this.btn_reset_password_Click); - // // ribbonPanel3 // this.ribbonPanel3.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4425,7 +4296,7 @@ this.btn_Person.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; this.btn_Person.Name = "btn_Person"; this.btn_Person.SubItemsExpandWidth = 14; - this.btn_Person.Text = "巡检人员维护"; + this.btn_Person.Text = "定位人员维护"; this.btn_Person.Click += new System.EventHandler(this.btn_Person_Click); // // btn_constructMap @@ -4446,6 +4317,214 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel7 + // + this.ribbonPanel7.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel7.Controls.Add(this.ribbonBar5); + this.ribbonPanel7.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel7.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel7.Name = "ribbonPanel7"; + this.ribbonPanel7.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel7.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel7.Style.Class = ""; + this.ribbonPanel7.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel7.StyleMouseDown.Class = ""; + this.ribbonPanel7.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel7.StyleMouseOver.Class = ""; + this.ribbonPanel7.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel7.TabIndex = 41; + this.ribbonPanel7.Visible = false; + // + // ribbonBar5 + // + this.ribbonBar5.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar5.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar5.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar5.BackgroundStyle.Class = ""; + this.ribbonBar5.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar5.ContainerControlProcessDialogKey = true; + this.ribbonBar5.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar5.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.btn_flag, + this.slider4ground}); + this.ribbonBar5.Location = new System.Drawing.Point(3, 0); + this.ribbonBar5.Name = "ribbonBar5"; + this.ribbonBar5.Size = new System.Drawing.Size(427, 92); + this.ribbonBar5.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar5.TabIndex = 0; + // + // + // + this.ribbonBar5.TitleStyle.Class = ""; + this.ribbonBar5.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar5.TitleStyleMouseOver.Class = ""; + this.ribbonBar5.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar5.TitleVisible = false; + // + // btn_flag + // + this.btn_flag.Image = global::Cyberpipe.Properties.Resources._24x24icon_03_hover; + this.btn_flag.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_flag.Name = "btn_flag"; + this.btn_flag.SubItemsExpandWidth = 14; + this.btn_flag.Text = "标识器管理"; + this.btn_flag.Click += new System.EventHandler(this.btn_flag_Click); + // + // slider4ground + // + this.slider4ground.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; + this.slider4ground.Name = "slider4ground"; + this.slider4ground.Text = "地面透明度"; + this.slider4ground.Value = 0; + this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); + // + // ribbonPanel8 + // + this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel8.Controls.Add(this.ribbonBar_UserInfo); + this.ribbonPanel8.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel8.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel8.Name = "ribbonPanel8"; + this.ribbonPanel8.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel8.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel8.Style.Class = ""; + this.ribbonPanel8.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel8.StyleMouseDown.Class = ""; + this.ribbonPanel8.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel8.StyleMouseOver.Class = ""; + this.ribbonPanel8.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel8.TabIndex = 42; + this.ribbonPanel8.Visible = false; + // + // ribbonBar_UserInfo + // + this.ribbonBar_UserInfo.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar_UserInfo.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar_UserInfo.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar_UserInfo.BackgroundStyle.Class = ""; + this.ribbonBar_UserInfo.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar_UserInfo.ContainerControlProcessDialogKey = true; + this.ribbonBar_UserInfo.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar_UserInfo.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.btn_user_info, + this.btn_role_info, + this.btn_resc_info, + this.btn_role_resc, + this.btn_user_role, + this.btn_password_edit, + this.btn_reset_password}); + this.ribbonBar_UserInfo.Location = new System.Drawing.Point(3, 0); + this.ribbonBar_UserInfo.Name = "ribbonBar_UserInfo"; + this.ribbonBar_UserInfo.Size = new System.Drawing.Size(427, 92); + this.ribbonBar_UserInfo.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar_UserInfo.TabIndex = 0; + // + // + // + this.ribbonBar_UserInfo.TitleStyle.Class = ""; + this.ribbonBar_UserInfo.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar_UserInfo.TitleStyleMouseOver.Class = ""; + this.ribbonBar_UserInfo.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // btn_user_info + // + this.btn_user_info.Image = global::Cyberpipe.Properties.Resources._24x24icon_13_hover; + this.btn_user_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_user_info.Name = "btn_user_info"; + this.btn_user_info.SubItemsExpandWidth = 14; + this.btn_user_info.Text = "用户管理"; + this.btn_user_info.Click += new System.EventHandler(this.btn_user_info_Click); + // + // btn_role_info + // + this.btn_role_info.Image = global::Cyberpipe.Properties.Resources._24x24icon_05_hover1; + this.btn_role_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_role_info.Name = "btn_role_info"; + this.btn_role_info.SubItemsExpandWidth = 14; + this.btn_role_info.Text = "角色管理"; + this.btn_role_info.Click += new System.EventHandler(this.btn_role_info_Click); + // + // btn_resc_info + // + this.btn_resc_info.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__09; + this.btn_resc_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_resc_info.Name = "btn_resc_info"; + this.btn_resc_info.SubItemsExpandWidth = 14; + this.btn_resc_info.Text = "资源管理"; + this.btn_resc_info.Click += new System.EventHandler(this.btn_resc_info_Click); + // + // btn_role_resc + // + this.btn_role_resc.Image = global::Cyberpipe.Properties.Resources.btnlegendSet_Image_副本; + this.btn_role_resc.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_role_resc.Name = "btn_role_resc"; + this.btn_role_resc.SubItemsExpandWidth = 14; + this.btn_role_resc.Text = "角色授权"; + this.btn_role_resc.Click += new System.EventHandler(this.btn_role_resc_Click); + // + // btn_user_role + // + this.btn_user_role.Image = global::Cyberpipe.Properties.Resources._24x24icon_08_hover; + this.btn_user_role.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_user_role.Name = "btn_user_role"; + this.btn_user_role.SubItemsExpandWidth = 14; + this.btn_user_role.Text = "用户授权"; + this.btn_user_role.Click += new System.EventHandler(this.btn_user_role_Click); + // + // btn_password_edit + // + this.btn_password_edit.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__67; + this.btn_password_edit.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_password_edit.Name = "btn_password_edit"; + this.btn_password_edit.SubItemsExpandWidth = 14; + this.btn_password_edit.Text = "密码修改"; + this.btn_password_edit.Click += new System.EventHandler(this.btn_password_edit_Click); + // + // btn_reset_password + // + this.btn_reset_password.Image = global::Cyberpipe.Properties.Resources.liuxiang; + this.btn_reset_password.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_reset_password.Name = "btn_reset_password"; + this.btn_reset_password.SubItemsExpandWidth = 14; + this.btn_reset_password.Text = "重置密码"; + this.btn_reset_password.Click += new System.EventHandler(this.btn_reset_password_Click); + // // ribbonPanel2 // this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -5891,85 +5970,6 @@ this.buttonItemBZ11.Text = "标注管理"; this.buttonItemBZ11.Click += new System.EventHandler(this.buttonItemBZ11_Click); // - // ribbonPanel7 - // - this.ribbonPanel7.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel7.Controls.Add(this.ribbonBar5); - this.ribbonPanel7.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel7.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel7.Name = "ribbonPanel7"; - this.ribbonPanel7.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel7.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel7.Style.Class = ""; - this.ribbonPanel7.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel7.StyleMouseDown.Class = ""; - this.ribbonPanel7.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel7.StyleMouseOver.Class = ""; - this.ribbonPanel7.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel7.TabIndex = 41; - this.ribbonPanel7.Visible = false; - // - // ribbonBar5 - // - this.ribbonBar5.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar5.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar5.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar5.BackgroundStyle.Class = ""; - this.ribbonBar5.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar5.ContainerControlProcessDialogKey = true; - this.ribbonBar5.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar5.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.btn_flag, - this.slider4ground}); - this.ribbonBar5.Location = new System.Drawing.Point(3, 0); - this.ribbonBar5.Name = "ribbonBar5"; - this.ribbonBar5.Size = new System.Drawing.Size(427, 92); - this.ribbonBar5.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar5.TabIndex = 0; - // - // - // - this.ribbonBar5.TitleStyle.Class = ""; - this.ribbonBar5.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar5.TitleStyleMouseOver.Class = ""; - this.ribbonBar5.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar5.TitleVisible = false; - // - // btn_flag - // - this.btn_flag.Image = global::Cyberpipe.Properties.Resources._24x24icon_03_hover; - this.btn_flag.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_flag.Name = "btn_flag"; - this.btn_flag.SubItemsExpandWidth = 14; - this.btn_flag.Text = "标识器管理"; - this.btn_flag.Click += new System.EventHandler(this.btn_flag_Click); - // - // slider4ground - // - this.slider4ground.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; - this.slider4ground.Name = "slider4ground"; - this.slider4ground.Text = "地面透明度"; - this.slider4ground.Value = 0; - this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); - // // ribbonPanel12 // this.ribbonPanel12.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7181,11 +7181,11 @@ this.contextMenuStripDeleteLayerNode.ResumeLayout(false); this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); - this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel7.ResumeLayout(false); + this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); - this.ribbonPanel7.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); this.ribbonPanel5.ResumeLayout(false); this.ribbonPanel6.ResumeLayout(false); diff --git a/SysRescInfoManager.cs b/SysRescInfoManager.cs index 3a84d95..fda6f3f 100644 --- a/SysRescInfoManager.cs +++ b/SysRescInfoManager.cs @@ -79,11 +79,11 @@ //控制表格显示的列，以及每一列要显示的列名 this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - - this.winGridViewPager1.AddColumnAlias("RESC", "资源名称"); - this.winGridViewPager1.AddColumnAlias("ID", "编号"); - this.winGridViewPager1.AddColumnAlias("DESP", "资源描述"); - this.winGridViewPager1.DisplayColumns = "RESC,DESP"; + + this.winGridViewPager1.AddColumnAlias("资源名称", "资源名称"); + this.winGridViewPager1.AddColumnAlias("编号", "编号"); + this.winGridViewPager1.AddColumnAlias("资源描述", "资源描述"); + this.winGridViewPager1.DisplayColumns = "资源名称,资源描述"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -153,8 +153,8 @@ DataGridViewRow row = grid.SelectedRows[0]; if (MessageBox.Show("确定删除？", "确认", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) { - string dbid = row.Cells["id"].Value.ToString(); - string resc = row.Cells["resc"].Value.ToString(); + string dbid = row.Cells["编号"].Value.ToString(); + string resc = row.Cells["资源名称"].Value.ToString(); OracleConnection conn = null; OracleTransaction tran = null; try @@ -229,7 +229,7 @@ private string GetSql() { string sqlCount = "select count(*) from casic_userresctest where sysname='EMS'"; - string sqlData = "select resc,id,desp " + + string sqlData = "select resc as 资源名称,id as 编号,desp as 资源描述 " + "from (select t.*,rownum row_num from casic_userresctest t order by id desc)b " + " where sysname='EMS'"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -242,7 +242,7 @@ int minPage = (pageIndex - 1) * maxPageIndex + 1; int maxPage = pageIndex * maxPageIndex; string sqlCount = "select count(*) from casic_userresctest where sysname='EMS'"; - string sqlData = "select resc,id,desp " + + string sqlData = "select resc as 资源名称,id as 编号,desp as 资源描述 " + "from (select t.*,rownum row_num from casic_userresctest t where sysname='EMS' order by id desc)b " + " where(b.row_num between " + minPage + " and " + maxPage + ")"; diff --git a/bin/x86/Debug/Config.xml b/bin/x86/Debug/Config.xml index e2d7b46..560a163 100644 --- a/bin/x86/Debug/Config.xml +++ b/bin/x86/Debug/Config.xml @@ -3,9 +3,9 @@ LocaSpace三维地下管线信息系统 scott - SZHTDB - 127.0.0.1 - scott + SZHTDB2 + 192.168.0.203 + SZHTDB2 127.0.0.1 1500 @@ -14,8 +14,8 @@ http://192.168.0.122:8088/UpDownFile.asmx - http://127.0.0.1/EMSCyberpipe.msi - http://127.0.0.1/EMSConfig.xml + http://192.168.10.229/EMSCyberpipe.msi + http://192.168.10.229/EMSConfig.xml diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index b19e2ab..b5e320f 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 1a4aeed..c20e54a 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/PipelineType.xml b/bin/x86/Debug/PipelineType.xml index 51dc4b8..b1cbacc 100644 --- a/bin/x86/Debug/PipelineType.xml +++ b/bin/x86/Debug/PipelineType.xml @@ -1,6 +1,6 @@  - + @@ -42,7 +42,7 @@ - + @@ -83,7 +83,7 @@ - + @@ -115,7 +115,7 @@ - + @@ -159,7 +159,7 @@ - + @@ -200,7 +200,7 @@ - + @@ -236,7 +236,7 @@ - + @@ -278,7 +278,7 @@ - + @@ -320,7 +320,7 @@ - + @@ -363,7 +363,7 @@ - + @@ -408,7 +408,7 @@ - + @@ -448,7 +448,7 @@ - + @@ -485,7 +485,7 @@ - + @@ -527,7 +527,7 @@ - + @@ -565,7 +565,7 @@ - + @@ -595,7 +595,7 @@ - + @@ -625,7 +625,7 @@ - + @@ -657,7 +657,7 @@ - + @@ -691,7 +691,7 @@ - + @@ -728,7 +728,7 @@ - + @@ -763,7 +763,7 @@ - + @@ -799,7 +799,7 @@ - + @@ -824,7 +824,7 @@ - + @@ -846,7 +846,7 @@ - + diff --git a/obj/x86/Debug/Cyberpipe.csproj.FileListAbsolute.txt b/obj/x86/Debug/Cyberpipe.csproj.FileListAbsolute.txt index 42dc58c..b78c534 100644 --- a/obj/x86/Debug/Cyberpipe.csproj.FileListAbsolute.txt +++ b/obj/x86/Debug/Cyberpipe.csproj.FileListAbsolute.txt @@ -203,3 +203,4 @@ D:\ym\EMS+GHFX\EMS\obj\x86\Debug\EMSCyberpipe.pdb D:\ym\EMS+GHFX\EMS\obj\x86\Debug\Cyberpipe.FrmFlagManagers.resources D:\ym\EMS+GHFX\EMS\obj\x86\Debug\Cyberpipe.FrmFlagEdits.resources +D:\ym\EMS+GHFX\EMS\obj\x86\Debug\Cyberpipe.FrmFlagDetail.resources diff --git a/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache b/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache index 19b3415..cee9c4a 100644 --- a/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache +++ b/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache Binary files differ diff --git a/Cyberpipe.csproj b/Cyberpipe.csproj index fe600e5..501fd09 100644 --- a/Cyberpipe.csproj +++ b/Cyberpipe.csproj @@ -246,6 +246,12 @@ Form_TaskManager.cs + + Form + + + FrmFlagDetail.cs + Form @@ -1368,6 +1374,9 @@ Form_TaskManager.cs + + FrmFlagDetail.cs + FormDocumentManager.cs diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 537b4c3..1acf22a 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 7d5dd95..3f178cb 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -90,20 +90,20 @@ this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - - this.winGridViewPager1.AddColumnAlias("ACCIDENTTIME", "上报时间"); - this.winGridViewPager1.AddColumnAlias("DBID", "编号"); - this.winGridViewPager1.AddColumnAlias("DESCRIBE", "事件描述"); - this.winGridViewPager1.AddColumnAlias("LATITUDE", "纬度"); - this.winGridViewPager1.AddColumnAlias("LOCALE", "事件地点"); - this.winGridViewPager1.AddColumnAlias("LONGITUDE", "经度"); - this.winGridViewPager1.AddColumnAlias("PATROLERNAME", "上报人员"); - this.winGridViewPager1.AddColumnAlias("PATROLER_ID", "人员ID"); - this.winGridViewPager1.AddColumnAlias("TASK_ID", "任务编号"); - this.winGridViewPager1.AddColumnAlias("RESULT", "处理结果"); - this.winGridViewPager1.AddColumnAlias("STATE", "处理状态"); - this.winGridViewPager1.DisplayColumns = "ACCIDENTTIME,DESCRIBE,LOCALE,PATROLERNAME,TASK_ID,RESULT,STATE"; + this.winGridViewPager1.AddColumnAlias("上报时间", "上报时间"); + this.winGridViewPager1.AddColumnAlias("编号", "编号"); + this.winGridViewPager1.AddColumnAlias("事件描述", "事件描述"); + this.winGridViewPager1.AddColumnAlias("纬度", "纬度"); + this.winGridViewPager1.AddColumnAlias("事件地点", "事件地点"); + this.winGridViewPager1.AddColumnAlias("经度", "经度"); + this.winGridViewPager1.AddColumnAlias("上报人员", "上报人员"); + this.winGridViewPager1.AddColumnAlias("人员ID", "人员ID"); + this.winGridViewPager1.AddColumnAlias("任务编号", "任务编号"); + this.winGridViewPager1.AddColumnAlias("处理结果", "处理结果"); + this.winGridViewPager1.AddColumnAlias("处理状态", "处理状态"); + + this.winGridViewPager1.DisplayColumns = "上报时间,事件描述,事件地点,上报人员,任务编号,处理结果,处理状态"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -114,8 +114,8 @@ winGridViewPager1.dataGridView1.ContextMenuStrip.Items[5].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[6].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[7].Visible = false; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[1].Text = "查看位置"; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "结果编辑"; + winGridViewPager1.dataGridView1.ContextMenuStrip.Items[1].Text = "结果编辑"; + winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "查看位置"; //右键菜单宽度 winGridViewPager1.dataGridView1.ContextMenuStrip.AutoSize = false; @@ -160,13 +160,12 @@ this.WindowState = FormWindowState.Minimized; globeControl1.Globe.MemoryLayer.RemoveAllFeature(); this.WindowState = FormWindowState.Minimized; - double x = Convert.ToDouble(row.Cells["LONGITUDE"].Value); - double y = Convert.ToDouble(row.Cells["LATITUDE"].Value); - - string username = Convert.ToString(row.Cells["PATROLERNAME"].Value); - string Atime = Convert.ToString(row.Cells["ACCIDENTTIME"].Value); - string location = Convert.ToString(row.Cells["LOCALE"].Value); - string descp = Convert.ToString(row.Cells["DESCRIBE"].Value); + double x = Convert.ToDouble(row.Cells["经度"].Value); + double y = Convert.ToDouble(row.Cells["纬度"].Value); + string username = Convert.ToString(row.Cells["上报人员"].Value); + string Atime = Convert.ToString(row.Cells["上报时间"].Value); + string location = Convert.ToString(row.Cells["事件地点"].Value); + string descp = Convert.ToString(row.Cells["事件描述"].Value); /////////////////////////////////////// /*******设置飞行与创建模型******/ @@ -228,8 +227,8 @@ DataGridViewRow row = grid.SelectedRows[0]; try { - int dbId = Convert.ToInt32(row.Cells["DBID"].Value); - string result = Convert.ToString(row.Cells["RESULT"].Value); + int dbId = Convert.ToInt32(row.Cells["编号"].Value); + string result = Convert.ToString(row.Cells["处理结果"].Value); EMS_Forms.Form_EventResult form = new Form_EventResult(dbId, result); form.refresh += new Form_EventResult.Handle(LoadData);//改变值的事件 form.ShowDialog(); @@ -276,9 +275,9 @@ } for (int i = 0; i < table.Rows.Count; i++) { - if (winGridViewPager1.dataGridView1.Rows[i].Cells["RESULT"].Value != null && !(winGridViewPager1.dataGridView1.Rows[i].Cells["RESULT"].Value.ToString().Trim().Equals(""))) + if (winGridViewPager1.dataGridView1.Rows[i].Cells["处理结果"].Value != null && !(winGridViewPager1.dataGridView1.Rows[i].Cells["处理结果"].Value.ToString().Trim().Equals(""))) { - winGridViewPager1.dataGridView1.Rows[i].Cells["STATE"].Value = "已处理"; + winGridViewPager1.dataGridView1.Rows[i].Cells["处理状态"].Value = "已处理"; } } @@ -307,9 +306,9 @@ } for (int i = 0; i < table.Rows.Count; i++) { - if (winGridViewPager1.dataGridView1.Rows[i].Cells["RESULT"].Value != null && !(winGridViewPager1.dataGridView1.Rows[i].Cells["RESULT"].Value.ToString().Trim().Equals(""))) + if (winGridViewPager1.dataGridView1.Rows[i].Cells["处理结果"].Value != null && !(winGridViewPager1.dataGridView1.Rows[i].Cells["处理结果"].Value.ToString().Trim().Equals(""))) { - winGridViewPager1.dataGridView1.Rows[i].Cells["STATE"].Value = "已处理"; + winGridViewPager1.dataGridView1.Rows[i].Cells["处理状态"].Value = "已处理"; } } @@ -320,10 +319,12 @@ { string sqlCount = "select count(*) from ACCIDENT where 1=1"; - string sqlData = "select ACCIDENTTIME,DBID,DESCRIBE,LATITUDE,LOCALE,LONGITUDE,PATROLERNAME,PATROLER_ID,TASK_ID,RESULT,'' as STATE " + + string sqlData = "select ACCIDENTTIME as 上报时间,DBID as 编号,DESCRIBE as 事件描述,"+ + "LATITUDE as 纬度,LOCALE as 事件地点,LONGITUDE as 经度,PATROLERNAME 上报人员,"+ + "PATROLER_ID as 人员ID,TASK_ID as 任务编号,RESULT as 处理结果,'' as 处理状态 " + "from (select t.*,rownum row_num from ACCIDENT t order by DBID)b " + " where 1=1"; - + rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; @@ -340,9 +341,10 @@ string sqlCount = "select count(*) from ACCIDENT where 1=1"; - string sqlData = "select ACCIDENTTIME,DBID,DESCRIBE,LATITUDE,LOCALE,LONGITUDE,PATROLERNAME,PATROLER_ID,TASK_ID,RESULT,'' as STATE " + - "from (select t.*,rownum row_num from ACCIDENT t order by DBID)b " + - " where(b.row_num between " + minPage + " and " + maxPage + ")"; + string sqlData = "select ACCIDENTTIME as 上报时间,DBID as 编号,DESCRIBE as 事件描述," + + "LATITUDE as 纬度,LOCALE as 事件地点,LONGITUDE as 经度,PATROLERNAME 上报人员," + + "PATROLER_ID as 人员ID,TASK_ID as 任务编号,RESULT as 处理结果,'' as 处理状态 " + + "from (select t.*,rownum row_num from ACCIDENT t where 1=1"; if (!String.IsNullOrEmpty(comboBox_name.Text.Trim())) { @@ -361,7 +363,8 @@ sqlCount += "and ACCIDENTTIME<=to_date('" + time.ToShortDateString() + "','yyyy-MM-dd') "; sqlData += "and ACCIDENTTIME<=to_date('" + time.ToShortDateString() + "','yyyy-MM-dd') "; } - + sqlData += " order by DBID desc)b " + + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 225c8d7..8bd9e48 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -120,8 +120,8 @@ private void flyToTask(DataGridViewRow row, int taskState) { int dbID = 0; - dbID = Convert.ToInt32(row.Cells["DBID"].Value); - string userName = Convert.ToString(row.Cells["USERNAME"].Value); + dbID = Convert.ToInt32(row.Cells["任务编号"].Value); + string userName = Convert.ToString(row.Cells["任务执行人员"].Value); System.DateTime t = new DateTime(); try { @@ -392,15 +392,15 @@ //控制表格显示的列，以及每一列要显示的列名 this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - this.winGridViewPager1.AddColumnAlias("DBID", "任务编号"); - this.winGridViewPager1.AddColumnAlias("DEPLOYTIME", "创建时间"); - this.winGridViewPager1.AddColumnAlias("DESCIRPTION", "任务描述"); - this.winGridViewPager1.AddColumnAlias("FINISHTIME", "完成时间"); - this.winGridViewPager1.AddColumnAlias("STREET", "任务执行区域"); - this.winGridViewPager1.AddColumnAlias("TASKSTATE", "任务状态"); - this.winGridViewPager1.AddColumnAlias("USERNAME", "任务执行人员"); + this.winGridViewPager1.AddColumnAlias("任务编号", "任务编号"); + this.winGridViewPager1.AddColumnAlias("创建时间", "创建时间"); + this.winGridViewPager1.AddColumnAlias("任务描述", "任务描述"); + this.winGridViewPager1.AddColumnAlias("完成时间", "完成时间"); + this.winGridViewPager1.AddColumnAlias("任务执行区域", "任务执行区域"); + this.winGridViewPager1.AddColumnAlias("任务状态", "任务状态"); + this.winGridViewPager1.AddColumnAlias("任务执行人员", "任务执行人员"); - this.winGridViewPager1.DisplayColumns = "DBID,DEPLOYTIME,DESCIRPTION,FINISHTIME,STREET,TASKSTATE,USERNAME"; + this.winGridViewPager1.DisplayColumns = "任务编号,创建时间,任务描述,完成时间,任务执行区域,任务状态,任务执行人员"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -464,8 +464,8 @@ { int dbID = 0; int taskStateInt = 0; - dbID = Convert.ToInt32(row.Cells["DBID"].Value); - string taskState = row.Cells["TASKSTATE"].Value.ToString(); + dbID = Convert.ToInt32(row.Cells["任务编号"].Value); + string taskState = row.Cells["任务状态"].Value.ToString(); if (taskState.Equals("开始任务")) { taskStateInt = 1; @@ -534,9 +534,10 @@ private string GetSql() { - string sqlCount = "select count(*) from taskinfo t where 1=1'"; + string sqlCount = "select count(*) from taskinfo t where 1=1"; - string sqlData = "select dbid,deploytime,descirption,finishtime,street,taskstate,username " + + 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"; @@ -550,9 +551,9 @@ int minPage = (pageIndex - 1) * maxPageIndex + 1; int maxPage = pageIndex * maxPageIndex; string sqlCount = "select count(*) from taskinfo t where 1=1"; - string sqlData = "select dbid,deploytime,descirption,finishtime,street,taskstate,username " + - "from (select t.*,rownum row_num from taskinfo t order by DBID desc)b " + - " where(b.row_num between " + minPage + " and " + maxPage + ")"; + 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"; if (!String.IsNullOrEmpty(comboBox_userName.Text.Trim()) && !comboBox_userName.Text.Trim().Equals("不限")) { @@ -581,6 +582,8 @@ sqlCount += "and street='" + combo_street.Text + "' "; sqlData += "and street='" + combo_street.Text + "' "; } + sqlData += " order by DBID desc)b " + + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index e65a4bd..58f5342 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -73,13 +73,13 @@ //控制表格显示的列，以及每一列要显示的列名 this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - this.winGridViewPager1.AddColumnAlias("FILENAME", "文档名称"); - this.winGridViewPager1.AddColumnAlias("DBID", "编号"); - this.winGridViewPager1.AddColumnAlias("TITLE", "文档标题"); - this.winGridViewPager1.AddColumnAlias("FILETYPE", "文档类型"); - this.winGridViewPager1.AddColumnAlias("UPDAY", "上传日期"); - this.winGridViewPager1.AddColumnAlias("WRITER", "上传人"); - this.winGridViewPager1.DisplayColumns = "FILENAME,TITLE,FILETYPE,UPDAY,WRITER"; + this.winGridViewPager1.AddColumnAlias("文档名称", "文档名称"); + this.winGridViewPager1.AddColumnAlias("编号", "编号"); + this.winGridViewPager1.AddColumnAlias("文档标题", "文档标题"); + this.winGridViewPager1.AddColumnAlias("文档类型", "文档类型"); + this.winGridViewPager1.AddColumnAlias("上传日期", "上传日期"); + this.winGridViewPager1.AddColumnAlias("上传人", "上传人"); + this.winGridViewPager1.DisplayColumns = "文档名称,文档标题,文档类型,上传日期,上传人"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -167,7 +167,7 @@ if (grid != null) { DataGridViewRow row = grid.SelectedRows[0]; - string dbid = row.Cells["dbid"].Value.ToString(); + string dbid = row.Cells["编号"].Value.ToString(); try { if (MessageBox.Show("确认删除吗？", "确认", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) @@ -212,7 +212,8 @@ { string sqlCount = "select count(*) from casic_userdocument where sysname = 'EMS'"; - string sqlData = "select filename,dbid,title,filetype,upday,writer " + + string sqlData = "select filename as 文档名称,dbid as 编号,title as 文档标题," + + "filetype as 文档类型,upday as 上传日期,writer as 上传人 " + "from (select t.*,rownum row_num from casic_userdocument t order by DBID desc)b " + " where sysname = 'EMS'"; @@ -226,9 +227,9 @@ int minPage = (pageIndex - 1) * maxPageIndex + 1; int maxPage = pageIndex * maxPageIndex; string sqlCount = "select count(*) from casic_userdocument where sysname = 'EMS'"; - string sqlData = "select filename,dbid,title,filetype,upday,writer " + - "from (select t.*,rownum row_num from casic_userdocument t where sysname = 'EMS' order by DBID desc)b " + - " where(b.row_num between " + minPage + " and " + maxPage + ")"; + string sqlData = "select filename as 文档名称,dbid as 编号,title as 文档标题,"+ + "filetype as 文档类型,upday as 上传日期,writer as 上传人 " + + "from (select t.*,rownum row_num from casic_userdocument t where sysname = 'EMS'"; string txtTitleText = null; string comboFileType = null; @@ -278,7 +279,8 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - + sqlData += " order by DBID desc)b " + + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; @@ -437,7 +439,7 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - string filename = row.Cells["filename"].Value.ToString(); + string filename = row.Cells["文档名称"].Value.ToString(); string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; string file = System.Environment.CurrentDirectory + "\\download\\" + filename; int result = DownloadFile(url, file, progressBar1); @@ -515,7 +517,7 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - string filename = row.Cells["filename"].Value.ToString(); + string filename = row.Cells["文档名称"].Value.ToString(); string ext = Path.GetExtension(filename); SaveFileDialog dlg = new SaveFileDialog(); dlg.Filter = "保存文档|*" + ext + ";"; diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 1d1201b..3902629 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -748,6 +748,7 @@ this.Name = "FrmAddSinMark"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "单个标识器添加"; + this.TopMost = true; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmAddSinMark_FormClosing); this.Load += new System.EventHandler(this.FrmAddSinMark_Load); this.groupPanel1.ResumeLayout(false); diff --git a/FrmEquipmentManage.cs b/FrmEquipmentManage.cs index 90bfdb2..a3cf55c 100644 --- a/FrmEquipmentManage.cs +++ b/FrmEquipmentManage.cs @@ -74,13 +74,13 @@ //控制表格显示的列，以及每一列要显示的列名 this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - this.winGridViewPager1.AddColumnAlias("DESCIRPTION", "设备描述"); - this.winGridViewPager1.AddColumnAlias("DBID", "编号"); - this.winGridViewPager1.AddColumnAlias("MACID", "MAC地址"); - this.winGridViewPager1.AddColumnAlias("OWNER", "设备所有人"); - this.winGridViewPager1.AddColumnAlias("STATUS", "设备状态"); + this.winGridViewPager1.AddColumnAlias("设备描述", "设备描述"); + this.winGridViewPager1.AddColumnAlias("编号", "编号"); + this.winGridViewPager1.AddColumnAlias("MAC地址", "MAC地址"); + this.winGridViewPager1.AddColumnAlias("设备所有人", "设备所有人"); + this.winGridViewPager1.AddColumnAlias("设备状态", "设备状态"); - this.winGridViewPager1.DisplayColumns = "DESCIRPTION,MACID,OWNER,STATUS"; + this.winGridViewPager1.DisplayColumns = "设备描述,MAC地址,设备所有人,设备状态"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -146,10 +146,10 @@ DataGridViewRow row = grid.SelectedRows[0]; try { - long dbid = long.Parse(row.Cells["DBID"].Value.ToString()); - String macId = row.Cells["MACID"].Value.ToString(); - String username = row.Cells["OWNER"].Value.ToString(); - String descn = row.Cells["DESCIRPTION"].Value.ToString(); + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); + String macId = row.Cells["MAC地址"].Value.ToString(); + String username = row.Cells["设备所有人"].Value.ToString(); + String descn = row.Cells["设备状态"].Value.ToString(); FrmEquipmentEdit frm = new FrmEquipmentEdit(dbid.ToString(), macId, username, descn); frm.reloadGrid += new ReloadEquipmentGrid(LoadData); frm.ShowDialog(); @@ -179,7 +179,7 @@ { return; } - String macId = row.Cells["MACID"].Value.ToString(); + String macId = row.Cells["MAC地址"].Value.ToString(); FrmLog frm = new FrmLog(macId); frm.Show(); } @@ -201,7 +201,7 @@ if (grid != null) { DataGridViewRow row = grid.SelectedRows[0]; - long dbid = long.Parse(row.Cells["DBID"].Value.ToString()); + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); try { if (MessageBox.Show("确定删除？", "确认", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) @@ -243,7 +243,8 @@ { string sqlCount = "select count(*) from equipment where status = 'USING'"; - string sqlData = "select descirption,DBID,macid,owner,case when status = 'USING' then '可用' when status = 'DAMAGE' then '损坏' end as status " + + string sqlData = "select descirption as 设备描述,DBID as 编号,macid as MAC地址,owner as 设备所有人,"+ + "case when status = 'USING' then '可用' when status = 'DAMAGE' then '损坏' end as 设备状态 " + "from (select t.*,rownum row_num from equipment t where status = 'USING' order by dbid desc)b " + " where 1=1"; @@ -258,16 +259,17 @@ int maxPage = pageIndex * maxPageIndex; string sqlCount = "select count(*) from equipment where status = 'USING' "; - string sqlData = "select descirption,DBID,macid,owner,case when status = 'USING' then '可用' when status = 'DAMAGE' then '损坏' end as status " + - "from (select t.*,rownum row_num from equipment t where status = 'USING' order by DBID desc)b " + - " where(b.row_num between " + minPage + " and " + maxPage + ")"; + string sqlData = "select descirption as 设备描述,DBID as 编号,macid as MAC地址,owner as 设备所有人," + + "case when status = 'USING' then '可用' when status = 'DAMAGE' then '损坏' end as 设备状态 " + + "from (select t.*,rownum row_num from equipment t where status = 'USING'"; if (!String.IsNullOrEmpty(txtMacId.Text.Trim())) { sqlData += " and macid like '%" + txtMacId.Text.Trim() + "%'"; sqlCount += " and macid like '%" + txtMacId.Text.Trim() + "%'"; } - + sqlData += " order by DBID desc)b " + + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; @@ -299,76 +301,6 @@ } } - //public void reloadGrid(int pageIndex) - //{ - // if (pageIndex <= 0) - // { - // pageIndex = 1; - // currentpage = 1; - // } - // String sqlrows = "select * from (select rownum as rowno,dbid,descirption,macid,owner,case when status = 'USING' then '可用' when status = 'DAMAGE' then '损坏' end as status,'编辑' as btnEdit,'删除' as btnDel from equipment t where status = 'USING' "; - // string sqlcount = "select count(*) from equipment where status = 'USING' "; - // if (!String.IsNullOrEmpty(txtMacId.Text.Trim())) - // { - // sqlrows += " and macid like '%" + txtMacId.Text.Trim() + "%'"; - // sqlcount += " and macid like '%" + txtMacId.Text.Trim() + "%'"; - // } - // sqlrows += " and rownum<=" + (pagesize * pageIndex) + ") table_alias where table_alias.rowno>=" + ((pageIndex - 1) * pagesize + 1); - - // int rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlcount).ToString()); - // int pages = 0; - // if (rows % pagesize == 0) - // { - // pages = rows / pagesize; - // } - // else - // { - // pages = rows / pagesize + 1; - // } - - // lastpage = pages; - - // lab_page_msg.Text = "共" + rows + "条记录，每页" + pagesize + "条，第" + pageIndex + "页，共" + pages + "页"; - // combo_page_num.Items.Clear(); - // for (int i = 1; i <= pages; i++) - // { - // combo_page_num.Items.Add(new ComboBoxItem(i.ToString(), i.ToString())); - // } - - // if (lastpage == 1) - // { - // btn_page_first.Enabled = false; - // btn_page_pre.Enabled = false; - // btn_page_last.Enabled = false; - // btn_page_next.Enabled = false; - // } - // else if (currentpage == 1) - // { - // btn_page_first.Enabled = false; - // btn_page_pre.Enabled = false; - // btn_page_last.Enabled = true; - // btn_page_next.Enabled = true; - // } - // else if (currentpage == lastpage) - // { - // btn_page_first.Enabled = true; - // btn_page_pre.Enabled = true; - // btn_page_last.Enabled = false; - // btn_page_next.Enabled = false; - // } - // else - // { - // btn_page_first.Enabled = true; - // btn_page_pre.Enabled = true; - // btn_page_last.Enabled = true; - // btn_page_next.Enabled = true; - // } - - // DataTable table = OracleUtils.ExecuteDataset(OracleUtils.ConnectionString, CommandType.Text, sqlrows).Tables[0]; - // dataGridViewX1.DataSource = table; - - //} - private void FrmEquipmentManage_FormClosing(object sender, FormClosingEventArgs e) diff --git a/FrmFlagDetail.Designer.cs b/FrmFlagDetail.Designer.cs new file mode 100644 index 0000000..982bfc6 --- /dev/null +++ b/FrmFlagDetail.Designer.cs @@ -0,0 +1,103 @@ +namespace Cyberpipe +{ + partial class FrmFlagDetail + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); + this.dataGridViewX_markDetail = new DevComponents.DotNetBar.Controls.DataGridViewX(); + this.对象类型 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.对象编号 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.对象名称 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX_markDetail)).BeginInit(); + this.SuspendLayout(); + // + // dataGridViewX_markDetail + // + this.dataGridViewX_markDetail.AllowUserToAddRows = false; + this.dataGridViewX_markDetail.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; + this.dataGridViewX_markDetail.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dataGridViewX_markDetail.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.对象类型, + this.对象编号, + this.对象名称}); + dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle3.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dataGridViewX_markDetail.DefaultCellStyle = dataGridViewCellStyle3; + this.dataGridViewX_markDetail.Dock = System.Windows.Forms.DockStyle.Fill; + this.dataGridViewX_markDetail.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(170)))), ((int)(((byte)(170)))), ((int)(((byte)(170))))); + this.dataGridViewX_markDetail.Location = new System.Drawing.Point(0, 0); + this.dataGridViewX_markDetail.Name = "dataGridViewX_markDetail"; + this.dataGridViewX_markDetail.RowTemplate.Height = 23; + this.dataGridViewX_markDetail.Size = new System.Drawing.Size(508, 321); + this.dataGridViewX_markDetail.TabIndex = 0; + // + // 对象类型 + // + this.对象类型.HeaderText = "对象类型"; + this.对象类型.Name = "对象类型"; + // + // 对象编号 + // + this.对象编号.HeaderText = "对象编号"; + this.对象编号.Name = "对象编号"; + // + // 对象名称 + // + this.对象名称.HeaderText = "对象名称"; + this.对象名称.Name = "对象名称"; + // + // FrmFlagDetail + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(508, 321); + this.Controls.Add(this.dataGridViewX_markDetail); + this.Name = "FrmFlagDetail"; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; + this.Text = "标识对象信息"; + this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmFlagDetail_FormClosing); + this.Load += new System.EventHandler(this.FrmFlagDetail_Load); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX_markDetail)).EndInit(); + this.ResumeLayout(false); + + } + + #endregion + + private DevComponents.DotNetBar.Controls.DataGridViewX dataGridViewX_markDetail; + private System.Windows.Forms.DataGridViewTextBoxColumn 对象类型; + private System.Windows.Forms.DataGridViewTextBoxColumn 对象编号; + private System.Windows.Forms.DataGridViewTextBoxColumn 对象名称; + + } +} \ No newline at end of file diff --git a/FrmFlagDetail.cs b/FrmFlagDetail.cs new file mode 100644 index 0000000..81de974 --- /dev/null +++ b/FrmFlagDetail.cs @@ -0,0 +1,77 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Windows.Forms; +using GeoScene.Globe; +using System.Data.OracleClient; + +namespace Cyberpipe +{ + public partial class FrmFlagDetail : Form + { + DataTable dt = new DataTable(); + private GSOGlobeControl globeControl1; + + public delegate void Handle(); + public event Handle showParentForm; + String markId; + + public FrmFlagDetail(GSOGlobeControl globeControl1, String id) + { + InitializeComponent(); + this.markId = id; + } + + private void FrmFlagDetail_FormClosing(object sender, FormClosingEventArgs e) + { + showParentForm(); + } + + private void FrmFlagDetail_Load(object sender, EventArgs e) + { + string objectIds = ""; + string objectTypeCodes = ""; + string sql = "select t.对象编号,t.对象类型 from 标识器 t where t.编号='" + markId + "'"; + using (OracleDataReader reader = OracleUtils.ExecuteReader(OracleUtils.ConnectionString, CommandType.Text, sql)) + { + while (reader.Read()) + { + objectIds = reader.GetString(0); + objectTypeCodes = reader.GetString(1); + } + } + + string[] codeTypes = objectTypeCodes.Split(','); + string[] codeIds = objectIds.Split(','); + int length = 0; + if (codeTypes.Length <= codeIds.Length) + { + length = codeTypes.Length; + } + else + { + length = codeIds.Length; + } + for (int n = 0; n < length; n++) + { + for (int i = 0; i < Utility1.listPipelineType.Count; i++) + { + if (Utility1.listPipelineType[i].code == codeTypes[n]) + { + //string objectId = codeIds[i]; + //string objectType = Utility1.listPipelineType[i].type; + //string objectName = Utility1.listPipelineType[i].name; + int index = this.dataGridViewX_markDetail.Rows.Add(); + this.dataGridViewX_markDetail.Rows[index].Cells[0].Value = Utility1.listPipelineType[i].type; + this.dataGridViewX_markDetail.Rows[index].Cells[1].Value = codeIds[n].ToString(); + this.dataGridViewX_markDetail.Rows[index].Cells[2].Value = Utility1.listPipelineType[i].name; + } + } + } + } + } +} diff --git a/FrmFlagDetail.resx b/FrmFlagDetail.resx new file mode 100644 index 0000000..e98a8fe --- /dev/null +++ b/FrmFlagDetail.resx @@ -0,0 +1,129 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + True + + + True + + + True + + \ No newline at end of file diff --git a/FrmFlagManagers.Designer.cs b/FrmFlagManagers.Designer.cs index d7e2f60..9fe14fb 100644 --- a/FrmFlagManagers.Designer.cs +++ b/FrmFlagManagers.Designer.cs @@ -28,8 +28,10 @@ /// private void InitializeComponent() { - this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); - this.winGridViewPager1 = new WHC.Pager.WinControl.WinGridViewPager(); + this.components = new System.ComponentModel.Container(); + this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components); + this.标识对象ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripMenuItem2 = new System.Windows.Forms.ToolStripMenuItem(); this.bar1 = new DevComponents.DotNetBar.Bar(); this.labelItem1 = new DevComponents.DotNetBar.LabelItem(); this.txt_no = new DevComponents.DotNetBar.TextBoxItem(); @@ -38,45 +40,37 @@ this.btn_query = new DevComponents.DotNetBar.ButtonItem(); this.btn_add_batch = new DevComponents.DotNetBar.ButtonItem(); this.btn_add_menu = new DevComponents.DotNetBar.ButtonItem(); - this.btn_db = new DevComponents.DotNetBar.ButtonItem(); - this.tableLayoutPanel1.SuspendLayout(); + this.winGridViewPager1 = new WHC.Pager.WinControl.WinGridViewPager(); + this.contextMenuStrip1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.bar1)).BeginInit(); this.SuspendLayout(); // - // tableLayoutPanel1 + // contextMenuStrip1 // - this.tableLayoutPanel1.ColumnCount = 1; - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel1.Controls.Add(this.winGridViewPager1, 0, 1); - this.tableLayoutPanel1.Controls.Add(this.bar1, 0, 0); - this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 0); - this.tableLayoutPanel1.Name = "tableLayoutPanel1"; - this.tableLayoutPanel1.RowCount = 2; - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 32F)); - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel1.Size = new System.Drawing.Size(881, 474); - this.tableLayoutPanel1.TabIndex = 6; + this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.标识对象ToolStripMenuItem, + this.toolStripMenuItem2}); + this.contextMenuStrip1.Name = "contextMenuStrip1"; + this.contextMenuStrip1.Size = new System.Drawing.Size(125, 48); // - // winGridViewPager1 + // 标识对象ToolStripMenuItem // - this.winGridViewPager1.AppendedMenu = null; - this.winGridViewPager1.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; - this.winGridViewPager1.DataSource = null; - this.winGridViewPager1.DisplayColumns = ""; - this.winGridViewPager1.Dock = System.Windows.Forms.DockStyle.Fill; - this.winGridViewPager1.Location = new System.Drawing.Point(3, 35); - this.winGridViewPager1.MinimumSize = new System.Drawing.Size(540, 0); - this.winGridViewPager1.Name = "winGridViewPager1"; - this.winGridViewPager1.PrintTitle = ""; - this.winGridViewPager1.Size = new System.Drawing.Size(875, 436); - this.winGridViewPager1.TabIndex = 5; + this.标识对象ToolStripMenuItem.Name = "标识对象ToolStripMenuItem"; + this.标识对象ToolStripMenuItem.Size = new System.Drawing.Size(124, 22); + this.标识对象ToolStripMenuItem.Text = "标识对象"; + this.标识对象ToolStripMenuItem.Click += new System.EventHandler(this.标识对象ToolStripMenuItem_Click); + // + // toolStripMenuItem2 + // + this.toolStripMenuItem2.Name = "toolStripMenuItem2"; + this.toolStripMenuItem2.Size = new System.Drawing.Size(152, 22); + this.toolStripMenuItem2.Text = "查看位置"; + this.toolStripMenuItem2.Click += new System.EventHandler(this.toolStripMenuItem2_Click); // // bar1 // this.bar1.AntiAlias = true; this.bar1.Dock = System.Windows.Forms.DockStyle.Top; - this.bar1.DockSide = DevComponents.DotNetBar.eDockSide.Document; this.bar1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.labelItem1, this.txt_no, @@ -84,14 +78,13 @@ this.combo_street, this.btn_query, this.btn_add_batch, - this.btn_add_menu, - this.btn_db}); - this.bar1.Location = new System.Drawing.Point(3, 3); + this.btn_add_menu}); + this.bar1.Location = new System.Drawing.Point(0, 0); this.bar1.Name = "bar1"; - this.bar1.Size = new System.Drawing.Size(875, 28); + this.bar1.Size = new System.Drawing.Size(881, 28); this.bar1.Stretch = true; this.bar1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.bar1.TabIndex = 1; + this.bar1.TabIndex = 8; this.bar1.TabStop = false; this.bar1.Text = "bar1"; // @@ -136,24 +129,34 @@ this.btn_add_menu.Text = "手工添加"; this.btn_add_menu.Click += new System.EventHandler(this.btn_add_menu_Click); // - // btn_db + // winGridViewPager1 // - this.btn_db.Name = "btn_db"; - this.btn_db.Text = "数据导出"; + this.winGridViewPager1.AppendedMenu = null; + this.winGridViewPager1.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; + this.winGridViewPager1.DataSource = null; + this.winGridViewPager1.DisplayColumns = ""; + this.winGridViewPager1.Dock = System.Windows.Forms.DockStyle.Fill; + this.winGridViewPager1.Location = new System.Drawing.Point(0, 28); + this.winGridViewPager1.MinimumSize = new System.Drawing.Size(540, 0); + this.winGridViewPager1.Name = "winGridViewPager1"; + this.winGridViewPager1.PrintTitle = ""; + this.winGridViewPager1.Size = new System.Drawing.Size(881, 446); + this.winGridViewPager1.TabIndex = 9; // // FrmFlagManagers // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(881, 474); - this.Controls.Add(this.tableLayoutPanel1); + this.Controls.Add(this.winGridViewPager1); + this.Controls.Add(this.bar1); this.DoubleBuffered = true; this.Name = "FrmFlagManagers"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "标识器管理"; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmFlagManagers_FormClosing); this.Load += new System.EventHandler(this.FrmFlagManagers_Load); - this.tableLayoutPanel1.ResumeLayout(false); + this.contextMenuStrip1.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.bar1)).EndInit(); this.ResumeLayout(false); @@ -161,8 +164,8 @@ #endregion - private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1; - private WHC.Pager.WinControl.WinGridViewPager winGridViewPager1; + private System.Windows.Forms.ContextMenuStrip contextMenuStrip1; + private System.Windows.Forms.ToolStripMenuItem 标识对象ToolStripMenuItem; private DevComponents.DotNetBar.Bar bar1; private DevComponents.DotNetBar.LabelItem labelItem1; private DevComponents.DotNetBar.TextBoxItem txt_no; @@ -171,6 +174,7 @@ private DevComponents.DotNetBar.ButtonItem btn_query; private DevComponents.DotNetBar.ButtonItem btn_add_batch; private DevComponents.DotNetBar.ButtonItem btn_add_menu; - private DevComponents.DotNetBar.ButtonItem btn_db; + private WHC.Pager.WinControl.WinGridViewPager winGridViewPager1; + private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem2; } } \ No newline at end of file diff --git a/FrmFlagManagers.cs b/FrmFlagManagers.cs index 38d4927..9bf9734 100644 --- a/FrmFlagManagers.cs +++ b/FrmFlagManagers.cs @@ -33,15 +33,13 @@ { this.globeControl1 = _globeControl1; InitializeComponent(); - winGridViewPager1.OnPageChanged += new EventHandler(winGridViewPager1_OnPageChanged); - this.winGridViewPager1.OnAddNew += new EventHandler(winGridViewPager1_OnAddNew); //右键定位 + winGridViewPager1.OnPageChanged += new EventHandler(winGridViewPager1_OnPageChanged); this.winGridViewPager1.OnEditSelected += new EventHandler(winGridViewPager1_OnEditSelected);//属性编辑 this.winGridViewPager1.OnDeleteSelected += new EventHandler(winGridViewPager1_OnDeleteSelected);//标识器报废 + this.winGridViewPager1.OnStartExport += new EventHandler(pager1_OnStartExport); this.winGridViewPager1.OnEndExport += new EventHandler(pager1_OnEndExport); - //this.winGridViewPager1.ExportCurrent += new ExportCurrentEventHandler(pager1_ExportCurrent); - //this.winGridViewPager1.ExportAll += new ExportAllEventHandler(pager1_ExportAll); winGridViewPager1.dataGridView1.MultiSelect = false; @@ -76,26 +74,25 @@ this.winGridViewPager1.AddColumnAlias("标识器型号", "标识器型号"); this.winGridViewPager1.AddColumnAlias("地面高程", "地面高程"); this.winGridViewPager1.AddColumnAlias("标识器埋深", "标识器埋深"); - this.winGridViewPager1.AddColumnAlias("对象编号", "对象编号"); - this.winGridViewPager1.AddColumnAlias("对象类型", "对象类型"); this.winGridViewPager1.AddColumnAlias("所属道路", "所属道路"); this.winGridViewPager1.AddColumnAlias("使用状态", "使用状态"); - this.winGridViewPager1.DisplayColumns = "编号,标识器ID号,标识器型号,地面高程,标识器埋深,对象编号,对象类型,所属道路,使用状态"; + this.winGridViewPager1.DisplayColumns = "编号,标识器ID号,标识器型号,地面高程,标识器埋深,所属道路,使用状态"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 //隐藏右键功能按钮 //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[1].Visible = false; - //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[4].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[5].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[6].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[7].Visible = false; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[1].Text = "定位查看"; + //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[1].Text = "定位查看"; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "属性编辑"; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Text = "标识器报废"; + winGridViewPager1.AppendedMenu = this.contextMenuStrip1; + //右键菜单宽度 winGridViewPager1.dataGridView1.ContextMenuStrip.AutoSize = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Width = 150; @@ -153,7 +150,7 @@ } /// - /// 右键定位 + /// 对象查看 /// /// /// @@ -306,20 +303,10 @@ string sqlCount = "select count(*) from 标识器 where 使用状态 = '使用中'"; - string sqlData = "select 编号,标识器ID号,标识器型号,地面高程,标识器埋深,对象编号,对象类型,所属道路,LSSYS_ID,X坐标,Y坐标,使用状态 " + + string sqlData = "select 编号,标识器ID号,标识器型号,地面高程,标识器埋深,所属道路,LSSYS_ID,X坐标,Y坐标,使用状态 " + "from (select t.*,rownum row_num from 标识器 t where 使用状态 = '使用中' order by 编号)b " + " where 1=1"; - if (!String.IsNullOrEmpty(txt_no.Text.Trim())) - { - sqlCount += " and 编号 like '%" + txt_no.Text.Trim() + "%'"; - sqlData += " and 编号 like '%" + txt_no.Text.Trim() + "%'"; - } - if (null != combo_street.SelectedItem && !String.IsNullOrEmpty(combo_street.SelectedItem.ToString().Trim())) - { - sqlData += " and 所属道路='" + combo_street.SelectedItem.ToString().Trim() + "'"; - sqlCount += " and 所属道路='" + combo_street.SelectedItem.ToString().Trim() + "'"; - } rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -332,9 +319,8 @@ int maxPage = pageIndex * maxPageIndex; string sqlCount = "select count(*) from 标识器 where 使用状态 = '使用中'"; - string sqlData = "select 编号,标识器ID号,标识器型号,地面高程,标识器埋深,对象编号,对象类型,所属道路,LSSYS_ID,X坐标,Y坐标,使用状态 " + - "from (select t.*,rownum row_num from 标识器 t where 使用状态 = '使用中' order by 编号)b "+ - " where(b.row_num between " + minPage + " and " + maxPage + ")"; + string sqlData = "select 编号,标识器ID号,标识器型号,地面高程,标识器埋深,所属道路,LSSYS_ID,X坐标,Y坐标,使用状态 " + + "from (select t.*,rownum row_num from 标识器 t where 使用状态 = '使用中'"; if (!String.IsNullOrEmpty(txt_no.Text.Trim())) { @@ -347,6 +333,8 @@ sqlCount += " and 所属道路='" + combo_street.SelectedItem.ToString().Trim() + "'"; } + sqlData += " order by 编号)b " + + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; @@ -372,9 +360,10 @@ private void FrmFlagManagers_FormClosing(object sender, FormClosingEventArgs e) { IS_OPEN = false; - Thread downloadJob = new Thread(new ParameterizedThreadStart(doSave)); - downloadJob.IsBackground = true; - downloadJob.Start(e); + //Thread downloadJob = new Thread(new ParameterizedThreadStart(doSave)); + //downloadJob.IsBackground = true; + //downloadJob.Start(e); + globeControl1.Globe.Layers["标识器"].Save(); globeControl1.Globe.MemoryLayer.RemoveAllFeature(); foreach (GSOFeature f in Features) { @@ -480,10 +469,88 @@ if (null != globeControl1) { FrmAddSinMark frm = new FrmAddSinMark(globeControl1); - frm.ShowDialog(); + frm.Show(); } } + private void 标识对象ToolStripMenuItem_Click(object sender, EventArgs e) + { + if (winGridViewPager1 != null && winGridViewPager1.dataGridView1 != null) + { + DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; + try + { + this.Hide(); + string id = row.Cells["编号"].Value.ToString(); + FrmFlagDetail p = new FrmFlagDetail(globeControl1, id); + p.showParentForm += new FrmFlagDetail.Handle(showThisForm);//改变值的事件 + p.Show(); + } + catch (Exception ex) + { + MessageBox.Show("失败:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } + + private void showThisForm() + { + this.Show(); + } + + private void toolStripMenuItem2_Click(object sender, EventArgs e) + { + if (winGridViewPager1 != null && winGridViewPager1.dataGridView1 != null) + { + DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; + try + { + this.WindowState = FormWindowState.Minimized; + string id = row.Cells["LSSYS_ID"].Value.ToString(); + string flagno = row.Cells["编号"].Value.ToString(); + string flagstreet = row.Cells["所属道路"].Value.ToString(); + double x = Convert.ToDouble(row.Cells["X坐标"].Value); + double y = Convert.ToDouble(row.Cells["Y坐标"].Value); + GSOFeature flagFeature = globeControl1.Globe.Layers.GetLayerByCaption("标识器").GetFeatureByID(int.Parse(id)); + + string type = ""; + string pipe = ""; + string sql = "select t.标识器型号,t.对象编号 from 标识器 t where t.编号='" + flagno + "'"; + using (OracleDataReader reader = OracleUtils.ExecuteReader(OracleUtils.ConnectionString, CommandType.Text, sql)) + { + while (reader.Read()) + { + type = reader.GetString(0); + pipe = reader.GetString(1); + } + } + + GSOLabel label = new GSOLabel(); + label.Text = "标识器编号：" + flagno + "\r\n" + + "标识器类型:" + type + "\r\n" + + //"标识对象编号:" + pipe + "\r\n" + + "所属道路:" + flagstreet; + label.Style = new GSOLabelStyle(); + label.Style.TextStyle.FontSize = 18; + label.Style.TextStyle.ForeColor = Color.FromArgb(0, 0, 0, 255); + label.Style.Opaque = 0.8; //设置标注的透明度，取值区间是0-1 + label.Style.TracktionLineType = EnumTracktionLineType.Solid; + label.Style.TextStyle.FontHeight = 10; + label.Style.TextStyle.FontName = "黑体"; + label.Style.TractionLineEndPos = new GSOPoint2d(80, 60); + + flagFeature.Label = label; + Features.Add(flagFeature); + globeControl1.Globe.JumpToFeature(flagFeature, 20); + this.globeControl1.Refresh(); + + } + catch (Exception ex) + { + MessageBox.Show("标识器定位失败:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } } diff --git a/FrmFlagManagers.resx b/FrmFlagManagers.resx index 1af7de1..ad53752 100644 --- a/FrmFlagManagers.resx +++ b/FrmFlagManagers.resx @@ -117,4 +117,7 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 17, 17 + \ No newline at end of file diff --git a/FrmPatrolerEdit.cs b/FrmPatrolerEdit.cs index dbd4fec..f45b5ae 100644 --- a/FrmPatrolerEdit.cs +++ b/FrmPatrolerEdit.cs @@ -46,7 +46,7 @@ txt_name.Focus(); return; } - if (String.IsNullOrEmpty(combo_sex.SelectedItem.ToString())) + if (combo_sex.SelectedItem == null ||String.IsNullOrEmpty(combo_sex.SelectedItem.ToString())) { MessageBox.Show("性别不能为空！", "警告", MessageBoxButtons.OK, MessageBoxIcon.Warning); combo_sex.Focus(); diff --git a/FrmPatrolerManager.Designer.cs b/FrmPatrolerManager.Designer.cs index bb8e5fb..10fac22 100644 --- a/FrmPatrolerManager.Designer.cs +++ b/FrmPatrolerManager.Designer.cs @@ -47,11 +47,13 @@ this.注销 = new DevComponents.Editors.ComboItem(); this.btn_query_person = new DevComponents.DotNetBar.ButtonItem(); this.btn_add_person = new DevComponents.DotNetBar.ButtonItem(); - this.winGridViewPager1 = new WHC.Pager.WinControl.WinGridViewPager(); this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components); this.日志ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.任务ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.定位ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.winGridViewPager1 = new WHC.Pager.WinControl.WinGridViewPager(); + this.编辑ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.注销ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); ((System.ComponentModel.ISupportInitialize)(this.bar1)).BeginInit(); this.contextMenuStrip1.SuspendLayout(); this.SuspendLayout(); @@ -173,9 +175,42 @@ this.btn_add_person.Text = "新增"; this.btn_add_person.Click += new System.EventHandler(this.btn_add_person_Click); // + // contextMenuStrip1 + // + this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.日志ToolStripMenuItem, + this.任务ToolStripMenuItem, + this.定位ToolStripMenuItem, + this.编辑ToolStripMenuItem, + this.注销ToolStripMenuItem}); + this.contextMenuStrip1.Name = "contextMenuStrip1"; + this.contextMenuStrip1.Size = new System.Drawing.Size(153, 136); + // + // 日志ToolStripMenuItem + // + this.日志ToolStripMenuItem.Name = "日志ToolStripMenuItem"; + this.日志ToolStripMenuItem.Size = new System.Drawing.Size(100, 22); + this.日志ToolStripMenuItem.Text = "日志"; + this.日志ToolStripMenuItem.Click += new System.EventHandler(this.日志ToolStripMenuItem_Click); + // + // 任务ToolStripMenuItem + // + this.任务ToolStripMenuItem.Name = "任务ToolStripMenuItem"; + this.任务ToolStripMenuItem.Size = new System.Drawing.Size(100, 22); + this.任务ToolStripMenuItem.Text = "任务"; + this.任务ToolStripMenuItem.Click += new System.EventHandler(this.任务ToolStripMenuItem_Click); + // + // 定位ToolStripMenuItem + // + this.定位ToolStripMenuItem.Name = "定位ToolStripMenuItem"; + this.定位ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.定位ToolStripMenuItem.Text = "定位"; + this.定位ToolStripMenuItem.Click += new System.EventHandler(this.定位ToolStripMenuItem_Click); + // // winGridViewPager1 // this.winGridViewPager1.AppendedMenu = null; + this.winGridViewPager1.ContextMenuStrip = this.contextMenuStrip1; this.winGridViewPager1.DataSource = null; this.winGridViewPager1.DisplayColumns = ""; this.winGridViewPager1.Dock = System.Windows.Forms.DockStyle.Fill; @@ -186,35 +221,19 @@ this.winGridViewPager1.Size = new System.Drawing.Size(756, 309); this.winGridViewPager1.TabIndex = 3; // - // contextMenuStrip1 + // 编辑ToolStripMenuItem // - this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.日志ToolStripMenuItem, - this.任务ToolStripMenuItem, - this.定位ToolStripMenuItem}); - this.contextMenuStrip1.Name = "contextMenuStrip1"; - this.contextMenuStrip1.Size = new System.Drawing.Size(101, 70); + this.编辑ToolStripMenuItem.Name = "编辑ToolStripMenuItem"; + this.编辑ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.编辑ToolStripMenuItem.Text = "编辑"; + this.编辑ToolStripMenuItem.Click += new System.EventHandler(this.编辑ToolStripMenuItem_Click); // - // 日志ToolStripMenuItem + // 注销ToolStripMenuItem // - this.日志ToolStripMenuItem.Name = "日志ToolStripMenuItem"; - this.日志ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); - this.日志ToolStripMenuItem.Text = "日志"; - this.日志ToolStripMenuItem.Click += new System.EventHandler(this.日志ToolStripMenuItem_Click); - // - // 任务ToolStripMenuItem - // - this.任务ToolStripMenuItem.Name = "任务ToolStripMenuItem"; - this.任务ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); - this.任务ToolStripMenuItem.Text = "任务"; - this.任务ToolStripMenuItem.Click += new System.EventHandler(this.任务ToolStripMenuItem_Click); - // - // 定位ToolStripMenuItem - // - this.定位ToolStripMenuItem.Name = "定位ToolStripMenuItem"; - this.定位ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); - this.定位ToolStripMenuItem.Text = "定位"; - this.定位ToolStripMenuItem.Click += new System.EventHandler(this.定位ToolStripMenuItem_Click); + this.注销ToolStripMenuItem.Name = "注销ToolStripMenuItem"; + this.注销ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.注销ToolStripMenuItem.Text = "注销"; + this.注销ToolStripMenuItem.Click += new System.EventHandler(this.注销ToolStripMenuItem_Click); // // FrmPatrolerManager // @@ -229,7 +248,7 @@ this.MinimizeBox = false; this.Name = "FrmPatrolerManager"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; - this.Text = "巡检人员维护"; + this.Text = "定位人员维护"; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmPatrolerManager_FormClosing); this.Load += new System.EventHandler(this.FrmPatrolerManager_Load); ((System.ComponentModel.ISupportInitialize)(this.bar1)).EndInit(); @@ -258,10 +277,12 @@ private DevComponents.Editors.ComboItem 注销; private DevComponents.Editors.ComboItem comboItem1; private DevComponents.Editors.ComboItem 不限; - private WHC.Pager.WinControl.WinGridViewPager winGridViewPager1; private System.Windows.Forms.ContextMenuStrip contextMenuStrip1; private System.Windows.Forms.ToolStripMenuItem 日志ToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem 任务ToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem 定位ToolStripMenuItem; + private WHC.Pager.WinControl.WinGridViewPager winGridViewPager1; + private System.Windows.Forms.ToolStripMenuItem 编辑ToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem 注销ToolStripMenuItem; } } \ No newline at end of file diff --git a/FrmPatrolerManager.cs b/FrmPatrolerManager.cs index 255a076..9c32f54 100644 --- a/FrmPatrolerManager.cs +++ b/FrmPatrolerManager.cs @@ -29,9 +29,7 @@ this.globeControl1 = globeControl1; winGridViewPager1.OnPageChanged += new EventHandler(winGridViewPager1_OnPageChanged); - this.winGridViewPager1.OnEditSelected += new EventHandler(winGridViewPager1_OnEditSelected);//编辑 - this.winGridViewPager1.OnDeleteSelected += new EventHandler(winGridViewPager1_OnDeleteSelected);//删除 - + this.winGridViewPager1.OnStartExport += new EventHandler(pager1_OnStartExport); this.winGridViewPager1.OnEndExport += new EventHandler(pager1_OnEndExport); @@ -47,26 +45,31 @@ //控制表格显示的列，以及每一列要显示的列名 this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - this.winGridViewPager1.AddColumnAlias("USERNAME", "姓名"); - this.winGridViewPager1.AddColumnAlias("DBID", "编号"); - this.winGridViewPager1.AddColumnAlias("SEX", "性别"); - this.winGridViewPager1.AddColumnAlias("AGE", "年龄"); - this.winGridViewPager1.AddColumnAlias("PHONENUM", "电话"); - this.winGridViewPager1.AddColumnAlias("ACCOUNTSTATE", "状态"); - this.winGridViewPager1.DisplayColumns = "USERNAME,SEX,AGE,PHONENUM,ACCOUNTSTATE"; + this.winGridViewPager1.AddColumnAlias("姓名", "姓名"); + this.winGridViewPager1.AddColumnAlias("编号", "编号"); + this.winGridViewPager1.AddColumnAlias("性别", "性别"); + this.winGridViewPager1.AddColumnAlias("年龄", "年龄"); + this.winGridViewPager1.AddColumnAlias("电话", "电话"); + this.winGridViewPager1.AddColumnAlias("状态", "状态"); + this.winGridViewPager1.DisplayColumns = "姓名,性别,年龄,电话,状态"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 + //隐藏右键功能按钮 //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[1].Visible = false; + winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Visible = false; + winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[4].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[5].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[6].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[7].Visible = false; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "编辑"; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Text = "注销"; + + //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "编辑"; + //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Text = "注销"; winGridViewPager1.AppendedMenu = this.contextMenuStrip1; + //右键菜单宽度 winGridViewPager1.dataGridView1.ContextMenuStrip.AutoSize = false; @@ -122,11 +125,11 @@ DataGridViewRow row = grid.SelectedRows[0]; try { - long dbid = long.Parse(row.Cells["dbid"].Value.ToString()); - String name = row.Cells["USERNAME"].Value.ToString(); - String sex = row.Cells["SEX"].Value.ToString(); - String age = row.Cells["AGE"].Value.ToString(); - string phone = row.Cells["PHONENUM"].Value.ToString(); + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); + String name = row.Cells["姓名"].Value.ToString(); + String sex = row.Cells["性别"].Value.ToString(); + String age = row.Cells["年龄"].Value.ToString(); + string phone = row.Cells["电话"].Value.ToString(); age = String.IsNullOrEmpty(age.ToString().Trim()) ? "1" : age.ToString().Trim(); FrmPatrolerEdit frm = new FrmPatrolerEdit(dbid.ToString(), name, age, sex, phone); frm.reloadGrid += new ReloadPatrolerGrid(LoadData); @@ -152,10 +155,10 @@ if (grid != null) { DataGridViewRow row = grid.SelectedRows[0]; - long dbid = long.Parse(row.Cells["DBID"].Value.ToString()); + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); try { - string state = row.Cells["ACCOUNTSTATE"].Value.ToString(); + string state = row.Cells["状态"].Value.ToString(); if ("在线".Equals(state)) { if (MessageBox.Show("确定注销？", "确认", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) @@ -180,60 +183,60 @@ { int pageIndex = winGridViewPager1.PagerInfo.CurrenetPageIndex; string sqlData = GetSql(pageIndex); - initlizeDatagrid(); + DataTable table = OracleUtils.ExecuteDataset(OracleUtils.ConnectionString, CommandType.Text, sqlData).Tables[0]; winGridViewPager1.DataSource = table.DefaultView; - for (int i = 0; i < winGridViewPager1.dataGridView1.Rows.Count; i++) - { - if (winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value.ToString() == "ONLINE") - { - winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value = "在线"; - } - else - { - if (winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value.ToString() == "OFFLINE") - { - winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value = "离线"; - } - else - { - if (winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value.ToString() == "LEAVER") - { - winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value = "注销"; - } - } - } - } + //for (int i = 0; i < winGridViewPager1.dataGridView1.Rows.Count; i++) + //{ + // if (winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value.ToString() == "ONLINE") + // { + // winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value = "在线"; + // } + // else + // { + // if (winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value.ToString() == "OFFLINE") + // { + // winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value = "离线"; + // } + // else + // { + // if (winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value.ToString() == "LEAVER") + // { + // winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value = "注销"; + // } + // } + // } + //} winGridViewPager1.Refresh(); } private void LoadData(int pageIndex) { string sqlData = GetSql(pageIndex); - initlizeDatagrid(); + DataTable table = OracleUtils.ExecuteDataset(OracleUtils.ConnectionString, CommandType.Text, sqlData).Tables[0]; winGridViewPager1.DataSource = table.DefaultView; - for (int i = 0; i < winGridViewPager1.dataGridView1.Rows.Count; i++) - { - if (winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value.ToString() == "ONLINE") - { - winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value = "在线"; - } - else - { - if (winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value.ToString() == "OFFLINE") - { - winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value = "离线"; - } - else - { - if (winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value.ToString() == "LEAVER") - { - winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value = "注销"; - } - } - } - } + //for (int i = 0; i < winGridViewPager1.dataGridView1.Rows.Count; i++) + //{ + // if (winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value.ToString() == "ONLINE") + // { + // winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value = "在线"; + // } + // else + // { + // if (winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value.ToString() == "OFFLINE") + // { + // winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value = "离线"; + // } + // else + // { + // if (winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value.ToString() == "LEAVER") + // { + // winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value = "注销"; + // } + // } + // } + //} winGridViewPager1.Refresh(); } @@ -241,7 +244,8 @@ { string sqlCount = "select count(*) from equipment where status = 'USING'"; - string sqlData = "select username,dbid,sex,age,phonenum,accountstate " + + string sqlData = "select username as 姓名,dbid as 编号,sex as 性别,age as 年龄,phonenum as 电话,"+ + "case when accountstate = 'ONLINE' then '在线' when accountstate = 'OFFLINE' then '离线' when accountstate = 'LEAVER' then '注销' end as 状态 " + "from (select t.*,rownum row_num from patroler t order by DBID desc)b " + " where 1=1"; @@ -255,9 +259,9 @@ int minPage = (pageIndex - 1) * maxPageIndex + 1; int maxPage = pageIndex * maxPageIndex; string sqlCount = "select count(*) from patroler where 1=1"; - string sqlData = "select username,dbid,sex,age,phonenum,accountstate " + - "from (select t.*,rownum row_num from patroler t order by DBID desc)b " + - " where(b.row_num between " + minPage + " and " + maxPage + ")"; + string sqlData = "select username as 姓名,dbid as 编号,sex as 性别,age as 年龄,phonenum as 电话,"+ + "case when accountstate = 'ONLINE' then '在线' when accountstate = 'OFFLINE' then '离线' when accountstate = 'LEAVER' then '注销' end as 状态 " + + "from (select t.*,rownum row_num from patroler t where 1=1"; if (!String.IsNullOrEmpty(txt_username.Text.Trim())) { @@ -281,7 +285,8 @@ sqlCount += " and accountstate='" + combo_stateText + "'"; sqlData += " and accountstate='" + combo_stateText + "'"; } - + sqlData += " order by DBID desc)b " + + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; @@ -291,6 +296,7 @@ { try { + initlizeDatagrid(); LoadData(); initForm(); IS_OPEN = true; @@ -310,11 +316,13 @@ } if (Utility.userRole.IndexOf("巡检员编辑") == -1) { - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Visible = false; + //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Visible = false; + 编辑ToolStripMenuItem.Visible = false; } if (Utility.userRole.IndexOf("巡检员注销") == -1) { - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Visible = false; + //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Visible = false; + 注销ToolStripMenuItem.Visible = false; } } @@ -376,7 +384,7 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - long dbid = long.Parse(row.Cells["dbid"].Value.ToString()); + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); Log p = new Log(dbid.ToString()); p.Show(); } @@ -395,8 +403,8 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - long dbid = long.Parse(row.Cells["dbid"].Value.ToString()); - String state = row.Cells["ACCOUNTSTATE"].Value.ToString(); + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); + String state = row.Cells["状态"].Value.ToString(); if ("在线".Equals(state)) { string sql = "select t.dbid " + @@ -435,8 +443,8 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - long dbid = long.Parse(row.Cells["dbid"].Value.ToString()); - String username = row.Cells["USERNAME"].Value.ToString(); + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); + String username = row.Cells["姓名"].Value.ToString(); string sql = "select t.latitude, t.longitude " + "from position t " + "where t.dbid = (select max(dbid) from position where patroler_id = " + dbid + ")"; @@ -489,6 +497,63 @@ } + private void 编辑ToolStripMenuItem_Click(object sender, EventArgs e) + { + if (winGridViewPager1 != null && winGridViewPager1.dataGridView1 != null) + { + DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; + try + { + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); + String name = row.Cells["姓名"].Value.ToString(); + String sex = row.Cells["性别"].Value.ToString(); + String age = row.Cells["年龄"].Value.ToString(); + string phone = row.Cells["电话"].Value.ToString(); + age = String.IsNullOrEmpty(age.ToString().Trim()) ? "1" : age.ToString().Trim(); + FrmPatrolerEdit frm = new FrmPatrolerEdit(dbid.ToString(), name, age, sex, phone); + frm.reloadGrid += new ReloadPatrolerGrid(LoadData); + frm.ShowDialog(); + winGridViewPager1.Refresh(); + } + catch (Exception ex) + { + MessageBox.Show("编辑失败:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } + + private void 注销ToolStripMenuItem_Click(object sender, EventArgs e) + { + if (winGridViewPager1 != null && winGridViewPager1.dataGridView1 != null) + { + DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); + try + { + if (MessageBox.Show("确定注销？", "确认", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) + { + String sql = "update patroler t set t.accountstate='LEAVER' where t.dbid=" + dbid; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + LoadData(); + MessageBox.Show("人员已注销", "信息", MessageBoxButtons.OK, MessageBoxIcon.Information); + } + //string state = row.Cells["状态"].Value.ToString(); + //if ("在线".Equals(state)) + //{ + + //} + //else + //{ + // MessageBox.Show("人员不在线，无法注销", "信息"); + //} + } + catch (Exception ex) + { + MessageBox.Show("人员注销失败:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } + } } diff --git a/FrmRoleInfoManager.cs b/FrmRoleInfoManager.cs index 8897133..35693cf 100644 --- a/FrmRoleInfoManager.cs +++ b/FrmRoleInfoManager.cs @@ -55,10 +55,10 @@ //控制表格显示的列，以及每一列要显示的列名 this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - this.winGridViewPager1.AddColumnAlias("NT", "角色名称"); - this.winGridViewPager1.AddColumnAlias("ID", "编号"); + this.winGridViewPager1.AddColumnAlias("角色名称", "角色名称"); + this.winGridViewPager1.AddColumnAlias("编号", "编号"); - this.winGridViewPager1.DisplayColumns = "NT"; + this.winGridViewPager1.DisplayColumns = "角色名称"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -131,7 +131,7 @@ { try { - string dbid = row.Cells["id"].Value.ToString(); + string dbid = row.Cells["编号"].Value.ToString(); string sql = "delete from casic_userroletest where id=" + dbid; OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); LoadData(); @@ -170,7 +170,7 @@ { string sqlCount = "select id,nt from casic_userroletest where sysname='EMS'"; - string sqlData = "select nt,id " + + string sqlData = "select nt as 角色名称,id as 编号 " + "from (select t.*,rownum row_num from casic_userroletest t order by id desc)b " + " where sysname='EMS'"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -183,7 +183,7 @@ int minPage = (pageIndex - 1) * maxPageIndex + 1; int maxPage = pageIndex * maxPageIndex; string sqlCount = "select id,nt from casic_userroletest where sysname='EMS'"; - string sqlData = "select nt,id " + + string sqlData = "select nt as 角色名称,id as 编号 " + "from (select t.*,rownum row_num from casic_userroletest t where sysname='EMS' order by id desc)b " + " where(b.row_num between " + minPage + " and " + maxPage + ")"; diff --git a/FrmSysUserInfoManger.cs b/FrmSysUserInfoManger.cs index 7903916..e193a61 100644 --- a/FrmSysUserInfoManger.cs +++ b/FrmSysUserInfoManger.cs @@ -28,6 +28,7 @@ this.winGridViewPager1.OnEndExport += new EventHandler(pager1_OnEndExport); winGridViewPager1.dataGridView1.MultiSelect = false; + } private void FrmSysUserInfoManger_Load(object sender, EventArgs e) @@ -59,10 +60,10 @@ //控制表格显示的列，以及每一列要显示的列名 this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - this.winGridViewPager1.AddColumnAlias("USERNAME", "账号"); - this.winGridViewPager1.AddColumnAlias("ID", "编号"); + this.winGridViewPager1.AddColumnAlias("账号", "账号"); + this.winGridViewPager1.AddColumnAlias("编号", "编号"); - this.winGridViewPager1.DisplayColumns = "USERNAME"; + this.winGridViewPager1.DisplayColumns = "账号"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -130,8 +131,8 @@ if (grid != null) { DataGridViewRow row = grid.SelectedRows[0]; - string dbid = row.Cells["id"].Value.ToString(); - string userName = row.Cells["USERNAME"].Value.ToString(); + string dbid = row.Cells["编号"].Value.ToString(); + string userName = row.Cells["账号"].Value.ToString(); if (userName.Equals("ems")) { MessageBox.Show("该用户为管理员用户，无法删除！", "信息"); @@ -184,7 +185,7 @@ { string sqlCount = "select count(*) from casic_userinfotest where sysname='EMS'"; - string sqlData = "select username,id " + + string sqlData = "select username as 账号,id as 编号 " + "from (select t.*,rownum row_num from casic_userinfotest t order by id desc)b " + " where sysname='EMS'"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -197,16 +198,16 @@ int minPage = (pageIndex - 1) * maxPageIndex + 1; int maxPage = pageIndex * maxPageIndex; string sqlCount = "select count(*) from casic_userinfotest where sysname='EMS'"; - string sqlData = "select username,id " + - "from (select t.*,rownum row_num from casic_userinfotest t where sysname='EMS' order by id desc)b " + - " where(b.row_num between " + minPage + " and " + maxPage + ")"; + string sqlData = "select username as 账号,id as 编号 " + + "from (select t.*,rownum row_num from casic_userinfotest t where sysname='EMS'"; if (!String.IsNullOrEmpty(txt_user_code.Text.Trim())) { sqlCount += " and username like '%" + txt_user_code.Text.Trim() + "%'"; sqlData += " and username like '%" + txt_user_code.Text.Trim() + "%'"; } - + sqlData += " order by id desc)b " + + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; diff --git a/MainFrm.cs b/MainFrm.cs index 39df646..0cd5881 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3310,10 +3310,10 @@ string str1 = ""; if (feature != null) { - if (feature.GetFieldDefn("图?片?编括?码?") != null) // + if (feature.GetFieldDefn("图片编码") != null) // { str1 = GetBubbleInfo(feature); - if (RemoteFileExists(Utility.PicRootURL + feature.GetValue("图?片?编括?码?").ToString())) + if (RemoteFileExists(Utility.PicRootURL + feature.GetValue("图片编码").ToString())) { str1 += ""; } @@ -3450,9 +3450,15 @@ string value1 = ""; if (field1 != null) { - if (field1.Name == "图片编码") + //if (field1.Name == "图片编码" || field1.Name == "对象编号" || field1.Name == "对象类型" || field1.Name == "对象名称") + //{ + // j++; + //} + while (field1.Name == "图片编码" || field1.Name == "对象编号" || field1.Name == "对象类型" || field1.Name == "对象名称") { j++; + fieldName = fieldNames[j].Trim(); + field1 = (GSOFieldDefn)feature.GetFieldDefn(fieldName); } if (j < rowCount) { @@ -3479,6 +3485,11 @@ if (!feature.IsFieldValueNull(j)) { value1 = feature.GetValue(j).ToString(); + if (name1 == "标识器埋深") + { + if (value1!=null&&value1.Length>4) + value1 = value1.Substring(0,4); + } } } } @@ -3491,9 +3502,14 @@ if (field2 != null) { - if (field2.Name == "图片编码") + //if (field2.Name == "图片编码" || field1.Name == "对象编号" || field1.Name == "对象类型" || field1.Name == "对象名称") + //{ + // j++; + //} + while (field2.Name == "图片编码" || field2.Name == "对象编号" || field2.Name == "对象类型" || field2.Name == "对象名称") { j++; + field2 = (GSOFieldDefn)feature.GetFieldDefn(j + 1); } if (j + 1 < rowCount) { @@ -3521,6 +3537,11 @@ if (!feature.IsFieldValueNull(j + 1)) { value2 = feature.GetValue(j + 1).ToString(); + if (name2 == "标识器埋深") + { + if (value2 != null && value2.Length > 4) + value2 = value2.Substring(0, 4); + } } } } @@ -15347,7 +15368,7 @@ return; } FrmFlagManagers frm = new FrmFlagManagers(globeControl1); - frm.Show(this); + frm.Show(); } private void ribbonTabItem2_MouseDown(object sender, MouseEventArgs e) diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index fddfb94..e5f0003 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -365,6 +365,16 @@ this.可编辑ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.保存ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.ribbonControl1 = new DevComponents.DotNetBar.RibbonControl(); + this.ribbonPanel3 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar3 = new DevComponents.DotNetBar.RibbonBar(); + this.btn_device = new DevComponents.DotNetBar.ButtonItem(); + this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); + this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel7 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); + this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); + this.slider4ground = new DevComponents.DotNetBar.SliderItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -374,12 +384,6 @@ this.btn_user_role = new DevComponents.DotNetBar.ButtonItem(); this.btn_password_edit = new DevComponents.DotNetBar.ButtonItem(); this.btn_reset_password = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel3 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar3 = new DevComponents.DotNetBar.RibbonBar(); - this.btn_device = new DevComponents.DotNetBar.ButtonItem(); - this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); - this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); @@ -551,10 +555,6 @@ this.buttonItemBZ9 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItemBZ10 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItemBZ11 = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel7 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); - this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); - this.slider4ground = new DevComponents.DotNetBar.SliderItem(); this.ribbonPanel12 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar18 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItem133 = new DevComponents.DotNetBar.ButtonItem(); @@ -690,11 +690,11 @@ this.contextMenuStrip3.SuspendLayout(); this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); - this.ribbonPanel8.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel7.SuspendLayout(); + this.ribbonPanel8.SuspendLayout(); this.ribbonPanel2.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); - this.ribbonPanel7.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); this.ribbonPanel5.SuspendLayout(); this.ribbonPanel6.SuspendLayout(); @@ -4162,10 +4162,10 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); - this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel2); - this.ribbonControl1.Controls.Add(this.ribbonPanel15); + this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel7); + this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); this.ribbonControl1.Controls.Add(this.ribbonPanel5); this.ribbonControl1.Controls.Add(this.ribbonPanel6); @@ -4216,135 +4216,6 @@ this.ribbonControl1.UseCustomizeDialog = false; this.ribbonControl1.Click += new System.EventHandler(this.ribbonControl1_Click); // - // ribbonPanel8 - // - this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel8.Controls.Add(this.ribbonBar_UserInfo); - this.ribbonPanel8.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel8.Location = new System.Drawing.Point(0, 33); - this.ribbonPanel8.Name = "ribbonPanel8"; - this.ribbonPanel8.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel8.Size = new System.Drawing.Size(1328, 62); - // - // - // - this.ribbonPanel8.Style.Class = ""; - this.ribbonPanel8.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel8.StyleMouseDown.Class = ""; - this.ribbonPanel8.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel8.StyleMouseOver.Class = ""; - this.ribbonPanel8.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel8.TabIndex = 42; - this.ribbonPanel8.Visible = false; - // - // ribbonBar_UserInfo - // - this.ribbonBar_UserInfo.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar_UserInfo.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar_UserInfo.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar_UserInfo.BackgroundStyle.Class = ""; - this.ribbonBar_UserInfo.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar_UserInfo.ContainerControlProcessDialogKey = true; - this.ribbonBar_UserInfo.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar_UserInfo.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.btn_user_info, - this.btn_role_info, - this.btn_resc_info, - this.btn_role_resc, - this.btn_user_role, - this.btn_password_edit, - this.btn_reset_password}); - this.ribbonBar_UserInfo.Location = new System.Drawing.Point(3, 0); - this.ribbonBar_UserInfo.Name = "ribbonBar_UserInfo"; - this.ribbonBar_UserInfo.Size = new System.Drawing.Size(427, 59); - this.ribbonBar_UserInfo.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar_UserInfo.TabIndex = 0; - // - // - // - this.ribbonBar_UserInfo.TitleStyle.Class = ""; - this.ribbonBar_UserInfo.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar_UserInfo.TitleStyleMouseOver.Class = ""; - this.ribbonBar_UserInfo.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // btn_user_info - // - this.btn_user_info.Image = global::Cyberpipe.Properties.Resources._24x24icon_13_hover; - this.btn_user_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_user_info.Name = "btn_user_info"; - this.btn_user_info.SubItemsExpandWidth = 14; - this.btn_user_info.Text = "用户管理"; - this.btn_user_info.Click += new System.EventHandler(this.btn_user_info_Click); - // - // btn_role_info - // - this.btn_role_info.Image = global::Cyberpipe.Properties.Resources._24x24icon_05_hover1; - this.btn_role_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_role_info.Name = "btn_role_info"; - this.btn_role_info.SubItemsExpandWidth = 14; - this.btn_role_info.Text = "角色管理"; - this.btn_role_info.Click += new System.EventHandler(this.btn_role_info_Click); - // - // btn_resc_info - // - this.btn_resc_info.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__09; - this.btn_resc_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_resc_info.Name = "btn_resc_info"; - this.btn_resc_info.SubItemsExpandWidth = 14; - this.btn_resc_info.Text = "资源管理"; - this.btn_resc_info.Click += new System.EventHandler(this.btn_resc_info_Click); - // - // btn_role_resc - // - this.btn_role_resc.Image = global::Cyberpipe.Properties.Resources.btnlegendSet_Image_副本; - this.btn_role_resc.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_role_resc.Name = "btn_role_resc"; - this.btn_role_resc.SubItemsExpandWidth = 14; - this.btn_role_resc.Text = "角色授权"; - this.btn_role_resc.Click += new System.EventHandler(this.btn_role_resc_Click); - // - // btn_user_role - // - this.btn_user_role.Image = global::Cyberpipe.Properties.Resources._24x24icon_08_hover; - this.btn_user_role.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_user_role.Name = "btn_user_role"; - this.btn_user_role.SubItemsExpandWidth = 14; - this.btn_user_role.Text = "用户授权"; - this.btn_user_role.Click += new System.EventHandler(this.btn_user_role_Click); - // - // btn_password_edit - // - this.btn_password_edit.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__67; - this.btn_password_edit.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_password_edit.Name = "btn_password_edit"; - this.btn_password_edit.SubItemsExpandWidth = 14; - this.btn_password_edit.Text = "密码修改"; - this.btn_password_edit.Click += new System.EventHandler(this.btn_password_edit_Click); - // - // btn_reset_password - // - this.btn_reset_password.Image = global::Cyberpipe.Properties.Resources.liuxiang; - this.btn_reset_password.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_reset_password.Name = "btn_reset_password"; - this.btn_reset_password.SubItemsExpandWidth = 14; - this.btn_reset_password.Text = "重置密码"; - this.btn_reset_password.Click += new System.EventHandler(this.btn_reset_password_Click); - // // ribbonPanel3 // this.ribbonPanel3.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4425,7 +4296,7 @@ this.btn_Person.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; this.btn_Person.Name = "btn_Person"; this.btn_Person.SubItemsExpandWidth = 14; - this.btn_Person.Text = "巡检人员维护"; + this.btn_Person.Text = "定位人员维护"; this.btn_Person.Click += new System.EventHandler(this.btn_Person_Click); // // btn_constructMap @@ -4446,6 +4317,214 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel7 + // + this.ribbonPanel7.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel7.Controls.Add(this.ribbonBar5); + this.ribbonPanel7.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel7.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel7.Name = "ribbonPanel7"; + this.ribbonPanel7.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel7.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel7.Style.Class = ""; + this.ribbonPanel7.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel7.StyleMouseDown.Class = ""; + this.ribbonPanel7.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel7.StyleMouseOver.Class = ""; + this.ribbonPanel7.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel7.TabIndex = 41; + this.ribbonPanel7.Visible = false; + // + // ribbonBar5 + // + this.ribbonBar5.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar5.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar5.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar5.BackgroundStyle.Class = ""; + this.ribbonBar5.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar5.ContainerControlProcessDialogKey = true; + this.ribbonBar5.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar5.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.btn_flag, + this.slider4ground}); + this.ribbonBar5.Location = new System.Drawing.Point(3, 0); + this.ribbonBar5.Name = "ribbonBar5"; + this.ribbonBar5.Size = new System.Drawing.Size(427, 92); + this.ribbonBar5.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar5.TabIndex = 0; + // + // + // + this.ribbonBar5.TitleStyle.Class = ""; + this.ribbonBar5.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar5.TitleStyleMouseOver.Class = ""; + this.ribbonBar5.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar5.TitleVisible = false; + // + // btn_flag + // + this.btn_flag.Image = global::Cyberpipe.Properties.Resources._24x24icon_03_hover; + this.btn_flag.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_flag.Name = "btn_flag"; + this.btn_flag.SubItemsExpandWidth = 14; + this.btn_flag.Text = "标识器管理"; + this.btn_flag.Click += new System.EventHandler(this.btn_flag_Click); + // + // slider4ground + // + this.slider4ground.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; + this.slider4ground.Name = "slider4ground"; + this.slider4ground.Text = "地面透明度"; + this.slider4ground.Value = 0; + this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); + // + // ribbonPanel8 + // + this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel8.Controls.Add(this.ribbonBar_UserInfo); + this.ribbonPanel8.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel8.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel8.Name = "ribbonPanel8"; + this.ribbonPanel8.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel8.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel8.Style.Class = ""; + this.ribbonPanel8.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel8.StyleMouseDown.Class = ""; + this.ribbonPanel8.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel8.StyleMouseOver.Class = ""; + this.ribbonPanel8.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel8.TabIndex = 42; + this.ribbonPanel8.Visible = false; + // + // ribbonBar_UserInfo + // + this.ribbonBar_UserInfo.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar_UserInfo.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar_UserInfo.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar_UserInfo.BackgroundStyle.Class = ""; + this.ribbonBar_UserInfo.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar_UserInfo.ContainerControlProcessDialogKey = true; + this.ribbonBar_UserInfo.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar_UserInfo.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.btn_user_info, + this.btn_role_info, + this.btn_resc_info, + this.btn_role_resc, + this.btn_user_role, + this.btn_password_edit, + this.btn_reset_password}); + this.ribbonBar_UserInfo.Location = new System.Drawing.Point(3, 0); + this.ribbonBar_UserInfo.Name = "ribbonBar_UserInfo"; + this.ribbonBar_UserInfo.Size = new System.Drawing.Size(427, 92); + this.ribbonBar_UserInfo.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar_UserInfo.TabIndex = 0; + // + // + // + this.ribbonBar_UserInfo.TitleStyle.Class = ""; + this.ribbonBar_UserInfo.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar_UserInfo.TitleStyleMouseOver.Class = ""; + this.ribbonBar_UserInfo.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // btn_user_info + // + this.btn_user_info.Image = global::Cyberpipe.Properties.Resources._24x24icon_13_hover; + this.btn_user_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_user_info.Name = "btn_user_info"; + this.btn_user_info.SubItemsExpandWidth = 14; + this.btn_user_info.Text = "用户管理"; + this.btn_user_info.Click += new System.EventHandler(this.btn_user_info_Click); + // + // btn_role_info + // + this.btn_role_info.Image = global::Cyberpipe.Properties.Resources._24x24icon_05_hover1; + this.btn_role_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_role_info.Name = "btn_role_info"; + this.btn_role_info.SubItemsExpandWidth = 14; + this.btn_role_info.Text = "角色管理"; + this.btn_role_info.Click += new System.EventHandler(this.btn_role_info_Click); + // + // btn_resc_info + // + this.btn_resc_info.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__09; + this.btn_resc_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_resc_info.Name = "btn_resc_info"; + this.btn_resc_info.SubItemsExpandWidth = 14; + this.btn_resc_info.Text = "资源管理"; + this.btn_resc_info.Click += new System.EventHandler(this.btn_resc_info_Click); + // + // btn_role_resc + // + this.btn_role_resc.Image = global::Cyberpipe.Properties.Resources.btnlegendSet_Image_副本; + this.btn_role_resc.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_role_resc.Name = "btn_role_resc"; + this.btn_role_resc.SubItemsExpandWidth = 14; + this.btn_role_resc.Text = "角色授权"; + this.btn_role_resc.Click += new System.EventHandler(this.btn_role_resc_Click); + // + // btn_user_role + // + this.btn_user_role.Image = global::Cyberpipe.Properties.Resources._24x24icon_08_hover; + this.btn_user_role.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_user_role.Name = "btn_user_role"; + this.btn_user_role.SubItemsExpandWidth = 14; + this.btn_user_role.Text = "用户授权"; + this.btn_user_role.Click += new System.EventHandler(this.btn_user_role_Click); + // + // btn_password_edit + // + this.btn_password_edit.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__67; + this.btn_password_edit.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_password_edit.Name = "btn_password_edit"; + this.btn_password_edit.SubItemsExpandWidth = 14; + this.btn_password_edit.Text = "密码修改"; + this.btn_password_edit.Click += new System.EventHandler(this.btn_password_edit_Click); + // + // btn_reset_password + // + this.btn_reset_password.Image = global::Cyberpipe.Properties.Resources.liuxiang; + this.btn_reset_password.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_reset_password.Name = "btn_reset_password"; + this.btn_reset_password.SubItemsExpandWidth = 14; + this.btn_reset_password.Text = "重置密码"; + this.btn_reset_password.Click += new System.EventHandler(this.btn_reset_password_Click); + // // ribbonPanel2 // this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -5891,85 +5970,6 @@ this.buttonItemBZ11.Text = "标注管理"; this.buttonItemBZ11.Click += new System.EventHandler(this.buttonItemBZ11_Click); // - // ribbonPanel7 - // - this.ribbonPanel7.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel7.Controls.Add(this.ribbonBar5); - this.ribbonPanel7.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel7.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel7.Name = "ribbonPanel7"; - this.ribbonPanel7.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel7.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel7.Style.Class = ""; - this.ribbonPanel7.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel7.StyleMouseDown.Class = ""; - this.ribbonPanel7.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel7.StyleMouseOver.Class = ""; - this.ribbonPanel7.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel7.TabIndex = 41; - this.ribbonPanel7.Visible = false; - // - // ribbonBar5 - // - this.ribbonBar5.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar5.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar5.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar5.BackgroundStyle.Class = ""; - this.ribbonBar5.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar5.ContainerControlProcessDialogKey = true; - this.ribbonBar5.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar5.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.btn_flag, - this.slider4ground}); - this.ribbonBar5.Location = new System.Drawing.Point(3, 0); - this.ribbonBar5.Name = "ribbonBar5"; - this.ribbonBar5.Size = new System.Drawing.Size(427, 92); - this.ribbonBar5.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar5.TabIndex = 0; - // - // - // - this.ribbonBar5.TitleStyle.Class = ""; - this.ribbonBar5.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar5.TitleStyleMouseOver.Class = ""; - this.ribbonBar5.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar5.TitleVisible = false; - // - // btn_flag - // - this.btn_flag.Image = global::Cyberpipe.Properties.Resources._24x24icon_03_hover; - this.btn_flag.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_flag.Name = "btn_flag"; - this.btn_flag.SubItemsExpandWidth = 14; - this.btn_flag.Text = "标识器管理"; - this.btn_flag.Click += new System.EventHandler(this.btn_flag_Click); - // - // slider4ground - // - this.slider4ground.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; - this.slider4ground.Name = "slider4ground"; - this.slider4ground.Text = "地面透明度"; - this.slider4ground.Value = 0; - this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); - // // ribbonPanel12 // this.ribbonPanel12.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7181,11 +7181,11 @@ this.contextMenuStripDeleteLayerNode.ResumeLayout(false); this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); - this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel7.ResumeLayout(false); + this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); - this.ribbonPanel7.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); this.ribbonPanel5.ResumeLayout(false); this.ribbonPanel6.ResumeLayout(false); diff --git a/SysRescInfoManager.cs b/SysRescInfoManager.cs index 3a84d95..fda6f3f 100644 --- a/SysRescInfoManager.cs +++ b/SysRescInfoManager.cs @@ -79,11 +79,11 @@ //控制表格显示的列，以及每一列要显示的列名 this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - - this.winGridViewPager1.AddColumnAlias("RESC", "资源名称"); - this.winGridViewPager1.AddColumnAlias("ID", "编号"); - this.winGridViewPager1.AddColumnAlias("DESP", "资源描述"); - this.winGridViewPager1.DisplayColumns = "RESC,DESP"; + + this.winGridViewPager1.AddColumnAlias("资源名称", "资源名称"); + this.winGridViewPager1.AddColumnAlias("编号", "编号"); + this.winGridViewPager1.AddColumnAlias("资源描述", "资源描述"); + this.winGridViewPager1.DisplayColumns = "资源名称,资源描述"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -153,8 +153,8 @@ DataGridViewRow row = grid.SelectedRows[0]; if (MessageBox.Show("确定删除？", "确认", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) { - string dbid = row.Cells["id"].Value.ToString(); - string resc = row.Cells["resc"].Value.ToString(); + string dbid = row.Cells["编号"].Value.ToString(); + string resc = row.Cells["资源名称"].Value.ToString(); OracleConnection conn = null; OracleTransaction tran = null; try @@ -229,7 +229,7 @@ private string GetSql() { string sqlCount = "select count(*) from casic_userresctest where sysname='EMS'"; - string sqlData = "select resc,id,desp " + + string sqlData = "select resc as 资源名称,id as 编号,desp as 资源描述 " + "from (select t.*,rownum row_num from casic_userresctest t order by id desc)b " + " where sysname='EMS'"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -242,7 +242,7 @@ int minPage = (pageIndex - 1) * maxPageIndex + 1; int maxPage = pageIndex * maxPageIndex; string sqlCount = "select count(*) from casic_userresctest where sysname='EMS'"; - string sqlData = "select resc,id,desp " + + string sqlData = "select resc as 资源名称,id as 编号,desp as 资源描述 " + "from (select t.*,rownum row_num from casic_userresctest t where sysname='EMS' order by id desc)b " + " where(b.row_num between " + minPage + " and " + maxPage + ")"; diff --git a/bin/x86/Debug/Config.xml b/bin/x86/Debug/Config.xml index e2d7b46..560a163 100644 --- a/bin/x86/Debug/Config.xml +++ b/bin/x86/Debug/Config.xml @@ -3,9 +3,9 @@ LocaSpace三维地下管线信息系统 scott - SZHTDB - 127.0.0.1 - scott + SZHTDB2 + 192.168.0.203 + SZHTDB2 127.0.0.1 1500 @@ -14,8 +14,8 @@ http://192.168.0.122:8088/UpDownFile.asmx - http://127.0.0.1/EMSCyberpipe.msi - http://127.0.0.1/EMSConfig.xml + http://192.168.10.229/EMSCyberpipe.msi + http://192.168.10.229/EMSConfig.xml diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index b19e2ab..b5e320f 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 1a4aeed..c20e54a 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/PipelineType.xml b/bin/x86/Debug/PipelineType.xml index 51dc4b8..b1cbacc 100644 --- a/bin/x86/Debug/PipelineType.xml +++ b/bin/x86/Debug/PipelineType.xml @@ -1,6 +1,6 @@  - + @@ -42,7 +42,7 @@ - + @@ -83,7 +83,7 @@ - + @@ -115,7 +115,7 @@ - + @@ -159,7 +159,7 @@ - + @@ -200,7 +200,7 @@ - + @@ -236,7 +236,7 @@ - + @@ -278,7 +278,7 @@ - + @@ -320,7 +320,7 @@ - + @@ -363,7 +363,7 @@ - + @@ -408,7 +408,7 @@ - + @@ -448,7 +448,7 @@ - + @@ -485,7 +485,7 @@ - + @@ -527,7 +527,7 @@ - + @@ -565,7 +565,7 @@ - + @@ -595,7 +595,7 @@ - + @@ -625,7 +625,7 @@ - + @@ -657,7 +657,7 @@ - + @@ -691,7 +691,7 @@ - + @@ -728,7 +728,7 @@ - + @@ -763,7 +763,7 @@ - + @@ -799,7 +799,7 @@ - + @@ -824,7 +824,7 @@ - + @@ -846,7 +846,7 @@ - + diff --git a/obj/x86/Debug/Cyberpipe.csproj.FileListAbsolute.txt b/obj/x86/Debug/Cyberpipe.csproj.FileListAbsolute.txt index 42dc58c..b78c534 100644 --- a/obj/x86/Debug/Cyberpipe.csproj.FileListAbsolute.txt +++ b/obj/x86/Debug/Cyberpipe.csproj.FileListAbsolute.txt @@ -203,3 +203,4 @@ D:\ym\EMS+GHFX\EMS\obj\x86\Debug\EMSCyberpipe.pdb D:\ym\EMS+GHFX\EMS\obj\x86\Debug\Cyberpipe.FrmFlagManagers.resources D:\ym\EMS+GHFX\EMS\obj\x86\Debug\Cyberpipe.FrmFlagEdits.resources +D:\ym\EMS+GHFX\EMS\obj\x86\Debug\Cyberpipe.FrmFlagDetail.resources diff --git a/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache b/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache index 19b3415..cee9c4a 100644 --- a/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache +++ b/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache Binary files differ diff --git a/obj/x86/Debug/EMSCyberpipe.exe b/obj/x86/Debug/EMSCyberpipe.exe index b19e2ab..b5e320f 100644 --- a/obj/x86/Debug/EMSCyberpipe.exe +++ b/obj/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/Cyberpipe.csproj b/Cyberpipe.csproj index fe600e5..501fd09 100644 --- a/Cyberpipe.csproj +++ b/Cyberpipe.csproj @@ -246,6 +246,12 @@ Form_TaskManager.cs + + Form + + + FrmFlagDetail.cs + Form @@ -1368,6 +1374,9 @@ Form_TaskManager.cs + + FrmFlagDetail.cs + FormDocumentManager.cs diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 537b4c3..1acf22a 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 7d5dd95..3f178cb 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -90,20 +90,20 @@ this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - - this.winGridViewPager1.AddColumnAlias("ACCIDENTTIME", "上报时间"); - this.winGridViewPager1.AddColumnAlias("DBID", "编号"); - this.winGridViewPager1.AddColumnAlias("DESCRIBE", "事件描述"); - this.winGridViewPager1.AddColumnAlias("LATITUDE", "纬度"); - this.winGridViewPager1.AddColumnAlias("LOCALE", "事件地点"); - this.winGridViewPager1.AddColumnAlias("LONGITUDE", "经度"); - this.winGridViewPager1.AddColumnAlias("PATROLERNAME", "上报人员"); - this.winGridViewPager1.AddColumnAlias("PATROLER_ID", "人员ID"); - this.winGridViewPager1.AddColumnAlias("TASK_ID", "任务编号"); - this.winGridViewPager1.AddColumnAlias("RESULT", "处理结果"); - this.winGridViewPager1.AddColumnAlias("STATE", "处理状态"); - this.winGridViewPager1.DisplayColumns = "ACCIDENTTIME,DESCRIBE,LOCALE,PATROLERNAME,TASK_ID,RESULT,STATE"; + this.winGridViewPager1.AddColumnAlias("上报时间", "上报时间"); + this.winGridViewPager1.AddColumnAlias("编号", "编号"); + this.winGridViewPager1.AddColumnAlias("事件描述", "事件描述"); + this.winGridViewPager1.AddColumnAlias("纬度", "纬度"); + this.winGridViewPager1.AddColumnAlias("事件地点", "事件地点"); + this.winGridViewPager1.AddColumnAlias("经度", "经度"); + this.winGridViewPager1.AddColumnAlias("上报人员", "上报人员"); + this.winGridViewPager1.AddColumnAlias("人员ID", "人员ID"); + this.winGridViewPager1.AddColumnAlias("任务编号", "任务编号"); + this.winGridViewPager1.AddColumnAlias("处理结果", "处理结果"); + this.winGridViewPager1.AddColumnAlias("处理状态", "处理状态"); + + this.winGridViewPager1.DisplayColumns = "上报时间,事件描述,事件地点,上报人员,任务编号,处理结果,处理状态"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -114,8 +114,8 @@ winGridViewPager1.dataGridView1.ContextMenuStrip.Items[5].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[6].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[7].Visible = false; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[1].Text = "查看位置"; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "结果编辑"; + winGridViewPager1.dataGridView1.ContextMenuStrip.Items[1].Text = "结果编辑"; + winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "查看位置"; //右键菜单宽度 winGridViewPager1.dataGridView1.ContextMenuStrip.AutoSize = false; @@ -160,13 +160,12 @@ this.WindowState = FormWindowState.Minimized; globeControl1.Globe.MemoryLayer.RemoveAllFeature(); this.WindowState = FormWindowState.Minimized; - double x = Convert.ToDouble(row.Cells["LONGITUDE"].Value); - double y = Convert.ToDouble(row.Cells["LATITUDE"].Value); - - string username = Convert.ToString(row.Cells["PATROLERNAME"].Value); - string Atime = Convert.ToString(row.Cells["ACCIDENTTIME"].Value); - string location = Convert.ToString(row.Cells["LOCALE"].Value); - string descp = Convert.ToString(row.Cells["DESCRIBE"].Value); + double x = Convert.ToDouble(row.Cells["经度"].Value); + double y = Convert.ToDouble(row.Cells["纬度"].Value); + string username = Convert.ToString(row.Cells["上报人员"].Value); + string Atime = Convert.ToString(row.Cells["上报时间"].Value); + string location = Convert.ToString(row.Cells["事件地点"].Value); + string descp = Convert.ToString(row.Cells["事件描述"].Value); /////////////////////////////////////// /*******设置飞行与创建模型******/ @@ -228,8 +227,8 @@ DataGridViewRow row = grid.SelectedRows[0]; try { - int dbId = Convert.ToInt32(row.Cells["DBID"].Value); - string result = Convert.ToString(row.Cells["RESULT"].Value); + int dbId = Convert.ToInt32(row.Cells["编号"].Value); + string result = Convert.ToString(row.Cells["处理结果"].Value); EMS_Forms.Form_EventResult form = new Form_EventResult(dbId, result); form.refresh += new Form_EventResult.Handle(LoadData);//改变值的事件 form.ShowDialog(); @@ -276,9 +275,9 @@ } for (int i = 0; i < table.Rows.Count; i++) { - if (winGridViewPager1.dataGridView1.Rows[i].Cells["RESULT"].Value != null && !(winGridViewPager1.dataGridView1.Rows[i].Cells["RESULT"].Value.ToString().Trim().Equals(""))) + if (winGridViewPager1.dataGridView1.Rows[i].Cells["处理结果"].Value != null && !(winGridViewPager1.dataGridView1.Rows[i].Cells["处理结果"].Value.ToString().Trim().Equals(""))) { - winGridViewPager1.dataGridView1.Rows[i].Cells["STATE"].Value = "已处理"; + winGridViewPager1.dataGridView1.Rows[i].Cells["处理状态"].Value = "已处理"; } } @@ -307,9 +306,9 @@ } for (int i = 0; i < table.Rows.Count; i++) { - if (winGridViewPager1.dataGridView1.Rows[i].Cells["RESULT"].Value != null && !(winGridViewPager1.dataGridView1.Rows[i].Cells["RESULT"].Value.ToString().Trim().Equals(""))) + if (winGridViewPager1.dataGridView1.Rows[i].Cells["处理结果"].Value != null && !(winGridViewPager1.dataGridView1.Rows[i].Cells["处理结果"].Value.ToString().Trim().Equals(""))) { - winGridViewPager1.dataGridView1.Rows[i].Cells["STATE"].Value = "已处理"; + winGridViewPager1.dataGridView1.Rows[i].Cells["处理状态"].Value = "已处理"; } } @@ -320,10 +319,12 @@ { string sqlCount = "select count(*) from ACCIDENT where 1=1"; - string sqlData = "select ACCIDENTTIME,DBID,DESCRIBE,LATITUDE,LOCALE,LONGITUDE,PATROLERNAME,PATROLER_ID,TASK_ID,RESULT,'' as STATE " + + string sqlData = "select ACCIDENTTIME as 上报时间,DBID as 编号,DESCRIBE as 事件描述,"+ + "LATITUDE as 纬度,LOCALE as 事件地点,LONGITUDE as 经度,PATROLERNAME 上报人员,"+ + "PATROLER_ID as 人员ID,TASK_ID as 任务编号,RESULT as 处理结果,'' as 处理状态 " + "from (select t.*,rownum row_num from ACCIDENT t order by DBID)b " + " where 1=1"; - + rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; @@ -340,9 +341,10 @@ string sqlCount = "select count(*) from ACCIDENT where 1=1"; - string sqlData = "select ACCIDENTTIME,DBID,DESCRIBE,LATITUDE,LOCALE,LONGITUDE,PATROLERNAME,PATROLER_ID,TASK_ID,RESULT,'' as STATE " + - "from (select t.*,rownum row_num from ACCIDENT t order by DBID)b " + - " where(b.row_num between " + minPage + " and " + maxPage + ")"; + string sqlData = "select ACCIDENTTIME as 上报时间,DBID as 编号,DESCRIBE as 事件描述," + + "LATITUDE as 纬度,LOCALE as 事件地点,LONGITUDE as 经度,PATROLERNAME 上报人员," + + "PATROLER_ID as 人员ID,TASK_ID as 任务编号,RESULT as 处理结果,'' as 处理状态 " + + "from (select t.*,rownum row_num from ACCIDENT t where 1=1"; if (!String.IsNullOrEmpty(comboBox_name.Text.Trim())) { @@ -361,7 +363,8 @@ sqlCount += "and ACCIDENTTIME<=to_date('" + time.ToShortDateString() + "','yyyy-MM-dd') "; sqlData += "and ACCIDENTTIME<=to_date('" + time.ToShortDateString() + "','yyyy-MM-dd') "; } - + sqlData += " order by DBID desc)b " + + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 225c8d7..8bd9e48 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -120,8 +120,8 @@ private void flyToTask(DataGridViewRow row, int taskState) { int dbID = 0; - dbID = Convert.ToInt32(row.Cells["DBID"].Value); - string userName = Convert.ToString(row.Cells["USERNAME"].Value); + dbID = Convert.ToInt32(row.Cells["任务编号"].Value); + string userName = Convert.ToString(row.Cells["任务执行人员"].Value); System.DateTime t = new DateTime(); try { @@ -392,15 +392,15 @@ //控制表格显示的列，以及每一列要显示的列名 this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - this.winGridViewPager1.AddColumnAlias("DBID", "任务编号"); - this.winGridViewPager1.AddColumnAlias("DEPLOYTIME", "创建时间"); - this.winGridViewPager1.AddColumnAlias("DESCIRPTION", "任务描述"); - this.winGridViewPager1.AddColumnAlias("FINISHTIME", "完成时间"); - this.winGridViewPager1.AddColumnAlias("STREET", "任务执行区域"); - this.winGridViewPager1.AddColumnAlias("TASKSTATE", "任务状态"); - this.winGridViewPager1.AddColumnAlias("USERNAME", "任务执行人员"); + this.winGridViewPager1.AddColumnAlias("任务编号", "任务编号"); + this.winGridViewPager1.AddColumnAlias("创建时间", "创建时间"); + this.winGridViewPager1.AddColumnAlias("任务描述", "任务描述"); + this.winGridViewPager1.AddColumnAlias("完成时间", "完成时间"); + this.winGridViewPager1.AddColumnAlias("任务执行区域", "任务执行区域"); + this.winGridViewPager1.AddColumnAlias("任务状态", "任务状态"); + this.winGridViewPager1.AddColumnAlias("任务执行人员", "任务执行人员"); - this.winGridViewPager1.DisplayColumns = "DBID,DEPLOYTIME,DESCIRPTION,FINISHTIME,STREET,TASKSTATE,USERNAME"; + this.winGridViewPager1.DisplayColumns = "任务编号,创建时间,任务描述,完成时间,任务执行区域,任务状态,任务执行人员"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -464,8 +464,8 @@ { int dbID = 0; int taskStateInt = 0; - dbID = Convert.ToInt32(row.Cells["DBID"].Value); - string taskState = row.Cells["TASKSTATE"].Value.ToString(); + dbID = Convert.ToInt32(row.Cells["任务编号"].Value); + string taskState = row.Cells["任务状态"].Value.ToString(); if (taskState.Equals("开始任务")) { taskStateInt = 1; @@ -534,9 +534,10 @@ private string GetSql() { - string sqlCount = "select count(*) from taskinfo t where 1=1'"; + string sqlCount = "select count(*) from taskinfo t where 1=1"; - string sqlData = "select dbid,deploytime,descirption,finishtime,street,taskstate,username " + + 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"; @@ -550,9 +551,9 @@ int minPage = (pageIndex - 1) * maxPageIndex + 1; int maxPage = pageIndex * maxPageIndex; string sqlCount = "select count(*) from taskinfo t where 1=1"; - string sqlData = "select dbid,deploytime,descirption,finishtime,street,taskstate,username " + - "from (select t.*,rownum row_num from taskinfo t order by DBID desc)b " + - " where(b.row_num between " + minPage + " and " + maxPage + ")"; + 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"; if (!String.IsNullOrEmpty(comboBox_userName.Text.Trim()) && !comboBox_userName.Text.Trim().Equals("不限")) { @@ -581,6 +582,8 @@ sqlCount += "and street='" + combo_street.Text + "' "; sqlData += "and street='" + combo_street.Text + "' "; } + sqlData += " order by DBID desc)b " + + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index e65a4bd..58f5342 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -73,13 +73,13 @@ //控制表格显示的列，以及每一列要显示的列名 this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - this.winGridViewPager1.AddColumnAlias("FILENAME", "文档名称"); - this.winGridViewPager1.AddColumnAlias("DBID", "编号"); - this.winGridViewPager1.AddColumnAlias("TITLE", "文档标题"); - this.winGridViewPager1.AddColumnAlias("FILETYPE", "文档类型"); - this.winGridViewPager1.AddColumnAlias("UPDAY", "上传日期"); - this.winGridViewPager1.AddColumnAlias("WRITER", "上传人"); - this.winGridViewPager1.DisplayColumns = "FILENAME,TITLE,FILETYPE,UPDAY,WRITER"; + this.winGridViewPager1.AddColumnAlias("文档名称", "文档名称"); + this.winGridViewPager1.AddColumnAlias("编号", "编号"); + this.winGridViewPager1.AddColumnAlias("文档标题", "文档标题"); + this.winGridViewPager1.AddColumnAlias("文档类型", "文档类型"); + this.winGridViewPager1.AddColumnAlias("上传日期", "上传日期"); + this.winGridViewPager1.AddColumnAlias("上传人", "上传人"); + this.winGridViewPager1.DisplayColumns = "文档名称,文档标题,文档类型,上传日期,上传人"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -167,7 +167,7 @@ if (grid != null) { DataGridViewRow row = grid.SelectedRows[0]; - string dbid = row.Cells["dbid"].Value.ToString(); + string dbid = row.Cells["编号"].Value.ToString(); try { if (MessageBox.Show("确认删除吗？", "确认", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) @@ -212,7 +212,8 @@ { string sqlCount = "select count(*) from casic_userdocument where sysname = 'EMS'"; - string sqlData = "select filename,dbid,title,filetype,upday,writer " + + string sqlData = "select filename as 文档名称,dbid as 编号,title as 文档标题," + + "filetype as 文档类型,upday as 上传日期,writer as 上传人 " + "from (select t.*,rownum row_num from casic_userdocument t order by DBID desc)b " + " where sysname = 'EMS'"; @@ -226,9 +227,9 @@ int minPage = (pageIndex - 1) * maxPageIndex + 1; int maxPage = pageIndex * maxPageIndex; string sqlCount = "select count(*) from casic_userdocument where sysname = 'EMS'"; - string sqlData = "select filename,dbid,title,filetype,upday,writer " + - "from (select t.*,rownum row_num from casic_userdocument t where sysname = 'EMS' order by DBID desc)b " + - " where(b.row_num between " + minPage + " and " + maxPage + ")"; + string sqlData = "select filename as 文档名称,dbid as 编号,title as 文档标题,"+ + "filetype as 文档类型,upday as 上传日期,writer as 上传人 " + + "from (select t.*,rownum row_num from casic_userdocument t where sysname = 'EMS'"; string txtTitleText = null; string comboFileType = null; @@ -278,7 +279,8 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - + sqlData += " order by DBID desc)b " + + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; @@ -437,7 +439,7 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - string filename = row.Cells["filename"].Value.ToString(); + string filename = row.Cells["文档名称"].Value.ToString(); string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; string file = System.Environment.CurrentDirectory + "\\download\\" + filename; int result = DownloadFile(url, file, progressBar1); @@ -515,7 +517,7 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - string filename = row.Cells["filename"].Value.ToString(); + string filename = row.Cells["文档名称"].Value.ToString(); string ext = Path.GetExtension(filename); SaveFileDialog dlg = new SaveFileDialog(); dlg.Filter = "保存文档|*" + ext + ";"; diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 1d1201b..3902629 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -748,6 +748,7 @@ this.Name = "FrmAddSinMark"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "单个标识器添加"; + this.TopMost = true; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmAddSinMark_FormClosing); this.Load += new System.EventHandler(this.FrmAddSinMark_Load); this.groupPanel1.ResumeLayout(false); diff --git a/FrmEquipmentManage.cs b/FrmEquipmentManage.cs index 90bfdb2..a3cf55c 100644 --- a/FrmEquipmentManage.cs +++ b/FrmEquipmentManage.cs @@ -74,13 +74,13 @@ //控制表格显示的列，以及每一列要显示的列名 this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - this.winGridViewPager1.AddColumnAlias("DESCIRPTION", "设备描述"); - this.winGridViewPager1.AddColumnAlias("DBID", "编号"); - this.winGridViewPager1.AddColumnAlias("MACID", "MAC地址"); - this.winGridViewPager1.AddColumnAlias("OWNER", "设备所有人"); - this.winGridViewPager1.AddColumnAlias("STATUS", "设备状态"); + this.winGridViewPager1.AddColumnAlias("设备描述", "设备描述"); + this.winGridViewPager1.AddColumnAlias("编号", "编号"); + this.winGridViewPager1.AddColumnAlias("MAC地址", "MAC地址"); + this.winGridViewPager1.AddColumnAlias("设备所有人", "设备所有人"); + this.winGridViewPager1.AddColumnAlias("设备状态", "设备状态"); - this.winGridViewPager1.DisplayColumns = "DESCIRPTION,MACID,OWNER,STATUS"; + this.winGridViewPager1.DisplayColumns = "设备描述,MAC地址,设备所有人,设备状态"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -146,10 +146,10 @@ DataGridViewRow row = grid.SelectedRows[0]; try { - long dbid = long.Parse(row.Cells["DBID"].Value.ToString()); - String macId = row.Cells["MACID"].Value.ToString(); - String username = row.Cells["OWNER"].Value.ToString(); - String descn = row.Cells["DESCIRPTION"].Value.ToString(); + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); + String macId = row.Cells["MAC地址"].Value.ToString(); + String username = row.Cells["设备所有人"].Value.ToString(); + String descn = row.Cells["设备状态"].Value.ToString(); FrmEquipmentEdit frm = new FrmEquipmentEdit(dbid.ToString(), macId, username, descn); frm.reloadGrid += new ReloadEquipmentGrid(LoadData); frm.ShowDialog(); @@ -179,7 +179,7 @@ { return; } - String macId = row.Cells["MACID"].Value.ToString(); + String macId = row.Cells["MAC地址"].Value.ToString(); FrmLog frm = new FrmLog(macId); frm.Show(); } @@ -201,7 +201,7 @@ if (grid != null) { DataGridViewRow row = grid.SelectedRows[0]; - long dbid = long.Parse(row.Cells["DBID"].Value.ToString()); + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); try { if (MessageBox.Show("确定删除？", "确认", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) @@ -243,7 +243,8 @@ { string sqlCount = "select count(*) from equipment where status = 'USING'"; - string sqlData = "select descirption,DBID,macid,owner,case when status = 'USING' then '可用' when status = 'DAMAGE' then '损坏' end as status " + + string sqlData = "select descirption as 设备描述,DBID as 编号,macid as MAC地址,owner as 设备所有人,"+ + "case when status = 'USING' then '可用' when status = 'DAMAGE' then '损坏' end as 设备状态 " + "from (select t.*,rownum row_num from equipment t where status = 'USING' order by dbid desc)b " + " where 1=1"; @@ -258,16 +259,17 @@ int maxPage = pageIndex * maxPageIndex; string sqlCount = "select count(*) from equipment where status = 'USING' "; - string sqlData = "select descirption,DBID,macid,owner,case when status = 'USING' then '可用' when status = 'DAMAGE' then '损坏' end as status " + - "from (select t.*,rownum row_num from equipment t where status = 'USING' order by DBID desc)b " + - " where(b.row_num between " + minPage + " and " + maxPage + ")"; + string sqlData = "select descirption as 设备描述,DBID as 编号,macid as MAC地址,owner as 设备所有人," + + "case when status = 'USING' then '可用' when status = 'DAMAGE' then '损坏' end as 设备状态 " + + "from (select t.*,rownum row_num from equipment t where status = 'USING'"; if (!String.IsNullOrEmpty(txtMacId.Text.Trim())) { sqlData += " and macid like '%" + txtMacId.Text.Trim() + "%'"; sqlCount += " and macid like '%" + txtMacId.Text.Trim() + "%'"; } - + sqlData += " order by DBID desc)b " + + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; @@ -299,76 +301,6 @@ } } - //public void reloadGrid(int pageIndex) - //{ - // if (pageIndex <= 0) - // { - // pageIndex = 1; - // currentpage = 1; - // } - // String sqlrows = "select * from (select rownum as rowno,dbid,descirption,macid,owner,case when status = 'USING' then '可用' when status = 'DAMAGE' then '损坏' end as status,'编辑' as btnEdit,'删除' as btnDel from equipment t where status = 'USING' "; - // string sqlcount = "select count(*) from equipment where status = 'USING' "; - // if (!String.IsNullOrEmpty(txtMacId.Text.Trim())) - // { - // sqlrows += " and macid like '%" + txtMacId.Text.Trim() + "%'"; - // sqlcount += " and macid like '%" + txtMacId.Text.Trim() + "%'"; - // } - // sqlrows += " and rownum<=" + (pagesize * pageIndex) + ") table_alias where table_alias.rowno>=" + ((pageIndex - 1) * pagesize + 1); - - // int rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlcount).ToString()); - // int pages = 0; - // if (rows % pagesize == 0) - // { - // pages = rows / pagesize; - // } - // else - // { - // pages = rows / pagesize + 1; - // } - - // lastpage = pages; - - // lab_page_msg.Text = "共" + rows + "条记录，每页" + pagesize + "条，第" + pageIndex + "页，共" + pages + "页"; - // combo_page_num.Items.Clear(); - // for (int i = 1; i <= pages; i++) - // { - // combo_page_num.Items.Add(new ComboBoxItem(i.ToString(), i.ToString())); - // } - - // if (lastpage == 1) - // { - // btn_page_first.Enabled = false; - // btn_page_pre.Enabled = false; - // btn_page_last.Enabled = false; - // btn_page_next.Enabled = false; - // } - // else if (currentpage == 1) - // { - // btn_page_first.Enabled = false; - // btn_page_pre.Enabled = false; - // btn_page_last.Enabled = true; - // btn_page_next.Enabled = true; - // } - // else if (currentpage == lastpage) - // { - // btn_page_first.Enabled = true; - // btn_page_pre.Enabled = true; - // btn_page_last.Enabled = false; - // btn_page_next.Enabled = false; - // } - // else - // { - // btn_page_first.Enabled = true; - // btn_page_pre.Enabled = true; - // btn_page_last.Enabled = true; - // btn_page_next.Enabled = true; - // } - - // DataTable table = OracleUtils.ExecuteDataset(OracleUtils.ConnectionString, CommandType.Text, sqlrows).Tables[0]; - // dataGridViewX1.DataSource = table; - - //} - private void FrmEquipmentManage_FormClosing(object sender, FormClosingEventArgs e) diff --git a/FrmFlagDetail.Designer.cs b/FrmFlagDetail.Designer.cs new file mode 100644 index 0000000..982bfc6 --- /dev/null +++ b/FrmFlagDetail.Designer.cs @@ -0,0 +1,103 @@ +namespace Cyberpipe +{ + partial class FrmFlagDetail + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); + this.dataGridViewX_markDetail = new DevComponents.DotNetBar.Controls.DataGridViewX(); + this.对象类型 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.对象编号 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.对象名称 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX_markDetail)).BeginInit(); + this.SuspendLayout(); + // + // dataGridViewX_markDetail + // + this.dataGridViewX_markDetail.AllowUserToAddRows = false; + this.dataGridViewX_markDetail.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; + this.dataGridViewX_markDetail.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dataGridViewX_markDetail.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.对象类型, + this.对象编号, + this.对象名称}); + dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle3.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dataGridViewX_markDetail.DefaultCellStyle = dataGridViewCellStyle3; + this.dataGridViewX_markDetail.Dock = System.Windows.Forms.DockStyle.Fill; + this.dataGridViewX_markDetail.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(170)))), ((int)(((byte)(170)))), ((int)(((byte)(170))))); + this.dataGridViewX_markDetail.Location = new System.Drawing.Point(0, 0); + this.dataGridViewX_markDetail.Name = "dataGridViewX_markDetail"; + this.dataGridViewX_markDetail.RowTemplate.Height = 23; + this.dataGridViewX_markDetail.Size = new System.Drawing.Size(508, 321); + this.dataGridViewX_markDetail.TabIndex = 0; + // + // 对象类型 + // + this.对象类型.HeaderText = "对象类型"; + this.对象类型.Name = "对象类型"; + // + // 对象编号 + // + this.对象编号.HeaderText = "对象编号"; + this.对象编号.Name = "对象编号"; + // + // 对象名称 + // + this.对象名称.HeaderText = "对象名称"; + this.对象名称.Name = "对象名称"; + // + // FrmFlagDetail + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(508, 321); + this.Controls.Add(this.dataGridViewX_markDetail); + this.Name = "FrmFlagDetail"; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; + this.Text = "标识对象信息"; + this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmFlagDetail_FormClosing); + this.Load += new System.EventHandler(this.FrmFlagDetail_Load); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX_markDetail)).EndInit(); + this.ResumeLayout(false); + + } + + #endregion + + private DevComponents.DotNetBar.Controls.DataGridViewX dataGridViewX_markDetail; + private System.Windows.Forms.DataGridViewTextBoxColumn 对象类型; + private System.Windows.Forms.DataGridViewTextBoxColumn 对象编号; + private System.Windows.Forms.DataGridViewTextBoxColumn 对象名称; + + } +} \ No newline at end of file diff --git a/FrmFlagDetail.cs b/FrmFlagDetail.cs new file mode 100644 index 0000000..81de974 --- /dev/null +++ b/FrmFlagDetail.cs @@ -0,0 +1,77 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Windows.Forms; +using GeoScene.Globe; +using System.Data.OracleClient; + +namespace Cyberpipe +{ + public partial class FrmFlagDetail : Form + { + DataTable dt = new DataTable(); + private GSOGlobeControl globeControl1; + + public delegate void Handle(); + public event Handle showParentForm; + String markId; + + public FrmFlagDetail(GSOGlobeControl globeControl1, String id) + { + InitializeComponent(); + this.markId = id; + } + + private void FrmFlagDetail_FormClosing(object sender, FormClosingEventArgs e) + { + showParentForm(); + } + + private void FrmFlagDetail_Load(object sender, EventArgs e) + { + string objectIds = ""; + string objectTypeCodes = ""; + string sql = "select t.对象编号,t.对象类型 from 标识器 t where t.编号='" + markId + "'"; + using (OracleDataReader reader = OracleUtils.ExecuteReader(OracleUtils.ConnectionString, CommandType.Text, sql)) + { + while (reader.Read()) + { + objectIds = reader.GetString(0); + objectTypeCodes = reader.GetString(1); + } + } + + string[] codeTypes = objectTypeCodes.Split(','); + string[] codeIds = objectIds.Split(','); + int length = 0; + if (codeTypes.Length <= codeIds.Length) + { + length = codeTypes.Length; + } + else + { + length = codeIds.Length; + } + for (int n = 0; n < length; n++) + { + for (int i = 0; i < Utility1.listPipelineType.Count; i++) + { + if (Utility1.listPipelineType[i].code == codeTypes[n]) + { + //string objectId = codeIds[i]; + //string objectType = Utility1.listPipelineType[i].type; + //string objectName = Utility1.listPipelineType[i].name; + int index = this.dataGridViewX_markDetail.Rows.Add(); + this.dataGridViewX_markDetail.Rows[index].Cells[0].Value = Utility1.listPipelineType[i].type; + this.dataGridViewX_markDetail.Rows[index].Cells[1].Value = codeIds[n].ToString(); + this.dataGridViewX_markDetail.Rows[index].Cells[2].Value = Utility1.listPipelineType[i].name; + } + } + } + } + } +} diff --git a/FrmFlagDetail.resx b/FrmFlagDetail.resx new file mode 100644 index 0000000..e98a8fe --- /dev/null +++ b/FrmFlagDetail.resx @@ -0,0 +1,129 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + True + + + True + + + True + + \ No newline at end of file diff --git a/FrmFlagManagers.Designer.cs b/FrmFlagManagers.Designer.cs index d7e2f60..9fe14fb 100644 --- a/FrmFlagManagers.Designer.cs +++ b/FrmFlagManagers.Designer.cs @@ -28,8 +28,10 @@ /// private void InitializeComponent() { - this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); - this.winGridViewPager1 = new WHC.Pager.WinControl.WinGridViewPager(); + this.components = new System.ComponentModel.Container(); + this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components); + this.标识对象ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripMenuItem2 = new System.Windows.Forms.ToolStripMenuItem(); this.bar1 = new DevComponents.DotNetBar.Bar(); this.labelItem1 = new DevComponents.DotNetBar.LabelItem(); this.txt_no = new DevComponents.DotNetBar.TextBoxItem(); @@ -38,45 +40,37 @@ this.btn_query = new DevComponents.DotNetBar.ButtonItem(); this.btn_add_batch = new DevComponents.DotNetBar.ButtonItem(); this.btn_add_menu = new DevComponents.DotNetBar.ButtonItem(); - this.btn_db = new DevComponents.DotNetBar.ButtonItem(); - this.tableLayoutPanel1.SuspendLayout(); + this.winGridViewPager1 = new WHC.Pager.WinControl.WinGridViewPager(); + this.contextMenuStrip1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.bar1)).BeginInit(); this.SuspendLayout(); // - // tableLayoutPanel1 + // contextMenuStrip1 // - this.tableLayoutPanel1.ColumnCount = 1; - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel1.Controls.Add(this.winGridViewPager1, 0, 1); - this.tableLayoutPanel1.Controls.Add(this.bar1, 0, 0); - this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 0); - this.tableLayoutPanel1.Name = "tableLayoutPanel1"; - this.tableLayoutPanel1.RowCount = 2; - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 32F)); - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel1.Size = new System.Drawing.Size(881, 474); - this.tableLayoutPanel1.TabIndex = 6; + this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.标识对象ToolStripMenuItem, + this.toolStripMenuItem2}); + this.contextMenuStrip1.Name = "contextMenuStrip1"; + this.contextMenuStrip1.Size = new System.Drawing.Size(125, 48); // - // winGridViewPager1 + // 标识对象ToolStripMenuItem // - this.winGridViewPager1.AppendedMenu = null; - this.winGridViewPager1.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; - this.winGridViewPager1.DataSource = null; - this.winGridViewPager1.DisplayColumns = ""; - this.winGridViewPager1.Dock = System.Windows.Forms.DockStyle.Fill; - this.winGridViewPager1.Location = new System.Drawing.Point(3, 35); - this.winGridViewPager1.MinimumSize = new System.Drawing.Size(540, 0); - this.winGridViewPager1.Name = "winGridViewPager1"; - this.winGridViewPager1.PrintTitle = ""; - this.winGridViewPager1.Size = new System.Drawing.Size(875, 436); - this.winGridViewPager1.TabIndex = 5; + this.标识对象ToolStripMenuItem.Name = "标识对象ToolStripMenuItem"; + this.标识对象ToolStripMenuItem.Size = new System.Drawing.Size(124, 22); + this.标识对象ToolStripMenuItem.Text = "标识对象"; + this.标识对象ToolStripMenuItem.Click += new System.EventHandler(this.标识对象ToolStripMenuItem_Click); + // + // toolStripMenuItem2 + // + this.toolStripMenuItem2.Name = "toolStripMenuItem2"; + this.toolStripMenuItem2.Size = new System.Drawing.Size(152, 22); + this.toolStripMenuItem2.Text = "查看位置"; + this.toolStripMenuItem2.Click += new System.EventHandler(this.toolStripMenuItem2_Click); // // bar1 // this.bar1.AntiAlias = true; this.bar1.Dock = System.Windows.Forms.DockStyle.Top; - this.bar1.DockSide = DevComponents.DotNetBar.eDockSide.Document; this.bar1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.labelItem1, this.txt_no, @@ -84,14 +78,13 @@ this.combo_street, this.btn_query, this.btn_add_batch, - this.btn_add_menu, - this.btn_db}); - this.bar1.Location = new System.Drawing.Point(3, 3); + this.btn_add_menu}); + this.bar1.Location = new System.Drawing.Point(0, 0); this.bar1.Name = "bar1"; - this.bar1.Size = new System.Drawing.Size(875, 28); + this.bar1.Size = new System.Drawing.Size(881, 28); this.bar1.Stretch = true; this.bar1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.bar1.TabIndex = 1; + this.bar1.TabIndex = 8; this.bar1.TabStop = false; this.bar1.Text = "bar1"; // @@ -136,24 +129,34 @@ this.btn_add_menu.Text = "手工添加"; this.btn_add_menu.Click += new System.EventHandler(this.btn_add_menu_Click); // - // btn_db + // winGridViewPager1 // - this.btn_db.Name = "btn_db"; - this.btn_db.Text = "数据导出"; + this.winGridViewPager1.AppendedMenu = null; + this.winGridViewPager1.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; + this.winGridViewPager1.DataSource = null; + this.winGridViewPager1.DisplayColumns = ""; + this.winGridViewPager1.Dock = System.Windows.Forms.DockStyle.Fill; + this.winGridViewPager1.Location = new System.Drawing.Point(0, 28); + this.winGridViewPager1.MinimumSize = new System.Drawing.Size(540, 0); + this.winGridViewPager1.Name = "winGridViewPager1"; + this.winGridViewPager1.PrintTitle = ""; + this.winGridViewPager1.Size = new System.Drawing.Size(881, 446); + this.winGridViewPager1.TabIndex = 9; // // FrmFlagManagers // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(881, 474); - this.Controls.Add(this.tableLayoutPanel1); + this.Controls.Add(this.winGridViewPager1); + this.Controls.Add(this.bar1); this.DoubleBuffered = true; this.Name = "FrmFlagManagers"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "标识器管理"; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmFlagManagers_FormClosing); this.Load += new System.EventHandler(this.FrmFlagManagers_Load); - this.tableLayoutPanel1.ResumeLayout(false); + this.contextMenuStrip1.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.bar1)).EndInit(); this.ResumeLayout(false); @@ -161,8 +164,8 @@ #endregion - private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1; - private WHC.Pager.WinControl.WinGridViewPager winGridViewPager1; + private System.Windows.Forms.ContextMenuStrip contextMenuStrip1; + private System.Windows.Forms.ToolStripMenuItem 标识对象ToolStripMenuItem; private DevComponents.DotNetBar.Bar bar1; private DevComponents.DotNetBar.LabelItem labelItem1; private DevComponents.DotNetBar.TextBoxItem txt_no; @@ -171,6 +174,7 @@ private DevComponents.DotNetBar.ButtonItem btn_query; private DevComponents.DotNetBar.ButtonItem btn_add_batch; private DevComponents.DotNetBar.ButtonItem btn_add_menu; - private DevComponents.DotNetBar.ButtonItem btn_db; + private WHC.Pager.WinControl.WinGridViewPager winGridViewPager1; + private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem2; } } \ No newline at end of file diff --git a/FrmFlagManagers.cs b/FrmFlagManagers.cs index 38d4927..9bf9734 100644 --- a/FrmFlagManagers.cs +++ b/FrmFlagManagers.cs @@ -33,15 +33,13 @@ { this.globeControl1 = _globeControl1; InitializeComponent(); - winGridViewPager1.OnPageChanged += new EventHandler(winGridViewPager1_OnPageChanged); - this.winGridViewPager1.OnAddNew += new EventHandler(winGridViewPager1_OnAddNew); //右键定位 + winGridViewPager1.OnPageChanged += new EventHandler(winGridViewPager1_OnPageChanged); this.winGridViewPager1.OnEditSelected += new EventHandler(winGridViewPager1_OnEditSelected);//属性编辑 this.winGridViewPager1.OnDeleteSelected += new EventHandler(winGridViewPager1_OnDeleteSelected);//标识器报废 + this.winGridViewPager1.OnStartExport += new EventHandler(pager1_OnStartExport); this.winGridViewPager1.OnEndExport += new EventHandler(pager1_OnEndExport); - //this.winGridViewPager1.ExportCurrent += new ExportCurrentEventHandler(pager1_ExportCurrent); - //this.winGridViewPager1.ExportAll += new ExportAllEventHandler(pager1_ExportAll); winGridViewPager1.dataGridView1.MultiSelect = false; @@ -76,26 +74,25 @@ this.winGridViewPager1.AddColumnAlias("标识器型号", "标识器型号"); this.winGridViewPager1.AddColumnAlias("地面高程", "地面高程"); this.winGridViewPager1.AddColumnAlias("标识器埋深", "标识器埋深"); - this.winGridViewPager1.AddColumnAlias("对象编号", "对象编号"); - this.winGridViewPager1.AddColumnAlias("对象类型", "对象类型"); this.winGridViewPager1.AddColumnAlias("所属道路", "所属道路"); this.winGridViewPager1.AddColumnAlias("使用状态", "使用状态"); - this.winGridViewPager1.DisplayColumns = "编号,标识器ID号,标识器型号,地面高程,标识器埋深,对象编号,对象类型,所属道路,使用状态"; + this.winGridViewPager1.DisplayColumns = "编号,标识器ID号,标识器型号,地面高程,标识器埋深,所属道路,使用状态"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 //隐藏右键功能按钮 //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[1].Visible = false; - //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[4].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[5].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[6].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[7].Visible = false; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[1].Text = "定位查看"; + //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[1].Text = "定位查看"; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "属性编辑"; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Text = "标识器报废"; + winGridViewPager1.AppendedMenu = this.contextMenuStrip1; + //右键菜单宽度 winGridViewPager1.dataGridView1.ContextMenuStrip.AutoSize = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Width = 150; @@ -153,7 +150,7 @@ } /// - /// 右键定位 + /// 对象查看 /// /// /// @@ -306,20 +303,10 @@ string sqlCount = "select count(*) from 标识器 where 使用状态 = '使用中'"; - string sqlData = "select 编号,标识器ID号,标识器型号,地面高程,标识器埋深,对象编号,对象类型,所属道路,LSSYS_ID,X坐标,Y坐标,使用状态 " + + string sqlData = "select 编号,标识器ID号,标识器型号,地面高程,标识器埋深,所属道路,LSSYS_ID,X坐标,Y坐标,使用状态 " + "from (select t.*,rownum row_num from 标识器 t where 使用状态 = '使用中' order by 编号)b " + " where 1=1"; - if (!String.IsNullOrEmpty(txt_no.Text.Trim())) - { - sqlCount += " and 编号 like '%" + txt_no.Text.Trim() + "%'"; - sqlData += " and 编号 like '%" + txt_no.Text.Trim() + "%'"; - } - if (null != combo_street.SelectedItem && !String.IsNullOrEmpty(combo_street.SelectedItem.ToString().Trim())) - { - sqlData += " and 所属道路='" + combo_street.SelectedItem.ToString().Trim() + "'"; - sqlCount += " and 所属道路='" + combo_street.SelectedItem.ToString().Trim() + "'"; - } rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -332,9 +319,8 @@ int maxPage = pageIndex * maxPageIndex; string sqlCount = "select count(*) from 标识器 where 使用状态 = '使用中'"; - string sqlData = "select 编号,标识器ID号,标识器型号,地面高程,标识器埋深,对象编号,对象类型,所属道路,LSSYS_ID,X坐标,Y坐标,使用状态 " + - "from (select t.*,rownum row_num from 标识器 t where 使用状态 = '使用中' order by 编号)b "+ - " where(b.row_num between " + minPage + " and " + maxPage + ")"; + string sqlData = "select 编号,标识器ID号,标识器型号,地面高程,标识器埋深,所属道路,LSSYS_ID,X坐标,Y坐标,使用状态 " + + "from (select t.*,rownum row_num from 标识器 t where 使用状态 = '使用中'"; if (!String.IsNullOrEmpty(txt_no.Text.Trim())) { @@ -347,6 +333,8 @@ sqlCount += " and 所属道路='" + combo_street.SelectedItem.ToString().Trim() + "'"; } + sqlData += " order by 编号)b " + + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; @@ -372,9 +360,10 @@ private void FrmFlagManagers_FormClosing(object sender, FormClosingEventArgs e) { IS_OPEN = false; - Thread downloadJob = new Thread(new ParameterizedThreadStart(doSave)); - downloadJob.IsBackground = true; - downloadJob.Start(e); + //Thread downloadJob = new Thread(new ParameterizedThreadStart(doSave)); + //downloadJob.IsBackground = true; + //downloadJob.Start(e); + globeControl1.Globe.Layers["标识器"].Save(); globeControl1.Globe.MemoryLayer.RemoveAllFeature(); foreach (GSOFeature f in Features) { @@ -480,10 +469,88 @@ if (null != globeControl1) { FrmAddSinMark frm = new FrmAddSinMark(globeControl1); - frm.ShowDialog(); + frm.Show(); } } + private void 标识对象ToolStripMenuItem_Click(object sender, EventArgs e) + { + if (winGridViewPager1 != null && winGridViewPager1.dataGridView1 != null) + { + DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; + try + { + this.Hide(); + string id = row.Cells["编号"].Value.ToString(); + FrmFlagDetail p = new FrmFlagDetail(globeControl1, id); + p.showParentForm += new FrmFlagDetail.Handle(showThisForm);//改变值的事件 + p.Show(); + } + catch (Exception ex) + { + MessageBox.Show("失败:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } + + private void showThisForm() + { + this.Show(); + } + + private void toolStripMenuItem2_Click(object sender, EventArgs e) + { + if (winGridViewPager1 != null && winGridViewPager1.dataGridView1 != null) + { + DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; + try + { + this.WindowState = FormWindowState.Minimized; + string id = row.Cells["LSSYS_ID"].Value.ToString(); + string flagno = row.Cells["编号"].Value.ToString(); + string flagstreet = row.Cells["所属道路"].Value.ToString(); + double x = Convert.ToDouble(row.Cells["X坐标"].Value); + double y = Convert.ToDouble(row.Cells["Y坐标"].Value); + GSOFeature flagFeature = globeControl1.Globe.Layers.GetLayerByCaption("标识器").GetFeatureByID(int.Parse(id)); + + string type = ""; + string pipe = ""; + string sql = "select t.标识器型号,t.对象编号 from 标识器 t where t.编号='" + flagno + "'"; + using (OracleDataReader reader = OracleUtils.ExecuteReader(OracleUtils.ConnectionString, CommandType.Text, sql)) + { + while (reader.Read()) + { + type = reader.GetString(0); + pipe = reader.GetString(1); + } + } + + GSOLabel label = new GSOLabel(); + label.Text = "标识器编号：" + flagno + "\r\n" + + "标识器类型:" + type + "\r\n" + + //"标识对象编号:" + pipe + "\r\n" + + "所属道路:" + flagstreet; + label.Style = new GSOLabelStyle(); + label.Style.TextStyle.FontSize = 18; + label.Style.TextStyle.ForeColor = Color.FromArgb(0, 0, 0, 255); + label.Style.Opaque = 0.8; //设置标注的透明度，取值区间是0-1 + label.Style.TracktionLineType = EnumTracktionLineType.Solid; + label.Style.TextStyle.FontHeight = 10; + label.Style.TextStyle.FontName = "黑体"; + label.Style.TractionLineEndPos = new GSOPoint2d(80, 60); + + flagFeature.Label = label; + Features.Add(flagFeature); + globeControl1.Globe.JumpToFeature(flagFeature, 20); + this.globeControl1.Refresh(); + + } + catch (Exception ex) + { + MessageBox.Show("标识器定位失败:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } } diff --git a/FrmFlagManagers.resx b/FrmFlagManagers.resx index 1af7de1..ad53752 100644 --- a/FrmFlagManagers.resx +++ b/FrmFlagManagers.resx @@ -117,4 +117,7 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 17, 17 + \ No newline at end of file diff --git a/FrmPatrolerEdit.cs b/FrmPatrolerEdit.cs index dbd4fec..f45b5ae 100644 --- a/FrmPatrolerEdit.cs +++ b/FrmPatrolerEdit.cs @@ -46,7 +46,7 @@ txt_name.Focus(); return; } - if (String.IsNullOrEmpty(combo_sex.SelectedItem.ToString())) + if (combo_sex.SelectedItem == null ||String.IsNullOrEmpty(combo_sex.SelectedItem.ToString())) { MessageBox.Show("性别不能为空！", "警告", MessageBoxButtons.OK, MessageBoxIcon.Warning); combo_sex.Focus(); diff --git a/FrmPatrolerManager.Designer.cs b/FrmPatrolerManager.Designer.cs index bb8e5fb..10fac22 100644 --- a/FrmPatrolerManager.Designer.cs +++ b/FrmPatrolerManager.Designer.cs @@ -47,11 +47,13 @@ this.注销 = new DevComponents.Editors.ComboItem(); this.btn_query_person = new DevComponents.DotNetBar.ButtonItem(); this.btn_add_person = new DevComponents.DotNetBar.ButtonItem(); - this.winGridViewPager1 = new WHC.Pager.WinControl.WinGridViewPager(); this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components); this.日志ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.任务ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.定位ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.winGridViewPager1 = new WHC.Pager.WinControl.WinGridViewPager(); + this.编辑ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.注销ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); ((System.ComponentModel.ISupportInitialize)(this.bar1)).BeginInit(); this.contextMenuStrip1.SuspendLayout(); this.SuspendLayout(); @@ -173,9 +175,42 @@ this.btn_add_person.Text = "新增"; this.btn_add_person.Click += new System.EventHandler(this.btn_add_person_Click); // + // contextMenuStrip1 + // + this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.日志ToolStripMenuItem, + this.任务ToolStripMenuItem, + this.定位ToolStripMenuItem, + this.编辑ToolStripMenuItem, + this.注销ToolStripMenuItem}); + this.contextMenuStrip1.Name = "contextMenuStrip1"; + this.contextMenuStrip1.Size = new System.Drawing.Size(153, 136); + // + // 日志ToolStripMenuItem + // + this.日志ToolStripMenuItem.Name = "日志ToolStripMenuItem"; + this.日志ToolStripMenuItem.Size = new System.Drawing.Size(100, 22); + this.日志ToolStripMenuItem.Text = "日志"; + this.日志ToolStripMenuItem.Click += new System.EventHandler(this.日志ToolStripMenuItem_Click); + // + // 任务ToolStripMenuItem + // + this.任务ToolStripMenuItem.Name = "任务ToolStripMenuItem"; + this.任务ToolStripMenuItem.Size = new System.Drawing.Size(100, 22); + this.任务ToolStripMenuItem.Text = "任务"; + this.任务ToolStripMenuItem.Click += new System.EventHandler(this.任务ToolStripMenuItem_Click); + // + // 定位ToolStripMenuItem + // + this.定位ToolStripMenuItem.Name = "定位ToolStripMenuItem"; + this.定位ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.定位ToolStripMenuItem.Text = "定位"; + this.定位ToolStripMenuItem.Click += new System.EventHandler(this.定位ToolStripMenuItem_Click); + // // winGridViewPager1 // this.winGridViewPager1.AppendedMenu = null; + this.winGridViewPager1.ContextMenuStrip = this.contextMenuStrip1; this.winGridViewPager1.DataSource = null; this.winGridViewPager1.DisplayColumns = ""; this.winGridViewPager1.Dock = System.Windows.Forms.DockStyle.Fill; @@ -186,35 +221,19 @@ this.winGridViewPager1.Size = new System.Drawing.Size(756, 309); this.winGridViewPager1.TabIndex = 3; // - // contextMenuStrip1 + // 编辑ToolStripMenuItem // - this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.日志ToolStripMenuItem, - this.任务ToolStripMenuItem, - this.定位ToolStripMenuItem}); - this.contextMenuStrip1.Name = "contextMenuStrip1"; - this.contextMenuStrip1.Size = new System.Drawing.Size(101, 70); + this.编辑ToolStripMenuItem.Name = "编辑ToolStripMenuItem"; + this.编辑ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.编辑ToolStripMenuItem.Text = "编辑"; + this.编辑ToolStripMenuItem.Click += new System.EventHandler(this.编辑ToolStripMenuItem_Click); // - // 日志ToolStripMenuItem + // 注销ToolStripMenuItem // - this.日志ToolStripMenuItem.Name = "日志ToolStripMenuItem"; - this.日志ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); - this.日志ToolStripMenuItem.Text = "日志"; - this.日志ToolStripMenuItem.Click += new System.EventHandler(this.日志ToolStripMenuItem_Click); - // - // 任务ToolStripMenuItem - // - this.任务ToolStripMenuItem.Name = "任务ToolStripMenuItem"; - this.任务ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); - this.任务ToolStripMenuItem.Text = "任务"; - this.任务ToolStripMenuItem.Click += new System.EventHandler(this.任务ToolStripMenuItem_Click); - // - // 定位ToolStripMenuItem - // - this.定位ToolStripMenuItem.Name = "定位ToolStripMenuItem"; - this.定位ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); - this.定位ToolStripMenuItem.Text = "定位"; - this.定位ToolStripMenuItem.Click += new System.EventHandler(this.定位ToolStripMenuItem_Click); + this.注销ToolStripMenuItem.Name = "注销ToolStripMenuItem"; + this.注销ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.注销ToolStripMenuItem.Text = "注销"; + this.注销ToolStripMenuItem.Click += new System.EventHandler(this.注销ToolStripMenuItem_Click); // // FrmPatrolerManager // @@ -229,7 +248,7 @@ this.MinimizeBox = false; this.Name = "FrmPatrolerManager"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; - this.Text = "巡检人员维护"; + this.Text = "定位人员维护"; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmPatrolerManager_FormClosing); this.Load += new System.EventHandler(this.FrmPatrolerManager_Load); ((System.ComponentModel.ISupportInitialize)(this.bar1)).EndInit(); @@ -258,10 +277,12 @@ private DevComponents.Editors.ComboItem 注销; private DevComponents.Editors.ComboItem comboItem1; private DevComponents.Editors.ComboItem 不限; - private WHC.Pager.WinControl.WinGridViewPager winGridViewPager1; private System.Windows.Forms.ContextMenuStrip contextMenuStrip1; private System.Windows.Forms.ToolStripMenuItem 日志ToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem 任务ToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem 定位ToolStripMenuItem; + private WHC.Pager.WinControl.WinGridViewPager winGridViewPager1; + private System.Windows.Forms.ToolStripMenuItem 编辑ToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem 注销ToolStripMenuItem; } } \ No newline at end of file diff --git a/FrmPatrolerManager.cs b/FrmPatrolerManager.cs index 255a076..9c32f54 100644 --- a/FrmPatrolerManager.cs +++ b/FrmPatrolerManager.cs @@ -29,9 +29,7 @@ this.globeControl1 = globeControl1; winGridViewPager1.OnPageChanged += new EventHandler(winGridViewPager1_OnPageChanged); - this.winGridViewPager1.OnEditSelected += new EventHandler(winGridViewPager1_OnEditSelected);//编辑 - this.winGridViewPager1.OnDeleteSelected += new EventHandler(winGridViewPager1_OnDeleteSelected);//删除 - + this.winGridViewPager1.OnStartExport += new EventHandler(pager1_OnStartExport); this.winGridViewPager1.OnEndExport += new EventHandler(pager1_OnEndExport); @@ -47,26 +45,31 @@ //控制表格显示的列，以及每一列要显示的列名 this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - this.winGridViewPager1.AddColumnAlias("USERNAME", "姓名"); - this.winGridViewPager1.AddColumnAlias("DBID", "编号"); - this.winGridViewPager1.AddColumnAlias("SEX", "性别"); - this.winGridViewPager1.AddColumnAlias("AGE", "年龄"); - this.winGridViewPager1.AddColumnAlias("PHONENUM", "电话"); - this.winGridViewPager1.AddColumnAlias("ACCOUNTSTATE", "状态"); - this.winGridViewPager1.DisplayColumns = "USERNAME,SEX,AGE,PHONENUM,ACCOUNTSTATE"; + this.winGridViewPager1.AddColumnAlias("姓名", "姓名"); + this.winGridViewPager1.AddColumnAlias("编号", "编号"); + this.winGridViewPager1.AddColumnAlias("性别", "性别"); + this.winGridViewPager1.AddColumnAlias("年龄", "年龄"); + this.winGridViewPager1.AddColumnAlias("电话", "电话"); + this.winGridViewPager1.AddColumnAlias("状态", "状态"); + this.winGridViewPager1.DisplayColumns = "姓名,性别,年龄,电话,状态"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 + //隐藏右键功能按钮 //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[1].Visible = false; + winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Visible = false; + winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[4].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[5].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[6].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[7].Visible = false; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "编辑"; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Text = "注销"; + + //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "编辑"; + //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Text = "注销"; winGridViewPager1.AppendedMenu = this.contextMenuStrip1; + //右键菜单宽度 winGridViewPager1.dataGridView1.ContextMenuStrip.AutoSize = false; @@ -122,11 +125,11 @@ DataGridViewRow row = grid.SelectedRows[0]; try { - long dbid = long.Parse(row.Cells["dbid"].Value.ToString()); - String name = row.Cells["USERNAME"].Value.ToString(); - String sex = row.Cells["SEX"].Value.ToString(); - String age = row.Cells["AGE"].Value.ToString(); - string phone = row.Cells["PHONENUM"].Value.ToString(); + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); + String name = row.Cells["姓名"].Value.ToString(); + String sex = row.Cells["性别"].Value.ToString(); + String age = row.Cells["年龄"].Value.ToString(); + string phone = row.Cells["电话"].Value.ToString(); age = String.IsNullOrEmpty(age.ToString().Trim()) ? "1" : age.ToString().Trim(); FrmPatrolerEdit frm = new FrmPatrolerEdit(dbid.ToString(), name, age, sex, phone); frm.reloadGrid += new ReloadPatrolerGrid(LoadData); @@ -152,10 +155,10 @@ if (grid != null) { DataGridViewRow row = grid.SelectedRows[0]; - long dbid = long.Parse(row.Cells["DBID"].Value.ToString()); + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); try { - string state = row.Cells["ACCOUNTSTATE"].Value.ToString(); + string state = row.Cells["状态"].Value.ToString(); if ("在线".Equals(state)) { if (MessageBox.Show("确定注销？", "确认", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) @@ -180,60 +183,60 @@ { int pageIndex = winGridViewPager1.PagerInfo.CurrenetPageIndex; string sqlData = GetSql(pageIndex); - initlizeDatagrid(); + DataTable table = OracleUtils.ExecuteDataset(OracleUtils.ConnectionString, CommandType.Text, sqlData).Tables[0]; winGridViewPager1.DataSource = table.DefaultView; - for (int i = 0; i < winGridViewPager1.dataGridView1.Rows.Count; i++) - { - if (winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value.ToString() == "ONLINE") - { - winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value = "在线"; - } - else - { - if (winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value.ToString() == "OFFLINE") - { - winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value = "离线"; - } - else - { - if (winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value.ToString() == "LEAVER") - { - winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value = "注销"; - } - } - } - } + //for (int i = 0; i < winGridViewPager1.dataGridView1.Rows.Count; i++) + //{ + // if (winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value.ToString() == "ONLINE") + // { + // winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value = "在线"; + // } + // else + // { + // if (winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value.ToString() == "OFFLINE") + // { + // winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value = "离线"; + // } + // else + // { + // if (winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value.ToString() == "LEAVER") + // { + // winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value = "注销"; + // } + // } + // } + //} winGridViewPager1.Refresh(); } private void LoadData(int pageIndex) { string sqlData = GetSql(pageIndex); - initlizeDatagrid(); + DataTable table = OracleUtils.ExecuteDataset(OracleUtils.ConnectionString, CommandType.Text, sqlData).Tables[0]; winGridViewPager1.DataSource = table.DefaultView; - for (int i = 0; i < winGridViewPager1.dataGridView1.Rows.Count; i++) - { - if (winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value.ToString() == "ONLINE") - { - winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value = "在线"; - } - else - { - if (winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value.ToString() == "OFFLINE") - { - winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value = "离线"; - } - else - { - if (winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value.ToString() == "LEAVER") - { - winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value = "注销"; - } - } - } - } + //for (int i = 0; i < winGridViewPager1.dataGridView1.Rows.Count; i++) + //{ + // if (winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value.ToString() == "ONLINE") + // { + // winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value = "在线"; + // } + // else + // { + // if (winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value.ToString() == "OFFLINE") + // { + // winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value = "离线"; + // } + // else + // { + // if (winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value.ToString() == "LEAVER") + // { + // winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value = "注销"; + // } + // } + // } + //} winGridViewPager1.Refresh(); } @@ -241,7 +244,8 @@ { string sqlCount = "select count(*) from equipment where status = 'USING'"; - string sqlData = "select username,dbid,sex,age,phonenum,accountstate " + + string sqlData = "select username as 姓名,dbid as 编号,sex as 性别,age as 年龄,phonenum as 电话,"+ + "case when accountstate = 'ONLINE' then '在线' when accountstate = 'OFFLINE' then '离线' when accountstate = 'LEAVER' then '注销' end as 状态 " + "from (select t.*,rownum row_num from patroler t order by DBID desc)b " + " where 1=1"; @@ -255,9 +259,9 @@ int minPage = (pageIndex - 1) * maxPageIndex + 1; int maxPage = pageIndex * maxPageIndex; string sqlCount = "select count(*) from patroler where 1=1"; - string sqlData = "select username,dbid,sex,age,phonenum,accountstate " + - "from (select t.*,rownum row_num from patroler t order by DBID desc)b " + - " where(b.row_num between " + minPage + " and " + maxPage + ")"; + string sqlData = "select username as 姓名,dbid as 编号,sex as 性别,age as 年龄,phonenum as 电话,"+ + "case when accountstate = 'ONLINE' then '在线' when accountstate = 'OFFLINE' then '离线' when accountstate = 'LEAVER' then '注销' end as 状态 " + + "from (select t.*,rownum row_num from patroler t where 1=1"; if (!String.IsNullOrEmpty(txt_username.Text.Trim())) { @@ -281,7 +285,8 @@ sqlCount += " and accountstate='" + combo_stateText + "'"; sqlData += " and accountstate='" + combo_stateText + "'"; } - + sqlData += " order by DBID desc)b " + + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; @@ -291,6 +296,7 @@ { try { + initlizeDatagrid(); LoadData(); initForm(); IS_OPEN = true; @@ -310,11 +316,13 @@ } if (Utility.userRole.IndexOf("巡检员编辑") == -1) { - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Visible = false; + //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Visible = false; + 编辑ToolStripMenuItem.Visible = false; } if (Utility.userRole.IndexOf("巡检员注销") == -1) { - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Visible = false; + //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Visible = false; + 注销ToolStripMenuItem.Visible = false; } } @@ -376,7 +384,7 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - long dbid = long.Parse(row.Cells["dbid"].Value.ToString()); + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); Log p = new Log(dbid.ToString()); p.Show(); } @@ -395,8 +403,8 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - long dbid = long.Parse(row.Cells["dbid"].Value.ToString()); - String state = row.Cells["ACCOUNTSTATE"].Value.ToString(); + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); + String state = row.Cells["状态"].Value.ToString(); if ("在线".Equals(state)) { string sql = "select t.dbid " + @@ -435,8 +443,8 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - long dbid = long.Parse(row.Cells["dbid"].Value.ToString()); - String username = row.Cells["USERNAME"].Value.ToString(); + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); + String username = row.Cells["姓名"].Value.ToString(); string sql = "select t.latitude, t.longitude " + "from position t " + "where t.dbid = (select max(dbid) from position where patroler_id = " + dbid + ")"; @@ -489,6 +497,63 @@ } + private void 编辑ToolStripMenuItem_Click(object sender, EventArgs e) + { + if (winGridViewPager1 != null && winGridViewPager1.dataGridView1 != null) + { + DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; + try + { + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); + String name = row.Cells["姓名"].Value.ToString(); + String sex = row.Cells["性别"].Value.ToString(); + String age = row.Cells["年龄"].Value.ToString(); + string phone = row.Cells["电话"].Value.ToString(); + age = String.IsNullOrEmpty(age.ToString().Trim()) ? "1" : age.ToString().Trim(); + FrmPatrolerEdit frm = new FrmPatrolerEdit(dbid.ToString(), name, age, sex, phone); + frm.reloadGrid += new ReloadPatrolerGrid(LoadData); + frm.ShowDialog(); + winGridViewPager1.Refresh(); + } + catch (Exception ex) + { + MessageBox.Show("编辑失败:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } + + private void 注销ToolStripMenuItem_Click(object sender, EventArgs e) + { + if (winGridViewPager1 != null && winGridViewPager1.dataGridView1 != null) + { + DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); + try + { + if (MessageBox.Show("确定注销？", "确认", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) + { + String sql = "update patroler t set t.accountstate='LEAVER' where t.dbid=" + dbid; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + LoadData(); + MessageBox.Show("人员已注销", "信息", MessageBoxButtons.OK, MessageBoxIcon.Information); + } + //string state = row.Cells["状态"].Value.ToString(); + //if ("在线".Equals(state)) + //{ + + //} + //else + //{ + // MessageBox.Show("人员不在线，无法注销", "信息"); + //} + } + catch (Exception ex) + { + MessageBox.Show("人员注销失败:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } + } } diff --git a/FrmRoleInfoManager.cs b/FrmRoleInfoManager.cs index 8897133..35693cf 100644 --- a/FrmRoleInfoManager.cs +++ b/FrmRoleInfoManager.cs @@ -55,10 +55,10 @@ //控制表格显示的列，以及每一列要显示的列名 this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - this.winGridViewPager1.AddColumnAlias("NT", "角色名称"); - this.winGridViewPager1.AddColumnAlias("ID", "编号"); + this.winGridViewPager1.AddColumnAlias("角色名称", "角色名称"); + this.winGridViewPager1.AddColumnAlias("编号", "编号"); - this.winGridViewPager1.DisplayColumns = "NT"; + this.winGridViewPager1.DisplayColumns = "角色名称"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -131,7 +131,7 @@ { try { - string dbid = row.Cells["id"].Value.ToString(); + string dbid = row.Cells["编号"].Value.ToString(); string sql = "delete from casic_userroletest where id=" + dbid; OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); LoadData(); @@ -170,7 +170,7 @@ { string sqlCount = "select id,nt from casic_userroletest where sysname='EMS'"; - string sqlData = "select nt,id " + + string sqlData = "select nt as 角色名称,id as 编号 " + "from (select t.*,rownum row_num from casic_userroletest t order by id desc)b " + " where sysname='EMS'"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -183,7 +183,7 @@ int minPage = (pageIndex - 1) * maxPageIndex + 1; int maxPage = pageIndex * maxPageIndex; string sqlCount = "select id,nt from casic_userroletest where sysname='EMS'"; - string sqlData = "select nt,id " + + string sqlData = "select nt as 角色名称,id as 编号 " + "from (select t.*,rownum row_num from casic_userroletest t where sysname='EMS' order by id desc)b " + " where(b.row_num between " + minPage + " and " + maxPage + ")"; diff --git a/FrmSysUserInfoManger.cs b/FrmSysUserInfoManger.cs index 7903916..e193a61 100644 --- a/FrmSysUserInfoManger.cs +++ b/FrmSysUserInfoManger.cs @@ -28,6 +28,7 @@ this.winGridViewPager1.OnEndExport += new EventHandler(pager1_OnEndExport); winGridViewPager1.dataGridView1.MultiSelect = false; + } private void FrmSysUserInfoManger_Load(object sender, EventArgs e) @@ -59,10 +60,10 @@ //控制表格显示的列，以及每一列要显示的列名 this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - this.winGridViewPager1.AddColumnAlias("USERNAME", "账号"); - this.winGridViewPager1.AddColumnAlias("ID", "编号"); + this.winGridViewPager1.AddColumnAlias("账号", "账号"); + this.winGridViewPager1.AddColumnAlias("编号", "编号"); - this.winGridViewPager1.DisplayColumns = "USERNAME"; + this.winGridViewPager1.DisplayColumns = "账号"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -130,8 +131,8 @@ if (grid != null) { DataGridViewRow row = grid.SelectedRows[0]; - string dbid = row.Cells["id"].Value.ToString(); - string userName = row.Cells["USERNAME"].Value.ToString(); + string dbid = row.Cells["编号"].Value.ToString(); + string userName = row.Cells["账号"].Value.ToString(); if (userName.Equals("ems")) { MessageBox.Show("该用户为管理员用户，无法删除！", "信息"); @@ -184,7 +185,7 @@ { string sqlCount = "select count(*) from casic_userinfotest where sysname='EMS'"; - string sqlData = "select username,id " + + string sqlData = "select username as 账号,id as 编号 " + "from (select t.*,rownum row_num from casic_userinfotest t order by id desc)b " + " where sysname='EMS'"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -197,16 +198,16 @@ int minPage = (pageIndex - 1) * maxPageIndex + 1; int maxPage = pageIndex * maxPageIndex; string sqlCount = "select count(*) from casic_userinfotest where sysname='EMS'"; - string sqlData = "select username,id " + - "from (select t.*,rownum row_num from casic_userinfotest t where sysname='EMS' order by id desc)b " + - " where(b.row_num between " + minPage + " and " + maxPage + ")"; + string sqlData = "select username as 账号,id as 编号 " + + "from (select t.*,rownum row_num from casic_userinfotest t where sysname='EMS'"; if (!String.IsNullOrEmpty(txt_user_code.Text.Trim())) { sqlCount += " and username like '%" + txt_user_code.Text.Trim() + "%'"; sqlData += " and username like '%" + txt_user_code.Text.Trim() + "%'"; } - + sqlData += " order by id desc)b " + + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; diff --git a/MainFrm.cs b/MainFrm.cs index 39df646..0cd5881 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3310,10 +3310,10 @@ string str1 = ""; if (feature != null) { - if (feature.GetFieldDefn("图?片?编括?码?") != null) // + if (feature.GetFieldDefn("图片编码") != null) // { str1 = GetBubbleInfo(feature); - if (RemoteFileExists(Utility.PicRootURL + feature.GetValue("图?片?编括?码?").ToString())) + if (RemoteFileExists(Utility.PicRootURL + feature.GetValue("图片编码").ToString())) { str1 += ""; } @@ -3450,9 +3450,15 @@ string value1 = ""; if (field1 != null) { - if (field1.Name == "图片编码") + //if (field1.Name == "图片编码" || field1.Name == "对象编号" || field1.Name == "对象类型" || field1.Name == "对象名称") + //{ + // j++; + //} + while (field1.Name == "图片编码" || field1.Name == "对象编号" || field1.Name == "对象类型" || field1.Name == "对象名称") { j++; + fieldName = fieldNames[j].Trim(); + field1 = (GSOFieldDefn)feature.GetFieldDefn(fieldName); } if (j < rowCount) { @@ -3479,6 +3485,11 @@ if (!feature.IsFieldValueNull(j)) { value1 = feature.GetValue(j).ToString(); + if (name1 == "标识器埋深") + { + if (value1!=null&&value1.Length>4) + value1 = value1.Substring(0,4); + } } } } @@ -3491,9 +3502,14 @@ if (field2 != null) { - if (field2.Name == "图片编码") + //if (field2.Name == "图片编码" || field1.Name == "对象编号" || field1.Name == "对象类型" || field1.Name == "对象名称") + //{ + // j++; + //} + while (field2.Name == "图片编码" || field2.Name == "对象编号" || field2.Name == "对象类型" || field2.Name == "对象名称") { j++; + field2 = (GSOFieldDefn)feature.GetFieldDefn(j + 1); } if (j + 1 < rowCount) { @@ -3521,6 +3537,11 @@ if (!feature.IsFieldValueNull(j + 1)) { value2 = feature.GetValue(j + 1).ToString(); + if (name2 == "标识器埋深") + { + if (value2 != null && value2.Length > 4) + value2 = value2.Substring(0, 4); + } } } } @@ -15347,7 +15368,7 @@ return; } FrmFlagManagers frm = new FrmFlagManagers(globeControl1); - frm.Show(this); + frm.Show(); } private void ribbonTabItem2_MouseDown(object sender, MouseEventArgs e) diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index fddfb94..e5f0003 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -365,6 +365,16 @@ this.可编辑ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.保存ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.ribbonControl1 = new DevComponents.DotNetBar.RibbonControl(); + this.ribbonPanel3 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar3 = new DevComponents.DotNetBar.RibbonBar(); + this.btn_device = new DevComponents.DotNetBar.ButtonItem(); + this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); + this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel7 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); + this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); + this.slider4ground = new DevComponents.DotNetBar.SliderItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -374,12 +384,6 @@ this.btn_user_role = new DevComponents.DotNetBar.ButtonItem(); this.btn_password_edit = new DevComponents.DotNetBar.ButtonItem(); this.btn_reset_password = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel3 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar3 = new DevComponents.DotNetBar.RibbonBar(); - this.btn_device = new DevComponents.DotNetBar.ButtonItem(); - this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); - this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); @@ -551,10 +555,6 @@ this.buttonItemBZ9 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItemBZ10 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItemBZ11 = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel7 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); - this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); - this.slider4ground = new DevComponents.DotNetBar.SliderItem(); this.ribbonPanel12 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar18 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItem133 = new DevComponents.DotNetBar.ButtonItem(); @@ -690,11 +690,11 @@ this.contextMenuStrip3.SuspendLayout(); this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); - this.ribbonPanel8.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel7.SuspendLayout(); + this.ribbonPanel8.SuspendLayout(); this.ribbonPanel2.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); - this.ribbonPanel7.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); this.ribbonPanel5.SuspendLayout(); this.ribbonPanel6.SuspendLayout(); @@ -4162,10 +4162,10 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); - this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel2); - this.ribbonControl1.Controls.Add(this.ribbonPanel15); + this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel7); + this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); this.ribbonControl1.Controls.Add(this.ribbonPanel5); this.ribbonControl1.Controls.Add(this.ribbonPanel6); @@ -4216,135 +4216,6 @@ this.ribbonControl1.UseCustomizeDialog = false; this.ribbonControl1.Click += new System.EventHandler(this.ribbonControl1_Click); // - // ribbonPanel8 - // - this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel8.Controls.Add(this.ribbonBar_UserInfo); - this.ribbonPanel8.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel8.Location = new System.Drawing.Point(0, 33); - this.ribbonPanel8.Name = "ribbonPanel8"; - this.ribbonPanel8.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel8.Size = new System.Drawing.Size(1328, 62); - // - // - // - this.ribbonPanel8.Style.Class = ""; - this.ribbonPanel8.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel8.StyleMouseDown.Class = ""; - this.ribbonPanel8.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel8.StyleMouseOver.Class = ""; - this.ribbonPanel8.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel8.TabIndex = 42; - this.ribbonPanel8.Visible = false; - // - // ribbonBar_UserInfo - // - this.ribbonBar_UserInfo.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar_UserInfo.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar_UserInfo.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar_UserInfo.BackgroundStyle.Class = ""; - this.ribbonBar_UserInfo.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar_UserInfo.ContainerControlProcessDialogKey = true; - this.ribbonBar_UserInfo.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar_UserInfo.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.btn_user_info, - this.btn_role_info, - this.btn_resc_info, - this.btn_role_resc, - this.btn_user_role, - this.btn_password_edit, - this.btn_reset_password}); - this.ribbonBar_UserInfo.Location = new System.Drawing.Point(3, 0); - this.ribbonBar_UserInfo.Name = "ribbonBar_UserInfo"; - this.ribbonBar_UserInfo.Size = new System.Drawing.Size(427, 59); - this.ribbonBar_UserInfo.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar_UserInfo.TabIndex = 0; - // - // - // - this.ribbonBar_UserInfo.TitleStyle.Class = ""; - this.ribbonBar_UserInfo.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar_UserInfo.TitleStyleMouseOver.Class = ""; - this.ribbonBar_UserInfo.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // btn_user_info - // - this.btn_user_info.Image = global::Cyberpipe.Properties.Resources._24x24icon_13_hover; - this.btn_user_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_user_info.Name = "btn_user_info"; - this.btn_user_info.SubItemsExpandWidth = 14; - this.btn_user_info.Text = "用户管理"; - this.btn_user_info.Click += new System.EventHandler(this.btn_user_info_Click); - // - // btn_role_info - // - this.btn_role_info.Image = global::Cyberpipe.Properties.Resources._24x24icon_05_hover1; - this.btn_role_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_role_info.Name = "btn_role_info"; - this.btn_role_info.SubItemsExpandWidth = 14; - this.btn_role_info.Text = "角色管理"; - this.btn_role_info.Click += new System.EventHandler(this.btn_role_info_Click); - // - // btn_resc_info - // - this.btn_resc_info.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__09; - this.btn_resc_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_resc_info.Name = "btn_resc_info"; - this.btn_resc_info.SubItemsExpandWidth = 14; - this.btn_resc_info.Text = "资源管理"; - this.btn_resc_info.Click += new System.EventHandler(this.btn_resc_info_Click); - // - // btn_role_resc - // - this.btn_role_resc.Image = global::Cyberpipe.Properties.Resources.btnlegendSet_Image_副本; - this.btn_role_resc.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_role_resc.Name = "btn_role_resc"; - this.btn_role_resc.SubItemsExpandWidth = 14; - this.btn_role_resc.Text = "角色授权"; - this.btn_role_resc.Click += new System.EventHandler(this.btn_role_resc_Click); - // - // btn_user_role - // - this.btn_user_role.Image = global::Cyberpipe.Properties.Resources._24x24icon_08_hover; - this.btn_user_role.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_user_role.Name = "btn_user_role"; - this.btn_user_role.SubItemsExpandWidth = 14; - this.btn_user_role.Text = "用户授权"; - this.btn_user_role.Click += new System.EventHandler(this.btn_user_role_Click); - // - // btn_password_edit - // - this.btn_password_edit.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__67; - this.btn_password_edit.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_password_edit.Name = "btn_password_edit"; - this.btn_password_edit.SubItemsExpandWidth = 14; - this.btn_password_edit.Text = "密码修改"; - this.btn_password_edit.Click += new System.EventHandler(this.btn_password_edit_Click); - // - // btn_reset_password - // - this.btn_reset_password.Image = global::Cyberpipe.Properties.Resources.liuxiang; - this.btn_reset_password.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_reset_password.Name = "btn_reset_password"; - this.btn_reset_password.SubItemsExpandWidth = 14; - this.btn_reset_password.Text = "重置密码"; - this.btn_reset_password.Click += new System.EventHandler(this.btn_reset_password_Click); - // // ribbonPanel3 // this.ribbonPanel3.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4425,7 +4296,7 @@ this.btn_Person.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; this.btn_Person.Name = "btn_Person"; this.btn_Person.SubItemsExpandWidth = 14; - this.btn_Person.Text = "巡检人员维护"; + this.btn_Person.Text = "定位人员维护"; this.btn_Person.Click += new System.EventHandler(this.btn_Person_Click); // // btn_constructMap @@ -4446,6 +4317,214 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel7 + // + this.ribbonPanel7.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel7.Controls.Add(this.ribbonBar5); + this.ribbonPanel7.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel7.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel7.Name = "ribbonPanel7"; + this.ribbonPanel7.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel7.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel7.Style.Class = ""; + this.ribbonPanel7.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel7.StyleMouseDown.Class = ""; + this.ribbonPanel7.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel7.StyleMouseOver.Class = ""; + this.ribbonPanel7.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel7.TabIndex = 41; + this.ribbonPanel7.Visible = false; + // + // ribbonBar5 + // + this.ribbonBar5.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar5.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar5.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar5.BackgroundStyle.Class = ""; + this.ribbonBar5.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar5.ContainerControlProcessDialogKey = true; + this.ribbonBar5.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar5.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.btn_flag, + this.slider4ground}); + this.ribbonBar5.Location = new System.Drawing.Point(3, 0); + this.ribbonBar5.Name = "ribbonBar5"; + this.ribbonBar5.Size = new System.Drawing.Size(427, 92); + this.ribbonBar5.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar5.TabIndex = 0; + // + // + // + this.ribbonBar5.TitleStyle.Class = ""; + this.ribbonBar5.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar5.TitleStyleMouseOver.Class = ""; + this.ribbonBar5.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar5.TitleVisible = false; + // + // btn_flag + // + this.btn_flag.Image = global::Cyberpipe.Properties.Resources._24x24icon_03_hover; + this.btn_flag.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_flag.Name = "btn_flag"; + this.btn_flag.SubItemsExpandWidth = 14; + this.btn_flag.Text = "标识器管理"; + this.btn_flag.Click += new System.EventHandler(this.btn_flag_Click); + // + // slider4ground + // + this.slider4ground.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; + this.slider4ground.Name = "slider4ground"; + this.slider4ground.Text = "地面透明度"; + this.slider4ground.Value = 0; + this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); + // + // ribbonPanel8 + // + this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel8.Controls.Add(this.ribbonBar_UserInfo); + this.ribbonPanel8.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel8.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel8.Name = "ribbonPanel8"; + this.ribbonPanel8.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel8.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel8.Style.Class = ""; + this.ribbonPanel8.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel8.StyleMouseDown.Class = ""; + this.ribbonPanel8.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel8.StyleMouseOver.Class = ""; + this.ribbonPanel8.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel8.TabIndex = 42; + this.ribbonPanel8.Visible = false; + // + // ribbonBar_UserInfo + // + this.ribbonBar_UserInfo.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar_UserInfo.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar_UserInfo.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar_UserInfo.BackgroundStyle.Class = ""; + this.ribbonBar_UserInfo.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar_UserInfo.ContainerControlProcessDialogKey = true; + this.ribbonBar_UserInfo.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar_UserInfo.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.btn_user_info, + this.btn_role_info, + this.btn_resc_info, + this.btn_role_resc, + this.btn_user_role, + this.btn_password_edit, + this.btn_reset_password}); + this.ribbonBar_UserInfo.Location = new System.Drawing.Point(3, 0); + this.ribbonBar_UserInfo.Name = "ribbonBar_UserInfo"; + this.ribbonBar_UserInfo.Size = new System.Drawing.Size(427, 92); + this.ribbonBar_UserInfo.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar_UserInfo.TabIndex = 0; + // + // + // + this.ribbonBar_UserInfo.TitleStyle.Class = ""; + this.ribbonBar_UserInfo.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar_UserInfo.TitleStyleMouseOver.Class = ""; + this.ribbonBar_UserInfo.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // btn_user_info + // + this.btn_user_info.Image = global::Cyberpipe.Properties.Resources._24x24icon_13_hover; + this.btn_user_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_user_info.Name = "btn_user_info"; + this.btn_user_info.SubItemsExpandWidth = 14; + this.btn_user_info.Text = "用户管理"; + this.btn_user_info.Click += new System.EventHandler(this.btn_user_info_Click); + // + // btn_role_info + // + this.btn_role_info.Image = global::Cyberpipe.Properties.Resources._24x24icon_05_hover1; + this.btn_role_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_role_info.Name = "btn_role_info"; + this.btn_role_info.SubItemsExpandWidth = 14; + this.btn_role_info.Text = "角色管理"; + this.btn_role_info.Click += new System.EventHandler(this.btn_role_info_Click); + // + // btn_resc_info + // + this.btn_resc_info.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__09; + this.btn_resc_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_resc_info.Name = "btn_resc_info"; + this.btn_resc_info.SubItemsExpandWidth = 14; + this.btn_resc_info.Text = "资源管理"; + this.btn_resc_info.Click += new System.EventHandler(this.btn_resc_info_Click); + // + // btn_role_resc + // + this.btn_role_resc.Image = global::Cyberpipe.Properties.Resources.btnlegendSet_Image_副本; + this.btn_role_resc.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_role_resc.Name = "btn_role_resc"; + this.btn_role_resc.SubItemsExpandWidth = 14; + this.btn_role_resc.Text = "角色授权"; + this.btn_role_resc.Click += new System.EventHandler(this.btn_role_resc_Click); + // + // btn_user_role + // + this.btn_user_role.Image = global::Cyberpipe.Properties.Resources._24x24icon_08_hover; + this.btn_user_role.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_user_role.Name = "btn_user_role"; + this.btn_user_role.SubItemsExpandWidth = 14; + this.btn_user_role.Text = "用户授权"; + this.btn_user_role.Click += new System.EventHandler(this.btn_user_role_Click); + // + // btn_password_edit + // + this.btn_password_edit.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__67; + this.btn_password_edit.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_password_edit.Name = "btn_password_edit"; + this.btn_password_edit.SubItemsExpandWidth = 14; + this.btn_password_edit.Text = "密码修改"; + this.btn_password_edit.Click += new System.EventHandler(this.btn_password_edit_Click); + // + // btn_reset_password + // + this.btn_reset_password.Image = global::Cyberpipe.Properties.Resources.liuxiang; + this.btn_reset_password.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_reset_password.Name = "btn_reset_password"; + this.btn_reset_password.SubItemsExpandWidth = 14; + this.btn_reset_password.Text = "重置密码"; + this.btn_reset_password.Click += new System.EventHandler(this.btn_reset_password_Click); + // // ribbonPanel2 // this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -5891,85 +5970,6 @@ this.buttonItemBZ11.Text = "标注管理"; this.buttonItemBZ11.Click += new System.EventHandler(this.buttonItemBZ11_Click); // - // ribbonPanel7 - // - this.ribbonPanel7.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel7.Controls.Add(this.ribbonBar5); - this.ribbonPanel7.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel7.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel7.Name = "ribbonPanel7"; - this.ribbonPanel7.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel7.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel7.Style.Class = ""; - this.ribbonPanel7.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel7.StyleMouseDown.Class = ""; - this.ribbonPanel7.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel7.StyleMouseOver.Class = ""; - this.ribbonPanel7.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel7.TabIndex = 41; - this.ribbonPanel7.Visible = false; - // - // ribbonBar5 - // - this.ribbonBar5.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar5.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar5.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar5.BackgroundStyle.Class = ""; - this.ribbonBar5.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar5.ContainerControlProcessDialogKey = true; - this.ribbonBar5.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar5.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.btn_flag, - this.slider4ground}); - this.ribbonBar5.Location = new System.Drawing.Point(3, 0); - this.ribbonBar5.Name = "ribbonBar5"; - this.ribbonBar5.Size = new System.Drawing.Size(427, 92); - this.ribbonBar5.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar5.TabIndex = 0; - // - // - // - this.ribbonBar5.TitleStyle.Class = ""; - this.ribbonBar5.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar5.TitleStyleMouseOver.Class = ""; - this.ribbonBar5.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar5.TitleVisible = false; - // - // btn_flag - // - this.btn_flag.Image = global::Cyberpipe.Properties.Resources._24x24icon_03_hover; - this.btn_flag.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_flag.Name = "btn_flag"; - this.btn_flag.SubItemsExpandWidth = 14; - this.btn_flag.Text = "标识器管理"; - this.btn_flag.Click += new System.EventHandler(this.btn_flag_Click); - // - // slider4ground - // - this.slider4ground.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; - this.slider4ground.Name = "slider4ground"; - this.slider4ground.Text = "地面透明度"; - this.slider4ground.Value = 0; - this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); - // // ribbonPanel12 // this.ribbonPanel12.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7181,11 +7181,11 @@ this.contextMenuStripDeleteLayerNode.ResumeLayout(false); this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); - this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel7.ResumeLayout(false); + this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); - this.ribbonPanel7.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); this.ribbonPanel5.ResumeLayout(false); this.ribbonPanel6.ResumeLayout(false); diff --git a/SysRescInfoManager.cs b/SysRescInfoManager.cs index 3a84d95..fda6f3f 100644 --- a/SysRescInfoManager.cs +++ b/SysRescInfoManager.cs @@ -79,11 +79,11 @@ //控制表格显示的列，以及每一列要显示的列名 this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - - this.winGridViewPager1.AddColumnAlias("RESC", "资源名称"); - this.winGridViewPager1.AddColumnAlias("ID", "编号"); - this.winGridViewPager1.AddColumnAlias("DESP", "资源描述"); - this.winGridViewPager1.DisplayColumns = "RESC,DESP"; + + this.winGridViewPager1.AddColumnAlias("资源名称", "资源名称"); + this.winGridViewPager1.AddColumnAlias("编号", "编号"); + this.winGridViewPager1.AddColumnAlias("资源描述", "资源描述"); + this.winGridViewPager1.DisplayColumns = "资源名称,资源描述"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -153,8 +153,8 @@ DataGridViewRow row = grid.SelectedRows[0]; if (MessageBox.Show("确定删除？", "确认", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) { - string dbid = row.Cells["id"].Value.ToString(); - string resc = row.Cells["resc"].Value.ToString(); + string dbid = row.Cells["编号"].Value.ToString(); + string resc = row.Cells["资源名称"].Value.ToString(); OracleConnection conn = null; OracleTransaction tran = null; try @@ -229,7 +229,7 @@ private string GetSql() { string sqlCount = "select count(*) from casic_userresctest where sysname='EMS'"; - string sqlData = "select resc,id,desp " + + string sqlData = "select resc as 资源名称,id as 编号,desp as 资源描述 " + "from (select t.*,rownum row_num from casic_userresctest t order by id desc)b " + " where sysname='EMS'"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -242,7 +242,7 @@ int minPage = (pageIndex - 1) * maxPageIndex + 1; int maxPage = pageIndex * maxPageIndex; string sqlCount = "select count(*) from casic_userresctest where sysname='EMS'"; - string sqlData = "select resc,id,desp " + + string sqlData = "select resc as 资源名称,id as 编号,desp as 资源描述 " + "from (select t.*,rownum row_num from casic_userresctest t where sysname='EMS' order by id desc)b " + " where(b.row_num between " + minPage + " and " + maxPage + ")"; diff --git a/bin/x86/Debug/Config.xml b/bin/x86/Debug/Config.xml index e2d7b46..560a163 100644 --- a/bin/x86/Debug/Config.xml +++ b/bin/x86/Debug/Config.xml @@ -3,9 +3,9 @@ LocaSpace三维地下管线信息系统 scott - SZHTDB - 127.0.0.1 - scott + SZHTDB2 + 192.168.0.203 + SZHTDB2 127.0.0.1 1500 @@ -14,8 +14,8 @@ http://192.168.0.122:8088/UpDownFile.asmx - http://127.0.0.1/EMSCyberpipe.msi - http://127.0.0.1/EMSConfig.xml + http://192.168.10.229/EMSCyberpipe.msi + http://192.168.10.229/EMSConfig.xml diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index b19e2ab..b5e320f 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 1a4aeed..c20e54a 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/PipelineType.xml b/bin/x86/Debug/PipelineType.xml index 51dc4b8..b1cbacc 100644 --- a/bin/x86/Debug/PipelineType.xml +++ b/bin/x86/Debug/PipelineType.xml @@ -1,6 +1,6 @@  - + @@ -42,7 +42,7 @@ - + @@ -83,7 +83,7 @@ - + @@ -115,7 +115,7 @@ - + @@ -159,7 +159,7 @@ - + @@ -200,7 +200,7 @@ - + @@ -236,7 +236,7 @@ - + @@ -278,7 +278,7 @@ - + @@ -320,7 +320,7 @@ - + @@ -363,7 +363,7 @@ - + @@ -408,7 +408,7 @@ - + @@ -448,7 +448,7 @@ - + @@ -485,7 +485,7 @@ - + @@ -527,7 +527,7 @@ - + @@ -565,7 +565,7 @@ - + @@ -595,7 +595,7 @@ - + @@ -625,7 +625,7 @@ - + @@ -657,7 +657,7 @@ - + @@ -691,7 +691,7 @@ - + @@ -728,7 +728,7 @@ - + @@ -763,7 +763,7 @@ - + @@ -799,7 +799,7 @@ - + @@ -824,7 +824,7 @@ - + @@ -846,7 +846,7 @@ - + diff --git a/obj/x86/Debug/Cyberpipe.csproj.FileListAbsolute.txt b/obj/x86/Debug/Cyberpipe.csproj.FileListAbsolute.txt index 42dc58c..b78c534 100644 --- a/obj/x86/Debug/Cyberpipe.csproj.FileListAbsolute.txt +++ b/obj/x86/Debug/Cyberpipe.csproj.FileListAbsolute.txt @@ -203,3 +203,4 @@ D:\ym\EMS+GHFX\EMS\obj\x86\Debug\EMSCyberpipe.pdb D:\ym\EMS+GHFX\EMS\obj\x86\Debug\Cyberpipe.FrmFlagManagers.resources D:\ym\EMS+GHFX\EMS\obj\x86\Debug\Cyberpipe.FrmFlagEdits.resources +D:\ym\EMS+GHFX\EMS\obj\x86\Debug\Cyberpipe.FrmFlagDetail.resources diff --git a/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache b/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache index 19b3415..cee9c4a 100644 --- a/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache +++ b/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache Binary files differ diff --git a/obj/x86/Debug/EMSCyberpipe.exe b/obj/x86/Debug/EMSCyberpipe.exe index b19e2ab..b5e320f 100644 --- a/obj/x86/Debug/EMSCyberpipe.exe +++ b/obj/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/obj/x86/Debug/EMSCyberpipe.pdb b/obj/x86/Debug/EMSCyberpipe.pdb index 1a4aeed..c20e54a 100644 --- a/obj/x86/Debug/EMSCyberpipe.pdb +++ b/obj/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/Cyberpipe.csproj b/Cyberpipe.csproj index fe600e5..501fd09 100644 --- a/Cyberpipe.csproj +++ b/Cyberpipe.csproj @@ -246,6 +246,12 @@ Form_TaskManager.cs + + Form + + + FrmFlagDetail.cs + Form @@ -1368,6 +1374,9 @@ Form_TaskManager.cs + + FrmFlagDetail.cs + FormDocumentManager.cs diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 537b4c3..1acf22a 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 7d5dd95..3f178cb 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -90,20 +90,20 @@ this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - - this.winGridViewPager1.AddColumnAlias("ACCIDENTTIME", "上报时间"); - this.winGridViewPager1.AddColumnAlias("DBID", "编号"); - this.winGridViewPager1.AddColumnAlias("DESCRIBE", "事件描述"); - this.winGridViewPager1.AddColumnAlias("LATITUDE", "纬度"); - this.winGridViewPager1.AddColumnAlias("LOCALE", "事件地点"); - this.winGridViewPager1.AddColumnAlias("LONGITUDE", "经度"); - this.winGridViewPager1.AddColumnAlias("PATROLERNAME", "上报人员"); - this.winGridViewPager1.AddColumnAlias("PATROLER_ID", "人员ID"); - this.winGridViewPager1.AddColumnAlias("TASK_ID", "任务编号"); - this.winGridViewPager1.AddColumnAlias("RESULT", "处理结果"); - this.winGridViewPager1.AddColumnAlias("STATE", "处理状态"); - this.winGridViewPager1.DisplayColumns = "ACCIDENTTIME,DESCRIBE,LOCALE,PATROLERNAME,TASK_ID,RESULT,STATE"; + this.winGridViewPager1.AddColumnAlias("上报时间", "上报时间"); + this.winGridViewPager1.AddColumnAlias("编号", "编号"); + this.winGridViewPager1.AddColumnAlias("事件描述", "事件描述"); + this.winGridViewPager1.AddColumnAlias("纬度", "纬度"); + this.winGridViewPager1.AddColumnAlias("事件地点", "事件地点"); + this.winGridViewPager1.AddColumnAlias("经度", "经度"); + this.winGridViewPager1.AddColumnAlias("上报人员", "上报人员"); + this.winGridViewPager1.AddColumnAlias("人员ID", "人员ID"); + this.winGridViewPager1.AddColumnAlias("任务编号", "任务编号"); + this.winGridViewPager1.AddColumnAlias("处理结果", "处理结果"); + this.winGridViewPager1.AddColumnAlias("处理状态", "处理状态"); + + this.winGridViewPager1.DisplayColumns = "上报时间,事件描述,事件地点,上报人员,任务编号,处理结果,处理状态"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -114,8 +114,8 @@ winGridViewPager1.dataGridView1.ContextMenuStrip.Items[5].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[6].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[7].Visible = false; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[1].Text = "查看位置"; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "结果编辑"; + winGridViewPager1.dataGridView1.ContextMenuStrip.Items[1].Text = "结果编辑"; + winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "查看位置"; //右键菜单宽度 winGridViewPager1.dataGridView1.ContextMenuStrip.AutoSize = false; @@ -160,13 +160,12 @@ this.WindowState = FormWindowState.Minimized; globeControl1.Globe.MemoryLayer.RemoveAllFeature(); this.WindowState = FormWindowState.Minimized; - double x = Convert.ToDouble(row.Cells["LONGITUDE"].Value); - double y = Convert.ToDouble(row.Cells["LATITUDE"].Value); - - string username = Convert.ToString(row.Cells["PATROLERNAME"].Value); - string Atime = Convert.ToString(row.Cells["ACCIDENTTIME"].Value); - string location = Convert.ToString(row.Cells["LOCALE"].Value); - string descp = Convert.ToString(row.Cells["DESCRIBE"].Value); + double x = Convert.ToDouble(row.Cells["经度"].Value); + double y = Convert.ToDouble(row.Cells["纬度"].Value); + string username = Convert.ToString(row.Cells["上报人员"].Value); + string Atime = Convert.ToString(row.Cells["上报时间"].Value); + string location = Convert.ToString(row.Cells["事件地点"].Value); + string descp = Convert.ToString(row.Cells["事件描述"].Value); /////////////////////////////////////// /*******设置飞行与创建模型******/ @@ -228,8 +227,8 @@ DataGridViewRow row = grid.SelectedRows[0]; try { - int dbId = Convert.ToInt32(row.Cells["DBID"].Value); - string result = Convert.ToString(row.Cells["RESULT"].Value); + int dbId = Convert.ToInt32(row.Cells["编号"].Value); + string result = Convert.ToString(row.Cells["处理结果"].Value); EMS_Forms.Form_EventResult form = new Form_EventResult(dbId, result); form.refresh += new Form_EventResult.Handle(LoadData);//改变值的事件 form.ShowDialog(); @@ -276,9 +275,9 @@ } for (int i = 0; i < table.Rows.Count; i++) { - if (winGridViewPager1.dataGridView1.Rows[i].Cells["RESULT"].Value != null && !(winGridViewPager1.dataGridView1.Rows[i].Cells["RESULT"].Value.ToString().Trim().Equals(""))) + if (winGridViewPager1.dataGridView1.Rows[i].Cells["处理结果"].Value != null && !(winGridViewPager1.dataGridView1.Rows[i].Cells["处理结果"].Value.ToString().Trim().Equals(""))) { - winGridViewPager1.dataGridView1.Rows[i].Cells["STATE"].Value = "已处理"; + winGridViewPager1.dataGridView1.Rows[i].Cells["处理状态"].Value = "已处理"; } } @@ -307,9 +306,9 @@ } for (int i = 0; i < table.Rows.Count; i++) { - if (winGridViewPager1.dataGridView1.Rows[i].Cells["RESULT"].Value != null && !(winGridViewPager1.dataGridView1.Rows[i].Cells["RESULT"].Value.ToString().Trim().Equals(""))) + if (winGridViewPager1.dataGridView1.Rows[i].Cells["处理结果"].Value != null && !(winGridViewPager1.dataGridView1.Rows[i].Cells["处理结果"].Value.ToString().Trim().Equals(""))) { - winGridViewPager1.dataGridView1.Rows[i].Cells["STATE"].Value = "已处理"; + winGridViewPager1.dataGridView1.Rows[i].Cells["处理状态"].Value = "已处理"; } } @@ -320,10 +319,12 @@ { string sqlCount = "select count(*) from ACCIDENT where 1=1"; - string sqlData = "select ACCIDENTTIME,DBID,DESCRIBE,LATITUDE,LOCALE,LONGITUDE,PATROLERNAME,PATROLER_ID,TASK_ID,RESULT,'' as STATE " + + string sqlData = "select ACCIDENTTIME as 上报时间,DBID as 编号,DESCRIBE as 事件描述,"+ + "LATITUDE as 纬度,LOCALE as 事件地点,LONGITUDE as 经度,PATROLERNAME 上报人员,"+ + "PATROLER_ID as 人员ID,TASK_ID as 任务编号,RESULT as 处理结果,'' as 处理状态 " + "from (select t.*,rownum row_num from ACCIDENT t order by DBID)b " + " where 1=1"; - + rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; @@ -340,9 +341,10 @@ string sqlCount = "select count(*) from ACCIDENT where 1=1"; - string sqlData = "select ACCIDENTTIME,DBID,DESCRIBE,LATITUDE,LOCALE,LONGITUDE,PATROLERNAME,PATROLER_ID,TASK_ID,RESULT,'' as STATE " + - "from (select t.*,rownum row_num from ACCIDENT t order by DBID)b " + - " where(b.row_num between " + minPage + " and " + maxPage + ")"; + string sqlData = "select ACCIDENTTIME as 上报时间,DBID as 编号,DESCRIBE as 事件描述," + + "LATITUDE as 纬度,LOCALE as 事件地点,LONGITUDE as 经度,PATROLERNAME 上报人员," + + "PATROLER_ID as 人员ID,TASK_ID as 任务编号,RESULT as 处理结果,'' as 处理状态 " + + "from (select t.*,rownum row_num from ACCIDENT t where 1=1"; if (!String.IsNullOrEmpty(comboBox_name.Text.Trim())) { @@ -361,7 +363,8 @@ sqlCount += "and ACCIDENTTIME<=to_date('" + time.ToShortDateString() + "','yyyy-MM-dd') "; sqlData += "and ACCIDENTTIME<=to_date('" + time.ToShortDateString() + "','yyyy-MM-dd') "; } - + sqlData += " order by DBID desc)b " + + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 225c8d7..8bd9e48 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -120,8 +120,8 @@ private void flyToTask(DataGridViewRow row, int taskState) { int dbID = 0; - dbID = Convert.ToInt32(row.Cells["DBID"].Value); - string userName = Convert.ToString(row.Cells["USERNAME"].Value); + dbID = Convert.ToInt32(row.Cells["任务编号"].Value); + string userName = Convert.ToString(row.Cells["任务执行人员"].Value); System.DateTime t = new DateTime(); try { @@ -392,15 +392,15 @@ //控制表格显示的列，以及每一列要显示的列名 this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - this.winGridViewPager1.AddColumnAlias("DBID", "任务编号"); - this.winGridViewPager1.AddColumnAlias("DEPLOYTIME", "创建时间"); - this.winGridViewPager1.AddColumnAlias("DESCIRPTION", "任务描述"); - this.winGridViewPager1.AddColumnAlias("FINISHTIME", "完成时间"); - this.winGridViewPager1.AddColumnAlias("STREET", "任务执行区域"); - this.winGridViewPager1.AddColumnAlias("TASKSTATE", "任务状态"); - this.winGridViewPager1.AddColumnAlias("USERNAME", "任务执行人员"); + this.winGridViewPager1.AddColumnAlias("任务编号", "任务编号"); + this.winGridViewPager1.AddColumnAlias("创建时间", "创建时间"); + this.winGridViewPager1.AddColumnAlias("任务描述", "任务描述"); + this.winGridViewPager1.AddColumnAlias("完成时间", "完成时间"); + this.winGridViewPager1.AddColumnAlias("任务执行区域", "任务执行区域"); + this.winGridViewPager1.AddColumnAlias("任务状态", "任务状态"); + this.winGridViewPager1.AddColumnAlias("任务执行人员", "任务执行人员"); - this.winGridViewPager1.DisplayColumns = "DBID,DEPLOYTIME,DESCIRPTION,FINISHTIME,STREET,TASKSTATE,USERNAME"; + this.winGridViewPager1.DisplayColumns = "任务编号,创建时间,任务描述,完成时间,任务执行区域,任务状态,任务执行人员"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -464,8 +464,8 @@ { int dbID = 0; int taskStateInt = 0; - dbID = Convert.ToInt32(row.Cells["DBID"].Value); - string taskState = row.Cells["TASKSTATE"].Value.ToString(); + dbID = Convert.ToInt32(row.Cells["任务编号"].Value); + string taskState = row.Cells["任务状态"].Value.ToString(); if (taskState.Equals("开始任务")) { taskStateInt = 1; @@ -534,9 +534,10 @@ private string GetSql() { - string sqlCount = "select count(*) from taskinfo t where 1=1'"; + string sqlCount = "select count(*) from taskinfo t where 1=1"; - string sqlData = "select dbid,deploytime,descirption,finishtime,street,taskstate,username " + + 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"; @@ -550,9 +551,9 @@ int minPage = (pageIndex - 1) * maxPageIndex + 1; int maxPage = pageIndex * maxPageIndex; string sqlCount = "select count(*) from taskinfo t where 1=1"; - string sqlData = "select dbid,deploytime,descirption,finishtime,street,taskstate,username " + - "from (select t.*,rownum row_num from taskinfo t order by DBID desc)b " + - " where(b.row_num between " + minPage + " and " + maxPage + ")"; + 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"; if (!String.IsNullOrEmpty(comboBox_userName.Text.Trim()) && !comboBox_userName.Text.Trim().Equals("不限")) { @@ -581,6 +582,8 @@ sqlCount += "and street='" + combo_street.Text + "' "; sqlData += "and street='" + combo_street.Text + "' "; } + sqlData += " order by DBID desc)b " + + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index e65a4bd..58f5342 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -73,13 +73,13 @@ //控制表格显示的列，以及每一列要显示的列名 this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - this.winGridViewPager1.AddColumnAlias("FILENAME", "文档名称"); - this.winGridViewPager1.AddColumnAlias("DBID", "编号"); - this.winGridViewPager1.AddColumnAlias("TITLE", "文档标题"); - this.winGridViewPager1.AddColumnAlias("FILETYPE", "文档类型"); - this.winGridViewPager1.AddColumnAlias("UPDAY", "上传日期"); - this.winGridViewPager1.AddColumnAlias("WRITER", "上传人"); - this.winGridViewPager1.DisplayColumns = "FILENAME,TITLE,FILETYPE,UPDAY,WRITER"; + this.winGridViewPager1.AddColumnAlias("文档名称", "文档名称"); + this.winGridViewPager1.AddColumnAlias("编号", "编号"); + this.winGridViewPager1.AddColumnAlias("文档标题", "文档标题"); + this.winGridViewPager1.AddColumnAlias("文档类型", "文档类型"); + this.winGridViewPager1.AddColumnAlias("上传日期", "上传日期"); + this.winGridViewPager1.AddColumnAlias("上传人", "上传人"); + this.winGridViewPager1.DisplayColumns = "文档名称,文档标题,文档类型,上传日期,上传人"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -167,7 +167,7 @@ if (grid != null) { DataGridViewRow row = grid.SelectedRows[0]; - string dbid = row.Cells["dbid"].Value.ToString(); + string dbid = row.Cells["编号"].Value.ToString(); try { if (MessageBox.Show("确认删除吗？", "确认", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) @@ -212,7 +212,8 @@ { string sqlCount = "select count(*) from casic_userdocument where sysname = 'EMS'"; - string sqlData = "select filename,dbid,title,filetype,upday,writer " + + string sqlData = "select filename as 文档名称,dbid as 编号,title as 文档标题," + + "filetype as 文档类型,upday as 上传日期,writer as 上传人 " + "from (select t.*,rownum row_num from casic_userdocument t order by DBID desc)b " + " where sysname = 'EMS'"; @@ -226,9 +227,9 @@ int minPage = (pageIndex - 1) * maxPageIndex + 1; int maxPage = pageIndex * maxPageIndex; string sqlCount = "select count(*) from casic_userdocument where sysname = 'EMS'"; - string sqlData = "select filename,dbid,title,filetype,upday,writer " + - "from (select t.*,rownum row_num from casic_userdocument t where sysname = 'EMS' order by DBID desc)b " + - " where(b.row_num between " + minPage + " and " + maxPage + ")"; + string sqlData = "select filename as 文档名称,dbid as 编号,title as 文档标题,"+ + "filetype as 文档类型,upday as 上传日期,writer as 上传人 " + + "from (select t.*,rownum row_num from casic_userdocument t where sysname = 'EMS'"; string txtTitleText = null; string comboFileType = null; @@ -278,7 +279,8 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - + sqlData += " order by DBID desc)b " + + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; @@ -437,7 +439,7 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - string filename = row.Cells["filename"].Value.ToString(); + string filename = row.Cells["文档名称"].Value.ToString(); string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; string file = System.Environment.CurrentDirectory + "\\download\\" + filename; int result = DownloadFile(url, file, progressBar1); @@ -515,7 +517,7 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - string filename = row.Cells["filename"].Value.ToString(); + string filename = row.Cells["文档名称"].Value.ToString(); string ext = Path.GetExtension(filename); SaveFileDialog dlg = new SaveFileDialog(); dlg.Filter = "保存文档|*" + ext + ";"; diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 1d1201b..3902629 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -748,6 +748,7 @@ this.Name = "FrmAddSinMark"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "单个标识器添加"; + this.TopMost = true; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmAddSinMark_FormClosing); this.Load += new System.EventHandler(this.FrmAddSinMark_Load); this.groupPanel1.ResumeLayout(false); diff --git a/FrmEquipmentManage.cs b/FrmEquipmentManage.cs index 90bfdb2..a3cf55c 100644 --- a/FrmEquipmentManage.cs +++ b/FrmEquipmentManage.cs @@ -74,13 +74,13 @@ //控制表格显示的列，以及每一列要显示的列名 this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - this.winGridViewPager1.AddColumnAlias("DESCIRPTION", "设备描述"); - this.winGridViewPager1.AddColumnAlias("DBID", "编号"); - this.winGridViewPager1.AddColumnAlias("MACID", "MAC地址"); - this.winGridViewPager1.AddColumnAlias("OWNER", "设备所有人"); - this.winGridViewPager1.AddColumnAlias("STATUS", "设备状态"); + this.winGridViewPager1.AddColumnAlias("设备描述", "设备描述"); + this.winGridViewPager1.AddColumnAlias("编号", "编号"); + this.winGridViewPager1.AddColumnAlias("MAC地址", "MAC地址"); + this.winGridViewPager1.AddColumnAlias("设备所有人", "设备所有人"); + this.winGridViewPager1.AddColumnAlias("设备状态", "设备状态"); - this.winGridViewPager1.DisplayColumns = "DESCIRPTION,MACID,OWNER,STATUS"; + this.winGridViewPager1.DisplayColumns = "设备描述,MAC地址,设备所有人,设备状态"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -146,10 +146,10 @@ DataGridViewRow row = grid.SelectedRows[0]; try { - long dbid = long.Parse(row.Cells["DBID"].Value.ToString()); - String macId = row.Cells["MACID"].Value.ToString(); - String username = row.Cells["OWNER"].Value.ToString(); - String descn = row.Cells["DESCIRPTION"].Value.ToString(); + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); + String macId = row.Cells["MAC地址"].Value.ToString(); + String username = row.Cells["设备所有人"].Value.ToString(); + String descn = row.Cells["设备状态"].Value.ToString(); FrmEquipmentEdit frm = new FrmEquipmentEdit(dbid.ToString(), macId, username, descn); frm.reloadGrid += new ReloadEquipmentGrid(LoadData); frm.ShowDialog(); @@ -179,7 +179,7 @@ { return; } - String macId = row.Cells["MACID"].Value.ToString(); + String macId = row.Cells["MAC地址"].Value.ToString(); FrmLog frm = new FrmLog(macId); frm.Show(); } @@ -201,7 +201,7 @@ if (grid != null) { DataGridViewRow row = grid.SelectedRows[0]; - long dbid = long.Parse(row.Cells["DBID"].Value.ToString()); + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); try { if (MessageBox.Show("确定删除？", "确认", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) @@ -243,7 +243,8 @@ { string sqlCount = "select count(*) from equipment where status = 'USING'"; - string sqlData = "select descirption,DBID,macid,owner,case when status = 'USING' then '可用' when status = 'DAMAGE' then '损坏' end as status " + + string sqlData = "select descirption as 设备描述,DBID as 编号,macid as MAC地址,owner as 设备所有人,"+ + "case when status = 'USING' then '可用' when status = 'DAMAGE' then '损坏' end as 设备状态 " + "from (select t.*,rownum row_num from equipment t where status = 'USING' order by dbid desc)b " + " where 1=1"; @@ -258,16 +259,17 @@ int maxPage = pageIndex * maxPageIndex; string sqlCount = "select count(*) from equipment where status = 'USING' "; - string sqlData = "select descirption,DBID,macid,owner,case when status = 'USING' then '可用' when status = 'DAMAGE' then '损坏' end as status " + - "from (select t.*,rownum row_num from equipment t where status = 'USING' order by DBID desc)b " + - " where(b.row_num between " + minPage + " and " + maxPage + ")"; + string sqlData = "select descirption as 设备描述,DBID as 编号,macid as MAC地址,owner as 设备所有人," + + "case when status = 'USING' then '可用' when status = 'DAMAGE' then '损坏' end as 设备状态 " + + "from (select t.*,rownum row_num from equipment t where status = 'USING'"; if (!String.IsNullOrEmpty(txtMacId.Text.Trim())) { sqlData += " and macid like '%" + txtMacId.Text.Trim() + "%'"; sqlCount += " and macid like '%" + txtMacId.Text.Trim() + "%'"; } - + sqlData += " order by DBID desc)b " + + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; @@ -299,76 +301,6 @@ } } - //public void reloadGrid(int pageIndex) - //{ - // if (pageIndex <= 0) - // { - // pageIndex = 1; - // currentpage = 1; - // } - // String sqlrows = "select * from (select rownum as rowno,dbid,descirption,macid,owner,case when status = 'USING' then '可用' when status = 'DAMAGE' then '损坏' end as status,'编辑' as btnEdit,'删除' as btnDel from equipment t where status = 'USING' "; - // string sqlcount = "select count(*) from equipment where status = 'USING' "; - // if (!String.IsNullOrEmpty(txtMacId.Text.Trim())) - // { - // sqlrows += " and macid like '%" + txtMacId.Text.Trim() + "%'"; - // sqlcount += " and macid like '%" + txtMacId.Text.Trim() + "%'"; - // } - // sqlrows += " and rownum<=" + (pagesize * pageIndex) + ") table_alias where table_alias.rowno>=" + ((pageIndex - 1) * pagesize + 1); - - // int rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlcount).ToString()); - // int pages = 0; - // if (rows % pagesize == 0) - // { - // pages = rows / pagesize; - // } - // else - // { - // pages = rows / pagesize + 1; - // } - - // lastpage = pages; - - // lab_page_msg.Text = "共" + rows + "条记录，每页" + pagesize + "条，第" + pageIndex + "页，共" + pages + "页"; - // combo_page_num.Items.Clear(); - // for (int i = 1; i <= pages; i++) - // { - // combo_page_num.Items.Add(new ComboBoxItem(i.ToString(), i.ToString())); - // } - - // if (lastpage == 1) - // { - // btn_page_first.Enabled = false; - // btn_page_pre.Enabled = false; - // btn_page_last.Enabled = false; - // btn_page_next.Enabled = false; - // } - // else if (currentpage == 1) - // { - // btn_page_first.Enabled = false; - // btn_page_pre.Enabled = false; - // btn_page_last.Enabled = true; - // btn_page_next.Enabled = true; - // } - // else if (currentpage == lastpage) - // { - // btn_page_first.Enabled = true; - // btn_page_pre.Enabled = true; - // btn_page_last.Enabled = false; - // btn_page_next.Enabled = false; - // } - // else - // { - // btn_page_first.Enabled = true; - // btn_page_pre.Enabled = true; - // btn_page_last.Enabled = true; - // btn_page_next.Enabled = true; - // } - - // DataTable table = OracleUtils.ExecuteDataset(OracleUtils.ConnectionString, CommandType.Text, sqlrows).Tables[0]; - // dataGridViewX1.DataSource = table; - - //} - private void FrmEquipmentManage_FormClosing(object sender, FormClosingEventArgs e) diff --git a/FrmFlagDetail.Designer.cs b/FrmFlagDetail.Designer.cs new file mode 100644 index 0000000..982bfc6 --- /dev/null +++ b/FrmFlagDetail.Designer.cs @@ -0,0 +1,103 @@ +namespace Cyberpipe +{ + partial class FrmFlagDetail + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); + this.dataGridViewX_markDetail = new DevComponents.DotNetBar.Controls.DataGridViewX(); + this.对象类型 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.对象编号 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.对象名称 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX_markDetail)).BeginInit(); + this.SuspendLayout(); + // + // dataGridViewX_markDetail + // + this.dataGridViewX_markDetail.AllowUserToAddRows = false; + this.dataGridViewX_markDetail.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; + this.dataGridViewX_markDetail.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dataGridViewX_markDetail.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.对象类型, + this.对象编号, + this.对象名称}); + dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle3.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dataGridViewX_markDetail.DefaultCellStyle = dataGridViewCellStyle3; + this.dataGridViewX_markDetail.Dock = System.Windows.Forms.DockStyle.Fill; + this.dataGridViewX_markDetail.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(170)))), ((int)(((byte)(170)))), ((int)(((byte)(170))))); + this.dataGridViewX_markDetail.Location = new System.Drawing.Point(0, 0); + this.dataGridViewX_markDetail.Name = "dataGridViewX_markDetail"; + this.dataGridViewX_markDetail.RowTemplate.Height = 23; + this.dataGridViewX_markDetail.Size = new System.Drawing.Size(508, 321); + this.dataGridViewX_markDetail.TabIndex = 0; + // + // 对象类型 + // + this.对象类型.HeaderText = "对象类型"; + this.对象类型.Name = "对象类型"; + // + // 对象编号 + // + this.对象编号.HeaderText = "对象编号"; + this.对象编号.Name = "对象编号"; + // + // 对象名称 + // + this.对象名称.HeaderText = "对象名称"; + this.对象名称.Name = "对象名称"; + // + // FrmFlagDetail + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(508, 321); + this.Controls.Add(this.dataGridViewX_markDetail); + this.Name = "FrmFlagDetail"; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; + this.Text = "标识对象信息"; + this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmFlagDetail_FormClosing); + this.Load += new System.EventHandler(this.FrmFlagDetail_Load); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX_markDetail)).EndInit(); + this.ResumeLayout(false); + + } + + #endregion + + private DevComponents.DotNetBar.Controls.DataGridViewX dataGridViewX_markDetail; + private System.Windows.Forms.DataGridViewTextBoxColumn 对象类型; + private System.Windows.Forms.DataGridViewTextBoxColumn 对象编号; + private System.Windows.Forms.DataGridViewTextBoxColumn 对象名称; + + } +} \ No newline at end of file diff --git a/FrmFlagDetail.cs b/FrmFlagDetail.cs new file mode 100644 index 0000000..81de974 --- /dev/null +++ b/FrmFlagDetail.cs @@ -0,0 +1,77 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Windows.Forms; +using GeoScene.Globe; +using System.Data.OracleClient; + +namespace Cyberpipe +{ + public partial class FrmFlagDetail : Form + { + DataTable dt = new DataTable(); + private GSOGlobeControl globeControl1; + + public delegate void Handle(); + public event Handle showParentForm; + String markId; + + public FrmFlagDetail(GSOGlobeControl globeControl1, String id) + { + InitializeComponent(); + this.markId = id; + } + + private void FrmFlagDetail_FormClosing(object sender, FormClosingEventArgs e) + { + showParentForm(); + } + + private void FrmFlagDetail_Load(object sender, EventArgs e) + { + string objectIds = ""; + string objectTypeCodes = ""; + string sql = "select t.对象编号,t.对象类型 from 标识器 t where t.编号='" + markId + "'"; + using (OracleDataReader reader = OracleUtils.ExecuteReader(OracleUtils.ConnectionString, CommandType.Text, sql)) + { + while (reader.Read()) + { + objectIds = reader.GetString(0); + objectTypeCodes = reader.GetString(1); + } + } + + string[] codeTypes = objectTypeCodes.Split(','); + string[] codeIds = objectIds.Split(','); + int length = 0; + if (codeTypes.Length <= codeIds.Length) + { + length = codeTypes.Length; + } + else + { + length = codeIds.Length; + } + for (int n = 0; n < length; n++) + { + for (int i = 0; i < Utility1.listPipelineType.Count; i++) + { + if (Utility1.listPipelineType[i].code == codeTypes[n]) + { + //string objectId = codeIds[i]; + //string objectType = Utility1.listPipelineType[i].type; + //string objectName = Utility1.listPipelineType[i].name; + int index = this.dataGridViewX_markDetail.Rows.Add(); + this.dataGridViewX_markDetail.Rows[index].Cells[0].Value = Utility1.listPipelineType[i].type; + this.dataGridViewX_markDetail.Rows[index].Cells[1].Value = codeIds[n].ToString(); + this.dataGridViewX_markDetail.Rows[index].Cells[2].Value = Utility1.listPipelineType[i].name; + } + } + } + } + } +} diff --git a/FrmFlagDetail.resx b/FrmFlagDetail.resx new file mode 100644 index 0000000..e98a8fe --- /dev/null +++ b/FrmFlagDetail.resx @@ -0,0 +1,129 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + True + + + True + + + True + + \ No newline at end of file diff --git a/FrmFlagManagers.Designer.cs b/FrmFlagManagers.Designer.cs index d7e2f60..9fe14fb 100644 --- a/FrmFlagManagers.Designer.cs +++ b/FrmFlagManagers.Designer.cs @@ -28,8 +28,10 @@ /// private void InitializeComponent() { - this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); - this.winGridViewPager1 = new WHC.Pager.WinControl.WinGridViewPager(); + this.components = new System.ComponentModel.Container(); + this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components); + this.标识对象ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripMenuItem2 = new System.Windows.Forms.ToolStripMenuItem(); this.bar1 = new DevComponents.DotNetBar.Bar(); this.labelItem1 = new DevComponents.DotNetBar.LabelItem(); this.txt_no = new DevComponents.DotNetBar.TextBoxItem(); @@ -38,45 +40,37 @@ this.btn_query = new DevComponents.DotNetBar.ButtonItem(); this.btn_add_batch = new DevComponents.DotNetBar.ButtonItem(); this.btn_add_menu = new DevComponents.DotNetBar.ButtonItem(); - this.btn_db = new DevComponents.DotNetBar.ButtonItem(); - this.tableLayoutPanel1.SuspendLayout(); + this.winGridViewPager1 = new WHC.Pager.WinControl.WinGridViewPager(); + this.contextMenuStrip1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.bar1)).BeginInit(); this.SuspendLayout(); // - // tableLayoutPanel1 + // contextMenuStrip1 // - this.tableLayoutPanel1.ColumnCount = 1; - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel1.Controls.Add(this.winGridViewPager1, 0, 1); - this.tableLayoutPanel1.Controls.Add(this.bar1, 0, 0); - this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 0); - this.tableLayoutPanel1.Name = "tableLayoutPanel1"; - this.tableLayoutPanel1.RowCount = 2; - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 32F)); - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel1.Size = new System.Drawing.Size(881, 474); - this.tableLayoutPanel1.TabIndex = 6; + this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.标识对象ToolStripMenuItem, + this.toolStripMenuItem2}); + this.contextMenuStrip1.Name = "contextMenuStrip1"; + this.contextMenuStrip1.Size = new System.Drawing.Size(125, 48); // - // winGridViewPager1 + // 标识对象ToolStripMenuItem // - this.winGridViewPager1.AppendedMenu = null; - this.winGridViewPager1.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; - this.winGridViewPager1.DataSource = null; - this.winGridViewPager1.DisplayColumns = ""; - this.winGridViewPager1.Dock = System.Windows.Forms.DockStyle.Fill; - this.winGridViewPager1.Location = new System.Drawing.Point(3, 35); - this.winGridViewPager1.MinimumSize = new System.Drawing.Size(540, 0); - this.winGridViewPager1.Name = "winGridViewPager1"; - this.winGridViewPager1.PrintTitle = ""; - this.winGridViewPager1.Size = new System.Drawing.Size(875, 436); - this.winGridViewPager1.TabIndex = 5; + this.标识对象ToolStripMenuItem.Name = "标识对象ToolStripMenuItem"; + this.标识对象ToolStripMenuItem.Size = new System.Drawing.Size(124, 22); + this.标识对象ToolStripMenuItem.Text = "标识对象"; + this.标识对象ToolStripMenuItem.Click += new System.EventHandler(this.标识对象ToolStripMenuItem_Click); + // + // toolStripMenuItem2 + // + this.toolStripMenuItem2.Name = "toolStripMenuItem2"; + this.toolStripMenuItem2.Size = new System.Drawing.Size(152, 22); + this.toolStripMenuItem2.Text = "查看位置"; + this.toolStripMenuItem2.Click += new System.EventHandler(this.toolStripMenuItem2_Click); // // bar1 // this.bar1.AntiAlias = true; this.bar1.Dock = System.Windows.Forms.DockStyle.Top; - this.bar1.DockSide = DevComponents.DotNetBar.eDockSide.Document; this.bar1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.labelItem1, this.txt_no, @@ -84,14 +78,13 @@ this.combo_street, this.btn_query, this.btn_add_batch, - this.btn_add_menu, - this.btn_db}); - this.bar1.Location = new System.Drawing.Point(3, 3); + this.btn_add_menu}); + this.bar1.Location = new System.Drawing.Point(0, 0); this.bar1.Name = "bar1"; - this.bar1.Size = new System.Drawing.Size(875, 28); + this.bar1.Size = new System.Drawing.Size(881, 28); this.bar1.Stretch = true; this.bar1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.bar1.TabIndex = 1; + this.bar1.TabIndex = 8; this.bar1.TabStop = false; this.bar1.Text = "bar1"; // @@ -136,24 +129,34 @@ this.btn_add_menu.Text = "手工添加"; this.btn_add_menu.Click += new System.EventHandler(this.btn_add_menu_Click); // - // btn_db + // winGridViewPager1 // - this.btn_db.Name = "btn_db"; - this.btn_db.Text = "数据导出"; + this.winGridViewPager1.AppendedMenu = null; + this.winGridViewPager1.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; + this.winGridViewPager1.DataSource = null; + this.winGridViewPager1.DisplayColumns = ""; + this.winGridViewPager1.Dock = System.Windows.Forms.DockStyle.Fill; + this.winGridViewPager1.Location = new System.Drawing.Point(0, 28); + this.winGridViewPager1.MinimumSize = new System.Drawing.Size(540, 0); + this.winGridViewPager1.Name = "winGridViewPager1"; + this.winGridViewPager1.PrintTitle = ""; + this.winGridViewPager1.Size = new System.Drawing.Size(881, 446); + this.winGridViewPager1.TabIndex = 9; // // FrmFlagManagers // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(881, 474); - this.Controls.Add(this.tableLayoutPanel1); + this.Controls.Add(this.winGridViewPager1); + this.Controls.Add(this.bar1); this.DoubleBuffered = true; this.Name = "FrmFlagManagers"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "标识器管理"; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmFlagManagers_FormClosing); this.Load += new System.EventHandler(this.FrmFlagManagers_Load); - this.tableLayoutPanel1.ResumeLayout(false); + this.contextMenuStrip1.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.bar1)).EndInit(); this.ResumeLayout(false); @@ -161,8 +164,8 @@ #endregion - private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1; - private WHC.Pager.WinControl.WinGridViewPager winGridViewPager1; + private System.Windows.Forms.ContextMenuStrip contextMenuStrip1; + private System.Windows.Forms.ToolStripMenuItem 标识对象ToolStripMenuItem; private DevComponents.DotNetBar.Bar bar1; private DevComponents.DotNetBar.LabelItem labelItem1; private DevComponents.DotNetBar.TextBoxItem txt_no; @@ -171,6 +174,7 @@ private DevComponents.DotNetBar.ButtonItem btn_query; private DevComponents.DotNetBar.ButtonItem btn_add_batch; private DevComponents.DotNetBar.ButtonItem btn_add_menu; - private DevComponents.DotNetBar.ButtonItem btn_db; + private WHC.Pager.WinControl.WinGridViewPager winGridViewPager1; + private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem2; } } \ No newline at end of file diff --git a/FrmFlagManagers.cs b/FrmFlagManagers.cs index 38d4927..9bf9734 100644 --- a/FrmFlagManagers.cs +++ b/FrmFlagManagers.cs @@ -33,15 +33,13 @@ { this.globeControl1 = _globeControl1; InitializeComponent(); - winGridViewPager1.OnPageChanged += new EventHandler(winGridViewPager1_OnPageChanged); - this.winGridViewPager1.OnAddNew += new EventHandler(winGridViewPager1_OnAddNew); //右键定位 + winGridViewPager1.OnPageChanged += new EventHandler(winGridViewPager1_OnPageChanged); this.winGridViewPager1.OnEditSelected += new EventHandler(winGridViewPager1_OnEditSelected);//属性编辑 this.winGridViewPager1.OnDeleteSelected += new EventHandler(winGridViewPager1_OnDeleteSelected);//标识器报废 + this.winGridViewPager1.OnStartExport += new EventHandler(pager1_OnStartExport); this.winGridViewPager1.OnEndExport += new EventHandler(pager1_OnEndExport); - //this.winGridViewPager1.ExportCurrent += new ExportCurrentEventHandler(pager1_ExportCurrent); - //this.winGridViewPager1.ExportAll += new ExportAllEventHandler(pager1_ExportAll); winGridViewPager1.dataGridView1.MultiSelect = false; @@ -76,26 +74,25 @@ this.winGridViewPager1.AddColumnAlias("标识器型号", "标识器型号"); this.winGridViewPager1.AddColumnAlias("地面高程", "地面高程"); this.winGridViewPager1.AddColumnAlias("标识器埋深", "标识器埋深"); - this.winGridViewPager1.AddColumnAlias("对象编号", "对象编号"); - this.winGridViewPager1.AddColumnAlias("对象类型", "对象类型"); this.winGridViewPager1.AddColumnAlias("所属道路", "所属道路"); this.winGridViewPager1.AddColumnAlias("使用状态", "使用状态"); - this.winGridViewPager1.DisplayColumns = "编号,标识器ID号,标识器型号,地面高程,标识器埋深,对象编号,对象类型,所属道路,使用状态"; + this.winGridViewPager1.DisplayColumns = "编号,标识器ID号,标识器型号,地面高程,标识器埋深,所属道路,使用状态"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 //隐藏右键功能按钮 //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[1].Visible = false; - //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[4].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[5].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[6].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[7].Visible = false; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[1].Text = "定位查看"; + //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[1].Text = "定位查看"; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "属性编辑"; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Text = "标识器报废"; + winGridViewPager1.AppendedMenu = this.contextMenuStrip1; + //右键菜单宽度 winGridViewPager1.dataGridView1.ContextMenuStrip.AutoSize = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Width = 150; @@ -153,7 +150,7 @@ } /// - /// 右键定位 + /// 对象查看 /// /// /// @@ -306,20 +303,10 @@ string sqlCount = "select count(*) from 标识器 where 使用状态 = '使用中'"; - string sqlData = "select 编号,标识器ID号,标识器型号,地面高程,标识器埋深,对象编号,对象类型,所属道路,LSSYS_ID,X坐标,Y坐标,使用状态 " + + string sqlData = "select 编号,标识器ID号,标识器型号,地面高程,标识器埋深,所属道路,LSSYS_ID,X坐标,Y坐标,使用状态 " + "from (select t.*,rownum row_num from 标识器 t where 使用状态 = '使用中' order by 编号)b " + " where 1=1"; - if (!String.IsNullOrEmpty(txt_no.Text.Trim())) - { - sqlCount += " and 编号 like '%" + txt_no.Text.Trim() + "%'"; - sqlData += " and 编号 like '%" + txt_no.Text.Trim() + "%'"; - } - if (null != combo_street.SelectedItem && !String.IsNullOrEmpty(combo_street.SelectedItem.ToString().Trim())) - { - sqlData += " and 所属道路='" + combo_street.SelectedItem.ToString().Trim() + "'"; - sqlCount += " and 所属道路='" + combo_street.SelectedItem.ToString().Trim() + "'"; - } rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -332,9 +319,8 @@ int maxPage = pageIndex * maxPageIndex; string sqlCount = "select count(*) from 标识器 where 使用状态 = '使用中'"; - string sqlData = "select 编号,标识器ID号,标识器型号,地面高程,标识器埋深,对象编号,对象类型,所属道路,LSSYS_ID,X坐标,Y坐标,使用状态 " + - "from (select t.*,rownum row_num from 标识器 t where 使用状态 = '使用中' order by 编号)b "+ - " where(b.row_num between " + minPage + " and " + maxPage + ")"; + string sqlData = "select 编号,标识器ID号,标识器型号,地面高程,标识器埋深,所属道路,LSSYS_ID,X坐标,Y坐标,使用状态 " + + "from (select t.*,rownum row_num from 标识器 t where 使用状态 = '使用中'"; if (!String.IsNullOrEmpty(txt_no.Text.Trim())) { @@ -347,6 +333,8 @@ sqlCount += " and 所属道路='" + combo_street.SelectedItem.ToString().Trim() + "'"; } + sqlData += " order by 编号)b " + + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; @@ -372,9 +360,10 @@ private void FrmFlagManagers_FormClosing(object sender, FormClosingEventArgs e) { IS_OPEN = false; - Thread downloadJob = new Thread(new ParameterizedThreadStart(doSave)); - downloadJob.IsBackground = true; - downloadJob.Start(e); + //Thread downloadJob = new Thread(new ParameterizedThreadStart(doSave)); + //downloadJob.IsBackground = true; + //downloadJob.Start(e); + globeControl1.Globe.Layers["标识器"].Save(); globeControl1.Globe.MemoryLayer.RemoveAllFeature(); foreach (GSOFeature f in Features) { @@ -480,10 +469,88 @@ if (null != globeControl1) { FrmAddSinMark frm = new FrmAddSinMark(globeControl1); - frm.ShowDialog(); + frm.Show(); } } + private void 标识对象ToolStripMenuItem_Click(object sender, EventArgs e) + { + if (winGridViewPager1 != null && winGridViewPager1.dataGridView1 != null) + { + DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; + try + { + this.Hide(); + string id = row.Cells["编号"].Value.ToString(); + FrmFlagDetail p = new FrmFlagDetail(globeControl1, id); + p.showParentForm += new FrmFlagDetail.Handle(showThisForm);//改变值的事件 + p.Show(); + } + catch (Exception ex) + { + MessageBox.Show("失败:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } + + private void showThisForm() + { + this.Show(); + } + + private void toolStripMenuItem2_Click(object sender, EventArgs e) + { + if (winGridViewPager1 != null && winGridViewPager1.dataGridView1 != null) + { + DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; + try + { + this.WindowState = FormWindowState.Minimized; + string id = row.Cells["LSSYS_ID"].Value.ToString(); + string flagno = row.Cells["编号"].Value.ToString(); + string flagstreet = row.Cells["所属道路"].Value.ToString(); + double x = Convert.ToDouble(row.Cells["X坐标"].Value); + double y = Convert.ToDouble(row.Cells["Y坐标"].Value); + GSOFeature flagFeature = globeControl1.Globe.Layers.GetLayerByCaption("标识器").GetFeatureByID(int.Parse(id)); + + string type = ""; + string pipe = ""; + string sql = "select t.标识器型号,t.对象编号 from 标识器 t where t.编号='" + flagno + "'"; + using (OracleDataReader reader = OracleUtils.ExecuteReader(OracleUtils.ConnectionString, CommandType.Text, sql)) + { + while (reader.Read()) + { + type = reader.GetString(0); + pipe = reader.GetString(1); + } + } + + GSOLabel label = new GSOLabel(); + label.Text = "标识器编号：" + flagno + "\r\n" + + "标识器类型:" + type + "\r\n" + + //"标识对象编号:" + pipe + "\r\n" + + "所属道路:" + flagstreet; + label.Style = new GSOLabelStyle(); + label.Style.TextStyle.FontSize = 18; + label.Style.TextStyle.ForeColor = Color.FromArgb(0, 0, 0, 255); + label.Style.Opaque = 0.8; //设置标注的透明度，取值区间是0-1 + label.Style.TracktionLineType = EnumTracktionLineType.Solid; + label.Style.TextStyle.FontHeight = 10; + label.Style.TextStyle.FontName = "黑体"; + label.Style.TractionLineEndPos = new GSOPoint2d(80, 60); + + flagFeature.Label = label; + Features.Add(flagFeature); + globeControl1.Globe.JumpToFeature(flagFeature, 20); + this.globeControl1.Refresh(); + + } + catch (Exception ex) + { + MessageBox.Show("标识器定位失败:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } } diff --git a/FrmFlagManagers.resx b/FrmFlagManagers.resx index 1af7de1..ad53752 100644 --- a/FrmFlagManagers.resx +++ b/FrmFlagManagers.resx @@ -117,4 +117,7 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 17, 17 + \ No newline at end of file diff --git a/FrmPatrolerEdit.cs b/FrmPatrolerEdit.cs index dbd4fec..f45b5ae 100644 --- a/FrmPatrolerEdit.cs +++ b/FrmPatrolerEdit.cs @@ -46,7 +46,7 @@ txt_name.Focus(); return; } - if (String.IsNullOrEmpty(combo_sex.SelectedItem.ToString())) + if (combo_sex.SelectedItem == null ||String.IsNullOrEmpty(combo_sex.SelectedItem.ToString())) { MessageBox.Show("性别不能为空！", "警告", MessageBoxButtons.OK, MessageBoxIcon.Warning); combo_sex.Focus(); diff --git a/FrmPatrolerManager.Designer.cs b/FrmPatrolerManager.Designer.cs index bb8e5fb..10fac22 100644 --- a/FrmPatrolerManager.Designer.cs +++ b/FrmPatrolerManager.Designer.cs @@ -47,11 +47,13 @@ this.注销 = new DevComponents.Editors.ComboItem(); this.btn_query_person = new DevComponents.DotNetBar.ButtonItem(); this.btn_add_person = new DevComponents.DotNetBar.ButtonItem(); - this.winGridViewPager1 = new WHC.Pager.WinControl.WinGridViewPager(); this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components); this.日志ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.任务ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.定位ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.winGridViewPager1 = new WHC.Pager.WinControl.WinGridViewPager(); + this.编辑ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.注销ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); ((System.ComponentModel.ISupportInitialize)(this.bar1)).BeginInit(); this.contextMenuStrip1.SuspendLayout(); this.SuspendLayout(); @@ -173,9 +175,42 @@ this.btn_add_person.Text = "新增"; this.btn_add_person.Click += new System.EventHandler(this.btn_add_person_Click); // + // contextMenuStrip1 + // + this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.日志ToolStripMenuItem, + this.任务ToolStripMenuItem, + this.定位ToolStripMenuItem, + this.编辑ToolStripMenuItem, + this.注销ToolStripMenuItem}); + this.contextMenuStrip1.Name = "contextMenuStrip1"; + this.contextMenuStrip1.Size = new System.Drawing.Size(153, 136); + // + // 日志ToolStripMenuItem + // + this.日志ToolStripMenuItem.Name = "日志ToolStripMenuItem"; + this.日志ToolStripMenuItem.Size = new System.Drawing.Size(100, 22); + this.日志ToolStripMenuItem.Text = "日志"; + this.日志ToolStripMenuItem.Click += new System.EventHandler(this.日志ToolStripMenuItem_Click); + // + // 任务ToolStripMenuItem + // + this.任务ToolStripMenuItem.Name = "任务ToolStripMenuItem"; + this.任务ToolStripMenuItem.Size = new System.Drawing.Size(100, 22); + this.任务ToolStripMenuItem.Text = "任务"; + this.任务ToolStripMenuItem.Click += new System.EventHandler(this.任务ToolStripMenuItem_Click); + // + // 定位ToolStripMenuItem + // + this.定位ToolStripMenuItem.Name = "定位ToolStripMenuItem"; + this.定位ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.定位ToolStripMenuItem.Text = "定位"; + this.定位ToolStripMenuItem.Click += new System.EventHandler(this.定位ToolStripMenuItem_Click); + // // winGridViewPager1 // this.winGridViewPager1.AppendedMenu = null; + this.winGridViewPager1.ContextMenuStrip = this.contextMenuStrip1; this.winGridViewPager1.DataSource = null; this.winGridViewPager1.DisplayColumns = ""; this.winGridViewPager1.Dock = System.Windows.Forms.DockStyle.Fill; @@ -186,35 +221,19 @@ this.winGridViewPager1.Size = new System.Drawing.Size(756, 309); this.winGridViewPager1.TabIndex = 3; // - // contextMenuStrip1 + // 编辑ToolStripMenuItem // - this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.日志ToolStripMenuItem, - this.任务ToolStripMenuItem, - this.定位ToolStripMenuItem}); - this.contextMenuStrip1.Name = "contextMenuStrip1"; - this.contextMenuStrip1.Size = new System.Drawing.Size(101, 70); + this.编辑ToolStripMenuItem.Name = "编辑ToolStripMenuItem"; + this.编辑ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.编辑ToolStripMenuItem.Text = "编辑"; + this.编辑ToolStripMenuItem.Click += new System.EventHandler(this.编辑ToolStripMenuItem_Click); // - // 日志ToolStripMenuItem + // 注销ToolStripMenuItem // - this.日志ToolStripMenuItem.Name = "日志ToolStripMenuItem"; - this.日志ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); - this.日志ToolStripMenuItem.Text = "日志"; - this.日志ToolStripMenuItem.Click += new System.EventHandler(this.日志ToolStripMenuItem_Click); - // - // 任务ToolStripMenuItem - // - this.任务ToolStripMenuItem.Name = "任务ToolStripMenuItem"; - this.任务ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); - this.任务ToolStripMenuItem.Text = "任务"; - this.任务ToolStripMenuItem.Click += new System.EventHandler(this.任务ToolStripMenuItem_Click); - // - // 定位ToolStripMenuItem - // - this.定位ToolStripMenuItem.Name = "定位ToolStripMenuItem"; - this.定位ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); - this.定位ToolStripMenuItem.Text = "定位"; - this.定位ToolStripMenuItem.Click += new System.EventHandler(this.定位ToolStripMenuItem_Click); + this.注销ToolStripMenuItem.Name = "注销ToolStripMenuItem"; + this.注销ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.注销ToolStripMenuItem.Text = "注销"; + this.注销ToolStripMenuItem.Click += new System.EventHandler(this.注销ToolStripMenuItem_Click); // // FrmPatrolerManager // @@ -229,7 +248,7 @@ this.MinimizeBox = false; this.Name = "FrmPatrolerManager"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; - this.Text = "巡检人员维护"; + this.Text = "定位人员维护"; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmPatrolerManager_FormClosing); this.Load += new System.EventHandler(this.FrmPatrolerManager_Load); ((System.ComponentModel.ISupportInitialize)(this.bar1)).EndInit(); @@ -258,10 +277,12 @@ private DevComponents.Editors.ComboItem 注销; private DevComponents.Editors.ComboItem comboItem1; private DevComponents.Editors.ComboItem 不限; - private WHC.Pager.WinControl.WinGridViewPager winGridViewPager1; private System.Windows.Forms.ContextMenuStrip contextMenuStrip1; private System.Windows.Forms.ToolStripMenuItem 日志ToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem 任务ToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem 定位ToolStripMenuItem; + private WHC.Pager.WinControl.WinGridViewPager winGridViewPager1; + private System.Windows.Forms.ToolStripMenuItem 编辑ToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem 注销ToolStripMenuItem; } } \ No newline at end of file diff --git a/FrmPatrolerManager.cs b/FrmPatrolerManager.cs index 255a076..9c32f54 100644 --- a/FrmPatrolerManager.cs +++ b/FrmPatrolerManager.cs @@ -29,9 +29,7 @@ this.globeControl1 = globeControl1; winGridViewPager1.OnPageChanged += new EventHandler(winGridViewPager1_OnPageChanged); - this.winGridViewPager1.OnEditSelected += new EventHandler(winGridViewPager1_OnEditSelected);//编辑 - this.winGridViewPager1.OnDeleteSelected += new EventHandler(winGridViewPager1_OnDeleteSelected);//删除 - + this.winGridViewPager1.OnStartExport += new EventHandler(pager1_OnStartExport); this.winGridViewPager1.OnEndExport += new EventHandler(pager1_OnEndExport); @@ -47,26 +45,31 @@ //控制表格显示的列，以及每一列要显示的列名 this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - this.winGridViewPager1.AddColumnAlias("USERNAME", "姓名"); - this.winGridViewPager1.AddColumnAlias("DBID", "编号"); - this.winGridViewPager1.AddColumnAlias("SEX", "性别"); - this.winGridViewPager1.AddColumnAlias("AGE", "年龄"); - this.winGridViewPager1.AddColumnAlias("PHONENUM", "电话"); - this.winGridViewPager1.AddColumnAlias("ACCOUNTSTATE", "状态"); - this.winGridViewPager1.DisplayColumns = "USERNAME,SEX,AGE,PHONENUM,ACCOUNTSTATE"; + this.winGridViewPager1.AddColumnAlias("姓名", "姓名"); + this.winGridViewPager1.AddColumnAlias("编号", "编号"); + this.winGridViewPager1.AddColumnAlias("性别", "性别"); + this.winGridViewPager1.AddColumnAlias("年龄", "年龄"); + this.winGridViewPager1.AddColumnAlias("电话", "电话"); + this.winGridViewPager1.AddColumnAlias("状态", "状态"); + this.winGridViewPager1.DisplayColumns = "姓名,性别,年龄,电话,状态"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 + //隐藏右键功能按钮 //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[1].Visible = false; + winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Visible = false; + winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[4].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[5].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[6].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[7].Visible = false; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "编辑"; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Text = "注销"; + + //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "编辑"; + //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Text = "注销"; winGridViewPager1.AppendedMenu = this.contextMenuStrip1; + //右键菜单宽度 winGridViewPager1.dataGridView1.ContextMenuStrip.AutoSize = false; @@ -122,11 +125,11 @@ DataGridViewRow row = grid.SelectedRows[0]; try { - long dbid = long.Parse(row.Cells["dbid"].Value.ToString()); - String name = row.Cells["USERNAME"].Value.ToString(); - String sex = row.Cells["SEX"].Value.ToString(); - String age = row.Cells["AGE"].Value.ToString(); - string phone = row.Cells["PHONENUM"].Value.ToString(); + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); + String name = row.Cells["姓名"].Value.ToString(); + String sex = row.Cells["性别"].Value.ToString(); + String age = row.Cells["年龄"].Value.ToString(); + string phone = row.Cells["电话"].Value.ToString(); age = String.IsNullOrEmpty(age.ToString().Trim()) ? "1" : age.ToString().Trim(); FrmPatrolerEdit frm = new FrmPatrolerEdit(dbid.ToString(), name, age, sex, phone); frm.reloadGrid += new ReloadPatrolerGrid(LoadData); @@ -152,10 +155,10 @@ if (grid != null) { DataGridViewRow row = grid.SelectedRows[0]; - long dbid = long.Parse(row.Cells["DBID"].Value.ToString()); + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); try { - string state = row.Cells["ACCOUNTSTATE"].Value.ToString(); + string state = row.Cells["状态"].Value.ToString(); if ("在线".Equals(state)) { if (MessageBox.Show("确定注销？", "确认", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) @@ -180,60 +183,60 @@ { int pageIndex = winGridViewPager1.PagerInfo.CurrenetPageIndex; string sqlData = GetSql(pageIndex); - initlizeDatagrid(); + DataTable table = OracleUtils.ExecuteDataset(OracleUtils.ConnectionString, CommandType.Text, sqlData).Tables[0]; winGridViewPager1.DataSource = table.DefaultView; - for (int i = 0; i < winGridViewPager1.dataGridView1.Rows.Count; i++) - { - if (winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value.ToString() == "ONLINE") - { - winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value = "在线"; - } - else - { - if (winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value.ToString() == "OFFLINE") - { - winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value = "离线"; - } - else - { - if (winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value.ToString() == "LEAVER") - { - winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value = "注销"; - } - } - } - } + //for (int i = 0; i < winGridViewPager1.dataGridView1.Rows.Count; i++) + //{ + // if (winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value.ToString() == "ONLINE") + // { + // winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value = "在线"; + // } + // else + // { + // if (winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value.ToString() == "OFFLINE") + // { + // winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value = "离线"; + // } + // else + // { + // if (winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value.ToString() == "LEAVER") + // { + // winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value = "注销"; + // } + // } + // } + //} winGridViewPager1.Refresh(); } private void LoadData(int pageIndex) { string sqlData = GetSql(pageIndex); - initlizeDatagrid(); + DataTable table = OracleUtils.ExecuteDataset(OracleUtils.ConnectionString, CommandType.Text, sqlData).Tables[0]; winGridViewPager1.DataSource = table.DefaultView; - for (int i = 0; i < winGridViewPager1.dataGridView1.Rows.Count; i++) - { - if (winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value.ToString() == "ONLINE") - { - winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value = "在线"; - } - else - { - if (winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value.ToString() == "OFFLINE") - { - winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value = "离线"; - } - else - { - if (winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value.ToString() == "LEAVER") - { - winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value = "注销"; - } - } - } - } + //for (int i = 0; i < winGridViewPager1.dataGridView1.Rows.Count; i++) + //{ + // if (winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value.ToString() == "ONLINE") + // { + // winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value = "在线"; + // } + // else + // { + // if (winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value.ToString() == "OFFLINE") + // { + // winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value = "离线"; + // } + // else + // { + // if (winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value.ToString() == "LEAVER") + // { + // winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value = "注销"; + // } + // } + // } + //} winGridViewPager1.Refresh(); } @@ -241,7 +244,8 @@ { string sqlCount = "select count(*) from equipment where status = 'USING'"; - string sqlData = "select username,dbid,sex,age,phonenum,accountstate " + + string sqlData = "select username as 姓名,dbid as 编号,sex as 性别,age as 年龄,phonenum as 电话,"+ + "case when accountstate = 'ONLINE' then '在线' when accountstate = 'OFFLINE' then '离线' when accountstate = 'LEAVER' then '注销' end as 状态 " + "from (select t.*,rownum row_num from patroler t order by DBID desc)b " + " where 1=1"; @@ -255,9 +259,9 @@ int minPage = (pageIndex - 1) * maxPageIndex + 1; int maxPage = pageIndex * maxPageIndex; string sqlCount = "select count(*) from patroler where 1=1"; - string sqlData = "select username,dbid,sex,age,phonenum,accountstate " + - "from (select t.*,rownum row_num from patroler t order by DBID desc)b " + - " where(b.row_num between " + minPage + " and " + maxPage + ")"; + string sqlData = "select username as 姓名,dbid as 编号,sex as 性别,age as 年龄,phonenum as 电话,"+ + "case when accountstate = 'ONLINE' then '在线' when accountstate = 'OFFLINE' then '离线' when accountstate = 'LEAVER' then '注销' end as 状态 " + + "from (select t.*,rownum row_num from patroler t where 1=1"; if (!String.IsNullOrEmpty(txt_username.Text.Trim())) { @@ -281,7 +285,8 @@ sqlCount += " and accountstate='" + combo_stateText + "'"; sqlData += " and accountstate='" + combo_stateText + "'"; } - + sqlData += " order by DBID desc)b " + + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; @@ -291,6 +296,7 @@ { try { + initlizeDatagrid(); LoadData(); initForm(); IS_OPEN = true; @@ -310,11 +316,13 @@ } if (Utility.userRole.IndexOf("巡检员编辑") == -1) { - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Visible = false; + //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Visible = false; + 编辑ToolStripMenuItem.Visible = false; } if (Utility.userRole.IndexOf("巡检员注销") == -1) { - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Visible = false; + //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Visible = false; + 注销ToolStripMenuItem.Visible = false; } } @@ -376,7 +384,7 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - long dbid = long.Parse(row.Cells["dbid"].Value.ToString()); + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); Log p = new Log(dbid.ToString()); p.Show(); } @@ -395,8 +403,8 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - long dbid = long.Parse(row.Cells["dbid"].Value.ToString()); - String state = row.Cells["ACCOUNTSTATE"].Value.ToString(); + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); + String state = row.Cells["状态"].Value.ToString(); if ("在线".Equals(state)) { string sql = "select t.dbid " + @@ -435,8 +443,8 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - long dbid = long.Parse(row.Cells["dbid"].Value.ToString()); - String username = row.Cells["USERNAME"].Value.ToString(); + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); + String username = row.Cells["姓名"].Value.ToString(); string sql = "select t.latitude, t.longitude " + "from position t " + "where t.dbid = (select max(dbid) from position where patroler_id = " + dbid + ")"; @@ -489,6 +497,63 @@ } + private void 编辑ToolStripMenuItem_Click(object sender, EventArgs e) + { + if (winGridViewPager1 != null && winGridViewPager1.dataGridView1 != null) + { + DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; + try + { + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); + String name = row.Cells["姓名"].Value.ToString(); + String sex = row.Cells["性别"].Value.ToString(); + String age = row.Cells["年龄"].Value.ToString(); + string phone = row.Cells["电话"].Value.ToString(); + age = String.IsNullOrEmpty(age.ToString().Trim()) ? "1" : age.ToString().Trim(); + FrmPatrolerEdit frm = new FrmPatrolerEdit(dbid.ToString(), name, age, sex, phone); + frm.reloadGrid += new ReloadPatrolerGrid(LoadData); + frm.ShowDialog(); + winGridViewPager1.Refresh(); + } + catch (Exception ex) + { + MessageBox.Show("编辑失败:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } + + private void 注销ToolStripMenuItem_Click(object sender, EventArgs e) + { + if (winGridViewPager1 != null && winGridViewPager1.dataGridView1 != null) + { + DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); + try + { + if (MessageBox.Show("确定注销？", "确认", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) + { + String sql = "update patroler t set t.accountstate='LEAVER' where t.dbid=" + dbid; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + LoadData(); + MessageBox.Show("人员已注销", "信息", MessageBoxButtons.OK, MessageBoxIcon.Information); + } + //string state = row.Cells["状态"].Value.ToString(); + //if ("在线".Equals(state)) + //{ + + //} + //else + //{ + // MessageBox.Show("人员不在线，无法注销", "信息"); + //} + } + catch (Exception ex) + { + MessageBox.Show("人员注销失败:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } + } } diff --git a/FrmRoleInfoManager.cs b/FrmRoleInfoManager.cs index 8897133..35693cf 100644 --- a/FrmRoleInfoManager.cs +++ b/FrmRoleInfoManager.cs @@ -55,10 +55,10 @@ //控制表格显示的列，以及每一列要显示的列名 this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - this.winGridViewPager1.AddColumnAlias("NT", "角色名称"); - this.winGridViewPager1.AddColumnAlias("ID", "编号"); + this.winGridViewPager1.AddColumnAlias("角色名称", "角色名称"); + this.winGridViewPager1.AddColumnAlias("编号", "编号"); - this.winGridViewPager1.DisplayColumns = "NT"; + this.winGridViewPager1.DisplayColumns = "角色名称"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -131,7 +131,7 @@ { try { - string dbid = row.Cells["id"].Value.ToString(); + string dbid = row.Cells["编号"].Value.ToString(); string sql = "delete from casic_userroletest where id=" + dbid; OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); LoadData(); @@ -170,7 +170,7 @@ { string sqlCount = "select id,nt from casic_userroletest where sysname='EMS'"; - string sqlData = "select nt,id " + + string sqlData = "select nt as 角色名称,id as 编号 " + "from (select t.*,rownum row_num from casic_userroletest t order by id desc)b " + " where sysname='EMS'"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -183,7 +183,7 @@ int minPage = (pageIndex - 1) * maxPageIndex + 1; int maxPage = pageIndex * maxPageIndex; string sqlCount = "select id,nt from casic_userroletest where sysname='EMS'"; - string sqlData = "select nt,id " + + string sqlData = "select nt as 角色名称,id as 编号 " + "from (select t.*,rownum row_num from casic_userroletest t where sysname='EMS' order by id desc)b " + " where(b.row_num between " + minPage + " and " + maxPage + ")"; diff --git a/FrmSysUserInfoManger.cs b/FrmSysUserInfoManger.cs index 7903916..e193a61 100644 --- a/FrmSysUserInfoManger.cs +++ b/FrmSysUserInfoManger.cs @@ -28,6 +28,7 @@ this.winGridViewPager1.OnEndExport += new EventHandler(pager1_OnEndExport); winGridViewPager1.dataGridView1.MultiSelect = false; + } private void FrmSysUserInfoManger_Load(object sender, EventArgs e) @@ -59,10 +60,10 @@ //控制表格显示的列，以及每一列要显示的列名 this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - this.winGridViewPager1.AddColumnAlias("USERNAME", "账号"); - this.winGridViewPager1.AddColumnAlias("ID", "编号"); + this.winGridViewPager1.AddColumnAlias("账号", "账号"); + this.winGridViewPager1.AddColumnAlias("编号", "编号"); - this.winGridViewPager1.DisplayColumns = "USERNAME"; + this.winGridViewPager1.DisplayColumns = "账号"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -130,8 +131,8 @@ if (grid != null) { DataGridViewRow row = grid.SelectedRows[0]; - string dbid = row.Cells["id"].Value.ToString(); - string userName = row.Cells["USERNAME"].Value.ToString(); + string dbid = row.Cells["编号"].Value.ToString(); + string userName = row.Cells["账号"].Value.ToString(); if (userName.Equals("ems")) { MessageBox.Show("该用户为管理员用户，无法删除！", "信息"); @@ -184,7 +185,7 @@ { string sqlCount = "select count(*) from casic_userinfotest where sysname='EMS'"; - string sqlData = "select username,id " + + string sqlData = "select username as 账号,id as 编号 " + "from (select t.*,rownum row_num from casic_userinfotest t order by id desc)b " + " where sysname='EMS'"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -197,16 +198,16 @@ int minPage = (pageIndex - 1) * maxPageIndex + 1; int maxPage = pageIndex * maxPageIndex; string sqlCount = "select count(*) from casic_userinfotest where sysname='EMS'"; - string sqlData = "select username,id " + - "from (select t.*,rownum row_num from casic_userinfotest t where sysname='EMS' order by id desc)b " + - " where(b.row_num between " + minPage + " and " + maxPage + ")"; + string sqlData = "select username as 账号,id as 编号 " + + "from (select t.*,rownum row_num from casic_userinfotest t where sysname='EMS'"; if (!String.IsNullOrEmpty(txt_user_code.Text.Trim())) { sqlCount += " and username like '%" + txt_user_code.Text.Trim() + "%'"; sqlData += " and username like '%" + txt_user_code.Text.Trim() + "%'"; } - + sqlData += " order by id desc)b " + + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; diff --git a/MainFrm.cs b/MainFrm.cs index 39df646..0cd5881 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3310,10 +3310,10 @@ string str1 = ""; if (feature != null) { - if (feature.GetFieldDefn("图?片?编括?码?") != null) // + if (feature.GetFieldDefn("图片编码") != null) // { str1 = GetBubbleInfo(feature); - if (RemoteFileExists(Utility.PicRootURL + feature.GetValue("图?片?编括?码?").ToString())) + if (RemoteFileExists(Utility.PicRootURL + feature.GetValue("图片编码").ToString())) { str1 += ""; } @@ -3450,9 +3450,15 @@ string value1 = ""; if (field1 != null) { - if (field1.Name == "图片编码") + //if (field1.Name == "图片编码" || field1.Name == "对象编号" || field1.Name == "对象类型" || field1.Name == "对象名称") + //{ + // j++; + //} + while (field1.Name == "图片编码" || field1.Name == "对象编号" || field1.Name == "对象类型" || field1.Name == "对象名称") { j++; + fieldName = fieldNames[j].Trim(); + field1 = (GSOFieldDefn)feature.GetFieldDefn(fieldName); } if (j < rowCount) { @@ -3479,6 +3485,11 @@ if (!feature.IsFieldValueNull(j)) { value1 = feature.GetValue(j).ToString(); + if (name1 == "标识器埋深") + { + if (value1!=null&&value1.Length>4) + value1 = value1.Substring(0,4); + } } } } @@ -3491,9 +3502,14 @@ if (field2 != null) { - if (field2.Name == "图片编码") + //if (field2.Name == "图片编码" || field1.Name == "对象编号" || field1.Name == "对象类型" || field1.Name == "对象名称") + //{ + // j++; + //} + while (field2.Name == "图片编码" || field2.Name == "对象编号" || field2.Name == "对象类型" || field2.Name == "对象名称") { j++; + field2 = (GSOFieldDefn)feature.GetFieldDefn(j + 1); } if (j + 1 < rowCount) { @@ -3521,6 +3537,11 @@ if (!feature.IsFieldValueNull(j + 1)) { value2 = feature.GetValue(j + 1).ToString(); + if (name2 == "标识器埋深") + { + if (value2 != null && value2.Length > 4) + value2 = value2.Substring(0, 4); + } } } } @@ -15347,7 +15368,7 @@ return; } FrmFlagManagers frm = new FrmFlagManagers(globeControl1); - frm.Show(this); + frm.Show(); } private void ribbonTabItem2_MouseDown(object sender, MouseEventArgs e) diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index fddfb94..e5f0003 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -365,6 +365,16 @@ this.可编辑ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.保存ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.ribbonControl1 = new DevComponents.DotNetBar.RibbonControl(); + this.ribbonPanel3 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar3 = new DevComponents.DotNetBar.RibbonBar(); + this.btn_device = new DevComponents.DotNetBar.ButtonItem(); + this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); + this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel7 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); + this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); + this.slider4ground = new DevComponents.DotNetBar.SliderItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -374,12 +384,6 @@ this.btn_user_role = new DevComponents.DotNetBar.ButtonItem(); this.btn_password_edit = new DevComponents.DotNetBar.ButtonItem(); this.btn_reset_password = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel3 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar3 = new DevComponents.DotNetBar.RibbonBar(); - this.btn_device = new DevComponents.DotNetBar.ButtonItem(); - this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); - this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); @@ -551,10 +555,6 @@ this.buttonItemBZ9 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItemBZ10 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItemBZ11 = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel7 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); - this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); - this.slider4ground = new DevComponents.DotNetBar.SliderItem(); this.ribbonPanel12 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar18 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItem133 = new DevComponents.DotNetBar.ButtonItem(); @@ -690,11 +690,11 @@ this.contextMenuStrip3.SuspendLayout(); this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); - this.ribbonPanel8.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel7.SuspendLayout(); + this.ribbonPanel8.SuspendLayout(); this.ribbonPanel2.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); - this.ribbonPanel7.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); this.ribbonPanel5.SuspendLayout(); this.ribbonPanel6.SuspendLayout(); @@ -4162,10 +4162,10 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); - this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel2); - this.ribbonControl1.Controls.Add(this.ribbonPanel15); + this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel7); + this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); this.ribbonControl1.Controls.Add(this.ribbonPanel5); this.ribbonControl1.Controls.Add(this.ribbonPanel6); @@ -4216,135 +4216,6 @@ this.ribbonControl1.UseCustomizeDialog = false; this.ribbonControl1.Click += new System.EventHandler(this.ribbonControl1_Click); // - // ribbonPanel8 - // - this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel8.Controls.Add(this.ribbonBar_UserInfo); - this.ribbonPanel8.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel8.Location = new System.Drawing.Point(0, 33); - this.ribbonPanel8.Name = "ribbonPanel8"; - this.ribbonPanel8.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel8.Size = new System.Drawing.Size(1328, 62); - // - // - // - this.ribbonPanel8.Style.Class = ""; - this.ribbonPanel8.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel8.StyleMouseDown.Class = ""; - this.ribbonPanel8.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel8.StyleMouseOver.Class = ""; - this.ribbonPanel8.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel8.TabIndex = 42; - this.ribbonPanel8.Visible = false; - // - // ribbonBar_UserInfo - // - this.ribbonBar_UserInfo.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar_UserInfo.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar_UserInfo.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar_UserInfo.BackgroundStyle.Class = ""; - this.ribbonBar_UserInfo.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar_UserInfo.ContainerControlProcessDialogKey = true; - this.ribbonBar_UserInfo.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar_UserInfo.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.btn_user_info, - this.btn_role_info, - this.btn_resc_info, - this.btn_role_resc, - this.btn_user_role, - this.btn_password_edit, - this.btn_reset_password}); - this.ribbonBar_UserInfo.Location = new System.Drawing.Point(3, 0); - this.ribbonBar_UserInfo.Name = "ribbonBar_UserInfo"; - this.ribbonBar_UserInfo.Size = new System.Drawing.Size(427, 59); - this.ribbonBar_UserInfo.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar_UserInfo.TabIndex = 0; - // - // - // - this.ribbonBar_UserInfo.TitleStyle.Class = ""; - this.ribbonBar_UserInfo.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar_UserInfo.TitleStyleMouseOver.Class = ""; - this.ribbonBar_UserInfo.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // btn_user_info - // - this.btn_user_info.Image = global::Cyberpipe.Properties.Resources._24x24icon_13_hover; - this.btn_user_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_user_info.Name = "btn_user_info"; - this.btn_user_info.SubItemsExpandWidth = 14; - this.btn_user_info.Text = "用户管理"; - this.btn_user_info.Click += new System.EventHandler(this.btn_user_info_Click); - // - // btn_role_info - // - this.btn_role_info.Image = global::Cyberpipe.Properties.Resources._24x24icon_05_hover1; - this.btn_role_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_role_info.Name = "btn_role_info"; - this.btn_role_info.SubItemsExpandWidth = 14; - this.btn_role_info.Text = "角色管理"; - this.btn_role_info.Click += new System.EventHandler(this.btn_role_info_Click); - // - // btn_resc_info - // - this.btn_resc_info.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__09; - this.btn_resc_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_resc_info.Name = "btn_resc_info"; - this.btn_resc_info.SubItemsExpandWidth = 14; - this.btn_resc_info.Text = "资源管理"; - this.btn_resc_info.Click += new System.EventHandler(this.btn_resc_info_Click); - // - // btn_role_resc - // - this.btn_role_resc.Image = global::Cyberpipe.Properties.Resources.btnlegendSet_Image_副本; - this.btn_role_resc.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_role_resc.Name = "btn_role_resc"; - this.btn_role_resc.SubItemsExpandWidth = 14; - this.btn_role_resc.Text = "角色授权"; - this.btn_role_resc.Click += new System.EventHandler(this.btn_role_resc_Click); - // - // btn_user_role - // - this.btn_user_role.Image = global::Cyberpipe.Properties.Resources._24x24icon_08_hover; - this.btn_user_role.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_user_role.Name = "btn_user_role"; - this.btn_user_role.SubItemsExpandWidth = 14; - this.btn_user_role.Text = "用户授权"; - this.btn_user_role.Click += new System.EventHandler(this.btn_user_role_Click); - // - // btn_password_edit - // - this.btn_password_edit.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__67; - this.btn_password_edit.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_password_edit.Name = "btn_password_edit"; - this.btn_password_edit.SubItemsExpandWidth = 14; - this.btn_password_edit.Text = "密码修改"; - this.btn_password_edit.Click += new System.EventHandler(this.btn_password_edit_Click); - // - // btn_reset_password - // - this.btn_reset_password.Image = global::Cyberpipe.Properties.Resources.liuxiang; - this.btn_reset_password.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_reset_password.Name = "btn_reset_password"; - this.btn_reset_password.SubItemsExpandWidth = 14; - this.btn_reset_password.Text = "重置密码"; - this.btn_reset_password.Click += new System.EventHandler(this.btn_reset_password_Click); - // // ribbonPanel3 // this.ribbonPanel3.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4425,7 +4296,7 @@ this.btn_Person.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; this.btn_Person.Name = "btn_Person"; this.btn_Person.SubItemsExpandWidth = 14; - this.btn_Person.Text = "巡检人员维护"; + this.btn_Person.Text = "定位人员维护"; this.btn_Person.Click += new System.EventHandler(this.btn_Person_Click); // // btn_constructMap @@ -4446,6 +4317,214 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel7 + // + this.ribbonPanel7.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel7.Controls.Add(this.ribbonBar5); + this.ribbonPanel7.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel7.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel7.Name = "ribbonPanel7"; + this.ribbonPanel7.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel7.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel7.Style.Class = ""; + this.ribbonPanel7.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel7.StyleMouseDown.Class = ""; + this.ribbonPanel7.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel7.StyleMouseOver.Class = ""; + this.ribbonPanel7.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel7.TabIndex = 41; + this.ribbonPanel7.Visible = false; + // + // ribbonBar5 + // + this.ribbonBar5.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar5.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar5.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar5.BackgroundStyle.Class = ""; + this.ribbonBar5.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar5.ContainerControlProcessDialogKey = true; + this.ribbonBar5.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar5.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.btn_flag, + this.slider4ground}); + this.ribbonBar5.Location = new System.Drawing.Point(3, 0); + this.ribbonBar5.Name = "ribbonBar5"; + this.ribbonBar5.Size = new System.Drawing.Size(427, 92); + this.ribbonBar5.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar5.TabIndex = 0; + // + // + // + this.ribbonBar5.TitleStyle.Class = ""; + this.ribbonBar5.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar5.TitleStyleMouseOver.Class = ""; + this.ribbonBar5.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar5.TitleVisible = false; + // + // btn_flag + // + this.btn_flag.Image = global::Cyberpipe.Properties.Resources._24x24icon_03_hover; + this.btn_flag.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_flag.Name = "btn_flag"; + this.btn_flag.SubItemsExpandWidth = 14; + this.btn_flag.Text = "标识器管理"; + this.btn_flag.Click += new System.EventHandler(this.btn_flag_Click); + // + // slider4ground + // + this.slider4ground.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; + this.slider4ground.Name = "slider4ground"; + this.slider4ground.Text = "地面透明度"; + this.slider4ground.Value = 0; + this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); + // + // ribbonPanel8 + // + this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel8.Controls.Add(this.ribbonBar_UserInfo); + this.ribbonPanel8.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel8.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel8.Name = "ribbonPanel8"; + this.ribbonPanel8.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel8.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel8.Style.Class = ""; + this.ribbonPanel8.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel8.StyleMouseDown.Class = ""; + this.ribbonPanel8.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel8.StyleMouseOver.Class = ""; + this.ribbonPanel8.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel8.TabIndex = 42; + this.ribbonPanel8.Visible = false; + // + // ribbonBar_UserInfo + // + this.ribbonBar_UserInfo.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar_UserInfo.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar_UserInfo.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar_UserInfo.BackgroundStyle.Class = ""; + this.ribbonBar_UserInfo.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar_UserInfo.ContainerControlProcessDialogKey = true; + this.ribbonBar_UserInfo.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar_UserInfo.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.btn_user_info, + this.btn_role_info, + this.btn_resc_info, + this.btn_role_resc, + this.btn_user_role, + this.btn_password_edit, + this.btn_reset_password}); + this.ribbonBar_UserInfo.Location = new System.Drawing.Point(3, 0); + this.ribbonBar_UserInfo.Name = "ribbonBar_UserInfo"; + this.ribbonBar_UserInfo.Size = new System.Drawing.Size(427, 92); + this.ribbonBar_UserInfo.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar_UserInfo.TabIndex = 0; + // + // + // + this.ribbonBar_UserInfo.TitleStyle.Class = ""; + this.ribbonBar_UserInfo.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar_UserInfo.TitleStyleMouseOver.Class = ""; + this.ribbonBar_UserInfo.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // btn_user_info + // + this.btn_user_info.Image = global::Cyberpipe.Properties.Resources._24x24icon_13_hover; + this.btn_user_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_user_info.Name = "btn_user_info"; + this.btn_user_info.SubItemsExpandWidth = 14; + this.btn_user_info.Text = "用户管理"; + this.btn_user_info.Click += new System.EventHandler(this.btn_user_info_Click); + // + // btn_role_info + // + this.btn_role_info.Image = global::Cyberpipe.Properties.Resources._24x24icon_05_hover1; + this.btn_role_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_role_info.Name = "btn_role_info"; + this.btn_role_info.SubItemsExpandWidth = 14; + this.btn_role_info.Text = "角色管理"; + this.btn_role_info.Click += new System.EventHandler(this.btn_role_info_Click); + // + // btn_resc_info + // + this.btn_resc_info.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__09; + this.btn_resc_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_resc_info.Name = "btn_resc_info"; + this.btn_resc_info.SubItemsExpandWidth = 14; + this.btn_resc_info.Text = "资源管理"; + this.btn_resc_info.Click += new System.EventHandler(this.btn_resc_info_Click); + // + // btn_role_resc + // + this.btn_role_resc.Image = global::Cyberpipe.Properties.Resources.btnlegendSet_Image_副本; + this.btn_role_resc.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_role_resc.Name = "btn_role_resc"; + this.btn_role_resc.SubItemsExpandWidth = 14; + this.btn_role_resc.Text = "角色授权"; + this.btn_role_resc.Click += new System.EventHandler(this.btn_role_resc_Click); + // + // btn_user_role + // + this.btn_user_role.Image = global::Cyberpipe.Properties.Resources._24x24icon_08_hover; + this.btn_user_role.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_user_role.Name = "btn_user_role"; + this.btn_user_role.SubItemsExpandWidth = 14; + this.btn_user_role.Text = "用户授权"; + this.btn_user_role.Click += new System.EventHandler(this.btn_user_role_Click); + // + // btn_password_edit + // + this.btn_password_edit.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__67; + this.btn_password_edit.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_password_edit.Name = "btn_password_edit"; + this.btn_password_edit.SubItemsExpandWidth = 14; + this.btn_password_edit.Text = "密码修改"; + this.btn_password_edit.Click += new System.EventHandler(this.btn_password_edit_Click); + // + // btn_reset_password + // + this.btn_reset_password.Image = global::Cyberpipe.Properties.Resources.liuxiang; + this.btn_reset_password.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_reset_password.Name = "btn_reset_password"; + this.btn_reset_password.SubItemsExpandWidth = 14; + this.btn_reset_password.Text = "重置密码"; + this.btn_reset_password.Click += new System.EventHandler(this.btn_reset_password_Click); + // // ribbonPanel2 // this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -5891,85 +5970,6 @@ this.buttonItemBZ11.Text = "标注管理"; this.buttonItemBZ11.Click += new System.EventHandler(this.buttonItemBZ11_Click); // - // ribbonPanel7 - // - this.ribbonPanel7.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel7.Controls.Add(this.ribbonBar5); - this.ribbonPanel7.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel7.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel7.Name = "ribbonPanel7"; - this.ribbonPanel7.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel7.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel7.Style.Class = ""; - this.ribbonPanel7.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel7.StyleMouseDown.Class = ""; - this.ribbonPanel7.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel7.StyleMouseOver.Class = ""; - this.ribbonPanel7.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel7.TabIndex = 41; - this.ribbonPanel7.Visible = false; - // - // ribbonBar5 - // - this.ribbonBar5.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar5.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar5.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar5.BackgroundStyle.Class = ""; - this.ribbonBar5.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar5.ContainerControlProcessDialogKey = true; - this.ribbonBar5.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar5.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.btn_flag, - this.slider4ground}); - this.ribbonBar5.Location = new System.Drawing.Point(3, 0); - this.ribbonBar5.Name = "ribbonBar5"; - this.ribbonBar5.Size = new System.Drawing.Size(427, 92); - this.ribbonBar5.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar5.TabIndex = 0; - // - // - // - this.ribbonBar5.TitleStyle.Class = ""; - this.ribbonBar5.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar5.TitleStyleMouseOver.Class = ""; - this.ribbonBar5.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar5.TitleVisible = false; - // - // btn_flag - // - this.btn_flag.Image = global::Cyberpipe.Properties.Resources._24x24icon_03_hover; - this.btn_flag.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_flag.Name = "btn_flag"; - this.btn_flag.SubItemsExpandWidth = 14; - this.btn_flag.Text = "标识器管理"; - this.btn_flag.Click += new System.EventHandler(this.btn_flag_Click); - // - // slider4ground - // - this.slider4ground.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; - this.slider4ground.Name = "slider4ground"; - this.slider4ground.Text = "地面透明度"; - this.slider4ground.Value = 0; - this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); - // // ribbonPanel12 // this.ribbonPanel12.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7181,11 +7181,11 @@ this.contextMenuStripDeleteLayerNode.ResumeLayout(false); this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); - this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel7.ResumeLayout(false); + this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); - this.ribbonPanel7.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); this.ribbonPanel5.ResumeLayout(false); this.ribbonPanel6.ResumeLayout(false); diff --git a/SysRescInfoManager.cs b/SysRescInfoManager.cs index 3a84d95..fda6f3f 100644 --- a/SysRescInfoManager.cs +++ b/SysRescInfoManager.cs @@ -79,11 +79,11 @@ //控制表格显示的列，以及每一列要显示的列名 this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - - this.winGridViewPager1.AddColumnAlias("RESC", "资源名称"); - this.winGridViewPager1.AddColumnAlias("ID", "编号"); - this.winGridViewPager1.AddColumnAlias("DESP", "资源描述"); - this.winGridViewPager1.DisplayColumns = "RESC,DESP"; + + this.winGridViewPager1.AddColumnAlias("资源名称", "资源名称"); + this.winGridViewPager1.AddColumnAlias("编号", "编号"); + this.winGridViewPager1.AddColumnAlias("资源描述", "资源描述"); + this.winGridViewPager1.DisplayColumns = "资源名称,资源描述"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -153,8 +153,8 @@ DataGridViewRow row = grid.SelectedRows[0]; if (MessageBox.Show("确定删除？", "确认", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) { - string dbid = row.Cells["id"].Value.ToString(); - string resc = row.Cells["resc"].Value.ToString(); + string dbid = row.Cells["编号"].Value.ToString(); + string resc = row.Cells["资源名称"].Value.ToString(); OracleConnection conn = null; OracleTransaction tran = null; try @@ -229,7 +229,7 @@ private string GetSql() { string sqlCount = "select count(*) from casic_userresctest where sysname='EMS'"; - string sqlData = "select resc,id,desp " + + string sqlData = "select resc as 资源名称,id as 编号,desp as 资源描述 " + "from (select t.*,rownum row_num from casic_userresctest t order by id desc)b " + " where sysname='EMS'"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -242,7 +242,7 @@ int minPage = (pageIndex - 1) * maxPageIndex + 1; int maxPage = pageIndex * maxPageIndex; string sqlCount = "select count(*) from casic_userresctest where sysname='EMS'"; - string sqlData = "select resc,id,desp " + + string sqlData = "select resc as 资源名称,id as 编号,desp as 资源描述 " + "from (select t.*,rownum row_num from casic_userresctest t where sysname='EMS' order by id desc)b " + " where(b.row_num between " + minPage + " and " + maxPage + ")"; diff --git a/bin/x86/Debug/Config.xml b/bin/x86/Debug/Config.xml index e2d7b46..560a163 100644 --- a/bin/x86/Debug/Config.xml +++ b/bin/x86/Debug/Config.xml @@ -3,9 +3,9 @@ LocaSpace三维地下管线信息系统 scott - SZHTDB - 127.0.0.1 - scott + SZHTDB2 + 192.168.0.203 + SZHTDB2 127.0.0.1 1500 @@ -14,8 +14,8 @@ http://192.168.0.122:8088/UpDownFile.asmx - http://127.0.0.1/EMSCyberpipe.msi - http://127.0.0.1/EMSConfig.xml + http://192.168.10.229/EMSCyberpipe.msi + http://192.168.10.229/EMSConfig.xml diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index b19e2ab..b5e320f 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 1a4aeed..c20e54a 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/PipelineType.xml b/bin/x86/Debug/PipelineType.xml index 51dc4b8..b1cbacc 100644 --- a/bin/x86/Debug/PipelineType.xml +++ b/bin/x86/Debug/PipelineType.xml @@ -1,6 +1,6 @@  - + @@ -42,7 +42,7 @@ - + @@ -83,7 +83,7 @@ - + @@ -115,7 +115,7 @@ - + @@ -159,7 +159,7 @@ - + @@ -200,7 +200,7 @@ - + @@ -236,7 +236,7 @@ - + @@ -278,7 +278,7 @@ - + @@ -320,7 +320,7 @@ - + @@ -363,7 +363,7 @@ - + @@ -408,7 +408,7 @@ - + @@ -448,7 +448,7 @@ - + @@ -485,7 +485,7 @@ - + @@ -527,7 +527,7 @@ - + @@ -565,7 +565,7 @@ - + @@ -595,7 +595,7 @@ - + @@ -625,7 +625,7 @@ - + @@ -657,7 +657,7 @@ - + @@ -691,7 +691,7 @@ - + @@ -728,7 +728,7 @@ - + @@ -763,7 +763,7 @@ - + @@ -799,7 +799,7 @@ - + @@ -824,7 +824,7 @@ - + @@ -846,7 +846,7 @@ - + diff --git a/obj/x86/Debug/Cyberpipe.csproj.FileListAbsolute.txt b/obj/x86/Debug/Cyberpipe.csproj.FileListAbsolute.txt index 42dc58c..b78c534 100644 --- a/obj/x86/Debug/Cyberpipe.csproj.FileListAbsolute.txt +++ b/obj/x86/Debug/Cyberpipe.csproj.FileListAbsolute.txt @@ -203,3 +203,4 @@ D:\ym\EMS+GHFX\EMS\obj\x86\Debug\EMSCyberpipe.pdb D:\ym\EMS+GHFX\EMS\obj\x86\Debug\Cyberpipe.FrmFlagManagers.resources D:\ym\EMS+GHFX\EMS\obj\x86\Debug\Cyberpipe.FrmFlagEdits.resources +D:\ym\EMS+GHFX\EMS\obj\x86\Debug\Cyberpipe.FrmFlagDetail.resources diff --git a/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache b/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache index 19b3415..cee9c4a 100644 --- a/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache +++ b/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache Binary files differ diff --git a/obj/x86/Debug/EMSCyberpipe.exe b/obj/x86/Debug/EMSCyberpipe.exe index b19e2ab..b5e320f 100644 --- a/obj/x86/Debug/EMSCyberpipe.exe +++ b/obj/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/obj/x86/Debug/EMSCyberpipe.pdb b/obj/x86/Debug/EMSCyberpipe.pdb index 1a4aeed..c20e54a 100644 --- a/obj/x86/Debug/EMSCyberpipe.pdb +++ b/obj/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/obj/x86/Debug/GenerateResource.read.1.tlog b/obj/x86/Debug/GenerateResource.read.1.tlog index 79b7689..7ee40f5 100644 --- a/obj/x86/Debug/GenerateResource.read.1.tlog +++ b/obj/x86/Debug/GenerateResource.read.1.tlog Binary files differ diff --git a/Cyberpipe.csproj b/Cyberpipe.csproj index fe600e5..501fd09 100644 --- a/Cyberpipe.csproj +++ b/Cyberpipe.csproj @@ -246,6 +246,12 @@ Form_TaskManager.cs + + Form + + + FrmFlagDetail.cs + Form @@ -1368,6 +1374,9 @@ Form_TaskManager.cs + + FrmFlagDetail.cs + FormDocumentManager.cs diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 537b4c3..1acf22a 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 7d5dd95..3f178cb 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -90,20 +90,20 @@ this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - - this.winGridViewPager1.AddColumnAlias("ACCIDENTTIME", "上报时间"); - this.winGridViewPager1.AddColumnAlias("DBID", "编号"); - this.winGridViewPager1.AddColumnAlias("DESCRIBE", "事件描述"); - this.winGridViewPager1.AddColumnAlias("LATITUDE", "纬度"); - this.winGridViewPager1.AddColumnAlias("LOCALE", "事件地点"); - this.winGridViewPager1.AddColumnAlias("LONGITUDE", "经度"); - this.winGridViewPager1.AddColumnAlias("PATROLERNAME", "上报人员"); - this.winGridViewPager1.AddColumnAlias("PATROLER_ID", "人员ID"); - this.winGridViewPager1.AddColumnAlias("TASK_ID", "任务编号"); - this.winGridViewPager1.AddColumnAlias("RESULT", "处理结果"); - this.winGridViewPager1.AddColumnAlias("STATE", "处理状态"); - this.winGridViewPager1.DisplayColumns = "ACCIDENTTIME,DESCRIBE,LOCALE,PATROLERNAME,TASK_ID,RESULT,STATE"; + this.winGridViewPager1.AddColumnAlias("上报时间", "上报时间"); + this.winGridViewPager1.AddColumnAlias("编号", "编号"); + this.winGridViewPager1.AddColumnAlias("事件描述", "事件描述"); + this.winGridViewPager1.AddColumnAlias("纬度", "纬度"); + this.winGridViewPager1.AddColumnAlias("事件地点", "事件地点"); + this.winGridViewPager1.AddColumnAlias("经度", "经度"); + this.winGridViewPager1.AddColumnAlias("上报人员", "上报人员"); + this.winGridViewPager1.AddColumnAlias("人员ID", "人员ID"); + this.winGridViewPager1.AddColumnAlias("任务编号", "任务编号"); + this.winGridViewPager1.AddColumnAlias("处理结果", "处理结果"); + this.winGridViewPager1.AddColumnAlias("处理状态", "处理状态"); + + this.winGridViewPager1.DisplayColumns = "上报时间,事件描述,事件地点,上报人员,任务编号,处理结果,处理状态"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -114,8 +114,8 @@ winGridViewPager1.dataGridView1.ContextMenuStrip.Items[5].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[6].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[7].Visible = false; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[1].Text = "查看位置"; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "结果编辑"; + winGridViewPager1.dataGridView1.ContextMenuStrip.Items[1].Text = "结果编辑"; + winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "查看位置"; //右键菜单宽度 winGridViewPager1.dataGridView1.ContextMenuStrip.AutoSize = false; @@ -160,13 +160,12 @@ this.WindowState = FormWindowState.Minimized; globeControl1.Globe.MemoryLayer.RemoveAllFeature(); this.WindowState = FormWindowState.Minimized; - double x = Convert.ToDouble(row.Cells["LONGITUDE"].Value); - double y = Convert.ToDouble(row.Cells["LATITUDE"].Value); - - string username = Convert.ToString(row.Cells["PATROLERNAME"].Value); - string Atime = Convert.ToString(row.Cells["ACCIDENTTIME"].Value); - string location = Convert.ToString(row.Cells["LOCALE"].Value); - string descp = Convert.ToString(row.Cells["DESCRIBE"].Value); + double x = Convert.ToDouble(row.Cells["经度"].Value); + double y = Convert.ToDouble(row.Cells["纬度"].Value); + string username = Convert.ToString(row.Cells["上报人员"].Value); + string Atime = Convert.ToString(row.Cells["上报时间"].Value); + string location = Convert.ToString(row.Cells["事件地点"].Value); + string descp = Convert.ToString(row.Cells["事件描述"].Value); /////////////////////////////////////// /*******设置飞行与创建模型******/ @@ -228,8 +227,8 @@ DataGridViewRow row = grid.SelectedRows[0]; try { - int dbId = Convert.ToInt32(row.Cells["DBID"].Value); - string result = Convert.ToString(row.Cells["RESULT"].Value); + int dbId = Convert.ToInt32(row.Cells["编号"].Value); + string result = Convert.ToString(row.Cells["处理结果"].Value); EMS_Forms.Form_EventResult form = new Form_EventResult(dbId, result); form.refresh += new Form_EventResult.Handle(LoadData);//改变值的事件 form.ShowDialog(); @@ -276,9 +275,9 @@ } for (int i = 0; i < table.Rows.Count; i++) { - if (winGridViewPager1.dataGridView1.Rows[i].Cells["RESULT"].Value != null && !(winGridViewPager1.dataGridView1.Rows[i].Cells["RESULT"].Value.ToString().Trim().Equals(""))) + if (winGridViewPager1.dataGridView1.Rows[i].Cells["处理结果"].Value != null && !(winGridViewPager1.dataGridView1.Rows[i].Cells["处理结果"].Value.ToString().Trim().Equals(""))) { - winGridViewPager1.dataGridView1.Rows[i].Cells["STATE"].Value = "已处理"; + winGridViewPager1.dataGridView1.Rows[i].Cells["处理状态"].Value = "已处理"; } } @@ -307,9 +306,9 @@ } for (int i = 0; i < table.Rows.Count; i++) { - if (winGridViewPager1.dataGridView1.Rows[i].Cells["RESULT"].Value != null && !(winGridViewPager1.dataGridView1.Rows[i].Cells["RESULT"].Value.ToString().Trim().Equals(""))) + if (winGridViewPager1.dataGridView1.Rows[i].Cells["处理结果"].Value != null && !(winGridViewPager1.dataGridView1.Rows[i].Cells["处理结果"].Value.ToString().Trim().Equals(""))) { - winGridViewPager1.dataGridView1.Rows[i].Cells["STATE"].Value = "已处理"; + winGridViewPager1.dataGridView1.Rows[i].Cells["处理状态"].Value = "已处理"; } } @@ -320,10 +319,12 @@ { string sqlCount = "select count(*) from ACCIDENT where 1=1"; - string sqlData = "select ACCIDENTTIME,DBID,DESCRIBE,LATITUDE,LOCALE,LONGITUDE,PATROLERNAME,PATROLER_ID,TASK_ID,RESULT,'' as STATE " + + string sqlData = "select ACCIDENTTIME as 上报时间,DBID as 编号,DESCRIBE as 事件描述,"+ + "LATITUDE as 纬度,LOCALE as 事件地点,LONGITUDE as 经度,PATROLERNAME 上报人员,"+ + "PATROLER_ID as 人员ID,TASK_ID as 任务编号,RESULT as 处理结果,'' as 处理状态 " + "from (select t.*,rownum row_num from ACCIDENT t order by DBID)b " + " where 1=1"; - + rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; @@ -340,9 +341,10 @@ string sqlCount = "select count(*) from ACCIDENT where 1=1"; - string sqlData = "select ACCIDENTTIME,DBID,DESCRIBE,LATITUDE,LOCALE,LONGITUDE,PATROLERNAME,PATROLER_ID,TASK_ID,RESULT,'' as STATE " + - "from (select t.*,rownum row_num from ACCIDENT t order by DBID)b " + - " where(b.row_num between " + minPage + " and " + maxPage + ")"; + string sqlData = "select ACCIDENTTIME as 上报时间,DBID as 编号,DESCRIBE as 事件描述," + + "LATITUDE as 纬度,LOCALE as 事件地点,LONGITUDE as 经度,PATROLERNAME 上报人员," + + "PATROLER_ID as 人员ID,TASK_ID as 任务编号,RESULT as 处理结果,'' as 处理状态 " + + "from (select t.*,rownum row_num from ACCIDENT t where 1=1"; if (!String.IsNullOrEmpty(comboBox_name.Text.Trim())) { @@ -361,7 +363,8 @@ sqlCount += "and ACCIDENTTIME<=to_date('" + time.ToShortDateString() + "','yyyy-MM-dd') "; sqlData += "and ACCIDENTTIME<=to_date('" + time.ToShortDateString() + "','yyyy-MM-dd') "; } - + sqlData += " order by DBID desc)b " + + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 225c8d7..8bd9e48 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -120,8 +120,8 @@ private void flyToTask(DataGridViewRow row, int taskState) { int dbID = 0; - dbID = Convert.ToInt32(row.Cells["DBID"].Value); - string userName = Convert.ToString(row.Cells["USERNAME"].Value); + dbID = Convert.ToInt32(row.Cells["任务编号"].Value); + string userName = Convert.ToString(row.Cells["任务执行人员"].Value); System.DateTime t = new DateTime(); try { @@ -392,15 +392,15 @@ //控制表格显示的列，以及每一列要显示的列名 this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - this.winGridViewPager1.AddColumnAlias("DBID", "任务编号"); - this.winGridViewPager1.AddColumnAlias("DEPLOYTIME", "创建时间"); - this.winGridViewPager1.AddColumnAlias("DESCIRPTION", "任务描述"); - this.winGridViewPager1.AddColumnAlias("FINISHTIME", "完成时间"); - this.winGridViewPager1.AddColumnAlias("STREET", "任务执行区域"); - this.winGridViewPager1.AddColumnAlias("TASKSTATE", "任务状态"); - this.winGridViewPager1.AddColumnAlias("USERNAME", "任务执行人员"); + this.winGridViewPager1.AddColumnAlias("任务编号", "任务编号"); + this.winGridViewPager1.AddColumnAlias("创建时间", "创建时间"); + this.winGridViewPager1.AddColumnAlias("任务描述", "任务描述"); + this.winGridViewPager1.AddColumnAlias("完成时间", "完成时间"); + this.winGridViewPager1.AddColumnAlias("任务执行区域", "任务执行区域"); + this.winGridViewPager1.AddColumnAlias("任务状态", "任务状态"); + this.winGridViewPager1.AddColumnAlias("任务执行人员", "任务执行人员"); - this.winGridViewPager1.DisplayColumns = "DBID,DEPLOYTIME,DESCIRPTION,FINISHTIME,STREET,TASKSTATE,USERNAME"; + this.winGridViewPager1.DisplayColumns = "任务编号,创建时间,任务描述,完成时间,任务执行区域,任务状态,任务执行人员"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -464,8 +464,8 @@ { int dbID = 0; int taskStateInt = 0; - dbID = Convert.ToInt32(row.Cells["DBID"].Value); - string taskState = row.Cells["TASKSTATE"].Value.ToString(); + dbID = Convert.ToInt32(row.Cells["任务编号"].Value); + string taskState = row.Cells["任务状态"].Value.ToString(); if (taskState.Equals("开始任务")) { taskStateInt = 1; @@ -534,9 +534,10 @@ private string GetSql() { - string sqlCount = "select count(*) from taskinfo t where 1=1'"; + string sqlCount = "select count(*) from taskinfo t where 1=1"; - string sqlData = "select dbid,deploytime,descirption,finishtime,street,taskstate,username " + + 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"; @@ -550,9 +551,9 @@ int minPage = (pageIndex - 1) * maxPageIndex + 1; int maxPage = pageIndex * maxPageIndex; string sqlCount = "select count(*) from taskinfo t where 1=1"; - string sqlData = "select dbid,deploytime,descirption,finishtime,street,taskstate,username " + - "from (select t.*,rownum row_num from taskinfo t order by DBID desc)b " + - " where(b.row_num between " + minPage + " and " + maxPage + ")"; + 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"; if (!String.IsNullOrEmpty(comboBox_userName.Text.Trim()) && !comboBox_userName.Text.Trim().Equals("不限")) { @@ -581,6 +582,8 @@ sqlCount += "and street='" + combo_street.Text + "' "; sqlData += "and street='" + combo_street.Text + "' "; } + sqlData += " order by DBID desc)b " + + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index e65a4bd..58f5342 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -73,13 +73,13 @@ //控制表格显示的列，以及每一列要显示的列名 this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - this.winGridViewPager1.AddColumnAlias("FILENAME", "文档名称"); - this.winGridViewPager1.AddColumnAlias("DBID", "编号"); - this.winGridViewPager1.AddColumnAlias("TITLE", "文档标题"); - this.winGridViewPager1.AddColumnAlias("FILETYPE", "文档类型"); - this.winGridViewPager1.AddColumnAlias("UPDAY", "上传日期"); - this.winGridViewPager1.AddColumnAlias("WRITER", "上传人"); - this.winGridViewPager1.DisplayColumns = "FILENAME,TITLE,FILETYPE,UPDAY,WRITER"; + this.winGridViewPager1.AddColumnAlias("文档名称", "文档名称"); + this.winGridViewPager1.AddColumnAlias("编号", "编号"); + this.winGridViewPager1.AddColumnAlias("文档标题", "文档标题"); + this.winGridViewPager1.AddColumnAlias("文档类型", "文档类型"); + this.winGridViewPager1.AddColumnAlias("上传日期", "上传日期"); + this.winGridViewPager1.AddColumnAlias("上传人", "上传人"); + this.winGridViewPager1.DisplayColumns = "文档名称,文档标题,文档类型,上传日期,上传人"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -167,7 +167,7 @@ if (grid != null) { DataGridViewRow row = grid.SelectedRows[0]; - string dbid = row.Cells["dbid"].Value.ToString(); + string dbid = row.Cells["编号"].Value.ToString(); try { if (MessageBox.Show("确认删除吗？", "确认", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) @@ -212,7 +212,8 @@ { string sqlCount = "select count(*) from casic_userdocument where sysname = 'EMS'"; - string sqlData = "select filename,dbid,title,filetype,upday,writer " + + string sqlData = "select filename as 文档名称,dbid as 编号,title as 文档标题," + + "filetype as 文档类型,upday as 上传日期,writer as 上传人 " + "from (select t.*,rownum row_num from casic_userdocument t order by DBID desc)b " + " where sysname = 'EMS'"; @@ -226,9 +227,9 @@ int minPage = (pageIndex - 1) * maxPageIndex + 1; int maxPage = pageIndex * maxPageIndex; string sqlCount = "select count(*) from casic_userdocument where sysname = 'EMS'"; - string sqlData = "select filename,dbid,title,filetype,upday,writer " + - "from (select t.*,rownum row_num from casic_userdocument t where sysname = 'EMS' order by DBID desc)b " + - " where(b.row_num between " + minPage + " and " + maxPage + ")"; + string sqlData = "select filename as 文档名称,dbid as 编号,title as 文档标题,"+ + "filetype as 文档类型,upday as 上传日期,writer as 上传人 " + + "from (select t.*,rownum row_num from casic_userdocument t where sysname = 'EMS'"; string txtTitleText = null; string comboFileType = null; @@ -278,7 +279,8 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - + sqlData += " order by DBID desc)b " + + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; @@ -437,7 +439,7 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - string filename = row.Cells["filename"].Value.ToString(); + string filename = row.Cells["文档名称"].Value.ToString(); string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; string file = System.Environment.CurrentDirectory + "\\download\\" + filename; int result = DownloadFile(url, file, progressBar1); @@ -515,7 +517,7 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - string filename = row.Cells["filename"].Value.ToString(); + string filename = row.Cells["文档名称"].Value.ToString(); string ext = Path.GetExtension(filename); SaveFileDialog dlg = new SaveFileDialog(); dlg.Filter = "保存文档|*" + ext + ";"; diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 1d1201b..3902629 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -748,6 +748,7 @@ this.Name = "FrmAddSinMark"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "单个标识器添加"; + this.TopMost = true; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmAddSinMark_FormClosing); this.Load += new System.EventHandler(this.FrmAddSinMark_Load); this.groupPanel1.ResumeLayout(false); diff --git a/FrmEquipmentManage.cs b/FrmEquipmentManage.cs index 90bfdb2..a3cf55c 100644 --- a/FrmEquipmentManage.cs +++ b/FrmEquipmentManage.cs @@ -74,13 +74,13 @@ //控制表格显示的列，以及每一列要显示的列名 this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - this.winGridViewPager1.AddColumnAlias("DESCIRPTION", "设备描述"); - this.winGridViewPager1.AddColumnAlias("DBID", "编号"); - this.winGridViewPager1.AddColumnAlias("MACID", "MAC地址"); - this.winGridViewPager1.AddColumnAlias("OWNER", "设备所有人"); - this.winGridViewPager1.AddColumnAlias("STATUS", "设备状态"); + this.winGridViewPager1.AddColumnAlias("设备描述", "设备描述"); + this.winGridViewPager1.AddColumnAlias("编号", "编号"); + this.winGridViewPager1.AddColumnAlias("MAC地址", "MAC地址"); + this.winGridViewPager1.AddColumnAlias("设备所有人", "设备所有人"); + this.winGridViewPager1.AddColumnAlias("设备状态", "设备状态"); - this.winGridViewPager1.DisplayColumns = "DESCIRPTION,MACID,OWNER,STATUS"; + this.winGridViewPager1.DisplayColumns = "设备描述,MAC地址,设备所有人,设备状态"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -146,10 +146,10 @@ DataGridViewRow row = grid.SelectedRows[0]; try { - long dbid = long.Parse(row.Cells["DBID"].Value.ToString()); - String macId = row.Cells["MACID"].Value.ToString(); - String username = row.Cells["OWNER"].Value.ToString(); - String descn = row.Cells["DESCIRPTION"].Value.ToString(); + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); + String macId = row.Cells["MAC地址"].Value.ToString(); + String username = row.Cells["设备所有人"].Value.ToString(); + String descn = row.Cells["设备状态"].Value.ToString(); FrmEquipmentEdit frm = new FrmEquipmentEdit(dbid.ToString(), macId, username, descn); frm.reloadGrid += new ReloadEquipmentGrid(LoadData); frm.ShowDialog(); @@ -179,7 +179,7 @@ { return; } - String macId = row.Cells["MACID"].Value.ToString(); + String macId = row.Cells["MAC地址"].Value.ToString(); FrmLog frm = new FrmLog(macId); frm.Show(); } @@ -201,7 +201,7 @@ if (grid != null) { DataGridViewRow row = grid.SelectedRows[0]; - long dbid = long.Parse(row.Cells["DBID"].Value.ToString()); + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); try { if (MessageBox.Show("确定删除？", "确认", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) @@ -243,7 +243,8 @@ { string sqlCount = "select count(*) from equipment where status = 'USING'"; - string sqlData = "select descirption,DBID,macid,owner,case when status = 'USING' then '可用' when status = 'DAMAGE' then '损坏' end as status " + + string sqlData = "select descirption as 设备描述,DBID as 编号,macid as MAC地址,owner as 设备所有人,"+ + "case when status = 'USING' then '可用' when status = 'DAMAGE' then '损坏' end as 设备状态 " + "from (select t.*,rownum row_num from equipment t where status = 'USING' order by dbid desc)b " + " where 1=1"; @@ -258,16 +259,17 @@ int maxPage = pageIndex * maxPageIndex; string sqlCount = "select count(*) from equipment where status = 'USING' "; - string sqlData = "select descirption,DBID,macid,owner,case when status = 'USING' then '可用' when status = 'DAMAGE' then '损坏' end as status " + - "from (select t.*,rownum row_num from equipment t where status = 'USING' order by DBID desc)b " + - " where(b.row_num between " + minPage + " and " + maxPage + ")"; + string sqlData = "select descirption as 设备描述,DBID as 编号,macid as MAC地址,owner as 设备所有人," + + "case when status = 'USING' then '可用' when status = 'DAMAGE' then '损坏' end as 设备状态 " + + "from (select t.*,rownum row_num from equipment t where status = 'USING'"; if (!String.IsNullOrEmpty(txtMacId.Text.Trim())) { sqlData += " and macid like '%" + txtMacId.Text.Trim() + "%'"; sqlCount += " and macid like '%" + txtMacId.Text.Trim() + "%'"; } - + sqlData += " order by DBID desc)b " + + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; @@ -299,76 +301,6 @@ } } - //public void reloadGrid(int pageIndex) - //{ - // if (pageIndex <= 0) - // { - // pageIndex = 1; - // currentpage = 1; - // } - // String sqlrows = "select * from (select rownum as rowno,dbid,descirption,macid,owner,case when status = 'USING' then '可用' when status = 'DAMAGE' then '损坏' end as status,'编辑' as btnEdit,'删除' as btnDel from equipment t where status = 'USING' "; - // string sqlcount = "select count(*) from equipment where status = 'USING' "; - // if (!String.IsNullOrEmpty(txtMacId.Text.Trim())) - // { - // sqlrows += " and macid like '%" + txtMacId.Text.Trim() + "%'"; - // sqlcount += " and macid like '%" + txtMacId.Text.Trim() + "%'"; - // } - // sqlrows += " and rownum<=" + (pagesize * pageIndex) + ") table_alias where table_alias.rowno>=" + ((pageIndex - 1) * pagesize + 1); - - // int rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlcount).ToString()); - // int pages = 0; - // if (rows % pagesize == 0) - // { - // pages = rows / pagesize; - // } - // else - // { - // pages = rows / pagesize + 1; - // } - - // lastpage = pages; - - // lab_page_msg.Text = "共" + rows + "条记录，每页" + pagesize + "条，第" + pageIndex + "页，共" + pages + "页"; - // combo_page_num.Items.Clear(); - // for (int i = 1; i <= pages; i++) - // { - // combo_page_num.Items.Add(new ComboBoxItem(i.ToString(), i.ToString())); - // } - - // if (lastpage == 1) - // { - // btn_page_first.Enabled = false; - // btn_page_pre.Enabled = false; - // btn_page_last.Enabled = false; - // btn_page_next.Enabled = false; - // } - // else if (currentpage == 1) - // { - // btn_page_first.Enabled = false; - // btn_page_pre.Enabled = false; - // btn_page_last.Enabled = true; - // btn_page_next.Enabled = true; - // } - // else if (currentpage == lastpage) - // { - // btn_page_first.Enabled = true; - // btn_page_pre.Enabled = true; - // btn_page_last.Enabled = false; - // btn_page_next.Enabled = false; - // } - // else - // { - // btn_page_first.Enabled = true; - // btn_page_pre.Enabled = true; - // btn_page_last.Enabled = true; - // btn_page_next.Enabled = true; - // } - - // DataTable table = OracleUtils.ExecuteDataset(OracleUtils.ConnectionString, CommandType.Text, sqlrows).Tables[0]; - // dataGridViewX1.DataSource = table; - - //} - private void FrmEquipmentManage_FormClosing(object sender, FormClosingEventArgs e) diff --git a/FrmFlagDetail.Designer.cs b/FrmFlagDetail.Designer.cs new file mode 100644 index 0000000..982bfc6 --- /dev/null +++ b/FrmFlagDetail.Designer.cs @@ -0,0 +1,103 @@ +namespace Cyberpipe +{ + partial class FrmFlagDetail + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); + this.dataGridViewX_markDetail = new DevComponents.DotNetBar.Controls.DataGridViewX(); + this.对象类型 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.对象编号 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.对象名称 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX_markDetail)).BeginInit(); + this.SuspendLayout(); + // + // dataGridViewX_markDetail + // + this.dataGridViewX_markDetail.AllowUserToAddRows = false; + this.dataGridViewX_markDetail.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; + this.dataGridViewX_markDetail.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dataGridViewX_markDetail.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.对象类型, + this.对象编号, + this.对象名称}); + dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle3.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dataGridViewX_markDetail.DefaultCellStyle = dataGridViewCellStyle3; + this.dataGridViewX_markDetail.Dock = System.Windows.Forms.DockStyle.Fill; + this.dataGridViewX_markDetail.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(170)))), ((int)(((byte)(170)))), ((int)(((byte)(170))))); + this.dataGridViewX_markDetail.Location = new System.Drawing.Point(0, 0); + this.dataGridViewX_markDetail.Name = "dataGridViewX_markDetail"; + this.dataGridViewX_markDetail.RowTemplate.Height = 23; + this.dataGridViewX_markDetail.Size = new System.Drawing.Size(508, 321); + this.dataGridViewX_markDetail.TabIndex = 0; + // + // 对象类型 + // + this.对象类型.HeaderText = "对象类型"; + this.对象类型.Name = "对象类型"; + // + // 对象编号 + // + this.对象编号.HeaderText = "对象编号"; + this.对象编号.Name = "对象编号"; + // + // 对象名称 + // + this.对象名称.HeaderText = "对象名称"; + this.对象名称.Name = "对象名称"; + // + // FrmFlagDetail + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(508, 321); + this.Controls.Add(this.dataGridViewX_markDetail); + this.Name = "FrmFlagDetail"; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; + this.Text = "标识对象信息"; + this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmFlagDetail_FormClosing); + this.Load += new System.EventHandler(this.FrmFlagDetail_Load); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX_markDetail)).EndInit(); + this.ResumeLayout(false); + + } + + #endregion + + private DevComponents.DotNetBar.Controls.DataGridViewX dataGridViewX_markDetail; + private System.Windows.Forms.DataGridViewTextBoxColumn 对象类型; + private System.Windows.Forms.DataGridViewTextBoxColumn 对象编号; + private System.Windows.Forms.DataGridViewTextBoxColumn 对象名称; + + } +} \ No newline at end of file diff --git a/FrmFlagDetail.cs b/FrmFlagDetail.cs new file mode 100644 index 0000000..81de974 --- /dev/null +++ b/FrmFlagDetail.cs @@ -0,0 +1,77 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Windows.Forms; +using GeoScene.Globe; +using System.Data.OracleClient; + +namespace Cyberpipe +{ + public partial class FrmFlagDetail : Form + { + DataTable dt = new DataTable(); + private GSOGlobeControl globeControl1; + + public delegate void Handle(); + public event Handle showParentForm; + String markId; + + public FrmFlagDetail(GSOGlobeControl globeControl1, String id) + { + InitializeComponent(); + this.markId = id; + } + + private void FrmFlagDetail_FormClosing(object sender, FormClosingEventArgs e) + { + showParentForm(); + } + + private void FrmFlagDetail_Load(object sender, EventArgs e) + { + string objectIds = ""; + string objectTypeCodes = ""; + string sql = "select t.对象编号,t.对象类型 from 标识器 t where t.编号='" + markId + "'"; + using (OracleDataReader reader = OracleUtils.ExecuteReader(OracleUtils.ConnectionString, CommandType.Text, sql)) + { + while (reader.Read()) + { + objectIds = reader.GetString(0); + objectTypeCodes = reader.GetString(1); + } + } + + string[] codeTypes = objectTypeCodes.Split(','); + string[] codeIds = objectIds.Split(','); + int length = 0; + if (codeTypes.Length <= codeIds.Length) + { + length = codeTypes.Length; + } + else + { + length = codeIds.Length; + } + for (int n = 0; n < length; n++) + { + for (int i = 0; i < Utility1.listPipelineType.Count; i++) + { + if (Utility1.listPipelineType[i].code == codeTypes[n]) + { + //string objectId = codeIds[i]; + //string objectType = Utility1.listPipelineType[i].type; + //string objectName = Utility1.listPipelineType[i].name; + int index = this.dataGridViewX_markDetail.Rows.Add(); + this.dataGridViewX_markDetail.Rows[index].Cells[0].Value = Utility1.listPipelineType[i].type; + this.dataGridViewX_markDetail.Rows[index].Cells[1].Value = codeIds[n].ToString(); + this.dataGridViewX_markDetail.Rows[index].Cells[2].Value = Utility1.listPipelineType[i].name; + } + } + } + } + } +} diff --git a/FrmFlagDetail.resx b/FrmFlagDetail.resx new file mode 100644 index 0000000..e98a8fe --- /dev/null +++ b/FrmFlagDetail.resx @@ -0,0 +1,129 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + True + + + True + + + True + + \ No newline at end of file diff --git a/FrmFlagManagers.Designer.cs b/FrmFlagManagers.Designer.cs index d7e2f60..9fe14fb 100644 --- a/FrmFlagManagers.Designer.cs +++ b/FrmFlagManagers.Designer.cs @@ -28,8 +28,10 @@ /// private void InitializeComponent() { - this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); - this.winGridViewPager1 = new WHC.Pager.WinControl.WinGridViewPager(); + this.components = new System.ComponentModel.Container(); + this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components); + this.标识对象ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripMenuItem2 = new System.Windows.Forms.ToolStripMenuItem(); this.bar1 = new DevComponents.DotNetBar.Bar(); this.labelItem1 = new DevComponents.DotNetBar.LabelItem(); this.txt_no = new DevComponents.DotNetBar.TextBoxItem(); @@ -38,45 +40,37 @@ this.btn_query = new DevComponents.DotNetBar.ButtonItem(); this.btn_add_batch = new DevComponents.DotNetBar.ButtonItem(); this.btn_add_menu = new DevComponents.DotNetBar.ButtonItem(); - this.btn_db = new DevComponents.DotNetBar.ButtonItem(); - this.tableLayoutPanel1.SuspendLayout(); + this.winGridViewPager1 = new WHC.Pager.WinControl.WinGridViewPager(); + this.contextMenuStrip1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.bar1)).BeginInit(); this.SuspendLayout(); // - // tableLayoutPanel1 + // contextMenuStrip1 // - this.tableLayoutPanel1.ColumnCount = 1; - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel1.Controls.Add(this.winGridViewPager1, 0, 1); - this.tableLayoutPanel1.Controls.Add(this.bar1, 0, 0); - this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 0); - this.tableLayoutPanel1.Name = "tableLayoutPanel1"; - this.tableLayoutPanel1.RowCount = 2; - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 32F)); - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel1.Size = new System.Drawing.Size(881, 474); - this.tableLayoutPanel1.TabIndex = 6; + this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.标识对象ToolStripMenuItem, + this.toolStripMenuItem2}); + this.contextMenuStrip1.Name = "contextMenuStrip1"; + this.contextMenuStrip1.Size = new System.Drawing.Size(125, 48); // - // winGridViewPager1 + // 标识对象ToolStripMenuItem // - this.winGridViewPager1.AppendedMenu = null; - this.winGridViewPager1.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; - this.winGridViewPager1.DataSource = null; - this.winGridViewPager1.DisplayColumns = ""; - this.winGridViewPager1.Dock = System.Windows.Forms.DockStyle.Fill; - this.winGridViewPager1.Location = new System.Drawing.Point(3, 35); - this.winGridViewPager1.MinimumSize = new System.Drawing.Size(540, 0); - this.winGridViewPager1.Name = "winGridViewPager1"; - this.winGridViewPager1.PrintTitle = ""; - this.winGridViewPager1.Size = new System.Drawing.Size(875, 436); - this.winGridViewPager1.TabIndex = 5; + this.标识对象ToolStripMenuItem.Name = "标识对象ToolStripMenuItem"; + this.标识对象ToolStripMenuItem.Size = new System.Drawing.Size(124, 22); + this.标识对象ToolStripMenuItem.Text = "标识对象"; + this.标识对象ToolStripMenuItem.Click += new System.EventHandler(this.标识对象ToolStripMenuItem_Click); + // + // toolStripMenuItem2 + // + this.toolStripMenuItem2.Name = "toolStripMenuItem2"; + this.toolStripMenuItem2.Size = new System.Drawing.Size(152, 22); + this.toolStripMenuItem2.Text = "查看位置"; + this.toolStripMenuItem2.Click += new System.EventHandler(this.toolStripMenuItem2_Click); // // bar1 // this.bar1.AntiAlias = true; this.bar1.Dock = System.Windows.Forms.DockStyle.Top; - this.bar1.DockSide = DevComponents.DotNetBar.eDockSide.Document; this.bar1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.labelItem1, this.txt_no, @@ -84,14 +78,13 @@ this.combo_street, this.btn_query, this.btn_add_batch, - this.btn_add_menu, - this.btn_db}); - this.bar1.Location = new System.Drawing.Point(3, 3); + this.btn_add_menu}); + this.bar1.Location = new System.Drawing.Point(0, 0); this.bar1.Name = "bar1"; - this.bar1.Size = new System.Drawing.Size(875, 28); + this.bar1.Size = new System.Drawing.Size(881, 28); this.bar1.Stretch = true; this.bar1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.bar1.TabIndex = 1; + this.bar1.TabIndex = 8; this.bar1.TabStop = false; this.bar1.Text = "bar1"; // @@ -136,24 +129,34 @@ this.btn_add_menu.Text = "手工添加"; this.btn_add_menu.Click += new System.EventHandler(this.btn_add_menu_Click); // - // btn_db + // winGridViewPager1 // - this.btn_db.Name = "btn_db"; - this.btn_db.Text = "数据导出"; + this.winGridViewPager1.AppendedMenu = null; + this.winGridViewPager1.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; + this.winGridViewPager1.DataSource = null; + this.winGridViewPager1.DisplayColumns = ""; + this.winGridViewPager1.Dock = System.Windows.Forms.DockStyle.Fill; + this.winGridViewPager1.Location = new System.Drawing.Point(0, 28); + this.winGridViewPager1.MinimumSize = new System.Drawing.Size(540, 0); + this.winGridViewPager1.Name = "winGridViewPager1"; + this.winGridViewPager1.PrintTitle = ""; + this.winGridViewPager1.Size = new System.Drawing.Size(881, 446); + this.winGridViewPager1.TabIndex = 9; // // FrmFlagManagers // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(881, 474); - this.Controls.Add(this.tableLayoutPanel1); + this.Controls.Add(this.winGridViewPager1); + this.Controls.Add(this.bar1); this.DoubleBuffered = true; this.Name = "FrmFlagManagers"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "标识器管理"; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmFlagManagers_FormClosing); this.Load += new System.EventHandler(this.FrmFlagManagers_Load); - this.tableLayoutPanel1.ResumeLayout(false); + this.contextMenuStrip1.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.bar1)).EndInit(); this.ResumeLayout(false); @@ -161,8 +164,8 @@ #endregion - private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1; - private WHC.Pager.WinControl.WinGridViewPager winGridViewPager1; + private System.Windows.Forms.ContextMenuStrip contextMenuStrip1; + private System.Windows.Forms.ToolStripMenuItem 标识对象ToolStripMenuItem; private DevComponents.DotNetBar.Bar bar1; private DevComponents.DotNetBar.LabelItem labelItem1; private DevComponents.DotNetBar.TextBoxItem txt_no; @@ -171,6 +174,7 @@ private DevComponents.DotNetBar.ButtonItem btn_query; private DevComponents.DotNetBar.ButtonItem btn_add_batch; private DevComponents.DotNetBar.ButtonItem btn_add_menu; - private DevComponents.DotNetBar.ButtonItem btn_db; + private WHC.Pager.WinControl.WinGridViewPager winGridViewPager1; + private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem2; } } \ No newline at end of file diff --git a/FrmFlagManagers.cs b/FrmFlagManagers.cs index 38d4927..9bf9734 100644 --- a/FrmFlagManagers.cs +++ b/FrmFlagManagers.cs @@ -33,15 +33,13 @@ { this.globeControl1 = _globeControl1; InitializeComponent(); - winGridViewPager1.OnPageChanged += new EventHandler(winGridViewPager1_OnPageChanged); - this.winGridViewPager1.OnAddNew += new EventHandler(winGridViewPager1_OnAddNew); //右键定位 + winGridViewPager1.OnPageChanged += new EventHandler(winGridViewPager1_OnPageChanged); this.winGridViewPager1.OnEditSelected += new EventHandler(winGridViewPager1_OnEditSelected);//属性编辑 this.winGridViewPager1.OnDeleteSelected += new EventHandler(winGridViewPager1_OnDeleteSelected);//标识器报废 + this.winGridViewPager1.OnStartExport += new EventHandler(pager1_OnStartExport); this.winGridViewPager1.OnEndExport += new EventHandler(pager1_OnEndExport); - //this.winGridViewPager1.ExportCurrent += new ExportCurrentEventHandler(pager1_ExportCurrent); - //this.winGridViewPager1.ExportAll += new ExportAllEventHandler(pager1_ExportAll); winGridViewPager1.dataGridView1.MultiSelect = false; @@ -76,26 +74,25 @@ this.winGridViewPager1.AddColumnAlias("标识器型号", "标识器型号"); this.winGridViewPager1.AddColumnAlias("地面高程", "地面高程"); this.winGridViewPager1.AddColumnAlias("标识器埋深", "标识器埋深"); - this.winGridViewPager1.AddColumnAlias("对象编号", "对象编号"); - this.winGridViewPager1.AddColumnAlias("对象类型", "对象类型"); this.winGridViewPager1.AddColumnAlias("所属道路", "所属道路"); this.winGridViewPager1.AddColumnAlias("使用状态", "使用状态"); - this.winGridViewPager1.DisplayColumns = "编号,标识器ID号,标识器型号,地面高程,标识器埋深,对象编号,对象类型,所属道路,使用状态"; + this.winGridViewPager1.DisplayColumns = "编号,标识器ID号,标识器型号,地面高程,标识器埋深,所属道路,使用状态"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 //隐藏右键功能按钮 //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[1].Visible = false; - //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[4].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[5].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[6].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[7].Visible = false; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[1].Text = "定位查看"; + //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[1].Text = "定位查看"; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "属性编辑"; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Text = "标识器报废"; + winGridViewPager1.AppendedMenu = this.contextMenuStrip1; + //右键菜单宽度 winGridViewPager1.dataGridView1.ContextMenuStrip.AutoSize = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Width = 150; @@ -153,7 +150,7 @@ } /// - /// 右键定位 + /// 对象查看 /// /// /// @@ -306,20 +303,10 @@ string sqlCount = "select count(*) from 标识器 where 使用状态 = '使用中'"; - string sqlData = "select 编号,标识器ID号,标识器型号,地面高程,标识器埋深,对象编号,对象类型,所属道路,LSSYS_ID,X坐标,Y坐标,使用状态 " + + string sqlData = "select 编号,标识器ID号,标识器型号,地面高程,标识器埋深,所属道路,LSSYS_ID,X坐标,Y坐标,使用状态 " + "from (select t.*,rownum row_num from 标识器 t where 使用状态 = '使用中' order by 编号)b " + " where 1=1"; - if (!String.IsNullOrEmpty(txt_no.Text.Trim())) - { - sqlCount += " and 编号 like '%" + txt_no.Text.Trim() + "%'"; - sqlData += " and 编号 like '%" + txt_no.Text.Trim() + "%'"; - } - if (null != combo_street.SelectedItem && !String.IsNullOrEmpty(combo_street.SelectedItem.ToString().Trim())) - { - sqlData += " and 所属道路='" + combo_street.SelectedItem.ToString().Trim() + "'"; - sqlCount += " and 所属道路='" + combo_street.SelectedItem.ToString().Trim() + "'"; - } rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -332,9 +319,8 @@ int maxPage = pageIndex * maxPageIndex; string sqlCount = "select count(*) from 标识器 where 使用状态 = '使用中'"; - string sqlData = "select 编号,标识器ID号,标识器型号,地面高程,标识器埋深,对象编号,对象类型,所属道路,LSSYS_ID,X坐标,Y坐标,使用状态 " + - "from (select t.*,rownum row_num from 标识器 t where 使用状态 = '使用中' order by 编号)b "+ - " where(b.row_num between " + minPage + " and " + maxPage + ")"; + string sqlData = "select 编号,标识器ID号,标识器型号,地面高程,标识器埋深,所属道路,LSSYS_ID,X坐标,Y坐标,使用状态 " + + "from (select t.*,rownum row_num from 标识器 t where 使用状态 = '使用中'"; if (!String.IsNullOrEmpty(txt_no.Text.Trim())) { @@ -347,6 +333,8 @@ sqlCount += " and 所属道路='" + combo_street.SelectedItem.ToString().Trim() + "'"; } + sqlData += " order by 编号)b " + + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; @@ -372,9 +360,10 @@ private void FrmFlagManagers_FormClosing(object sender, FormClosingEventArgs e) { IS_OPEN = false; - Thread downloadJob = new Thread(new ParameterizedThreadStart(doSave)); - downloadJob.IsBackground = true; - downloadJob.Start(e); + //Thread downloadJob = new Thread(new ParameterizedThreadStart(doSave)); + //downloadJob.IsBackground = true; + //downloadJob.Start(e); + globeControl1.Globe.Layers["标识器"].Save(); globeControl1.Globe.MemoryLayer.RemoveAllFeature(); foreach (GSOFeature f in Features) { @@ -480,10 +469,88 @@ if (null != globeControl1) { FrmAddSinMark frm = new FrmAddSinMark(globeControl1); - frm.ShowDialog(); + frm.Show(); } } + private void 标识对象ToolStripMenuItem_Click(object sender, EventArgs e) + { + if (winGridViewPager1 != null && winGridViewPager1.dataGridView1 != null) + { + DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; + try + { + this.Hide(); + string id = row.Cells["编号"].Value.ToString(); + FrmFlagDetail p = new FrmFlagDetail(globeControl1, id); + p.showParentForm += new FrmFlagDetail.Handle(showThisForm);//改变值的事件 + p.Show(); + } + catch (Exception ex) + { + MessageBox.Show("失败:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } + + private void showThisForm() + { + this.Show(); + } + + private void toolStripMenuItem2_Click(object sender, EventArgs e) + { + if (winGridViewPager1 != null && winGridViewPager1.dataGridView1 != null) + { + DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; + try + { + this.WindowState = FormWindowState.Minimized; + string id = row.Cells["LSSYS_ID"].Value.ToString(); + string flagno = row.Cells["编号"].Value.ToString(); + string flagstreet = row.Cells["所属道路"].Value.ToString(); + double x = Convert.ToDouble(row.Cells["X坐标"].Value); + double y = Convert.ToDouble(row.Cells["Y坐标"].Value); + GSOFeature flagFeature = globeControl1.Globe.Layers.GetLayerByCaption("标识器").GetFeatureByID(int.Parse(id)); + + string type = ""; + string pipe = ""; + string sql = "select t.标识器型号,t.对象编号 from 标识器 t where t.编号='" + flagno + "'"; + using (OracleDataReader reader = OracleUtils.ExecuteReader(OracleUtils.ConnectionString, CommandType.Text, sql)) + { + while (reader.Read()) + { + type = reader.GetString(0); + pipe = reader.GetString(1); + } + } + + GSOLabel label = new GSOLabel(); + label.Text = "标识器编号：" + flagno + "\r\n" + + "标识器类型:" + type + "\r\n" + + //"标识对象编号:" + pipe + "\r\n" + + "所属道路:" + flagstreet; + label.Style = new GSOLabelStyle(); + label.Style.TextStyle.FontSize = 18; + label.Style.TextStyle.ForeColor = Color.FromArgb(0, 0, 0, 255); + label.Style.Opaque = 0.8; //设置标注的透明度，取值区间是0-1 + label.Style.TracktionLineType = EnumTracktionLineType.Solid; + label.Style.TextStyle.FontHeight = 10; + label.Style.TextStyle.FontName = "黑体"; + label.Style.TractionLineEndPos = new GSOPoint2d(80, 60); + + flagFeature.Label = label; + Features.Add(flagFeature); + globeControl1.Globe.JumpToFeature(flagFeature, 20); + this.globeControl1.Refresh(); + + } + catch (Exception ex) + { + MessageBox.Show("标识器定位失败:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } } diff --git a/FrmFlagManagers.resx b/FrmFlagManagers.resx index 1af7de1..ad53752 100644 --- a/FrmFlagManagers.resx +++ b/FrmFlagManagers.resx @@ -117,4 +117,7 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 17, 17 + \ No newline at end of file diff --git a/FrmPatrolerEdit.cs b/FrmPatrolerEdit.cs index dbd4fec..f45b5ae 100644 --- a/FrmPatrolerEdit.cs +++ b/FrmPatrolerEdit.cs @@ -46,7 +46,7 @@ txt_name.Focus(); return; } - if (String.IsNullOrEmpty(combo_sex.SelectedItem.ToString())) + if (combo_sex.SelectedItem == null ||String.IsNullOrEmpty(combo_sex.SelectedItem.ToString())) { MessageBox.Show("性别不能为空！", "警告", MessageBoxButtons.OK, MessageBoxIcon.Warning); combo_sex.Focus(); diff --git a/FrmPatrolerManager.Designer.cs b/FrmPatrolerManager.Designer.cs index bb8e5fb..10fac22 100644 --- a/FrmPatrolerManager.Designer.cs +++ b/FrmPatrolerManager.Designer.cs @@ -47,11 +47,13 @@ this.注销 = new DevComponents.Editors.ComboItem(); this.btn_query_person = new DevComponents.DotNetBar.ButtonItem(); this.btn_add_person = new DevComponents.DotNetBar.ButtonItem(); - this.winGridViewPager1 = new WHC.Pager.WinControl.WinGridViewPager(); this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components); this.日志ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.任务ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.定位ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.winGridViewPager1 = new WHC.Pager.WinControl.WinGridViewPager(); + this.编辑ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.注销ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); ((System.ComponentModel.ISupportInitialize)(this.bar1)).BeginInit(); this.contextMenuStrip1.SuspendLayout(); this.SuspendLayout(); @@ -173,9 +175,42 @@ this.btn_add_person.Text = "新增"; this.btn_add_person.Click += new System.EventHandler(this.btn_add_person_Click); // + // contextMenuStrip1 + // + this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.日志ToolStripMenuItem, + this.任务ToolStripMenuItem, + this.定位ToolStripMenuItem, + this.编辑ToolStripMenuItem, + this.注销ToolStripMenuItem}); + this.contextMenuStrip1.Name = "contextMenuStrip1"; + this.contextMenuStrip1.Size = new System.Drawing.Size(153, 136); + // + // 日志ToolStripMenuItem + // + this.日志ToolStripMenuItem.Name = "日志ToolStripMenuItem"; + this.日志ToolStripMenuItem.Size = new System.Drawing.Size(100, 22); + this.日志ToolStripMenuItem.Text = "日志"; + this.日志ToolStripMenuItem.Click += new System.EventHandler(this.日志ToolStripMenuItem_Click); + // + // 任务ToolStripMenuItem + // + this.任务ToolStripMenuItem.Name = "任务ToolStripMenuItem"; + this.任务ToolStripMenuItem.Size = new System.Drawing.Size(100, 22); + this.任务ToolStripMenuItem.Text = "任务"; + this.任务ToolStripMenuItem.Click += new System.EventHandler(this.任务ToolStripMenuItem_Click); + // + // 定位ToolStripMenuItem + // + this.定位ToolStripMenuItem.Name = "定位ToolStripMenuItem"; + this.定位ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.定位ToolStripMenuItem.Text = "定位"; + this.定位ToolStripMenuItem.Click += new System.EventHandler(this.定位ToolStripMenuItem_Click); + // // winGridViewPager1 // this.winGridViewPager1.AppendedMenu = null; + this.winGridViewPager1.ContextMenuStrip = this.contextMenuStrip1; this.winGridViewPager1.DataSource = null; this.winGridViewPager1.DisplayColumns = ""; this.winGridViewPager1.Dock = System.Windows.Forms.DockStyle.Fill; @@ -186,35 +221,19 @@ this.winGridViewPager1.Size = new System.Drawing.Size(756, 309); this.winGridViewPager1.TabIndex = 3; // - // contextMenuStrip1 + // 编辑ToolStripMenuItem // - this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.日志ToolStripMenuItem, - this.任务ToolStripMenuItem, - this.定位ToolStripMenuItem}); - this.contextMenuStrip1.Name = "contextMenuStrip1"; - this.contextMenuStrip1.Size = new System.Drawing.Size(101, 70); + this.编辑ToolStripMenuItem.Name = "编辑ToolStripMenuItem"; + this.编辑ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.编辑ToolStripMenuItem.Text = "编辑"; + this.编辑ToolStripMenuItem.Click += new System.EventHandler(this.编辑ToolStripMenuItem_Click); // - // 日志ToolStripMenuItem + // 注销ToolStripMenuItem // - this.日志ToolStripMenuItem.Name = "日志ToolStripMenuItem"; - this.日志ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); - this.日志ToolStripMenuItem.Text = "日志"; - this.日志ToolStripMenuItem.Click += new System.EventHandler(this.日志ToolStripMenuItem_Click); - // - // 任务ToolStripMenuItem - // - this.任务ToolStripMenuItem.Name = "任务ToolStripMenuItem"; - this.任务ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); - this.任务ToolStripMenuItem.Text = "任务"; - this.任务ToolStripMenuItem.Click += new System.EventHandler(this.任务ToolStripMenuItem_Click); - // - // 定位ToolStripMenuItem - // - this.定位ToolStripMenuItem.Name = "定位ToolStripMenuItem"; - this.定位ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); - this.定位ToolStripMenuItem.Text = "定位"; - this.定位ToolStripMenuItem.Click += new System.EventHandler(this.定位ToolStripMenuItem_Click); + this.注销ToolStripMenuItem.Name = "注销ToolStripMenuItem"; + this.注销ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.注销ToolStripMenuItem.Text = "注销"; + this.注销ToolStripMenuItem.Click += new System.EventHandler(this.注销ToolStripMenuItem_Click); // // FrmPatrolerManager // @@ -229,7 +248,7 @@ this.MinimizeBox = false; this.Name = "FrmPatrolerManager"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; - this.Text = "巡检人员维护"; + this.Text = "定位人员维护"; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmPatrolerManager_FormClosing); this.Load += new System.EventHandler(this.FrmPatrolerManager_Load); ((System.ComponentModel.ISupportInitialize)(this.bar1)).EndInit(); @@ -258,10 +277,12 @@ private DevComponents.Editors.ComboItem 注销; private DevComponents.Editors.ComboItem comboItem1; private DevComponents.Editors.ComboItem 不限; - private WHC.Pager.WinControl.WinGridViewPager winGridViewPager1; private System.Windows.Forms.ContextMenuStrip contextMenuStrip1; private System.Windows.Forms.ToolStripMenuItem 日志ToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem 任务ToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem 定位ToolStripMenuItem; + private WHC.Pager.WinControl.WinGridViewPager winGridViewPager1; + private System.Windows.Forms.ToolStripMenuItem 编辑ToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem 注销ToolStripMenuItem; } } \ No newline at end of file diff --git a/FrmPatrolerManager.cs b/FrmPatrolerManager.cs index 255a076..9c32f54 100644 --- a/FrmPatrolerManager.cs +++ b/FrmPatrolerManager.cs @@ -29,9 +29,7 @@ this.globeControl1 = globeControl1; winGridViewPager1.OnPageChanged += new EventHandler(winGridViewPager1_OnPageChanged); - this.winGridViewPager1.OnEditSelected += new EventHandler(winGridViewPager1_OnEditSelected);//编辑 - this.winGridViewPager1.OnDeleteSelected += new EventHandler(winGridViewPager1_OnDeleteSelected);//删除 - + this.winGridViewPager1.OnStartExport += new EventHandler(pager1_OnStartExport); this.winGridViewPager1.OnEndExport += new EventHandler(pager1_OnEndExport); @@ -47,26 +45,31 @@ //控制表格显示的列，以及每一列要显示的列名 this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - this.winGridViewPager1.AddColumnAlias("USERNAME", "姓名"); - this.winGridViewPager1.AddColumnAlias("DBID", "编号"); - this.winGridViewPager1.AddColumnAlias("SEX", "性别"); - this.winGridViewPager1.AddColumnAlias("AGE", "年龄"); - this.winGridViewPager1.AddColumnAlias("PHONENUM", "电话"); - this.winGridViewPager1.AddColumnAlias("ACCOUNTSTATE", "状态"); - this.winGridViewPager1.DisplayColumns = "USERNAME,SEX,AGE,PHONENUM,ACCOUNTSTATE"; + this.winGridViewPager1.AddColumnAlias("姓名", "姓名"); + this.winGridViewPager1.AddColumnAlias("编号", "编号"); + this.winGridViewPager1.AddColumnAlias("性别", "性别"); + this.winGridViewPager1.AddColumnAlias("年龄", "年龄"); + this.winGridViewPager1.AddColumnAlias("电话", "电话"); + this.winGridViewPager1.AddColumnAlias("状态", "状态"); + this.winGridViewPager1.DisplayColumns = "姓名,性别,年龄,电话,状态"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 + //隐藏右键功能按钮 //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[1].Visible = false; + winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Visible = false; + winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[4].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[5].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[6].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[7].Visible = false; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "编辑"; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Text = "注销"; + + //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "编辑"; + //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Text = "注销"; winGridViewPager1.AppendedMenu = this.contextMenuStrip1; + //右键菜单宽度 winGridViewPager1.dataGridView1.ContextMenuStrip.AutoSize = false; @@ -122,11 +125,11 @@ DataGridViewRow row = grid.SelectedRows[0]; try { - long dbid = long.Parse(row.Cells["dbid"].Value.ToString()); - String name = row.Cells["USERNAME"].Value.ToString(); - String sex = row.Cells["SEX"].Value.ToString(); - String age = row.Cells["AGE"].Value.ToString(); - string phone = row.Cells["PHONENUM"].Value.ToString(); + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); + String name = row.Cells["姓名"].Value.ToString(); + String sex = row.Cells["性别"].Value.ToString(); + String age = row.Cells["年龄"].Value.ToString(); + string phone = row.Cells["电话"].Value.ToString(); age = String.IsNullOrEmpty(age.ToString().Trim()) ? "1" : age.ToString().Trim(); FrmPatrolerEdit frm = new FrmPatrolerEdit(dbid.ToString(), name, age, sex, phone); frm.reloadGrid += new ReloadPatrolerGrid(LoadData); @@ -152,10 +155,10 @@ if (grid != null) { DataGridViewRow row = grid.SelectedRows[0]; - long dbid = long.Parse(row.Cells["DBID"].Value.ToString()); + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); try { - string state = row.Cells["ACCOUNTSTATE"].Value.ToString(); + string state = row.Cells["状态"].Value.ToString(); if ("在线".Equals(state)) { if (MessageBox.Show("确定注销？", "确认", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) @@ -180,60 +183,60 @@ { int pageIndex = winGridViewPager1.PagerInfo.CurrenetPageIndex; string sqlData = GetSql(pageIndex); - initlizeDatagrid(); + DataTable table = OracleUtils.ExecuteDataset(OracleUtils.ConnectionString, CommandType.Text, sqlData).Tables[0]; winGridViewPager1.DataSource = table.DefaultView; - for (int i = 0; i < winGridViewPager1.dataGridView1.Rows.Count; i++) - { - if (winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value.ToString() == "ONLINE") - { - winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value = "在线"; - } - else - { - if (winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value.ToString() == "OFFLINE") - { - winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value = "离线"; - } - else - { - if (winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value.ToString() == "LEAVER") - { - winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value = "注销"; - } - } - } - } + //for (int i = 0; i < winGridViewPager1.dataGridView1.Rows.Count; i++) + //{ + // if (winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value.ToString() == "ONLINE") + // { + // winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value = "在线"; + // } + // else + // { + // if (winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value.ToString() == "OFFLINE") + // { + // winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value = "离线"; + // } + // else + // { + // if (winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value.ToString() == "LEAVER") + // { + // winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value = "注销"; + // } + // } + // } + //} winGridViewPager1.Refresh(); } private void LoadData(int pageIndex) { string sqlData = GetSql(pageIndex); - initlizeDatagrid(); + DataTable table = OracleUtils.ExecuteDataset(OracleUtils.ConnectionString, CommandType.Text, sqlData).Tables[0]; winGridViewPager1.DataSource = table.DefaultView; - for (int i = 0; i < winGridViewPager1.dataGridView1.Rows.Count; i++) - { - if (winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value.ToString() == "ONLINE") - { - winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value = "在线"; - } - else - { - if (winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value.ToString() == "OFFLINE") - { - winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value = "离线"; - } - else - { - if (winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value.ToString() == "LEAVER") - { - winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value = "注销"; - } - } - } - } + //for (int i = 0; i < winGridViewPager1.dataGridView1.Rows.Count; i++) + //{ + // if (winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value.ToString() == "ONLINE") + // { + // winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value = "在线"; + // } + // else + // { + // if (winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value.ToString() == "OFFLINE") + // { + // winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value = "离线"; + // } + // else + // { + // if (winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value.ToString() == "LEAVER") + // { + // winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value = "注销"; + // } + // } + // } + //} winGridViewPager1.Refresh(); } @@ -241,7 +244,8 @@ { string sqlCount = "select count(*) from equipment where status = 'USING'"; - string sqlData = "select username,dbid,sex,age,phonenum,accountstate " + + string sqlData = "select username as 姓名,dbid as 编号,sex as 性别,age as 年龄,phonenum as 电话,"+ + "case when accountstate = 'ONLINE' then '在线' when accountstate = 'OFFLINE' then '离线' when accountstate = 'LEAVER' then '注销' end as 状态 " + "from (select t.*,rownum row_num from patroler t order by DBID desc)b " + " where 1=1"; @@ -255,9 +259,9 @@ int minPage = (pageIndex - 1) * maxPageIndex + 1; int maxPage = pageIndex * maxPageIndex; string sqlCount = "select count(*) from patroler where 1=1"; - string sqlData = "select username,dbid,sex,age,phonenum,accountstate " + - "from (select t.*,rownum row_num from patroler t order by DBID desc)b " + - " where(b.row_num between " + minPage + " and " + maxPage + ")"; + string sqlData = "select username as 姓名,dbid as 编号,sex as 性别,age as 年龄,phonenum as 电话,"+ + "case when accountstate = 'ONLINE' then '在线' when accountstate = 'OFFLINE' then '离线' when accountstate = 'LEAVER' then '注销' end as 状态 " + + "from (select t.*,rownum row_num from patroler t where 1=1"; if (!String.IsNullOrEmpty(txt_username.Text.Trim())) { @@ -281,7 +285,8 @@ sqlCount += " and accountstate='" + combo_stateText + "'"; sqlData += " and accountstate='" + combo_stateText + "'"; } - + sqlData += " order by DBID desc)b " + + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; @@ -291,6 +296,7 @@ { try { + initlizeDatagrid(); LoadData(); initForm(); IS_OPEN = true; @@ -310,11 +316,13 @@ } if (Utility.userRole.IndexOf("巡检员编辑") == -1) { - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Visible = false; + //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Visible = false; + 编辑ToolStripMenuItem.Visible = false; } if (Utility.userRole.IndexOf("巡检员注销") == -1) { - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Visible = false; + //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Visible = false; + 注销ToolStripMenuItem.Visible = false; } } @@ -376,7 +384,7 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - long dbid = long.Parse(row.Cells["dbid"].Value.ToString()); + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); Log p = new Log(dbid.ToString()); p.Show(); } @@ -395,8 +403,8 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - long dbid = long.Parse(row.Cells["dbid"].Value.ToString()); - String state = row.Cells["ACCOUNTSTATE"].Value.ToString(); + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); + String state = row.Cells["状态"].Value.ToString(); if ("在线".Equals(state)) { string sql = "select t.dbid " + @@ -435,8 +443,8 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - long dbid = long.Parse(row.Cells["dbid"].Value.ToString()); - String username = row.Cells["USERNAME"].Value.ToString(); + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); + String username = row.Cells["姓名"].Value.ToString(); string sql = "select t.latitude, t.longitude " + "from position t " + "where t.dbid = (select max(dbid) from position where patroler_id = " + dbid + ")"; @@ -489,6 +497,63 @@ } + private void 编辑ToolStripMenuItem_Click(object sender, EventArgs e) + { + if (winGridViewPager1 != null && winGridViewPager1.dataGridView1 != null) + { + DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; + try + { + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); + String name = row.Cells["姓名"].Value.ToString(); + String sex = row.Cells["性别"].Value.ToString(); + String age = row.Cells["年龄"].Value.ToString(); + string phone = row.Cells["电话"].Value.ToString(); + age = String.IsNullOrEmpty(age.ToString().Trim()) ? "1" : age.ToString().Trim(); + FrmPatrolerEdit frm = new FrmPatrolerEdit(dbid.ToString(), name, age, sex, phone); + frm.reloadGrid += new ReloadPatrolerGrid(LoadData); + frm.ShowDialog(); + winGridViewPager1.Refresh(); + } + catch (Exception ex) + { + MessageBox.Show("编辑失败:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } + + private void 注销ToolStripMenuItem_Click(object sender, EventArgs e) + { + if (winGridViewPager1 != null && winGridViewPager1.dataGridView1 != null) + { + DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); + try + { + if (MessageBox.Show("确定注销？", "确认", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) + { + String sql = "update patroler t set t.accountstate='LEAVER' where t.dbid=" + dbid; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + LoadData(); + MessageBox.Show("人员已注销", "信息", MessageBoxButtons.OK, MessageBoxIcon.Information); + } + //string state = row.Cells["状态"].Value.ToString(); + //if ("在线".Equals(state)) + //{ + + //} + //else + //{ + // MessageBox.Show("人员不在线，无法注销", "信息"); + //} + } + catch (Exception ex) + { + MessageBox.Show("人员注销失败:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } + } } diff --git a/FrmRoleInfoManager.cs b/FrmRoleInfoManager.cs index 8897133..35693cf 100644 --- a/FrmRoleInfoManager.cs +++ b/FrmRoleInfoManager.cs @@ -55,10 +55,10 @@ //控制表格显示的列，以及每一列要显示的列名 this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - this.winGridViewPager1.AddColumnAlias("NT", "角色名称"); - this.winGridViewPager1.AddColumnAlias("ID", "编号"); + this.winGridViewPager1.AddColumnAlias("角色名称", "角色名称"); + this.winGridViewPager1.AddColumnAlias("编号", "编号"); - this.winGridViewPager1.DisplayColumns = "NT"; + this.winGridViewPager1.DisplayColumns = "角色名称"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -131,7 +131,7 @@ { try { - string dbid = row.Cells["id"].Value.ToString(); + string dbid = row.Cells["编号"].Value.ToString(); string sql = "delete from casic_userroletest where id=" + dbid; OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); LoadData(); @@ -170,7 +170,7 @@ { string sqlCount = "select id,nt from casic_userroletest where sysname='EMS'"; - string sqlData = "select nt,id " + + string sqlData = "select nt as 角色名称,id as 编号 " + "from (select t.*,rownum row_num from casic_userroletest t order by id desc)b " + " where sysname='EMS'"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -183,7 +183,7 @@ int minPage = (pageIndex - 1) * maxPageIndex + 1; int maxPage = pageIndex * maxPageIndex; string sqlCount = "select id,nt from casic_userroletest where sysname='EMS'"; - string sqlData = "select nt,id " + + string sqlData = "select nt as 角色名称,id as 编号 " + "from (select t.*,rownum row_num from casic_userroletest t where sysname='EMS' order by id desc)b " + " where(b.row_num between " + minPage + " and " + maxPage + ")"; diff --git a/FrmSysUserInfoManger.cs b/FrmSysUserInfoManger.cs index 7903916..e193a61 100644 --- a/FrmSysUserInfoManger.cs +++ b/FrmSysUserInfoManger.cs @@ -28,6 +28,7 @@ this.winGridViewPager1.OnEndExport += new EventHandler(pager1_OnEndExport); winGridViewPager1.dataGridView1.MultiSelect = false; + } private void FrmSysUserInfoManger_Load(object sender, EventArgs e) @@ -59,10 +60,10 @@ //控制表格显示的列，以及每一列要显示的列名 this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - this.winGridViewPager1.AddColumnAlias("USERNAME", "账号"); - this.winGridViewPager1.AddColumnAlias("ID", "编号"); + this.winGridViewPager1.AddColumnAlias("账号", "账号"); + this.winGridViewPager1.AddColumnAlias("编号", "编号"); - this.winGridViewPager1.DisplayColumns = "USERNAME"; + this.winGridViewPager1.DisplayColumns = "账号"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -130,8 +131,8 @@ if (grid != null) { DataGridViewRow row = grid.SelectedRows[0]; - string dbid = row.Cells["id"].Value.ToString(); - string userName = row.Cells["USERNAME"].Value.ToString(); + string dbid = row.Cells["编号"].Value.ToString(); + string userName = row.Cells["账号"].Value.ToString(); if (userName.Equals("ems")) { MessageBox.Show("该用户为管理员用户，无法删除！", "信息"); @@ -184,7 +185,7 @@ { string sqlCount = "select count(*) from casic_userinfotest where sysname='EMS'"; - string sqlData = "select username,id " + + string sqlData = "select username as 账号,id as 编号 " + "from (select t.*,rownum row_num from casic_userinfotest t order by id desc)b " + " where sysname='EMS'"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -197,16 +198,16 @@ int minPage = (pageIndex - 1) * maxPageIndex + 1; int maxPage = pageIndex * maxPageIndex; string sqlCount = "select count(*) from casic_userinfotest where sysname='EMS'"; - string sqlData = "select username,id " + - "from (select t.*,rownum row_num from casic_userinfotest t where sysname='EMS' order by id desc)b " + - " where(b.row_num between " + minPage + " and " + maxPage + ")"; + string sqlData = "select username as 账号,id as 编号 " + + "from (select t.*,rownum row_num from casic_userinfotest t where sysname='EMS'"; if (!String.IsNullOrEmpty(txt_user_code.Text.Trim())) { sqlCount += " and username like '%" + txt_user_code.Text.Trim() + "%'"; sqlData += " and username like '%" + txt_user_code.Text.Trim() + "%'"; } - + sqlData += " order by id desc)b " + + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; diff --git a/MainFrm.cs b/MainFrm.cs index 39df646..0cd5881 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3310,10 +3310,10 @@ string str1 = ""; if (feature != null) { - if (feature.GetFieldDefn("图?片?编括?码?") != null) // + if (feature.GetFieldDefn("图片编码") != null) // { str1 = GetBubbleInfo(feature); - if (RemoteFileExists(Utility.PicRootURL + feature.GetValue("图?片?编括?码?").ToString())) + if (RemoteFileExists(Utility.PicRootURL + feature.GetValue("图片编码").ToString())) { str1 += ""; } @@ -3450,9 +3450,15 @@ string value1 = ""; if (field1 != null) { - if (field1.Name == "图片编码") + //if (field1.Name == "图片编码" || field1.Name == "对象编号" || field1.Name == "对象类型" || field1.Name == "对象名称") + //{ + // j++; + //} + while (field1.Name == "图片编码" || field1.Name == "对象编号" || field1.Name == "对象类型" || field1.Name == "对象名称") { j++; + fieldName = fieldNames[j].Trim(); + field1 = (GSOFieldDefn)feature.GetFieldDefn(fieldName); } if (j < rowCount) { @@ -3479,6 +3485,11 @@ if (!feature.IsFieldValueNull(j)) { value1 = feature.GetValue(j).ToString(); + if (name1 == "标识器埋深") + { + if (value1!=null&&value1.Length>4) + value1 = value1.Substring(0,4); + } } } } @@ -3491,9 +3502,14 @@ if (field2 != null) { - if (field2.Name == "图片编码") + //if (field2.Name == "图片编码" || field1.Name == "对象编号" || field1.Name == "对象类型" || field1.Name == "对象名称") + //{ + // j++; + //} + while (field2.Name == "图片编码" || field2.Name == "对象编号" || field2.Name == "对象类型" || field2.Name == "对象名称") { j++; + field2 = (GSOFieldDefn)feature.GetFieldDefn(j + 1); } if (j + 1 < rowCount) { @@ -3521,6 +3537,11 @@ if (!feature.IsFieldValueNull(j + 1)) { value2 = feature.GetValue(j + 1).ToString(); + if (name2 == "标识器埋深") + { + if (value2 != null && value2.Length > 4) + value2 = value2.Substring(0, 4); + } } } } @@ -15347,7 +15368,7 @@ return; } FrmFlagManagers frm = new FrmFlagManagers(globeControl1); - frm.Show(this); + frm.Show(); } private void ribbonTabItem2_MouseDown(object sender, MouseEventArgs e) diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index fddfb94..e5f0003 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -365,6 +365,16 @@ this.可编辑ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.保存ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.ribbonControl1 = new DevComponents.DotNetBar.RibbonControl(); + this.ribbonPanel3 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar3 = new DevComponents.DotNetBar.RibbonBar(); + this.btn_device = new DevComponents.DotNetBar.ButtonItem(); + this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); + this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel7 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); + this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); + this.slider4ground = new DevComponents.DotNetBar.SliderItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -374,12 +384,6 @@ this.btn_user_role = new DevComponents.DotNetBar.ButtonItem(); this.btn_password_edit = new DevComponents.DotNetBar.ButtonItem(); this.btn_reset_password = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel3 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar3 = new DevComponents.DotNetBar.RibbonBar(); - this.btn_device = new DevComponents.DotNetBar.ButtonItem(); - this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); - this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); @@ -551,10 +555,6 @@ this.buttonItemBZ9 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItemBZ10 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItemBZ11 = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel7 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); - this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); - this.slider4ground = new DevComponents.DotNetBar.SliderItem(); this.ribbonPanel12 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar18 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItem133 = new DevComponents.DotNetBar.ButtonItem(); @@ -690,11 +690,11 @@ this.contextMenuStrip3.SuspendLayout(); this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); - this.ribbonPanel8.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel7.SuspendLayout(); + this.ribbonPanel8.SuspendLayout(); this.ribbonPanel2.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); - this.ribbonPanel7.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); this.ribbonPanel5.SuspendLayout(); this.ribbonPanel6.SuspendLayout(); @@ -4162,10 +4162,10 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); - this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel2); - this.ribbonControl1.Controls.Add(this.ribbonPanel15); + this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel7); + this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); this.ribbonControl1.Controls.Add(this.ribbonPanel5); this.ribbonControl1.Controls.Add(this.ribbonPanel6); @@ -4216,135 +4216,6 @@ this.ribbonControl1.UseCustomizeDialog = false; this.ribbonControl1.Click += new System.EventHandler(this.ribbonControl1_Click); // - // ribbonPanel8 - // - this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel8.Controls.Add(this.ribbonBar_UserInfo); - this.ribbonPanel8.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel8.Location = new System.Drawing.Point(0, 33); - this.ribbonPanel8.Name = "ribbonPanel8"; - this.ribbonPanel8.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel8.Size = new System.Drawing.Size(1328, 62); - // - // - // - this.ribbonPanel8.Style.Class = ""; - this.ribbonPanel8.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel8.StyleMouseDown.Class = ""; - this.ribbonPanel8.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel8.StyleMouseOver.Class = ""; - this.ribbonPanel8.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel8.TabIndex = 42; - this.ribbonPanel8.Visible = false; - // - // ribbonBar_UserInfo - // - this.ribbonBar_UserInfo.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar_UserInfo.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar_UserInfo.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar_UserInfo.BackgroundStyle.Class = ""; - this.ribbonBar_UserInfo.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar_UserInfo.ContainerControlProcessDialogKey = true; - this.ribbonBar_UserInfo.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar_UserInfo.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.btn_user_info, - this.btn_role_info, - this.btn_resc_info, - this.btn_role_resc, - this.btn_user_role, - this.btn_password_edit, - this.btn_reset_password}); - this.ribbonBar_UserInfo.Location = new System.Drawing.Point(3, 0); - this.ribbonBar_UserInfo.Name = "ribbonBar_UserInfo"; - this.ribbonBar_UserInfo.Size = new System.Drawing.Size(427, 59); - this.ribbonBar_UserInfo.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar_UserInfo.TabIndex = 0; - // - // - // - this.ribbonBar_UserInfo.TitleStyle.Class = ""; - this.ribbonBar_UserInfo.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar_UserInfo.TitleStyleMouseOver.Class = ""; - this.ribbonBar_UserInfo.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // btn_user_info - // - this.btn_user_info.Image = global::Cyberpipe.Properties.Resources._24x24icon_13_hover; - this.btn_user_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_user_info.Name = "btn_user_info"; - this.btn_user_info.SubItemsExpandWidth = 14; - this.btn_user_info.Text = "用户管理"; - this.btn_user_info.Click += new System.EventHandler(this.btn_user_info_Click); - // - // btn_role_info - // - this.btn_role_info.Image = global::Cyberpipe.Properties.Resources._24x24icon_05_hover1; - this.btn_role_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_role_info.Name = "btn_role_info"; - this.btn_role_info.SubItemsExpandWidth = 14; - this.btn_role_info.Text = "角色管理"; - this.btn_role_info.Click += new System.EventHandler(this.btn_role_info_Click); - // - // btn_resc_info - // - this.btn_resc_info.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__09; - this.btn_resc_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_resc_info.Name = "btn_resc_info"; - this.btn_resc_info.SubItemsExpandWidth = 14; - this.btn_resc_info.Text = "资源管理"; - this.btn_resc_info.Click += new System.EventHandler(this.btn_resc_info_Click); - // - // btn_role_resc - // - this.btn_role_resc.Image = global::Cyberpipe.Properties.Resources.btnlegendSet_Image_副本; - this.btn_role_resc.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_role_resc.Name = "btn_role_resc"; - this.btn_role_resc.SubItemsExpandWidth = 14; - this.btn_role_resc.Text = "角色授权"; - this.btn_role_resc.Click += new System.EventHandler(this.btn_role_resc_Click); - // - // btn_user_role - // - this.btn_user_role.Image = global::Cyberpipe.Properties.Resources._24x24icon_08_hover; - this.btn_user_role.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_user_role.Name = "btn_user_role"; - this.btn_user_role.SubItemsExpandWidth = 14; - this.btn_user_role.Text = "用户授权"; - this.btn_user_role.Click += new System.EventHandler(this.btn_user_role_Click); - // - // btn_password_edit - // - this.btn_password_edit.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__67; - this.btn_password_edit.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_password_edit.Name = "btn_password_edit"; - this.btn_password_edit.SubItemsExpandWidth = 14; - this.btn_password_edit.Text = "密码修改"; - this.btn_password_edit.Click += new System.EventHandler(this.btn_password_edit_Click); - // - // btn_reset_password - // - this.btn_reset_password.Image = global::Cyberpipe.Properties.Resources.liuxiang; - this.btn_reset_password.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_reset_password.Name = "btn_reset_password"; - this.btn_reset_password.SubItemsExpandWidth = 14; - this.btn_reset_password.Text = "重置密码"; - this.btn_reset_password.Click += new System.EventHandler(this.btn_reset_password_Click); - // // ribbonPanel3 // this.ribbonPanel3.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4425,7 +4296,7 @@ this.btn_Person.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; this.btn_Person.Name = "btn_Person"; this.btn_Person.SubItemsExpandWidth = 14; - this.btn_Person.Text = "巡检人员维护"; + this.btn_Person.Text = "定位人员维护"; this.btn_Person.Click += new System.EventHandler(this.btn_Person_Click); // // btn_constructMap @@ -4446,6 +4317,214 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel7 + // + this.ribbonPanel7.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel7.Controls.Add(this.ribbonBar5); + this.ribbonPanel7.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel7.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel7.Name = "ribbonPanel7"; + this.ribbonPanel7.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel7.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel7.Style.Class = ""; + this.ribbonPanel7.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel7.StyleMouseDown.Class = ""; + this.ribbonPanel7.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel7.StyleMouseOver.Class = ""; + this.ribbonPanel7.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel7.TabIndex = 41; + this.ribbonPanel7.Visible = false; + // + // ribbonBar5 + // + this.ribbonBar5.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar5.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar5.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar5.BackgroundStyle.Class = ""; + this.ribbonBar5.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar5.ContainerControlProcessDialogKey = true; + this.ribbonBar5.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar5.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.btn_flag, + this.slider4ground}); + this.ribbonBar5.Location = new System.Drawing.Point(3, 0); + this.ribbonBar5.Name = "ribbonBar5"; + this.ribbonBar5.Size = new System.Drawing.Size(427, 92); + this.ribbonBar5.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar5.TabIndex = 0; + // + // + // + this.ribbonBar5.TitleStyle.Class = ""; + this.ribbonBar5.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar5.TitleStyleMouseOver.Class = ""; + this.ribbonBar5.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar5.TitleVisible = false; + // + // btn_flag + // + this.btn_flag.Image = global::Cyberpipe.Properties.Resources._24x24icon_03_hover; + this.btn_flag.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_flag.Name = "btn_flag"; + this.btn_flag.SubItemsExpandWidth = 14; + this.btn_flag.Text = "标识器管理"; + this.btn_flag.Click += new System.EventHandler(this.btn_flag_Click); + // + // slider4ground + // + this.slider4ground.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; + this.slider4ground.Name = "slider4ground"; + this.slider4ground.Text = "地面透明度"; + this.slider4ground.Value = 0; + this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); + // + // ribbonPanel8 + // + this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel8.Controls.Add(this.ribbonBar_UserInfo); + this.ribbonPanel8.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel8.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel8.Name = "ribbonPanel8"; + this.ribbonPanel8.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel8.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel8.Style.Class = ""; + this.ribbonPanel8.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel8.StyleMouseDown.Class = ""; + this.ribbonPanel8.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel8.StyleMouseOver.Class = ""; + this.ribbonPanel8.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel8.TabIndex = 42; + this.ribbonPanel8.Visible = false; + // + // ribbonBar_UserInfo + // + this.ribbonBar_UserInfo.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar_UserInfo.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar_UserInfo.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar_UserInfo.BackgroundStyle.Class = ""; + this.ribbonBar_UserInfo.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar_UserInfo.ContainerControlProcessDialogKey = true; + this.ribbonBar_UserInfo.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar_UserInfo.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.btn_user_info, + this.btn_role_info, + this.btn_resc_info, + this.btn_role_resc, + this.btn_user_role, + this.btn_password_edit, + this.btn_reset_password}); + this.ribbonBar_UserInfo.Location = new System.Drawing.Point(3, 0); + this.ribbonBar_UserInfo.Name = "ribbonBar_UserInfo"; + this.ribbonBar_UserInfo.Size = new System.Drawing.Size(427, 92); + this.ribbonBar_UserInfo.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar_UserInfo.TabIndex = 0; + // + // + // + this.ribbonBar_UserInfo.TitleStyle.Class = ""; + this.ribbonBar_UserInfo.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar_UserInfo.TitleStyleMouseOver.Class = ""; + this.ribbonBar_UserInfo.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // btn_user_info + // + this.btn_user_info.Image = global::Cyberpipe.Properties.Resources._24x24icon_13_hover; + this.btn_user_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_user_info.Name = "btn_user_info"; + this.btn_user_info.SubItemsExpandWidth = 14; + this.btn_user_info.Text = "用户管理"; + this.btn_user_info.Click += new System.EventHandler(this.btn_user_info_Click); + // + // btn_role_info + // + this.btn_role_info.Image = global::Cyberpipe.Properties.Resources._24x24icon_05_hover1; + this.btn_role_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_role_info.Name = "btn_role_info"; + this.btn_role_info.SubItemsExpandWidth = 14; + this.btn_role_info.Text = "角色管理"; + this.btn_role_info.Click += new System.EventHandler(this.btn_role_info_Click); + // + // btn_resc_info + // + this.btn_resc_info.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__09; + this.btn_resc_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_resc_info.Name = "btn_resc_info"; + this.btn_resc_info.SubItemsExpandWidth = 14; + this.btn_resc_info.Text = "资源管理"; + this.btn_resc_info.Click += new System.EventHandler(this.btn_resc_info_Click); + // + // btn_role_resc + // + this.btn_role_resc.Image = global::Cyberpipe.Properties.Resources.btnlegendSet_Image_副本; + this.btn_role_resc.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_role_resc.Name = "btn_role_resc"; + this.btn_role_resc.SubItemsExpandWidth = 14; + this.btn_role_resc.Text = "角色授权"; + this.btn_role_resc.Click += new System.EventHandler(this.btn_role_resc_Click); + // + // btn_user_role + // + this.btn_user_role.Image = global::Cyberpipe.Properties.Resources._24x24icon_08_hover; + this.btn_user_role.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_user_role.Name = "btn_user_role"; + this.btn_user_role.SubItemsExpandWidth = 14; + this.btn_user_role.Text = "用户授权"; + this.btn_user_role.Click += new System.EventHandler(this.btn_user_role_Click); + // + // btn_password_edit + // + this.btn_password_edit.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__67; + this.btn_password_edit.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_password_edit.Name = "btn_password_edit"; + this.btn_password_edit.SubItemsExpandWidth = 14; + this.btn_password_edit.Text = "密码修改"; + this.btn_password_edit.Click += new System.EventHandler(this.btn_password_edit_Click); + // + // btn_reset_password + // + this.btn_reset_password.Image = global::Cyberpipe.Properties.Resources.liuxiang; + this.btn_reset_password.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_reset_password.Name = "btn_reset_password"; + this.btn_reset_password.SubItemsExpandWidth = 14; + this.btn_reset_password.Text = "重置密码"; + this.btn_reset_password.Click += new System.EventHandler(this.btn_reset_password_Click); + // // ribbonPanel2 // this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -5891,85 +5970,6 @@ this.buttonItemBZ11.Text = "标注管理"; this.buttonItemBZ11.Click += new System.EventHandler(this.buttonItemBZ11_Click); // - // ribbonPanel7 - // - this.ribbonPanel7.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel7.Controls.Add(this.ribbonBar5); - this.ribbonPanel7.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel7.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel7.Name = "ribbonPanel7"; - this.ribbonPanel7.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel7.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel7.Style.Class = ""; - this.ribbonPanel7.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel7.StyleMouseDown.Class = ""; - this.ribbonPanel7.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel7.StyleMouseOver.Class = ""; - this.ribbonPanel7.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel7.TabIndex = 41; - this.ribbonPanel7.Visible = false; - // - // ribbonBar5 - // - this.ribbonBar5.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar5.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar5.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar5.BackgroundStyle.Class = ""; - this.ribbonBar5.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar5.ContainerControlProcessDialogKey = true; - this.ribbonBar5.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar5.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.btn_flag, - this.slider4ground}); - this.ribbonBar5.Location = new System.Drawing.Point(3, 0); - this.ribbonBar5.Name = "ribbonBar5"; - this.ribbonBar5.Size = new System.Drawing.Size(427, 92); - this.ribbonBar5.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar5.TabIndex = 0; - // - // - // - this.ribbonBar5.TitleStyle.Class = ""; - this.ribbonBar5.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar5.TitleStyleMouseOver.Class = ""; - this.ribbonBar5.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar5.TitleVisible = false; - // - // btn_flag - // - this.btn_flag.Image = global::Cyberpipe.Properties.Resources._24x24icon_03_hover; - this.btn_flag.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_flag.Name = "btn_flag"; - this.btn_flag.SubItemsExpandWidth = 14; - this.btn_flag.Text = "标识器管理"; - this.btn_flag.Click += new System.EventHandler(this.btn_flag_Click); - // - // slider4ground - // - this.slider4ground.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; - this.slider4ground.Name = "slider4ground"; - this.slider4ground.Text = "地面透明度"; - this.slider4ground.Value = 0; - this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); - // // ribbonPanel12 // this.ribbonPanel12.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7181,11 +7181,11 @@ this.contextMenuStripDeleteLayerNode.ResumeLayout(false); this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); - this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel7.ResumeLayout(false); + this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); - this.ribbonPanel7.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); this.ribbonPanel5.ResumeLayout(false); this.ribbonPanel6.ResumeLayout(false); diff --git a/SysRescInfoManager.cs b/SysRescInfoManager.cs index 3a84d95..fda6f3f 100644 --- a/SysRescInfoManager.cs +++ b/SysRescInfoManager.cs @@ -79,11 +79,11 @@ //控制表格显示的列，以及每一列要显示的列名 this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - - this.winGridViewPager1.AddColumnAlias("RESC", "资源名称"); - this.winGridViewPager1.AddColumnAlias("ID", "编号"); - this.winGridViewPager1.AddColumnAlias("DESP", "资源描述"); - this.winGridViewPager1.DisplayColumns = "RESC,DESP"; + + this.winGridViewPager1.AddColumnAlias("资源名称", "资源名称"); + this.winGridViewPager1.AddColumnAlias("编号", "编号"); + this.winGridViewPager1.AddColumnAlias("资源描述", "资源描述"); + this.winGridViewPager1.DisplayColumns = "资源名称,资源描述"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -153,8 +153,8 @@ DataGridViewRow row = grid.SelectedRows[0]; if (MessageBox.Show("确定删除？", "确认", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) { - string dbid = row.Cells["id"].Value.ToString(); - string resc = row.Cells["resc"].Value.ToString(); + string dbid = row.Cells["编号"].Value.ToString(); + string resc = row.Cells["资源名称"].Value.ToString(); OracleConnection conn = null; OracleTransaction tran = null; try @@ -229,7 +229,7 @@ private string GetSql() { string sqlCount = "select count(*) from casic_userresctest where sysname='EMS'"; - string sqlData = "select resc,id,desp " + + string sqlData = "select resc as 资源名称,id as 编号,desp as 资源描述 " + "from (select t.*,rownum row_num from casic_userresctest t order by id desc)b " + " where sysname='EMS'"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -242,7 +242,7 @@ int minPage = (pageIndex - 1) * maxPageIndex + 1; int maxPage = pageIndex * maxPageIndex; string sqlCount = "select count(*) from casic_userresctest where sysname='EMS'"; - string sqlData = "select resc,id,desp " + + string sqlData = "select resc as 资源名称,id as 编号,desp as 资源描述 " + "from (select t.*,rownum row_num from casic_userresctest t where sysname='EMS' order by id desc)b " + " where(b.row_num between " + minPage + " and " + maxPage + ")"; diff --git a/bin/x86/Debug/Config.xml b/bin/x86/Debug/Config.xml index e2d7b46..560a163 100644 --- a/bin/x86/Debug/Config.xml +++ b/bin/x86/Debug/Config.xml @@ -3,9 +3,9 @@ LocaSpace三维地下管线信息系统 scott - SZHTDB - 127.0.0.1 - scott + SZHTDB2 + 192.168.0.203 + SZHTDB2 127.0.0.1 1500 @@ -14,8 +14,8 @@ http://192.168.0.122:8088/UpDownFile.asmx - http://127.0.0.1/EMSCyberpipe.msi - http://127.0.0.1/EMSConfig.xml + http://192.168.10.229/EMSCyberpipe.msi + http://192.168.10.229/EMSConfig.xml diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index b19e2ab..b5e320f 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 1a4aeed..c20e54a 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/PipelineType.xml b/bin/x86/Debug/PipelineType.xml index 51dc4b8..b1cbacc 100644 --- a/bin/x86/Debug/PipelineType.xml +++ b/bin/x86/Debug/PipelineType.xml @@ -1,6 +1,6 @@  - + @@ -42,7 +42,7 @@ - + @@ -83,7 +83,7 @@ - + @@ -115,7 +115,7 @@ - + @@ -159,7 +159,7 @@ - + @@ -200,7 +200,7 @@ - + @@ -236,7 +236,7 @@ - + @@ -278,7 +278,7 @@ - + @@ -320,7 +320,7 @@ - + @@ -363,7 +363,7 @@ - + @@ -408,7 +408,7 @@ - + @@ -448,7 +448,7 @@ - + @@ -485,7 +485,7 @@ - + @@ -527,7 +527,7 @@ - + @@ -565,7 +565,7 @@ - + @@ -595,7 +595,7 @@ - + @@ -625,7 +625,7 @@ - + @@ -657,7 +657,7 @@ - + @@ -691,7 +691,7 @@ - + @@ -728,7 +728,7 @@ - + @@ -763,7 +763,7 @@ - + @@ -799,7 +799,7 @@ - + @@ -824,7 +824,7 @@ - + @@ -846,7 +846,7 @@ - + diff --git a/obj/x86/Debug/Cyberpipe.csproj.FileListAbsolute.txt b/obj/x86/Debug/Cyberpipe.csproj.FileListAbsolute.txt index 42dc58c..b78c534 100644 --- a/obj/x86/Debug/Cyberpipe.csproj.FileListAbsolute.txt +++ b/obj/x86/Debug/Cyberpipe.csproj.FileListAbsolute.txt @@ -203,3 +203,4 @@ D:\ym\EMS+GHFX\EMS\obj\x86\Debug\EMSCyberpipe.pdb D:\ym\EMS+GHFX\EMS\obj\x86\Debug\Cyberpipe.FrmFlagManagers.resources D:\ym\EMS+GHFX\EMS\obj\x86\Debug\Cyberpipe.FrmFlagEdits.resources +D:\ym\EMS+GHFX\EMS\obj\x86\Debug\Cyberpipe.FrmFlagDetail.resources diff --git a/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache b/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache index 19b3415..cee9c4a 100644 --- a/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache +++ b/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache Binary files differ diff --git a/obj/x86/Debug/EMSCyberpipe.exe b/obj/x86/Debug/EMSCyberpipe.exe index b19e2ab..b5e320f 100644 --- a/obj/x86/Debug/EMSCyberpipe.exe +++ b/obj/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/obj/x86/Debug/EMSCyberpipe.pdb b/obj/x86/Debug/EMSCyberpipe.pdb index 1a4aeed..c20e54a 100644 --- a/obj/x86/Debug/EMSCyberpipe.pdb +++ b/obj/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/obj/x86/Debug/GenerateResource.read.1.tlog b/obj/x86/Debug/GenerateResource.read.1.tlog index 79b7689..7ee40f5 100644 --- a/obj/x86/Debug/GenerateResource.read.1.tlog +++ b/obj/x86/Debug/GenerateResource.read.1.tlog Binary files differ diff --git a/obj/x86/Debug/GenerateResource.write.1.tlog b/obj/x86/Debug/GenerateResource.write.1.tlog index ed512ef..9aabeca 100644 --- a/obj/x86/Debug/GenerateResource.write.1.tlog +++ b/obj/x86/Debug/GenerateResource.write.1.tlog Binary files differ diff --git a/Cyberpipe.csproj b/Cyberpipe.csproj index fe600e5..501fd09 100644 --- a/Cyberpipe.csproj +++ b/Cyberpipe.csproj @@ -246,6 +246,12 @@ Form_TaskManager.cs + + Form + + + FrmFlagDetail.cs + Form @@ -1368,6 +1374,9 @@ Form_TaskManager.cs + + FrmFlagDetail.cs + FormDocumentManager.cs diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 537b4c3..1acf22a 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 7d5dd95..3f178cb 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -90,20 +90,20 @@ this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - - this.winGridViewPager1.AddColumnAlias("ACCIDENTTIME", "上报时间"); - this.winGridViewPager1.AddColumnAlias("DBID", "编号"); - this.winGridViewPager1.AddColumnAlias("DESCRIBE", "事件描述"); - this.winGridViewPager1.AddColumnAlias("LATITUDE", "纬度"); - this.winGridViewPager1.AddColumnAlias("LOCALE", "事件地点"); - this.winGridViewPager1.AddColumnAlias("LONGITUDE", "经度"); - this.winGridViewPager1.AddColumnAlias("PATROLERNAME", "上报人员"); - this.winGridViewPager1.AddColumnAlias("PATROLER_ID", "人员ID"); - this.winGridViewPager1.AddColumnAlias("TASK_ID", "任务编号"); - this.winGridViewPager1.AddColumnAlias("RESULT", "处理结果"); - this.winGridViewPager1.AddColumnAlias("STATE", "处理状态"); - this.winGridViewPager1.DisplayColumns = "ACCIDENTTIME,DESCRIBE,LOCALE,PATROLERNAME,TASK_ID,RESULT,STATE"; + this.winGridViewPager1.AddColumnAlias("上报时间", "上报时间"); + this.winGridViewPager1.AddColumnAlias("编号", "编号"); + this.winGridViewPager1.AddColumnAlias("事件描述", "事件描述"); + this.winGridViewPager1.AddColumnAlias("纬度", "纬度"); + this.winGridViewPager1.AddColumnAlias("事件地点", "事件地点"); + this.winGridViewPager1.AddColumnAlias("经度", "经度"); + this.winGridViewPager1.AddColumnAlias("上报人员", "上报人员"); + this.winGridViewPager1.AddColumnAlias("人员ID", "人员ID"); + this.winGridViewPager1.AddColumnAlias("任务编号", "任务编号"); + this.winGridViewPager1.AddColumnAlias("处理结果", "处理结果"); + this.winGridViewPager1.AddColumnAlias("处理状态", "处理状态"); + + this.winGridViewPager1.DisplayColumns = "上报时间,事件描述,事件地点,上报人员,任务编号,处理结果,处理状态"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -114,8 +114,8 @@ winGridViewPager1.dataGridView1.ContextMenuStrip.Items[5].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[6].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[7].Visible = false; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[1].Text = "查看位置"; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "结果编辑"; + winGridViewPager1.dataGridView1.ContextMenuStrip.Items[1].Text = "结果编辑"; + winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "查看位置"; //右键菜单宽度 winGridViewPager1.dataGridView1.ContextMenuStrip.AutoSize = false; @@ -160,13 +160,12 @@ this.WindowState = FormWindowState.Minimized; globeControl1.Globe.MemoryLayer.RemoveAllFeature(); this.WindowState = FormWindowState.Minimized; - double x = Convert.ToDouble(row.Cells["LONGITUDE"].Value); - double y = Convert.ToDouble(row.Cells["LATITUDE"].Value); - - string username = Convert.ToString(row.Cells["PATROLERNAME"].Value); - string Atime = Convert.ToString(row.Cells["ACCIDENTTIME"].Value); - string location = Convert.ToString(row.Cells["LOCALE"].Value); - string descp = Convert.ToString(row.Cells["DESCRIBE"].Value); + double x = Convert.ToDouble(row.Cells["经度"].Value); + double y = Convert.ToDouble(row.Cells["纬度"].Value); + string username = Convert.ToString(row.Cells["上报人员"].Value); + string Atime = Convert.ToString(row.Cells["上报时间"].Value); + string location = Convert.ToString(row.Cells["事件地点"].Value); + string descp = Convert.ToString(row.Cells["事件描述"].Value); /////////////////////////////////////// /*******设置飞行与创建模型******/ @@ -228,8 +227,8 @@ DataGridViewRow row = grid.SelectedRows[0]; try { - int dbId = Convert.ToInt32(row.Cells["DBID"].Value); - string result = Convert.ToString(row.Cells["RESULT"].Value); + int dbId = Convert.ToInt32(row.Cells["编号"].Value); + string result = Convert.ToString(row.Cells["处理结果"].Value); EMS_Forms.Form_EventResult form = new Form_EventResult(dbId, result); form.refresh += new Form_EventResult.Handle(LoadData);//改变值的事件 form.ShowDialog(); @@ -276,9 +275,9 @@ } for (int i = 0; i < table.Rows.Count; i++) { - if (winGridViewPager1.dataGridView1.Rows[i].Cells["RESULT"].Value != null && !(winGridViewPager1.dataGridView1.Rows[i].Cells["RESULT"].Value.ToString().Trim().Equals(""))) + if (winGridViewPager1.dataGridView1.Rows[i].Cells["处理结果"].Value != null && !(winGridViewPager1.dataGridView1.Rows[i].Cells["处理结果"].Value.ToString().Trim().Equals(""))) { - winGridViewPager1.dataGridView1.Rows[i].Cells["STATE"].Value = "已处理"; + winGridViewPager1.dataGridView1.Rows[i].Cells["处理状态"].Value = "已处理"; } } @@ -307,9 +306,9 @@ } for (int i = 0; i < table.Rows.Count; i++) { - if (winGridViewPager1.dataGridView1.Rows[i].Cells["RESULT"].Value != null && !(winGridViewPager1.dataGridView1.Rows[i].Cells["RESULT"].Value.ToString().Trim().Equals(""))) + if (winGridViewPager1.dataGridView1.Rows[i].Cells["处理结果"].Value != null && !(winGridViewPager1.dataGridView1.Rows[i].Cells["处理结果"].Value.ToString().Trim().Equals(""))) { - winGridViewPager1.dataGridView1.Rows[i].Cells["STATE"].Value = "已处理"; + winGridViewPager1.dataGridView1.Rows[i].Cells["处理状态"].Value = "已处理"; } } @@ -320,10 +319,12 @@ { string sqlCount = "select count(*) from ACCIDENT where 1=1"; - string sqlData = "select ACCIDENTTIME,DBID,DESCRIBE,LATITUDE,LOCALE,LONGITUDE,PATROLERNAME,PATROLER_ID,TASK_ID,RESULT,'' as STATE " + + string sqlData = "select ACCIDENTTIME as 上报时间,DBID as 编号,DESCRIBE as 事件描述,"+ + "LATITUDE as 纬度,LOCALE as 事件地点,LONGITUDE as 经度,PATROLERNAME 上报人员,"+ + "PATROLER_ID as 人员ID,TASK_ID as 任务编号,RESULT as 处理结果,'' as 处理状态 " + "from (select t.*,rownum row_num from ACCIDENT t order by DBID)b " + " where 1=1"; - + rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; @@ -340,9 +341,10 @@ string sqlCount = "select count(*) from ACCIDENT where 1=1"; - string sqlData = "select ACCIDENTTIME,DBID,DESCRIBE,LATITUDE,LOCALE,LONGITUDE,PATROLERNAME,PATROLER_ID,TASK_ID,RESULT,'' as STATE " + - "from (select t.*,rownum row_num from ACCIDENT t order by DBID)b " + - " where(b.row_num between " + minPage + " and " + maxPage + ")"; + string sqlData = "select ACCIDENTTIME as 上报时间,DBID as 编号,DESCRIBE as 事件描述," + + "LATITUDE as 纬度,LOCALE as 事件地点,LONGITUDE as 经度,PATROLERNAME 上报人员," + + "PATROLER_ID as 人员ID,TASK_ID as 任务编号,RESULT as 处理结果,'' as 处理状态 " + + "from (select t.*,rownum row_num from ACCIDENT t where 1=1"; if (!String.IsNullOrEmpty(comboBox_name.Text.Trim())) { @@ -361,7 +363,8 @@ sqlCount += "and ACCIDENTTIME<=to_date('" + time.ToShortDateString() + "','yyyy-MM-dd') "; sqlData += "and ACCIDENTTIME<=to_date('" + time.ToShortDateString() + "','yyyy-MM-dd') "; } - + sqlData += " order by DBID desc)b " + + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 225c8d7..8bd9e48 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -120,8 +120,8 @@ private void flyToTask(DataGridViewRow row, int taskState) { int dbID = 0; - dbID = Convert.ToInt32(row.Cells["DBID"].Value); - string userName = Convert.ToString(row.Cells["USERNAME"].Value); + dbID = Convert.ToInt32(row.Cells["任务编号"].Value); + string userName = Convert.ToString(row.Cells["任务执行人员"].Value); System.DateTime t = new DateTime(); try { @@ -392,15 +392,15 @@ //控制表格显示的列，以及每一列要显示的列名 this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - this.winGridViewPager1.AddColumnAlias("DBID", "任务编号"); - this.winGridViewPager1.AddColumnAlias("DEPLOYTIME", "创建时间"); - this.winGridViewPager1.AddColumnAlias("DESCIRPTION", "任务描述"); - this.winGridViewPager1.AddColumnAlias("FINISHTIME", "完成时间"); - this.winGridViewPager1.AddColumnAlias("STREET", "任务执行区域"); - this.winGridViewPager1.AddColumnAlias("TASKSTATE", "任务状态"); - this.winGridViewPager1.AddColumnAlias("USERNAME", "任务执行人员"); + this.winGridViewPager1.AddColumnAlias("任务编号", "任务编号"); + this.winGridViewPager1.AddColumnAlias("创建时间", "创建时间"); + this.winGridViewPager1.AddColumnAlias("任务描述", "任务描述"); + this.winGridViewPager1.AddColumnAlias("完成时间", "完成时间"); + this.winGridViewPager1.AddColumnAlias("任务执行区域", "任务执行区域"); + this.winGridViewPager1.AddColumnAlias("任务状态", "任务状态"); + this.winGridViewPager1.AddColumnAlias("任务执行人员", "任务执行人员"); - this.winGridViewPager1.DisplayColumns = "DBID,DEPLOYTIME,DESCIRPTION,FINISHTIME,STREET,TASKSTATE,USERNAME"; + this.winGridViewPager1.DisplayColumns = "任务编号,创建时间,任务描述,完成时间,任务执行区域,任务状态,任务执行人员"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -464,8 +464,8 @@ { int dbID = 0; int taskStateInt = 0; - dbID = Convert.ToInt32(row.Cells["DBID"].Value); - string taskState = row.Cells["TASKSTATE"].Value.ToString(); + dbID = Convert.ToInt32(row.Cells["任务编号"].Value); + string taskState = row.Cells["任务状态"].Value.ToString(); if (taskState.Equals("开始任务")) { taskStateInt = 1; @@ -534,9 +534,10 @@ private string GetSql() { - string sqlCount = "select count(*) from taskinfo t where 1=1'"; + string sqlCount = "select count(*) from taskinfo t where 1=1"; - string sqlData = "select dbid,deploytime,descirption,finishtime,street,taskstate,username " + + 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"; @@ -550,9 +551,9 @@ int minPage = (pageIndex - 1) * maxPageIndex + 1; int maxPage = pageIndex * maxPageIndex; string sqlCount = "select count(*) from taskinfo t where 1=1"; - string sqlData = "select dbid,deploytime,descirption,finishtime,street,taskstate,username " + - "from (select t.*,rownum row_num from taskinfo t order by DBID desc)b " + - " where(b.row_num between " + minPage + " and " + maxPage + ")"; + 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"; if (!String.IsNullOrEmpty(comboBox_userName.Text.Trim()) && !comboBox_userName.Text.Trim().Equals("不限")) { @@ -581,6 +582,8 @@ sqlCount += "and street='" + combo_street.Text + "' "; sqlData += "and street='" + combo_street.Text + "' "; } + sqlData += " order by DBID desc)b " + + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index e65a4bd..58f5342 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -73,13 +73,13 @@ //控制表格显示的列，以及每一列要显示的列名 this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - this.winGridViewPager1.AddColumnAlias("FILENAME", "文档名称"); - this.winGridViewPager1.AddColumnAlias("DBID", "编号"); - this.winGridViewPager1.AddColumnAlias("TITLE", "文档标题"); - this.winGridViewPager1.AddColumnAlias("FILETYPE", "文档类型"); - this.winGridViewPager1.AddColumnAlias("UPDAY", "上传日期"); - this.winGridViewPager1.AddColumnAlias("WRITER", "上传人"); - this.winGridViewPager1.DisplayColumns = "FILENAME,TITLE,FILETYPE,UPDAY,WRITER"; + this.winGridViewPager1.AddColumnAlias("文档名称", "文档名称"); + this.winGridViewPager1.AddColumnAlias("编号", "编号"); + this.winGridViewPager1.AddColumnAlias("文档标题", "文档标题"); + this.winGridViewPager1.AddColumnAlias("文档类型", "文档类型"); + this.winGridViewPager1.AddColumnAlias("上传日期", "上传日期"); + this.winGridViewPager1.AddColumnAlias("上传人", "上传人"); + this.winGridViewPager1.DisplayColumns = "文档名称,文档标题,文档类型,上传日期,上传人"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -167,7 +167,7 @@ if (grid != null) { DataGridViewRow row = grid.SelectedRows[0]; - string dbid = row.Cells["dbid"].Value.ToString(); + string dbid = row.Cells["编号"].Value.ToString(); try { if (MessageBox.Show("确认删除吗？", "确认", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) @@ -212,7 +212,8 @@ { string sqlCount = "select count(*) from casic_userdocument where sysname = 'EMS'"; - string sqlData = "select filename,dbid,title,filetype,upday,writer " + + string sqlData = "select filename as 文档名称,dbid as 编号,title as 文档标题," + + "filetype as 文档类型,upday as 上传日期,writer as 上传人 " + "from (select t.*,rownum row_num from casic_userdocument t order by DBID desc)b " + " where sysname = 'EMS'"; @@ -226,9 +227,9 @@ int minPage = (pageIndex - 1) * maxPageIndex + 1; int maxPage = pageIndex * maxPageIndex; string sqlCount = "select count(*) from casic_userdocument where sysname = 'EMS'"; - string sqlData = "select filename,dbid,title,filetype,upday,writer " + - "from (select t.*,rownum row_num from casic_userdocument t where sysname = 'EMS' order by DBID desc)b " + - " where(b.row_num between " + minPage + " and " + maxPage + ")"; + string sqlData = "select filename as 文档名称,dbid as 编号,title as 文档标题,"+ + "filetype as 文档类型,upday as 上传日期,writer as 上传人 " + + "from (select t.*,rownum row_num from casic_userdocument t where sysname = 'EMS'"; string txtTitleText = null; string comboFileType = null; @@ -278,7 +279,8 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - + sqlData += " order by DBID desc)b " + + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; @@ -437,7 +439,7 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - string filename = row.Cells["filename"].Value.ToString(); + string filename = row.Cells["文档名称"].Value.ToString(); string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; string file = System.Environment.CurrentDirectory + "\\download\\" + filename; int result = DownloadFile(url, file, progressBar1); @@ -515,7 +517,7 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - string filename = row.Cells["filename"].Value.ToString(); + string filename = row.Cells["文档名称"].Value.ToString(); string ext = Path.GetExtension(filename); SaveFileDialog dlg = new SaveFileDialog(); dlg.Filter = "保存文档|*" + ext + ";"; diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 1d1201b..3902629 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -748,6 +748,7 @@ this.Name = "FrmAddSinMark"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "单个标识器添加"; + this.TopMost = true; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmAddSinMark_FormClosing); this.Load += new System.EventHandler(this.FrmAddSinMark_Load); this.groupPanel1.ResumeLayout(false); diff --git a/FrmEquipmentManage.cs b/FrmEquipmentManage.cs index 90bfdb2..a3cf55c 100644 --- a/FrmEquipmentManage.cs +++ b/FrmEquipmentManage.cs @@ -74,13 +74,13 @@ //控制表格显示的列，以及每一列要显示的列名 this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - this.winGridViewPager1.AddColumnAlias("DESCIRPTION", "设备描述"); - this.winGridViewPager1.AddColumnAlias("DBID", "编号"); - this.winGridViewPager1.AddColumnAlias("MACID", "MAC地址"); - this.winGridViewPager1.AddColumnAlias("OWNER", "设备所有人"); - this.winGridViewPager1.AddColumnAlias("STATUS", "设备状态"); + this.winGridViewPager1.AddColumnAlias("设备描述", "设备描述"); + this.winGridViewPager1.AddColumnAlias("编号", "编号"); + this.winGridViewPager1.AddColumnAlias("MAC地址", "MAC地址"); + this.winGridViewPager1.AddColumnAlias("设备所有人", "设备所有人"); + this.winGridViewPager1.AddColumnAlias("设备状态", "设备状态"); - this.winGridViewPager1.DisplayColumns = "DESCIRPTION,MACID,OWNER,STATUS"; + this.winGridViewPager1.DisplayColumns = "设备描述,MAC地址,设备所有人,设备状态"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -146,10 +146,10 @@ DataGridViewRow row = grid.SelectedRows[0]; try { - long dbid = long.Parse(row.Cells["DBID"].Value.ToString()); - String macId = row.Cells["MACID"].Value.ToString(); - String username = row.Cells["OWNER"].Value.ToString(); - String descn = row.Cells["DESCIRPTION"].Value.ToString(); + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); + String macId = row.Cells["MAC地址"].Value.ToString(); + String username = row.Cells["设备所有人"].Value.ToString(); + String descn = row.Cells["设备状态"].Value.ToString(); FrmEquipmentEdit frm = new FrmEquipmentEdit(dbid.ToString(), macId, username, descn); frm.reloadGrid += new ReloadEquipmentGrid(LoadData); frm.ShowDialog(); @@ -179,7 +179,7 @@ { return; } - String macId = row.Cells["MACID"].Value.ToString(); + String macId = row.Cells["MAC地址"].Value.ToString(); FrmLog frm = new FrmLog(macId); frm.Show(); } @@ -201,7 +201,7 @@ if (grid != null) { DataGridViewRow row = grid.SelectedRows[0]; - long dbid = long.Parse(row.Cells["DBID"].Value.ToString()); + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); try { if (MessageBox.Show("确定删除？", "确认", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) @@ -243,7 +243,8 @@ { string sqlCount = "select count(*) from equipment where status = 'USING'"; - string sqlData = "select descirption,DBID,macid,owner,case when status = 'USING' then '可用' when status = 'DAMAGE' then '损坏' end as status " + + string sqlData = "select descirption as 设备描述,DBID as 编号,macid as MAC地址,owner as 设备所有人,"+ + "case when status = 'USING' then '可用' when status = 'DAMAGE' then '损坏' end as 设备状态 " + "from (select t.*,rownum row_num from equipment t where status = 'USING' order by dbid desc)b " + " where 1=1"; @@ -258,16 +259,17 @@ int maxPage = pageIndex * maxPageIndex; string sqlCount = "select count(*) from equipment where status = 'USING' "; - string sqlData = "select descirption,DBID,macid,owner,case when status = 'USING' then '可用' when status = 'DAMAGE' then '损坏' end as status " + - "from (select t.*,rownum row_num from equipment t where status = 'USING' order by DBID desc)b " + - " where(b.row_num between " + minPage + " and " + maxPage + ")"; + string sqlData = "select descirption as 设备描述,DBID as 编号,macid as MAC地址,owner as 设备所有人," + + "case when status = 'USING' then '可用' when status = 'DAMAGE' then '损坏' end as 设备状态 " + + "from (select t.*,rownum row_num from equipment t where status = 'USING'"; if (!String.IsNullOrEmpty(txtMacId.Text.Trim())) { sqlData += " and macid like '%" + txtMacId.Text.Trim() + "%'"; sqlCount += " and macid like '%" + txtMacId.Text.Trim() + "%'"; } - + sqlData += " order by DBID desc)b " + + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; @@ -299,76 +301,6 @@ } } - //public void reloadGrid(int pageIndex) - //{ - // if (pageIndex <= 0) - // { - // pageIndex = 1; - // currentpage = 1; - // } - // String sqlrows = "select * from (select rownum as rowno,dbid,descirption,macid,owner,case when status = 'USING' then '可用' when status = 'DAMAGE' then '损坏' end as status,'编辑' as btnEdit,'删除' as btnDel from equipment t where status = 'USING' "; - // string sqlcount = "select count(*) from equipment where status = 'USING' "; - // if (!String.IsNullOrEmpty(txtMacId.Text.Trim())) - // { - // sqlrows += " and macid like '%" + txtMacId.Text.Trim() + "%'"; - // sqlcount += " and macid like '%" + txtMacId.Text.Trim() + "%'"; - // } - // sqlrows += " and rownum<=" + (pagesize * pageIndex) + ") table_alias where table_alias.rowno>=" + ((pageIndex - 1) * pagesize + 1); - - // int rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlcount).ToString()); - // int pages = 0; - // if (rows % pagesize == 0) - // { - // pages = rows / pagesize; - // } - // else - // { - // pages = rows / pagesize + 1; - // } - - // lastpage = pages; - - // lab_page_msg.Text = "共" + rows + "条记录，每页" + pagesize + "条，第" + pageIndex + "页，共" + pages + "页"; - // combo_page_num.Items.Clear(); - // for (int i = 1; i <= pages; i++) - // { - // combo_page_num.Items.Add(new ComboBoxItem(i.ToString(), i.ToString())); - // } - - // if (lastpage == 1) - // { - // btn_page_first.Enabled = false; - // btn_page_pre.Enabled = false; - // btn_page_last.Enabled = false; - // btn_page_next.Enabled = false; - // } - // else if (currentpage == 1) - // { - // btn_page_first.Enabled = false; - // btn_page_pre.Enabled = false; - // btn_page_last.Enabled = true; - // btn_page_next.Enabled = true; - // } - // else if (currentpage == lastpage) - // { - // btn_page_first.Enabled = true; - // btn_page_pre.Enabled = true; - // btn_page_last.Enabled = false; - // btn_page_next.Enabled = false; - // } - // else - // { - // btn_page_first.Enabled = true; - // btn_page_pre.Enabled = true; - // btn_page_last.Enabled = true; - // btn_page_next.Enabled = true; - // } - - // DataTable table = OracleUtils.ExecuteDataset(OracleUtils.ConnectionString, CommandType.Text, sqlrows).Tables[0]; - // dataGridViewX1.DataSource = table; - - //} - private void FrmEquipmentManage_FormClosing(object sender, FormClosingEventArgs e) diff --git a/FrmFlagDetail.Designer.cs b/FrmFlagDetail.Designer.cs new file mode 100644 index 0000000..982bfc6 --- /dev/null +++ b/FrmFlagDetail.Designer.cs @@ -0,0 +1,103 @@ +namespace Cyberpipe +{ + partial class FrmFlagDetail + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); + this.dataGridViewX_markDetail = new DevComponents.DotNetBar.Controls.DataGridViewX(); + this.对象类型 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.对象编号 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.对象名称 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX_markDetail)).BeginInit(); + this.SuspendLayout(); + // + // dataGridViewX_markDetail + // + this.dataGridViewX_markDetail.AllowUserToAddRows = false; + this.dataGridViewX_markDetail.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; + this.dataGridViewX_markDetail.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dataGridViewX_markDetail.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.对象类型, + this.对象编号, + this.对象名称}); + dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle3.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dataGridViewX_markDetail.DefaultCellStyle = dataGridViewCellStyle3; + this.dataGridViewX_markDetail.Dock = System.Windows.Forms.DockStyle.Fill; + this.dataGridViewX_markDetail.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(170)))), ((int)(((byte)(170)))), ((int)(((byte)(170))))); + this.dataGridViewX_markDetail.Location = new System.Drawing.Point(0, 0); + this.dataGridViewX_markDetail.Name = "dataGridViewX_markDetail"; + this.dataGridViewX_markDetail.RowTemplate.Height = 23; + this.dataGridViewX_markDetail.Size = new System.Drawing.Size(508, 321); + this.dataGridViewX_markDetail.TabIndex = 0; + // + // 对象类型 + // + this.对象类型.HeaderText = "对象类型"; + this.对象类型.Name = "对象类型"; + // + // 对象编号 + // + this.对象编号.HeaderText = "对象编号"; + this.对象编号.Name = "对象编号"; + // + // 对象名称 + // + this.对象名称.HeaderText = "对象名称"; + this.对象名称.Name = "对象名称"; + // + // FrmFlagDetail + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(508, 321); + this.Controls.Add(this.dataGridViewX_markDetail); + this.Name = "FrmFlagDetail"; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; + this.Text = "标识对象信息"; + this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmFlagDetail_FormClosing); + this.Load += new System.EventHandler(this.FrmFlagDetail_Load); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX_markDetail)).EndInit(); + this.ResumeLayout(false); + + } + + #endregion + + private DevComponents.DotNetBar.Controls.DataGridViewX dataGridViewX_markDetail; + private System.Windows.Forms.DataGridViewTextBoxColumn 对象类型; + private System.Windows.Forms.DataGridViewTextBoxColumn 对象编号; + private System.Windows.Forms.DataGridViewTextBoxColumn 对象名称; + + } +} \ No newline at end of file diff --git a/FrmFlagDetail.cs b/FrmFlagDetail.cs new file mode 100644 index 0000000..81de974 --- /dev/null +++ b/FrmFlagDetail.cs @@ -0,0 +1,77 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Windows.Forms; +using GeoScene.Globe; +using System.Data.OracleClient; + +namespace Cyberpipe +{ + public partial class FrmFlagDetail : Form + { + DataTable dt = new DataTable(); + private GSOGlobeControl globeControl1; + + public delegate void Handle(); + public event Handle showParentForm; + String markId; + + public FrmFlagDetail(GSOGlobeControl globeControl1, String id) + { + InitializeComponent(); + this.markId = id; + } + + private void FrmFlagDetail_FormClosing(object sender, FormClosingEventArgs e) + { + showParentForm(); + } + + private void FrmFlagDetail_Load(object sender, EventArgs e) + { + string objectIds = ""; + string objectTypeCodes = ""; + string sql = "select t.对象编号,t.对象类型 from 标识器 t where t.编号='" + markId + "'"; + using (OracleDataReader reader = OracleUtils.ExecuteReader(OracleUtils.ConnectionString, CommandType.Text, sql)) + { + while (reader.Read()) + { + objectIds = reader.GetString(0); + objectTypeCodes = reader.GetString(1); + } + } + + string[] codeTypes = objectTypeCodes.Split(','); + string[] codeIds = objectIds.Split(','); + int length = 0; + if (codeTypes.Length <= codeIds.Length) + { + length = codeTypes.Length; + } + else + { + length = codeIds.Length; + } + for (int n = 0; n < length; n++) + { + for (int i = 0; i < Utility1.listPipelineType.Count; i++) + { + if (Utility1.listPipelineType[i].code == codeTypes[n]) + { + //string objectId = codeIds[i]; + //string objectType = Utility1.listPipelineType[i].type; + //string objectName = Utility1.listPipelineType[i].name; + int index = this.dataGridViewX_markDetail.Rows.Add(); + this.dataGridViewX_markDetail.Rows[index].Cells[0].Value = Utility1.listPipelineType[i].type; + this.dataGridViewX_markDetail.Rows[index].Cells[1].Value = codeIds[n].ToString(); + this.dataGridViewX_markDetail.Rows[index].Cells[2].Value = Utility1.listPipelineType[i].name; + } + } + } + } + } +} diff --git a/FrmFlagDetail.resx b/FrmFlagDetail.resx new file mode 100644 index 0000000..e98a8fe --- /dev/null +++ b/FrmFlagDetail.resx @@ -0,0 +1,129 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + True + + + True + + + True + + \ No newline at end of file diff --git a/FrmFlagManagers.Designer.cs b/FrmFlagManagers.Designer.cs index d7e2f60..9fe14fb 100644 --- a/FrmFlagManagers.Designer.cs +++ b/FrmFlagManagers.Designer.cs @@ -28,8 +28,10 @@ /// private void InitializeComponent() { - this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); - this.winGridViewPager1 = new WHC.Pager.WinControl.WinGridViewPager(); + this.components = new System.ComponentModel.Container(); + this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components); + this.标识对象ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripMenuItem2 = new System.Windows.Forms.ToolStripMenuItem(); this.bar1 = new DevComponents.DotNetBar.Bar(); this.labelItem1 = new DevComponents.DotNetBar.LabelItem(); this.txt_no = new DevComponents.DotNetBar.TextBoxItem(); @@ -38,45 +40,37 @@ this.btn_query = new DevComponents.DotNetBar.ButtonItem(); this.btn_add_batch = new DevComponents.DotNetBar.ButtonItem(); this.btn_add_menu = new DevComponents.DotNetBar.ButtonItem(); - this.btn_db = new DevComponents.DotNetBar.ButtonItem(); - this.tableLayoutPanel1.SuspendLayout(); + this.winGridViewPager1 = new WHC.Pager.WinControl.WinGridViewPager(); + this.contextMenuStrip1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.bar1)).BeginInit(); this.SuspendLayout(); // - // tableLayoutPanel1 + // contextMenuStrip1 // - this.tableLayoutPanel1.ColumnCount = 1; - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel1.Controls.Add(this.winGridViewPager1, 0, 1); - this.tableLayoutPanel1.Controls.Add(this.bar1, 0, 0); - this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 0); - this.tableLayoutPanel1.Name = "tableLayoutPanel1"; - this.tableLayoutPanel1.RowCount = 2; - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 32F)); - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel1.Size = new System.Drawing.Size(881, 474); - this.tableLayoutPanel1.TabIndex = 6; + this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.标识对象ToolStripMenuItem, + this.toolStripMenuItem2}); + this.contextMenuStrip1.Name = "contextMenuStrip1"; + this.contextMenuStrip1.Size = new System.Drawing.Size(125, 48); // - // winGridViewPager1 + // 标识对象ToolStripMenuItem // - this.winGridViewPager1.AppendedMenu = null; - this.winGridViewPager1.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; - this.winGridViewPager1.DataSource = null; - this.winGridViewPager1.DisplayColumns = ""; - this.winGridViewPager1.Dock = System.Windows.Forms.DockStyle.Fill; - this.winGridViewPager1.Location = new System.Drawing.Point(3, 35); - this.winGridViewPager1.MinimumSize = new System.Drawing.Size(540, 0); - this.winGridViewPager1.Name = "winGridViewPager1"; - this.winGridViewPager1.PrintTitle = ""; - this.winGridViewPager1.Size = new System.Drawing.Size(875, 436); - this.winGridViewPager1.TabIndex = 5; + this.标识对象ToolStripMenuItem.Name = "标识对象ToolStripMenuItem"; + this.标识对象ToolStripMenuItem.Size = new System.Drawing.Size(124, 22); + this.标识对象ToolStripMenuItem.Text = "标识对象"; + this.标识对象ToolStripMenuItem.Click += new System.EventHandler(this.标识对象ToolStripMenuItem_Click); + // + // toolStripMenuItem2 + // + this.toolStripMenuItem2.Name = "toolStripMenuItem2"; + this.toolStripMenuItem2.Size = new System.Drawing.Size(152, 22); + this.toolStripMenuItem2.Text = "查看位置"; + this.toolStripMenuItem2.Click += new System.EventHandler(this.toolStripMenuItem2_Click); // // bar1 // this.bar1.AntiAlias = true; this.bar1.Dock = System.Windows.Forms.DockStyle.Top; - this.bar1.DockSide = DevComponents.DotNetBar.eDockSide.Document; this.bar1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.labelItem1, this.txt_no, @@ -84,14 +78,13 @@ this.combo_street, this.btn_query, this.btn_add_batch, - this.btn_add_menu, - this.btn_db}); - this.bar1.Location = new System.Drawing.Point(3, 3); + this.btn_add_menu}); + this.bar1.Location = new System.Drawing.Point(0, 0); this.bar1.Name = "bar1"; - this.bar1.Size = new System.Drawing.Size(875, 28); + this.bar1.Size = new System.Drawing.Size(881, 28); this.bar1.Stretch = true; this.bar1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.bar1.TabIndex = 1; + this.bar1.TabIndex = 8; this.bar1.TabStop = false; this.bar1.Text = "bar1"; // @@ -136,24 +129,34 @@ this.btn_add_menu.Text = "手工添加"; this.btn_add_menu.Click += new System.EventHandler(this.btn_add_menu_Click); // - // btn_db + // winGridViewPager1 // - this.btn_db.Name = "btn_db"; - this.btn_db.Text = "数据导出"; + this.winGridViewPager1.AppendedMenu = null; + this.winGridViewPager1.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; + this.winGridViewPager1.DataSource = null; + this.winGridViewPager1.DisplayColumns = ""; + this.winGridViewPager1.Dock = System.Windows.Forms.DockStyle.Fill; + this.winGridViewPager1.Location = new System.Drawing.Point(0, 28); + this.winGridViewPager1.MinimumSize = new System.Drawing.Size(540, 0); + this.winGridViewPager1.Name = "winGridViewPager1"; + this.winGridViewPager1.PrintTitle = ""; + this.winGridViewPager1.Size = new System.Drawing.Size(881, 446); + this.winGridViewPager1.TabIndex = 9; // // FrmFlagManagers // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(881, 474); - this.Controls.Add(this.tableLayoutPanel1); + this.Controls.Add(this.winGridViewPager1); + this.Controls.Add(this.bar1); this.DoubleBuffered = true; this.Name = "FrmFlagManagers"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "标识器管理"; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmFlagManagers_FormClosing); this.Load += new System.EventHandler(this.FrmFlagManagers_Load); - this.tableLayoutPanel1.ResumeLayout(false); + this.contextMenuStrip1.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.bar1)).EndInit(); this.ResumeLayout(false); @@ -161,8 +164,8 @@ #endregion - private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1; - private WHC.Pager.WinControl.WinGridViewPager winGridViewPager1; + private System.Windows.Forms.ContextMenuStrip contextMenuStrip1; + private System.Windows.Forms.ToolStripMenuItem 标识对象ToolStripMenuItem; private DevComponents.DotNetBar.Bar bar1; private DevComponents.DotNetBar.LabelItem labelItem1; private DevComponents.DotNetBar.TextBoxItem txt_no; @@ -171,6 +174,7 @@ private DevComponents.DotNetBar.ButtonItem btn_query; private DevComponents.DotNetBar.ButtonItem btn_add_batch; private DevComponents.DotNetBar.ButtonItem btn_add_menu; - private DevComponents.DotNetBar.ButtonItem btn_db; + private WHC.Pager.WinControl.WinGridViewPager winGridViewPager1; + private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem2; } } \ No newline at end of file diff --git a/FrmFlagManagers.cs b/FrmFlagManagers.cs index 38d4927..9bf9734 100644 --- a/FrmFlagManagers.cs +++ b/FrmFlagManagers.cs @@ -33,15 +33,13 @@ { this.globeControl1 = _globeControl1; InitializeComponent(); - winGridViewPager1.OnPageChanged += new EventHandler(winGridViewPager1_OnPageChanged); - this.winGridViewPager1.OnAddNew += new EventHandler(winGridViewPager1_OnAddNew); //右键定位 + winGridViewPager1.OnPageChanged += new EventHandler(winGridViewPager1_OnPageChanged); this.winGridViewPager1.OnEditSelected += new EventHandler(winGridViewPager1_OnEditSelected);//属性编辑 this.winGridViewPager1.OnDeleteSelected += new EventHandler(winGridViewPager1_OnDeleteSelected);//标识器报废 + this.winGridViewPager1.OnStartExport += new EventHandler(pager1_OnStartExport); this.winGridViewPager1.OnEndExport += new EventHandler(pager1_OnEndExport); - //this.winGridViewPager1.ExportCurrent += new ExportCurrentEventHandler(pager1_ExportCurrent); - //this.winGridViewPager1.ExportAll += new ExportAllEventHandler(pager1_ExportAll); winGridViewPager1.dataGridView1.MultiSelect = false; @@ -76,26 +74,25 @@ this.winGridViewPager1.AddColumnAlias("标识器型号", "标识器型号"); this.winGridViewPager1.AddColumnAlias("地面高程", "地面高程"); this.winGridViewPager1.AddColumnAlias("标识器埋深", "标识器埋深"); - this.winGridViewPager1.AddColumnAlias("对象编号", "对象编号"); - this.winGridViewPager1.AddColumnAlias("对象类型", "对象类型"); this.winGridViewPager1.AddColumnAlias("所属道路", "所属道路"); this.winGridViewPager1.AddColumnAlias("使用状态", "使用状态"); - this.winGridViewPager1.DisplayColumns = "编号,标识器ID号,标识器型号,地面高程,标识器埋深,对象编号,对象类型,所属道路,使用状态"; + this.winGridViewPager1.DisplayColumns = "编号,标识器ID号,标识器型号,地面高程,标识器埋深,所属道路,使用状态"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 //隐藏右键功能按钮 //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[1].Visible = false; - //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[4].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[5].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[6].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[7].Visible = false; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[1].Text = "定位查看"; + //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[1].Text = "定位查看"; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "属性编辑"; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Text = "标识器报废"; + winGridViewPager1.AppendedMenu = this.contextMenuStrip1; + //右键菜单宽度 winGridViewPager1.dataGridView1.ContextMenuStrip.AutoSize = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Width = 150; @@ -153,7 +150,7 @@ } /// - /// 右键定位 + /// 对象查看 /// /// /// @@ -306,20 +303,10 @@ string sqlCount = "select count(*) from 标识器 where 使用状态 = '使用中'"; - string sqlData = "select 编号,标识器ID号,标识器型号,地面高程,标识器埋深,对象编号,对象类型,所属道路,LSSYS_ID,X坐标,Y坐标,使用状态 " + + string sqlData = "select 编号,标识器ID号,标识器型号,地面高程,标识器埋深,所属道路,LSSYS_ID,X坐标,Y坐标,使用状态 " + "from (select t.*,rownum row_num from 标识器 t where 使用状态 = '使用中' order by 编号)b " + " where 1=1"; - if (!String.IsNullOrEmpty(txt_no.Text.Trim())) - { - sqlCount += " and 编号 like '%" + txt_no.Text.Trim() + "%'"; - sqlData += " and 编号 like '%" + txt_no.Text.Trim() + "%'"; - } - if (null != combo_street.SelectedItem && !String.IsNullOrEmpty(combo_street.SelectedItem.ToString().Trim())) - { - sqlData += " and 所属道路='" + combo_street.SelectedItem.ToString().Trim() + "'"; - sqlCount += " and 所属道路='" + combo_street.SelectedItem.ToString().Trim() + "'"; - } rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -332,9 +319,8 @@ int maxPage = pageIndex * maxPageIndex; string sqlCount = "select count(*) from 标识器 where 使用状态 = '使用中'"; - string sqlData = "select 编号,标识器ID号,标识器型号,地面高程,标识器埋深,对象编号,对象类型,所属道路,LSSYS_ID,X坐标,Y坐标,使用状态 " + - "from (select t.*,rownum row_num from 标识器 t where 使用状态 = '使用中' order by 编号)b "+ - " where(b.row_num between " + minPage + " and " + maxPage + ")"; + string sqlData = "select 编号,标识器ID号,标识器型号,地面高程,标识器埋深,所属道路,LSSYS_ID,X坐标,Y坐标,使用状态 " + + "from (select t.*,rownum row_num from 标识器 t where 使用状态 = '使用中'"; if (!String.IsNullOrEmpty(txt_no.Text.Trim())) { @@ -347,6 +333,8 @@ sqlCount += " and 所属道路='" + combo_street.SelectedItem.ToString().Trim() + "'"; } + sqlData += " order by 编号)b " + + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; @@ -372,9 +360,10 @@ private void FrmFlagManagers_FormClosing(object sender, FormClosingEventArgs e) { IS_OPEN = false; - Thread downloadJob = new Thread(new ParameterizedThreadStart(doSave)); - downloadJob.IsBackground = true; - downloadJob.Start(e); + //Thread downloadJob = new Thread(new ParameterizedThreadStart(doSave)); + //downloadJob.IsBackground = true; + //downloadJob.Start(e); + globeControl1.Globe.Layers["标识器"].Save(); globeControl1.Globe.MemoryLayer.RemoveAllFeature(); foreach (GSOFeature f in Features) { @@ -480,10 +469,88 @@ if (null != globeControl1) { FrmAddSinMark frm = new FrmAddSinMark(globeControl1); - frm.ShowDialog(); + frm.Show(); } } + private void 标识对象ToolStripMenuItem_Click(object sender, EventArgs e) + { + if (winGridViewPager1 != null && winGridViewPager1.dataGridView1 != null) + { + DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; + try + { + this.Hide(); + string id = row.Cells["编号"].Value.ToString(); + FrmFlagDetail p = new FrmFlagDetail(globeControl1, id); + p.showParentForm += new FrmFlagDetail.Handle(showThisForm);//改变值的事件 + p.Show(); + } + catch (Exception ex) + { + MessageBox.Show("失败:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } + + private void showThisForm() + { + this.Show(); + } + + private void toolStripMenuItem2_Click(object sender, EventArgs e) + { + if (winGridViewPager1 != null && winGridViewPager1.dataGridView1 != null) + { + DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; + try + { + this.WindowState = FormWindowState.Minimized; + string id = row.Cells["LSSYS_ID"].Value.ToString(); + string flagno = row.Cells["编号"].Value.ToString(); + string flagstreet = row.Cells["所属道路"].Value.ToString(); + double x = Convert.ToDouble(row.Cells["X坐标"].Value); + double y = Convert.ToDouble(row.Cells["Y坐标"].Value); + GSOFeature flagFeature = globeControl1.Globe.Layers.GetLayerByCaption("标识器").GetFeatureByID(int.Parse(id)); + + string type = ""; + string pipe = ""; + string sql = "select t.标识器型号,t.对象编号 from 标识器 t where t.编号='" + flagno + "'"; + using (OracleDataReader reader = OracleUtils.ExecuteReader(OracleUtils.ConnectionString, CommandType.Text, sql)) + { + while (reader.Read()) + { + type = reader.GetString(0); + pipe = reader.GetString(1); + } + } + + GSOLabel label = new GSOLabel(); + label.Text = "标识器编号：" + flagno + "\r\n" + + "标识器类型:" + type + "\r\n" + + //"标识对象编号:" + pipe + "\r\n" + + "所属道路:" + flagstreet; + label.Style = new GSOLabelStyle(); + label.Style.TextStyle.FontSize = 18; + label.Style.TextStyle.ForeColor = Color.FromArgb(0, 0, 0, 255); + label.Style.Opaque = 0.8; //设置标注的透明度，取值区间是0-1 + label.Style.TracktionLineType = EnumTracktionLineType.Solid; + label.Style.TextStyle.FontHeight = 10; + label.Style.TextStyle.FontName = "黑体"; + label.Style.TractionLineEndPos = new GSOPoint2d(80, 60); + + flagFeature.Label = label; + Features.Add(flagFeature); + globeControl1.Globe.JumpToFeature(flagFeature, 20); + this.globeControl1.Refresh(); + + } + catch (Exception ex) + { + MessageBox.Show("标识器定位失败:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } } diff --git a/FrmFlagManagers.resx b/FrmFlagManagers.resx index 1af7de1..ad53752 100644 --- a/FrmFlagManagers.resx +++ b/FrmFlagManagers.resx @@ -117,4 +117,7 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 17, 17 + \ No newline at end of file diff --git a/FrmPatrolerEdit.cs b/FrmPatrolerEdit.cs index dbd4fec..f45b5ae 100644 --- a/FrmPatrolerEdit.cs +++ b/FrmPatrolerEdit.cs @@ -46,7 +46,7 @@ txt_name.Focus(); return; } - if (String.IsNullOrEmpty(combo_sex.SelectedItem.ToString())) + if (combo_sex.SelectedItem == null ||String.IsNullOrEmpty(combo_sex.SelectedItem.ToString())) { MessageBox.Show("性别不能为空！", "警告", MessageBoxButtons.OK, MessageBoxIcon.Warning); combo_sex.Focus(); diff --git a/FrmPatrolerManager.Designer.cs b/FrmPatrolerManager.Designer.cs index bb8e5fb..10fac22 100644 --- a/FrmPatrolerManager.Designer.cs +++ b/FrmPatrolerManager.Designer.cs @@ -47,11 +47,13 @@ this.注销 = new DevComponents.Editors.ComboItem(); this.btn_query_person = new DevComponents.DotNetBar.ButtonItem(); this.btn_add_person = new DevComponents.DotNetBar.ButtonItem(); - this.winGridViewPager1 = new WHC.Pager.WinControl.WinGridViewPager(); this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components); this.日志ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.任务ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.定位ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.winGridViewPager1 = new WHC.Pager.WinControl.WinGridViewPager(); + this.编辑ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.注销ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); ((System.ComponentModel.ISupportInitialize)(this.bar1)).BeginInit(); this.contextMenuStrip1.SuspendLayout(); this.SuspendLayout(); @@ -173,9 +175,42 @@ this.btn_add_person.Text = "新增"; this.btn_add_person.Click += new System.EventHandler(this.btn_add_person_Click); // + // contextMenuStrip1 + // + this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.日志ToolStripMenuItem, + this.任务ToolStripMenuItem, + this.定位ToolStripMenuItem, + this.编辑ToolStripMenuItem, + this.注销ToolStripMenuItem}); + this.contextMenuStrip1.Name = "contextMenuStrip1"; + this.contextMenuStrip1.Size = new System.Drawing.Size(153, 136); + // + // 日志ToolStripMenuItem + // + this.日志ToolStripMenuItem.Name = "日志ToolStripMenuItem"; + this.日志ToolStripMenuItem.Size = new System.Drawing.Size(100, 22); + this.日志ToolStripMenuItem.Text = "日志"; + this.日志ToolStripMenuItem.Click += new System.EventHandler(this.日志ToolStripMenuItem_Click); + // + // 任务ToolStripMenuItem + // + this.任务ToolStripMenuItem.Name = "任务ToolStripMenuItem"; + this.任务ToolStripMenuItem.Size = new System.Drawing.Size(100, 22); + this.任务ToolStripMenuItem.Text = "任务"; + this.任务ToolStripMenuItem.Click += new System.EventHandler(this.任务ToolStripMenuItem_Click); + // + // 定位ToolStripMenuItem + // + this.定位ToolStripMenuItem.Name = "定位ToolStripMenuItem"; + this.定位ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.定位ToolStripMenuItem.Text = "定位"; + this.定位ToolStripMenuItem.Click += new System.EventHandler(this.定位ToolStripMenuItem_Click); + // // winGridViewPager1 // this.winGridViewPager1.AppendedMenu = null; + this.winGridViewPager1.ContextMenuStrip = this.contextMenuStrip1; this.winGridViewPager1.DataSource = null; this.winGridViewPager1.DisplayColumns = ""; this.winGridViewPager1.Dock = System.Windows.Forms.DockStyle.Fill; @@ -186,35 +221,19 @@ this.winGridViewPager1.Size = new System.Drawing.Size(756, 309); this.winGridViewPager1.TabIndex = 3; // - // contextMenuStrip1 + // 编辑ToolStripMenuItem // - this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.日志ToolStripMenuItem, - this.任务ToolStripMenuItem, - this.定位ToolStripMenuItem}); - this.contextMenuStrip1.Name = "contextMenuStrip1"; - this.contextMenuStrip1.Size = new System.Drawing.Size(101, 70); + this.编辑ToolStripMenuItem.Name = "编辑ToolStripMenuItem"; + this.编辑ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.编辑ToolStripMenuItem.Text = "编辑"; + this.编辑ToolStripMenuItem.Click += new System.EventHandler(this.编辑ToolStripMenuItem_Click); // - // 日志ToolStripMenuItem + // 注销ToolStripMenuItem // - this.日志ToolStripMenuItem.Name = "日志ToolStripMenuItem"; - this.日志ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); - this.日志ToolStripMenuItem.Text = "日志"; - this.日志ToolStripMenuItem.Click += new System.EventHandler(this.日志ToolStripMenuItem_Click); - // - // 任务ToolStripMenuItem - // - this.任务ToolStripMenuItem.Name = "任务ToolStripMenuItem"; - this.任务ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); - this.任务ToolStripMenuItem.Text = "任务"; - this.任务ToolStripMenuItem.Click += new System.EventHandler(this.任务ToolStripMenuItem_Click); - // - // 定位ToolStripMenuItem - // - this.定位ToolStripMenuItem.Name = "定位ToolStripMenuItem"; - this.定位ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); - this.定位ToolStripMenuItem.Text = "定位"; - this.定位ToolStripMenuItem.Click += new System.EventHandler(this.定位ToolStripMenuItem_Click); + this.注销ToolStripMenuItem.Name = "注销ToolStripMenuItem"; + this.注销ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.注销ToolStripMenuItem.Text = "注销"; + this.注销ToolStripMenuItem.Click += new System.EventHandler(this.注销ToolStripMenuItem_Click); // // FrmPatrolerManager // @@ -229,7 +248,7 @@ this.MinimizeBox = false; this.Name = "FrmPatrolerManager"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; - this.Text = "巡检人员维护"; + this.Text = "定位人员维护"; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmPatrolerManager_FormClosing); this.Load += new System.EventHandler(this.FrmPatrolerManager_Load); ((System.ComponentModel.ISupportInitialize)(this.bar1)).EndInit(); @@ -258,10 +277,12 @@ private DevComponents.Editors.ComboItem 注销; private DevComponents.Editors.ComboItem comboItem1; private DevComponents.Editors.ComboItem 不限; - private WHC.Pager.WinControl.WinGridViewPager winGridViewPager1; private System.Windows.Forms.ContextMenuStrip contextMenuStrip1; private System.Windows.Forms.ToolStripMenuItem 日志ToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem 任务ToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem 定位ToolStripMenuItem; + private WHC.Pager.WinControl.WinGridViewPager winGridViewPager1; + private System.Windows.Forms.ToolStripMenuItem 编辑ToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem 注销ToolStripMenuItem; } } \ No newline at end of file diff --git a/FrmPatrolerManager.cs b/FrmPatrolerManager.cs index 255a076..9c32f54 100644 --- a/FrmPatrolerManager.cs +++ b/FrmPatrolerManager.cs @@ -29,9 +29,7 @@ this.globeControl1 = globeControl1; winGridViewPager1.OnPageChanged += new EventHandler(winGridViewPager1_OnPageChanged); - this.winGridViewPager1.OnEditSelected += new EventHandler(winGridViewPager1_OnEditSelected);//编辑 - this.winGridViewPager1.OnDeleteSelected += new EventHandler(winGridViewPager1_OnDeleteSelected);//删除 - + this.winGridViewPager1.OnStartExport += new EventHandler(pager1_OnStartExport); this.winGridViewPager1.OnEndExport += new EventHandler(pager1_OnEndExport); @@ -47,26 +45,31 @@ //控制表格显示的列，以及每一列要显示的列名 this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - this.winGridViewPager1.AddColumnAlias("USERNAME", "姓名"); - this.winGridViewPager1.AddColumnAlias("DBID", "编号"); - this.winGridViewPager1.AddColumnAlias("SEX", "性别"); - this.winGridViewPager1.AddColumnAlias("AGE", "年龄"); - this.winGridViewPager1.AddColumnAlias("PHONENUM", "电话"); - this.winGridViewPager1.AddColumnAlias("ACCOUNTSTATE", "状态"); - this.winGridViewPager1.DisplayColumns = "USERNAME,SEX,AGE,PHONENUM,ACCOUNTSTATE"; + this.winGridViewPager1.AddColumnAlias("姓名", "姓名"); + this.winGridViewPager1.AddColumnAlias("编号", "编号"); + this.winGridViewPager1.AddColumnAlias("性别", "性别"); + this.winGridViewPager1.AddColumnAlias("年龄", "年龄"); + this.winGridViewPager1.AddColumnAlias("电话", "电话"); + this.winGridViewPager1.AddColumnAlias("状态", "状态"); + this.winGridViewPager1.DisplayColumns = "姓名,性别,年龄,电话,状态"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 + //隐藏右键功能按钮 //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[1].Visible = false; + winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Visible = false; + winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[4].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[5].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[6].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[7].Visible = false; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "编辑"; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Text = "注销"; + + //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "编辑"; + //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Text = "注销"; winGridViewPager1.AppendedMenu = this.contextMenuStrip1; + //右键菜单宽度 winGridViewPager1.dataGridView1.ContextMenuStrip.AutoSize = false; @@ -122,11 +125,11 @@ DataGridViewRow row = grid.SelectedRows[0]; try { - long dbid = long.Parse(row.Cells["dbid"].Value.ToString()); - String name = row.Cells["USERNAME"].Value.ToString(); - String sex = row.Cells["SEX"].Value.ToString(); - String age = row.Cells["AGE"].Value.ToString(); - string phone = row.Cells["PHONENUM"].Value.ToString(); + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); + String name = row.Cells["姓名"].Value.ToString(); + String sex = row.Cells["性别"].Value.ToString(); + String age = row.Cells["年龄"].Value.ToString(); + string phone = row.Cells["电话"].Value.ToString(); age = String.IsNullOrEmpty(age.ToString().Trim()) ? "1" : age.ToString().Trim(); FrmPatrolerEdit frm = new FrmPatrolerEdit(dbid.ToString(), name, age, sex, phone); frm.reloadGrid += new ReloadPatrolerGrid(LoadData); @@ -152,10 +155,10 @@ if (grid != null) { DataGridViewRow row = grid.SelectedRows[0]; - long dbid = long.Parse(row.Cells["DBID"].Value.ToString()); + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); try { - string state = row.Cells["ACCOUNTSTATE"].Value.ToString(); + string state = row.Cells["状态"].Value.ToString(); if ("在线".Equals(state)) { if (MessageBox.Show("确定注销？", "确认", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) @@ -180,60 +183,60 @@ { int pageIndex = winGridViewPager1.PagerInfo.CurrenetPageIndex; string sqlData = GetSql(pageIndex); - initlizeDatagrid(); + DataTable table = OracleUtils.ExecuteDataset(OracleUtils.ConnectionString, CommandType.Text, sqlData).Tables[0]; winGridViewPager1.DataSource = table.DefaultView; - for (int i = 0; i < winGridViewPager1.dataGridView1.Rows.Count; i++) - { - if (winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value.ToString() == "ONLINE") - { - winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value = "在线"; - } - else - { - if (winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value.ToString() == "OFFLINE") - { - winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value = "离线"; - } - else - { - if (winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value.ToString() == "LEAVER") - { - winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value = "注销"; - } - } - } - } + //for (int i = 0; i < winGridViewPager1.dataGridView1.Rows.Count; i++) + //{ + // if (winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value.ToString() == "ONLINE") + // { + // winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value = "在线"; + // } + // else + // { + // if (winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value.ToString() == "OFFLINE") + // { + // winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value = "离线"; + // } + // else + // { + // if (winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value.ToString() == "LEAVER") + // { + // winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value = "注销"; + // } + // } + // } + //} winGridViewPager1.Refresh(); } private void LoadData(int pageIndex) { string sqlData = GetSql(pageIndex); - initlizeDatagrid(); + DataTable table = OracleUtils.ExecuteDataset(OracleUtils.ConnectionString, CommandType.Text, sqlData).Tables[0]; winGridViewPager1.DataSource = table.DefaultView; - for (int i = 0; i < winGridViewPager1.dataGridView1.Rows.Count; i++) - { - if (winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value.ToString() == "ONLINE") - { - winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value = "在线"; - } - else - { - if (winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value.ToString() == "OFFLINE") - { - winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value = "离线"; - } - else - { - if (winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value.ToString() == "LEAVER") - { - winGridViewPager1.dataGridView1.Rows[i].Cells["ACCOUNTSTATE"].Value = "注销"; - } - } - } - } + //for (int i = 0; i < winGridViewPager1.dataGridView1.Rows.Count; i++) + //{ + // if (winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value.ToString() == "ONLINE") + // { + // winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value = "在线"; + // } + // else + // { + // if (winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value.ToString() == "OFFLINE") + // { + // winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value = "离线"; + // } + // else + // { + // if (winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value.ToString() == "LEAVER") + // { + // winGridViewPager1.dataGridView1.Rows[i].Cells["状态"].Value = "注销"; + // } + // } + // } + //} winGridViewPager1.Refresh(); } @@ -241,7 +244,8 @@ { string sqlCount = "select count(*) from equipment where status = 'USING'"; - string sqlData = "select username,dbid,sex,age,phonenum,accountstate " + + string sqlData = "select username as 姓名,dbid as 编号,sex as 性别,age as 年龄,phonenum as 电话,"+ + "case when accountstate = 'ONLINE' then '在线' when accountstate = 'OFFLINE' then '离线' when accountstate = 'LEAVER' then '注销' end as 状态 " + "from (select t.*,rownum row_num from patroler t order by DBID desc)b " + " where 1=1"; @@ -255,9 +259,9 @@ int minPage = (pageIndex - 1) * maxPageIndex + 1; int maxPage = pageIndex * maxPageIndex; string sqlCount = "select count(*) from patroler where 1=1"; - string sqlData = "select username,dbid,sex,age,phonenum,accountstate " + - "from (select t.*,rownum row_num from patroler t order by DBID desc)b " + - " where(b.row_num between " + minPage + " and " + maxPage + ")"; + string sqlData = "select username as 姓名,dbid as 编号,sex as 性别,age as 年龄,phonenum as 电话,"+ + "case when accountstate = 'ONLINE' then '在线' when accountstate = 'OFFLINE' then '离线' when accountstate = 'LEAVER' then '注销' end as 状态 " + + "from (select t.*,rownum row_num from patroler t where 1=1"; if (!String.IsNullOrEmpty(txt_username.Text.Trim())) { @@ -281,7 +285,8 @@ sqlCount += " and accountstate='" + combo_stateText + "'"; sqlData += " and accountstate='" + combo_stateText + "'"; } - + sqlData += " order by DBID desc)b " + + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; @@ -291,6 +296,7 @@ { try { + initlizeDatagrid(); LoadData(); initForm(); IS_OPEN = true; @@ -310,11 +316,13 @@ } if (Utility.userRole.IndexOf("巡检员编辑") == -1) { - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Visible = false; + //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Visible = false; + 编辑ToolStripMenuItem.Visible = false; } if (Utility.userRole.IndexOf("巡检员注销") == -1) { - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Visible = false; + //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Visible = false; + 注销ToolStripMenuItem.Visible = false; } } @@ -376,7 +384,7 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - long dbid = long.Parse(row.Cells["dbid"].Value.ToString()); + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); Log p = new Log(dbid.ToString()); p.Show(); } @@ -395,8 +403,8 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - long dbid = long.Parse(row.Cells["dbid"].Value.ToString()); - String state = row.Cells["ACCOUNTSTATE"].Value.ToString(); + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); + String state = row.Cells["状态"].Value.ToString(); if ("在线".Equals(state)) { string sql = "select t.dbid " + @@ -435,8 +443,8 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - long dbid = long.Parse(row.Cells["dbid"].Value.ToString()); - String username = row.Cells["USERNAME"].Value.ToString(); + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); + String username = row.Cells["姓名"].Value.ToString(); string sql = "select t.latitude, t.longitude " + "from position t " + "where t.dbid = (select max(dbid) from position where patroler_id = " + dbid + ")"; @@ -489,6 +497,63 @@ } + private void 编辑ToolStripMenuItem_Click(object sender, EventArgs e) + { + if (winGridViewPager1 != null && winGridViewPager1.dataGridView1 != null) + { + DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; + try + { + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); + String name = row.Cells["姓名"].Value.ToString(); + String sex = row.Cells["性别"].Value.ToString(); + String age = row.Cells["年龄"].Value.ToString(); + string phone = row.Cells["电话"].Value.ToString(); + age = String.IsNullOrEmpty(age.ToString().Trim()) ? "1" : age.ToString().Trim(); + FrmPatrolerEdit frm = new FrmPatrolerEdit(dbid.ToString(), name, age, sex, phone); + frm.reloadGrid += new ReloadPatrolerGrid(LoadData); + frm.ShowDialog(); + winGridViewPager1.Refresh(); + } + catch (Exception ex) + { + MessageBox.Show("编辑失败:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } + + private void 注销ToolStripMenuItem_Click(object sender, EventArgs e) + { + if (winGridViewPager1 != null && winGridViewPager1.dataGridView1 != null) + { + DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; + long dbid = long.Parse(row.Cells["编号"].Value.ToString()); + try + { + if (MessageBox.Show("确定注销？", "确认", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) + { + String sql = "update patroler t set t.accountstate='LEAVER' where t.dbid=" + dbid; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + LoadData(); + MessageBox.Show("人员已注销", "信息", MessageBoxButtons.OK, MessageBoxIcon.Information); + } + //string state = row.Cells["状态"].Value.ToString(); + //if ("在线".Equals(state)) + //{ + + //} + //else + //{ + // MessageBox.Show("人员不在线，无法注销", "信息"); + //} + } + catch (Exception ex) + { + MessageBox.Show("人员注销失败:" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } + } } diff --git a/FrmRoleInfoManager.cs b/FrmRoleInfoManager.cs index 8897133..35693cf 100644 --- a/FrmRoleInfoManager.cs +++ b/FrmRoleInfoManager.cs @@ -55,10 +55,10 @@ //控制表格显示的列，以及每一列要显示的列名 this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - this.winGridViewPager1.AddColumnAlias("NT", "角色名称"); - this.winGridViewPager1.AddColumnAlias("ID", "编号"); + this.winGridViewPager1.AddColumnAlias("角色名称", "角色名称"); + this.winGridViewPager1.AddColumnAlias("编号", "编号"); - this.winGridViewPager1.DisplayColumns = "NT"; + this.winGridViewPager1.DisplayColumns = "角色名称"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -131,7 +131,7 @@ { try { - string dbid = row.Cells["id"].Value.ToString(); + string dbid = row.Cells["编号"].Value.ToString(); string sql = "delete from casic_userroletest where id=" + dbid; OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); LoadData(); @@ -170,7 +170,7 @@ { string sqlCount = "select id,nt from casic_userroletest where sysname='EMS'"; - string sqlData = "select nt,id " + + string sqlData = "select nt as 角色名称,id as 编号 " + "from (select t.*,rownum row_num from casic_userroletest t order by id desc)b " + " where sysname='EMS'"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -183,7 +183,7 @@ int minPage = (pageIndex - 1) * maxPageIndex + 1; int maxPage = pageIndex * maxPageIndex; string sqlCount = "select id,nt from casic_userroletest where sysname='EMS'"; - string sqlData = "select nt,id " + + string sqlData = "select nt as 角色名称,id as 编号 " + "from (select t.*,rownum row_num from casic_userroletest t where sysname='EMS' order by id desc)b " + " where(b.row_num between " + minPage + " and " + maxPage + ")"; diff --git a/FrmSysUserInfoManger.cs b/FrmSysUserInfoManger.cs index 7903916..e193a61 100644 --- a/FrmSysUserInfoManger.cs +++ b/FrmSysUserInfoManger.cs @@ -28,6 +28,7 @@ this.winGridViewPager1.OnEndExport += new EventHandler(pager1_OnEndExport); winGridViewPager1.dataGridView1.MultiSelect = false; + } private void FrmSysUserInfoManger_Load(object sender, EventArgs e) @@ -59,10 +60,10 @@ //控制表格显示的列，以及每一列要显示的列名 this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - this.winGridViewPager1.AddColumnAlias("USERNAME", "账号"); - this.winGridViewPager1.AddColumnAlias("ID", "编号"); + this.winGridViewPager1.AddColumnAlias("账号", "账号"); + this.winGridViewPager1.AddColumnAlias("编号", "编号"); - this.winGridViewPager1.DisplayColumns = "USERNAME"; + this.winGridViewPager1.DisplayColumns = "账号"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -130,8 +131,8 @@ if (grid != null) { DataGridViewRow row = grid.SelectedRows[0]; - string dbid = row.Cells["id"].Value.ToString(); - string userName = row.Cells["USERNAME"].Value.ToString(); + string dbid = row.Cells["编号"].Value.ToString(); + string userName = row.Cells["账号"].Value.ToString(); if (userName.Equals("ems")) { MessageBox.Show("该用户为管理员用户，无法删除！", "信息"); @@ -184,7 +185,7 @@ { string sqlCount = "select count(*) from casic_userinfotest where sysname='EMS'"; - string sqlData = "select username,id " + + string sqlData = "select username as 账号,id as 编号 " + "from (select t.*,rownum row_num from casic_userinfotest t order by id desc)b " + " where sysname='EMS'"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -197,16 +198,16 @@ int minPage = (pageIndex - 1) * maxPageIndex + 1; int maxPage = pageIndex * maxPageIndex; string sqlCount = "select count(*) from casic_userinfotest where sysname='EMS'"; - string sqlData = "select username,id " + - "from (select t.*,rownum row_num from casic_userinfotest t where sysname='EMS' order by id desc)b " + - " where(b.row_num between " + minPage + " and " + maxPage + ")"; + string sqlData = "select username as 账号,id as 编号 " + + "from (select t.*,rownum row_num from casic_userinfotest t where sysname='EMS'"; if (!String.IsNullOrEmpty(txt_user_code.Text.Trim())) { sqlCount += " and username like '%" + txt_user_code.Text.Trim() + "%'"; sqlData += " and username like '%" + txt_user_code.Text.Trim() + "%'"; } - + sqlData += " order by id desc)b " + + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); return sqlData; diff --git a/MainFrm.cs b/MainFrm.cs index 39df646..0cd5881 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3310,10 +3310,10 @@ string str1 = ""; if (feature != null) { - if (feature.GetFieldDefn("图?片?编括?码?") != null) // + if (feature.GetFieldDefn("图片编码") != null) // { str1 = GetBubbleInfo(feature); - if (RemoteFileExists(Utility.PicRootURL + feature.GetValue("图?片?编括?码?").ToString())) + if (RemoteFileExists(Utility.PicRootURL + feature.GetValue("图片编码").ToString())) { str1 += ""; } @@ -3450,9 +3450,15 @@ string value1 = ""; if (field1 != null) { - if (field1.Name == "图片编码") + //if (field1.Name == "图片编码" || field1.Name == "对象编号" || field1.Name == "对象类型" || field1.Name == "对象名称") + //{ + // j++; + //} + while (field1.Name == "图片编码" || field1.Name == "对象编号" || field1.Name == "对象类型" || field1.Name == "对象名称") { j++; + fieldName = fieldNames[j].Trim(); + field1 = (GSOFieldDefn)feature.GetFieldDefn(fieldName); } if (j < rowCount) { @@ -3479,6 +3485,11 @@ if (!feature.IsFieldValueNull(j)) { value1 = feature.GetValue(j).ToString(); + if (name1 == "标识器埋深") + { + if (value1!=null&&value1.Length>4) + value1 = value1.Substring(0,4); + } } } } @@ -3491,9 +3502,14 @@ if (field2 != null) { - if (field2.Name == "图片编码") + //if (field2.Name == "图片编码" || field1.Name == "对象编号" || field1.Name == "对象类型" || field1.Name == "对象名称") + //{ + // j++; + //} + while (field2.Name == "图片编码" || field2.Name == "对象编号" || field2.Name == "对象类型" || field2.Name == "对象名称") { j++; + field2 = (GSOFieldDefn)feature.GetFieldDefn(j + 1); } if (j + 1 < rowCount) { @@ -3521,6 +3537,11 @@ if (!feature.IsFieldValueNull(j + 1)) { value2 = feature.GetValue(j + 1).ToString(); + if (name2 == "标识器埋深") + { + if (value2 != null && value2.Length > 4) + value2 = value2.Substring(0, 4); + } } } } @@ -15347,7 +15368,7 @@ return; } FrmFlagManagers frm = new FrmFlagManagers(globeControl1); - frm.Show(this); + frm.Show(); } private void ribbonTabItem2_MouseDown(object sender, MouseEventArgs e) diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index fddfb94..e5f0003 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -365,6 +365,16 @@ this.可编辑ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.保存ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.ribbonControl1 = new DevComponents.DotNetBar.RibbonControl(); + this.ribbonPanel3 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar3 = new DevComponents.DotNetBar.RibbonBar(); + this.btn_device = new DevComponents.DotNetBar.ButtonItem(); + this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); + this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel7 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); + this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); + this.slider4ground = new DevComponents.DotNetBar.SliderItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -374,12 +384,6 @@ this.btn_user_role = new DevComponents.DotNetBar.ButtonItem(); this.btn_password_edit = new DevComponents.DotNetBar.ButtonItem(); this.btn_reset_password = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel3 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar3 = new DevComponents.DotNetBar.RibbonBar(); - this.btn_device = new DevComponents.DotNetBar.ButtonItem(); - this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); - this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); @@ -551,10 +555,6 @@ this.buttonItemBZ9 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItemBZ10 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItemBZ11 = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel7 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); - this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); - this.slider4ground = new DevComponents.DotNetBar.SliderItem(); this.ribbonPanel12 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar18 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItem133 = new DevComponents.DotNetBar.ButtonItem(); @@ -690,11 +690,11 @@ this.contextMenuStrip3.SuspendLayout(); this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); - this.ribbonPanel8.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel7.SuspendLayout(); + this.ribbonPanel8.SuspendLayout(); this.ribbonPanel2.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); - this.ribbonPanel7.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); this.ribbonPanel5.SuspendLayout(); this.ribbonPanel6.SuspendLayout(); @@ -4162,10 +4162,10 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); - this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel2); - this.ribbonControl1.Controls.Add(this.ribbonPanel15); + this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel7); + this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); this.ribbonControl1.Controls.Add(this.ribbonPanel5); this.ribbonControl1.Controls.Add(this.ribbonPanel6); @@ -4216,135 +4216,6 @@ this.ribbonControl1.UseCustomizeDialog = false; this.ribbonControl1.Click += new System.EventHandler(this.ribbonControl1_Click); // - // ribbonPanel8 - // - this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel8.Controls.Add(this.ribbonBar_UserInfo); - this.ribbonPanel8.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel8.Location = new System.Drawing.Point(0, 33); - this.ribbonPanel8.Name = "ribbonPanel8"; - this.ribbonPanel8.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel8.Size = new System.Drawing.Size(1328, 62); - // - // - // - this.ribbonPanel8.Style.Class = ""; - this.ribbonPanel8.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel8.StyleMouseDown.Class = ""; - this.ribbonPanel8.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel8.StyleMouseOver.Class = ""; - this.ribbonPanel8.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel8.TabIndex = 42; - this.ribbonPanel8.Visible = false; - // - // ribbonBar_UserInfo - // - this.ribbonBar_UserInfo.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar_UserInfo.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar_UserInfo.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar_UserInfo.BackgroundStyle.Class = ""; - this.ribbonBar_UserInfo.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar_UserInfo.ContainerControlProcessDialogKey = true; - this.ribbonBar_UserInfo.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar_UserInfo.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.btn_user_info, - this.btn_role_info, - this.btn_resc_info, - this.btn_role_resc, - this.btn_user_role, - this.btn_password_edit, - this.btn_reset_password}); - this.ribbonBar_UserInfo.Location = new System.Drawing.Point(3, 0); - this.ribbonBar_UserInfo.Name = "ribbonBar_UserInfo"; - this.ribbonBar_UserInfo.Size = new System.Drawing.Size(427, 59); - this.ribbonBar_UserInfo.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar_UserInfo.TabIndex = 0; - // - // - // - this.ribbonBar_UserInfo.TitleStyle.Class = ""; - this.ribbonBar_UserInfo.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar_UserInfo.TitleStyleMouseOver.Class = ""; - this.ribbonBar_UserInfo.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // btn_user_info - // - this.btn_user_info.Image = global::Cyberpipe.Properties.Resources._24x24icon_13_hover; - this.btn_user_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_user_info.Name = "btn_user_info"; - this.btn_user_info.SubItemsExpandWidth = 14; - this.btn_user_info.Text = "用户管理"; - this.btn_user_info.Click += new System.EventHandler(this.btn_user_info_Click); - // - // btn_role_info - // - this.btn_role_info.Image = global::Cyberpipe.Properties.Resources._24x24icon_05_hover1; - this.btn_role_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_role_info.Name = "btn_role_info"; - this.btn_role_info.SubItemsExpandWidth = 14; - this.btn_role_info.Text = "角色管理"; - this.btn_role_info.Click += new System.EventHandler(this.btn_role_info_Click); - // - // btn_resc_info - // - this.btn_resc_info.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__09; - this.btn_resc_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_resc_info.Name = "btn_resc_info"; - this.btn_resc_info.SubItemsExpandWidth = 14; - this.btn_resc_info.Text = "资源管理"; - this.btn_resc_info.Click += new System.EventHandler(this.btn_resc_info_Click); - // - // btn_role_resc - // - this.btn_role_resc.Image = global::Cyberpipe.Properties.Resources.btnlegendSet_Image_副本; - this.btn_role_resc.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_role_resc.Name = "btn_role_resc"; - this.btn_role_resc.SubItemsExpandWidth = 14; - this.btn_role_resc.Text = "角色授权"; - this.btn_role_resc.Click += new System.EventHandler(this.btn_role_resc_Click); - // - // btn_user_role - // - this.btn_user_role.Image = global::Cyberpipe.Properties.Resources._24x24icon_08_hover; - this.btn_user_role.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_user_role.Name = "btn_user_role"; - this.btn_user_role.SubItemsExpandWidth = 14; - this.btn_user_role.Text = "用户授权"; - this.btn_user_role.Click += new System.EventHandler(this.btn_user_role_Click); - // - // btn_password_edit - // - this.btn_password_edit.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__67; - this.btn_password_edit.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_password_edit.Name = "btn_password_edit"; - this.btn_password_edit.SubItemsExpandWidth = 14; - this.btn_password_edit.Text = "密码修改"; - this.btn_password_edit.Click += new System.EventHandler(this.btn_password_edit_Click); - // - // btn_reset_password - // - this.btn_reset_password.Image = global::Cyberpipe.Properties.Resources.liuxiang; - this.btn_reset_password.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_reset_password.Name = "btn_reset_password"; - this.btn_reset_password.SubItemsExpandWidth = 14; - this.btn_reset_password.Text = "重置密码"; - this.btn_reset_password.Click += new System.EventHandler(this.btn_reset_password_Click); - // // ribbonPanel3 // this.ribbonPanel3.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4425,7 +4296,7 @@ this.btn_Person.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; this.btn_Person.Name = "btn_Person"; this.btn_Person.SubItemsExpandWidth = 14; - this.btn_Person.Text = "巡检人员维护"; + this.btn_Person.Text = "定位人员维护"; this.btn_Person.Click += new System.EventHandler(this.btn_Person_Click); // // btn_constructMap @@ -4446,6 +4317,214 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel7 + // + this.ribbonPanel7.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel7.Controls.Add(this.ribbonBar5); + this.ribbonPanel7.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel7.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel7.Name = "ribbonPanel7"; + this.ribbonPanel7.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel7.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel7.Style.Class = ""; + this.ribbonPanel7.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel7.StyleMouseDown.Class = ""; + this.ribbonPanel7.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel7.StyleMouseOver.Class = ""; + this.ribbonPanel7.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel7.TabIndex = 41; + this.ribbonPanel7.Visible = false; + // + // ribbonBar5 + // + this.ribbonBar5.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar5.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar5.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar5.BackgroundStyle.Class = ""; + this.ribbonBar5.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar5.ContainerControlProcessDialogKey = true; + this.ribbonBar5.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar5.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.btn_flag, + this.slider4ground}); + this.ribbonBar5.Location = new System.Drawing.Point(3, 0); + this.ribbonBar5.Name = "ribbonBar5"; + this.ribbonBar5.Size = new System.Drawing.Size(427, 92); + this.ribbonBar5.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar5.TabIndex = 0; + // + // + // + this.ribbonBar5.TitleStyle.Class = ""; + this.ribbonBar5.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar5.TitleStyleMouseOver.Class = ""; + this.ribbonBar5.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar5.TitleVisible = false; + // + // btn_flag + // + this.btn_flag.Image = global::Cyberpipe.Properties.Resources._24x24icon_03_hover; + this.btn_flag.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_flag.Name = "btn_flag"; + this.btn_flag.SubItemsExpandWidth = 14; + this.btn_flag.Text = "标识器管理"; + this.btn_flag.Click += new System.EventHandler(this.btn_flag_Click); + // + // slider4ground + // + this.slider4ground.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; + this.slider4ground.Name = "slider4ground"; + this.slider4ground.Text = "地面透明度"; + this.slider4ground.Value = 0; + this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); + // + // ribbonPanel8 + // + this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel8.Controls.Add(this.ribbonBar_UserInfo); + this.ribbonPanel8.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel8.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel8.Name = "ribbonPanel8"; + this.ribbonPanel8.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel8.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel8.Style.Class = ""; + this.ribbonPanel8.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel8.StyleMouseDown.Class = ""; + this.ribbonPanel8.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel8.StyleMouseOver.Class = ""; + this.ribbonPanel8.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel8.TabIndex = 42; + this.ribbonPanel8.Visible = false; + // + // ribbonBar_UserInfo + // + this.ribbonBar_UserInfo.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar_UserInfo.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar_UserInfo.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar_UserInfo.BackgroundStyle.Class = ""; + this.ribbonBar_UserInfo.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar_UserInfo.ContainerControlProcessDialogKey = true; + this.ribbonBar_UserInfo.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar_UserInfo.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.btn_user_info, + this.btn_role_info, + this.btn_resc_info, + this.btn_role_resc, + this.btn_user_role, + this.btn_password_edit, + this.btn_reset_password}); + this.ribbonBar_UserInfo.Location = new System.Drawing.Point(3, 0); + this.ribbonBar_UserInfo.Name = "ribbonBar_UserInfo"; + this.ribbonBar_UserInfo.Size = new System.Drawing.Size(427, 92); + this.ribbonBar_UserInfo.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar_UserInfo.TabIndex = 0; + // + // + // + this.ribbonBar_UserInfo.TitleStyle.Class = ""; + this.ribbonBar_UserInfo.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar_UserInfo.TitleStyleMouseOver.Class = ""; + this.ribbonBar_UserInfo.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // btn_user_info + // + this.btn_user_info.Image = global::Cyberpipe.Properties.Resources._24x24icon_13_hover; + this.btn_user_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_user_info.Name = "btn_user_info"; + this.btn_user_info.SubItemsExpandWidth = 14; + this.btn_user_info.Text = "用户管理"; + this.btn_user_info.Click += new System.EventHandler(this.btn_user_info_Click); + // + // btn_role_info + // + this.btn_role_info.Image = global::Cyberpipe.Properties.Resources._24x24icon_05_hover1; + this.btn_role_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_role_info.Name = "btn_role_info"; + this.btn_role_info.SubItemsExpandWidth = 14; + this.btn_role_info.Text = "角色管理"; + this.btn_role_info.Click += new System.EventHandler(this.btn_role_info_Click); + // + // btn_resc_info + // + this.btn_resc_info.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__09; + this.btn_resc_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_resc_info.Name = "btn_resc_info"; + this.btn_resc_info.SubItemsExpandWidth = 14; + this.btn_resc_info.Text = "资源管理"; + this.btn_resc_info.Click += new System.EventHandler(this.btn_resc_info_Click); + // + // btn_role_resc + // + this.btn_role_resc.Image = global::Cyberpipe.Properties.Resources.btnlegendSet_Image_副本; + this.btn_role_resc.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_role_resc.Name = "btn_role_resc"; + this.btn_role_resc.SubItemsExpandWidth = 14; + this.btn_role_resc.Text = "角色授权"; + this.btn_role_resc.Click += new System.EventHandler(this.btn_role_resc_Click); + // + // btn_user_role + // + this.btn_user_role.Image = global::Cyberpipe.Properties.Resources._24x24icon_08_hover; + this.btn_user_role.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_user_role.Name = "btn_user_role"; + this.btn_user_role.SubItemsExpandWidth = 14; + this.btn_user_role.Text = "用户授权"; + this.btn_user_role.Click += new System.EventHandler(this.btn_user_role_Click); + // + // btn_password_edit + // + this.btn_password_edit.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__67; + this.btn_password_edit.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_password_edit.Name = "btn_password_edit"; + this.btn_password_edit.SubItemsExpandWidth = 14; + this.btn_password_edit.Text = "密码修改"; + this.btn_password_edit.Click += new System.EventHandler(this.btn_password_edit_Click); + // + // btn_reset_password + // + this.btn_reset_password.Image = global::Cyberpipe.Properties.Resources.liuxiang; + this.btn_reset_password.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_reset_password.Name = "btn_reset_password"; + this.btn_reset_password.SubItemsExpandWidth = 14; + this.btn_reset_password.Text = "重置密码"; + this.btn_reset_password.Click += new System.EventHandler(this.btn_reset_password_Click); + // // ribbonPanel2 // this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -5891,85 +5970,6 @@ this.buttonItemBZ11.Text = "标注管理"; this.buttonItemBZ11.Click += new System.EventHandler(this.buttonItemBZ11_Click); // - // ribbonPanel7 - // - this.ribbonPanel7.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel7.Controls.Add(this.ribbonBar5); - this.ribbonPanel7.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel7.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel7.Name = "ribbonPanel7"; - this.ribbonPanel7.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel7.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel7.Style.Class = ""; - this.ribbonPanel7.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel7.StyleMouseDown.Class = ""; - this.ribbonPanel7.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel7.StyleMouseOver.Class = ""; - this.ribbonPanel7.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel7.TabIndex = 41; - this.ribbonPanel7.Visible = false; - // - // ribbonBar5 - // - this.ribbonBar5.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar5.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar5.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar5.BackgroundStyle.Class = ""; - this.ribbonBar5.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar5.ContainerControlProcessDialogKey = true; - this.ribbonBar5.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar5.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.btn_flag, - this.slider4ground}); - this.ribbonBar5.Location = new System.Drawing.Point(3, 0); - this.ribbonBar5.Name = "ribbonBar5"; - this.ribbonBar5.Size = new System.Drawing.Size(427, 92); - this.ribbonBar5.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar5.TabIndex = 0; - // - // - // - this.ribbonBar5.TitleStyle.Class = ""; - this.ribbonBar5.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar5.TitleStyleMouseOver.Class = ""; - this.ribbonBar5.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar5.TitleVisible = false; - // - // btn_flag - // - this.btn_flag.Image = global::Cyberpipe.Properties.Resources._24x24icon_03_hover; - this.btn_flag.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_flag.Name = "btn_flag"; - this.btn_flag.SubItemsExpandWidth = 14; - this.btn_flag.Text = "标识器管理"; - this.btn_flag.Click += new System.EventHandler(this.btn_flag_Click); - // - // slider4ground - // - this.slider4ground.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; - this.slider4ground.Name = "slider4ground"; - this.slider4ground.Text = "地面透明度"; - this.slider4ground.Value = 0; - this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); - // // ribbonPanel12 // this.ribbonPanel12.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7181,11 +7181,11 @@ this.contextMenuStripDeleteLayerNode.ResumeLayout(false); this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); - this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel7.ResumeLayout(false); + this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); - this.ribbonPanel7.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); this.ribbonPanel5.ResumeLayout(false); this.ribbonPanel6.ResumeLayout(false); diff --git a/SysRescInfoManager.cs b/SysRescInfoManager.cs index 3a84d95..fda6f3f 100644 --- a/SysRescInfoManager.cs +++ b/SysRescInfoManager.cs @@ -79,11 +79,11 @@ //控制表格显示的列，以及每一列要显示的列名 this.winGridViewPager1.Dock = DockStyle.Fill; this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill; - - this.winGridViewPager1.AddColumnAlias("RESC", "资源名称"); - this.winGridViewPager1.AddColumnAlias("ID", "编号"); - this.winGridViewPager1.AddColumnAlias("DESP", "资源描述"); - this.winGridViewPager1.DisplayColumns = "RESC,DESP"; + + this.winGridViewPager1.AddColumnAlias("资源名称", "资源名称"); + this.winGridViewPager1.AddColumnAlias("编号", "编号"); + this.winGridViewPager1.AddColumnAlias("资源描述", "资源描述"); + this.winGridViewPager1.DisplayColumns = "资源名称,资源描述"; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -153,8 +153,8 @@ DataGridViewRow row = grid.SelectedRows[0]; if (MessageBox.Show("确定删除？", "确认", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) { - string dbid = row.Cells["id"].Value.ToString(); - string resc = row.Cells["resc"].Value.ToString(); + string dbid = row.Cells["编号"].Value.ToString(); + string resc = row.Cells["资源名称"].Value.ToString(); OracleConnection conn = null; OracleTransaction tran = null; try @@ -229,7 +229,7 @@ private string GetSql() { string sqlCount = "select count(*) from casic_userresctest where sysname='EMS'"; - string sqlData = "select resc,id,desp " + + string sqlData = "select resc as 资源名称,id as 编号,desp as 资源描述 " + "from (select t.*,rownum row_num from casic_userresctest t order by id desc)b " + " where sysname='EMS'"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -242,7 +242,7 @@ int minPage = (pageIndex - 1) * maxPageIndex + 1; int maxPage = pageIndex * maxPageIndex; string sqlCount = "select count(*) from casic_userresctest where sysname='EMS'"; - string sqlData = "select resc,id,desp " + + string sqlData = "select resc as 资源名称,id as 编号,desp as 资源描述 " + "from (select t.*,rownum row_num from casic_userresctest t where sysname='EMS' order by id desc)b " + " where(b.row_num between " + minPage + " and " + maxPage + ")"; diff --git a/bin/x86/Debug/Config.xml b/bin/x86/Debug/Config.xml index e2d7b46..560a163 100644 --- a/bin/x86/Debug/Config.xml +++ b/bin/x86/Debug/Config.xml @@ -3,9 +3,9 @@ LocaSpace三维地下管线信息系统 scott - SZHTDB - 127.0.0.1 - scott + SZHTDB2 + 192.168.0.203 + SZHTDB2 127.0.0.1 1500 @@ -14,8 +14,8 @@ http://192.168.0.122:8088/UpDownFile.asmx - http://127.0.0.1/EMSCyberpipe.msi - http://127.0.0.1/EMSConfig.xml + http://192.168.10.229/EMSCyberpipe.msi + http://192.168.10.229/EMSConfig.xml diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index b19e2ab..b5e320f 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 1a4aeed..c20e54a 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/PipelineType.xml b/bin/x86/Debug/PipelineType.xml index 51dc4b8..b1cbacc 100644 --- a/bin/x86/Debug/PipelineType.xml +++ b/bin/x86/Debug/PipelineType.xml @@ -1,6 +1,6 @@  - + @@ -42,7 +42,7 @@ - + @@ -83,7 +83,7 @@ - + @@ -115,7 +115,7 @@ - + @@ -159,7 +159,7 @@ - + @@ -200,7 +200,7 @@ - + @@ -236,7 +236,7 @@ - + @@ -278,7 +278,7 @@ - + @@ -320,7 +320,7 @@ - + @@ -363,7 +363,7 @@ - + @@ -408,7 +408,7 @@ - + @@ -448,7 +448,7 @@ - + @@ -485,7 +485,7 @@ - + @@ -527,7 +527,7 @@ - + @@ -565,7 +565,7 @@ - + @@ -595,7 +595,7 @@ - + @@ -625,7 +625,7 @@ - + @@ -657,7 +657,7 @@ - + @@ -691,7 +691,7 @@ - + @@ -728,7 +728,7 @@ - + @@ -763,7 +763,7 @@ - + @@ -799,7 +799,7 @@ - + @@ -824,7 +824,7 @@ - + @@ -846,7 +846,7 @@ - + diff --git a/obj/x86/Debug/Cyberpipe.csproj.FileListAbsolute.txt b/obj/x86/Debug/Cyberpipe.csproj.FileListAbsolute.txt index 42dc58c..b78c534 100644 --- a/obj/x86/Debug/Cyberpipe.csproj.FileListAbsolute.txt +++ b/obj/x86/Debug/Cyberpipe.csproj.FileListAbsolute.txt @@ -203,3 +203,4 @@ D:\ym\EMS+GHFX\EMS\obj\x86\Debug\EMSCyberpipe.pdb D:\ym\EMS+GHFX\EMS\obj\x86\Debug\Cyberpipe.FrmFlagManagers.resources D:\ym\EMS+GHFX\EMS\obj\x86\Debug\Cyberpipe.FrmFlagEdits.resources +D:\ym\EMS+GHFX\EMS\obj\x86\Debug\Cyberpipe.FrmFlagDetail.resources diff --git a/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache b/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache index 19b3415..cee9c4a 100644 --- a/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache +++ b/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache Binary files differ diff --git a/obj/x86/Debug/EMSCyberpipe.exe b/obj/x86/Debug/EMSCyberpipe.exe index b19e2ab..b5e320f 100644 --- a/obj/x86/Debug/EMSCyberpipe.exe +++ b/obj/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/obj/x86/Debug/EMSCyberpipe.pdb b/obj/x86/Debug/EMSCyberpipe.pdb index 1a4aeed..c20e54a 100644 --- a/obj/x86/Debug/EMSCyberpipe.pdb +++ b/obj/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/obj/x86/Debug/GenerateResource.read.1.tlog b/obj/x86/Debug/GenerateResource.read.1.tlog index 79b7689..7ee40f5 100644 --- a/obj/x86/Debug/GenerateResource.read.1.tlog +++ b/obj/x86/Debug/GenerateResource.read.1.tlog Binary files differ diff --git a/obj/x86/Debug/GenerateResource.write.1.tlog b/obj/x86/Debug/GenerateResource.write.1.tlog index ed512ef..9aabeca 100644 --- a/obj/x86/Debug/GenerateResource.write.1.tlog +++ b/obj/x86/Debug/GenerateResource.write.1.tlog Binary files differ diff --git a/obj/x86/Debug/ResolveAssemblyReference.cache b/obj/x86/Debug/ResolveAssemblyReference.cache index e85e2b1..f9dd4e6 100644 --- a/obj/x86/Debug/ResolveAssemblyReference.cache +++ b/obj/x86/Debug/ResolveAssemblyReference.cache Binary files differ