diff --git a/FrmFlagManagers.cs b/FrmFlagManagers.cs index 5e11dbb..09993fa 100644 --- a/FrmFlagManagers.cs +++ b/FrmFlagManagers.cs @@ -233,7 +233,8 @@ string sqlData = "select 编号,标识器ID号,标识器型号,round(地面高程,2) as 地面高程,round(标识器埋深,2) as 标识器埋深,所属道路,LSSYS_ID as " + LSSYS_ID_VALUE + ",X坐标,Y坐标,使用状态,权属单位,备注 " + - "from (select t.*,rownum row_num from 标识器 t where 使用状态 = '使用中' order by 编号)b " + " where 1=1"; + "from (select t.编号, t.标识器ID号, t.标识器型号, t.地面高程, t.标识器埋深, " + + "t.所属道路, t.X坐标, t.Y坐标, t.使用状态, t.权属单位, t.备注, t.LSSYS_ID, rownum row_num from 标识器 t where 使用状态 = '使用中' order by 编号)b " + " where 1=1"; if (!String.IsNullOrEmpty(txt_no.Text.Trim())) { @@ -259,7 +260,8 @@ string sqlData = "select 编号,标识器ID号,标识器型号,round(地面高程,2) as 地面高程,round(标识器埋深,2) as 标识器埋深,所属道路,LSSYS_ID as " + LSSYS_ID_VALUE + ",X坐标,Y坐标,使用状态,权属单位,备注 " + - "from (select t.*,rownum row_num from 标识器 t where 使用状态 = '使用中'"; + "from (select t.编号, t.标识器ID号, t.标识器型号, t.地面高程, t.标识器埋深, " + + "t.所属道路, t.X坐标, t.Y坐标, t.使用状态, t.权属单位, t.备注, t.LSSYS_ID, rownum row_num from 标识器 t where 使用状态 = '使用中'"; if (!String.IsNullOrEmpty(txt_no.Text.Trim())) { diff --git a/FrmFlagManagers.cs b/FrmFlagManagers.cs index 5e11dbb..09993fa 100644 --- a/FrmFlagManagers.cs +++ b/FrmFlagManagers.cs @@ -233,7 +233,8 @@ string sqlData = "select 编号,标识器ID号,标识器型号,round(地面高程,2) as 地面高程,round(标识器埋深,2) as 标识器埋深,所属道路,LSSYS_ID as " + LSSYS_ID_VALUE + ",X坐标,Y坐标,使用状态,权属单位,备注 " + - "from (select t.*,rownum row_num from 标识器 t where 使用状态 = '使用中' order by 编号)b " + " where 1=1"; + "from (select t.编号, t.标识器ID号, t.标识器型号, t.地面高程, t.标识器埋深, " + + "t.所属道路, t.X坐标, t.Y坐标, t.使用状态, t.权属单位, t.备注, t.LSSYS_ID, rownum row_num from 标识器 t where 使用状态 = '使用中' order by 编号)b " + " where 1=1"; if (!String.IsNullOrEmpty(txt_no.Text.Trim())) { @@ -259,7 +260,8 @@ string sqlData = "select 编号,标识器ID号,标识器型号,round(地面高程,2) as 地面高程,round(标识器埋深,2) as 标识器埋深,所属道路,LSSYS_ID as " + LSSYS_ID_VALUE + ",X坐标,Y坐标,使用状态,权属单位,备注 " + - "from (select t.*,rownum row_num from 标识器 t where 使用状态 = '使用中'"; + "from (select t.编号, t.标识器ID号, t.标识器型号, t.地面高程, t.标识器埋深, " + + "t.所属道路, t.X坐标, t.Y坐标, t.使用状态, t.权属单位, t.备注, t.LSSYS_ID, rownum row_num from 标识器 t where 使用状态 = '使用中'"; if (!String.IsNullOrEmpty(txt_no.Text.Trim())) { diff --git a/FrmFlyToPosition.cs b/FrmFlyToPosition.cs index e1240f5..d0b6b39 100644 --- a/FrmFlyToPosition.cs +++ b/FrmFlyToPosition.cs @@ -17,6 +17,8 @@ globeControl2 = _globeControl2; foreach (Location l in Utility.locationList) comboBox1.Items.Add(l.NAME); + + comboBox1.SelectedIndex = 0; } public FrmFlyToPosition(GSOGlobeControl _globeControl1) @@ -26,6 +28,8 @@ foreach (Location l in Utility.locationList) comboBox1.Items.Add(l.NAME); + + comboBox1.SelectedIndex = 0; } private void buttonX1_Click(object sender, EventArgs e) diff --git a/FrmFlagManagers.cs b/FrmFlagManagers.cs index 5e11dbb..09993fa 100644 --- a/FrmFlagManagers.cs +++ b/FrmFlagManagers.cs @@ -233,7 +233,8 @@ string sqlData = "select 编号,标识器ID号,标识器型号,round(地面高程,2) as 地面高程,round(标识器埋深,2) as 标识器埋深,所属道路,LSSYS_ID as " + LSSYS_ID_VALUE + ",X坐标,Y坐标,使用状态,权属单位,备注 " + - "from (select t.*,rownum row_num from 标识器 t where 使用状态 = '使用中' order by 编号)b " + " where 1=1"; + "from (select t.编号, t.标识器ID号, t.标识器型号, t.地面高程, t.标识器埋深, " + + "t.所属道路, t.X坐标, t.Y坐标, t.使用状态, t.权属单位, t.备注, t.LSSYS_ID, rownum row_num from 标识器 t where 使用状态 = '使用中' order by 编号)b " + " where 1=1"; if (!String.IsNullOrEmpty(txt_no.Text.Trim())) { @@ -259,7 +260,8 @@ string sqlData = "select 编号,标识器ID号,标识器型号,round(地面高程,2) as 地面高程,round(标识器埋深,2) as 标识器埋深,所属道路,LSSYS_ID as " + LSSYS_ID_VALUE + ",X坐标,Y坐标,使用状态,权属单位,备注 " + - "from (select t.*,rownum row_num from 标识器 t where 使用状态 = '使用中'"; + "from (select t.编号, t.标识器ID号, t.标识器型号, t.地面高程, t.标识器埋深, " + + "t.所属道路, t.X坐标, t.Y坐标, t.使用状态, t.权属单位, t.备注, t.LSSYS_ID, rownum row_num from 标识器 t where 使用状态 = '使用中'"; if (!String.IsNullOrEmpty(txt_no.Text.Trim())) { diff --git a/FrmFlyToPosition.cs b/FrmFlyToPosition.cs index e1240f5..d0b6b39 100644 --- a/FrmFlyToPosition.cs +++ b/FrmFlyToPosition.cs @@ -17,6 +17,8 @@ globeControl2 = _globeControl2; foreach (Location l in Utility.locationList) comboBox1.Items.Add(l.NAME); + + comboBox1.SelectedIndex = 0; } public FrmFlyToPosition(GSOGlobeControl _globeControl1) @@ -26,6 +28,8 @@ foreach (Location l in Utility.locationList) comboBox1.Items.Add(l.NAME); + + comboBox1.SelectedIndex = 0; } private void buttonX1_Click(object sender, EventArgs e) diff --git a/FrmSysUserInfoManger.Designer.cs b/FrmSysUserInfoManger.Designer.cs index a297414..bf1d8ad 100644 --- a/FrmSysUserInfoManger.Designer.cs +++ b/FrmSysUserInfoManger.Designer.cs @@ -39,10 +39,6 @@ this.btn_query = new DevComponents.DotNetBar.ButtonItem(); this.btn_add = new DevComponents.DotNetBar.ButtonItem(); this.dataGridViewX1 = new DevComponents.DotNetBar.Controls.DataGridViewX(); - this.id = new DevComponents.DotNetBar.Controls.DataGridViewLabelXColumn(); - this.rowno = new DevComponents.DotNetBar.Controls.DataGridViewLabelXColumn(); - this.code = new DevComponents.DotNetBar.Controls.DataGridViewLabelXColumn(); - this.btndel = new DevComponents.DotNetBar.Controls.DataGridViewButtonXColumn(); this.bar2 = new DevComponents.DotNetBar.Bar(); this.lab_page_msg = new DevComponents.DotNetBar.LabelItem(); this.btn_page_first = new DevComponents.DotNetBar.ButtonItem(); @@ -50,6 +46,11 @@ this.combo_page_num = new DevComponents.DotNetBar.ComboBoxItem(); this.btn_page_next = new DevComponents.DotNetBar.ButtonItem(); this.btn_page_last = new DevComponents.DotNetBar.ButtonItem(); + this.id = new DevComponents.DotNetBar.Controls.DataGridViewLabelXColumn(); + this.rowno = new DevComponents.DotNetBar.Controls.DataGridViewLabelXColumn(); + this.code = new DevComponents.DotNetBar.Controls.DataGridViewLabelXColumn(); + this.role = new DevComponents.DotNetBar.Controls.DataGridViewLabelXColumn(); + this.btndel = new DevComponents.DotNetBar.Controls.DataGridViewButtonXColumn(); ((System.ComponentModel.ISupportInitialize)(this.bar1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bar2)).BeginInit(); @@ -66,7 +67,7 @@ this.btn_add}); this.bar1.Location = new System.Drawing.Point(0, 0); this.bar1.Name = "bar1"; - this.bar1.Size = new System.Drawing.Size(562, 27); + this.bar1.Size = new System.Drawing.Size(562, 26); this.bar1.Stretch = true; this.bar1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.bar1.TabIndex = 1; @@ -82,7 +83,6 @@ // this.txt_user_code.Name = "txt_user_code"; this.txt_user_code.TextBoxWidth = 100; - this.txt_user_code.WatermarkColor = System.Drawing.SystemColors.GrayText; // // btn_query // @@ -106,6 +106,7 @@ this.id, this.rowno, this.code, + this.role, this.btndel}); dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Window; @@ -124,42 +125,6 @@ this.dataGridViewX1.TabIndex = 2; this.dataGridViewX1.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridViewX1_CellContentClick); // - // id - // - this.id.DataPropertyName = "id"; - this.id.HeaderText = "Column1"; - this.id.Name = "id"; - this.id.ReadOnly = true; - this.id.Visible = false; - // - // rowno - // - this.rowno.DataPropertyName = "rowno"; - this.rowno.HeaderText = "rowno"; - this.rowno.Name = "rowno"; - this.rowno.ReadOnly = true; - this.rowno.Visible = false; - // - // code - // - this.code.DataPropertyName = "username"; - this.code.HeaderText = "账号"; - this.code.Name = "code"; - this.code.ReadOnly = true; - this.code.TextAlignment = System.Drawing.StringAlignment.Center; - // - // btndel - // - this.btndel.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCells; - this.btndel.DataPropertyName = "btndel"; - this.btndel.HeaderText = "删除"; - this.btndel.Name = "btndel"; - this.btndel.ReadOnly = true; - this.btndel.Resizable = System.Windows.Forms.DataGridViewTriState.True; - this.btndel.Text = "删除"; - this.btndel.UseColumnTextForButtonValue = true; - this.btndel.Width = 35; - // // bar2 // this.bar2.AntiAlias = true; @@ -217,6 +182,50 @@ this.btn_page_last.Text = "尾页>|"; this.btn_page_last.Click += new System.EventHandler(this.btn_page_last_Click); // + // id + // + this.id.DataPropertyName = "id"; + this.id.HeaderText = "Column1"; + this.id.Name = "id"; + this.id.ReadOnly = true; + this.id.Visible = false; + // + // rowno + // + this.rowno.DataPropertyName = "rowno"; + this.rowno.HeaderText = "rowno"; + this.rowno.Name = "rowno"; + this.rowno.ReadOnly = true; + this.rowno.Visible = false; + // + // code + // + this.code.DataPropertyName = "username"; + this.code.HeaderText = "账号"; + this.code.Name = "code"; + this.code.ReadOnly = true; + this.code.TextAlignment = System.Drawing.StringAlignment.Center; + // + // role + // + this.role.DataPropertyName = "rolename"; + this.role.HeaderText = "角色"; + this.role.Name = "role"; + this.role.ReadOnly = true; + this.role.TextAlignment = System.Drawing.StringAlignment.Center; + // + // btndel + // + this.btndel.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCells; + this.btndel.DataPropertyName = "btndel"; + this.btndel.HeaderText = "删除"; + this.btndel.Name = "btndel"; + this.btndel.ReadOnly = true; + this.btndel.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.btndel.Text = "删除"; + this.btndel.UseColumnTextForButtonValue = true; + this.btndel.Width = 35; + // // FrmSysUserInfoManger // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); @@ -259,7 +268,7 @@ private DataGridViewLabelXColumn id; private DataGridViewLabelXColumn rowno; private DataGridViewLabelXColumn code; + private DataGridViewLabelXColumn role; private DataGridViewButtonXColumn btndel; - } } \ No newline at end of file diff --git a/FrmFlagManagers.cs b/FrmFlagManagers.cs index 5e11dbb..09993fa 100644 --- a/FrmFlagManagers.cs +++ b/FrmFlagManagers.cs @@ -233,7 +233,8 @@ string sqlData = "select 编号,标识器ID号,标识器型号,round(地面高程,2) as 地面高程,round(标识器埋深,2) as 标识器埋深,所属道路,LSSYS_ID as " + LSSYS_ID_VALUE + ",X坐标,Y坐标,使用状态,权属单位,备注 " + - "from (select t.*,rownum row_num from 标识器 t where 使用状态 = '使用中' order by 编号)b " + " where 1=1"; + "from (select t.编号, t.标识器ID号, t.标识器型号, t.地面高程, t.标识器埋深, " + + "t.所属道路, t.X坐标, t.Y坐标, t.使用状态, t.权属单位, t.备注, t.LSSYS_ID, rownum row_num from 标识器 t where 使用状态 = '使用中' order by 编号)b " + " where 1=1"; if (!String.IsNullOrEmpty(txt_no.Text.Trim())) { @@ -259,7 +260,8 @@ string sqlData = "select 编号,标识器ID号,标识器型号,round(地面高程,2) as 地面高程,round(标识器埋深,2) as 标识器埋深,所属道路,LSSYS_ID as " + LSSYS_ID_VALUE + ",X坐标,Y坐标,使用状态,权属单位,备注 " + - "from (select t.*,rownum row_num from 标识器 t where 使用状态 = '使用中'"; + "from (select t.编号, t.标识器ID号, t.标识器型号, t.地面高程, t.标识器埋深, " + + "t.所属道路, t.X坐标, t.Y坐标, t.使用状态, t.权属单位, t.备注, t.LSSYS_ID, rownum row_num from 标识器 t where 使用状态 = '使用中'"; if (!String.IsNullOrEmpty(txt_no.Text.Trim())) { diff --git a/FrmFlyToPosition.cs b/FrmFlyToPosition.cs index e1240f5..d0b6b39 100644 --- a/FrmFlyToPosition.cs +++ b/FrmFlyToPosition.cs @@ -17,6 +17,8 @@ globeControl2 = _globeControl2; foreach (Location l in Utility.locationList) comboBox1.Items.Add(l.NAME); + + comboBox1.SelectedIndex = 0; } public FrmFlyToPosition(GSOGlobeControl _globeControl1) @@ -26,6 +28,8 @@ foreach (Location l in Utility.locationList) comboBox1.Items.Add(l.NAME); + + comboBox1.SelectedIndex = 0; } private void buttonX1_Click(object sender, EventArgs e) diff --git a/FrmSysUserInfoManger.Designer.cs b/FrmSysUserInfoManger.Designer.cs index a297414..bf1d8ad 100644 --- a/FrmSysUserInfoManger.Designer.cs +++ b/FrmSysUserInfoManger.Designer.cs @@ -39,10 +39,6 @@ this.btn_query = new DevComponents.DotNetBar.ButtonItem(); this.btn_add = new DevComponents.DotNetBar.ButtonItem(); this.dataGridViewX1 = new DevComponents.DotNetBar.Controls.DataGridViewX(); - this.id = new DevComponents.DotNetBar.Controls.DataGridViewLabelXColumn(); - this.rowno = new DevComponents.DotNetBar.Controls.DataGridViewLabelXColumn(); - this.code = new DevComponents.DotNetBar.Controls.DataGridViewLabelXColumn(); - this.btndel = new DevComponents.DotNetBar.Controls.DataGridViewButtonXColumn(); this.bar2 = new DevComponents.DotNetBar.Bar(); this.lab_page_msg = new DevComponents.DotNetBar.LabelItem(); this.btn_page_first = new DevComponents.DotNetBar.ButtonItem(); @@ -50,6 +46,11 @@ this.combo_page_num = new DevComponents.DotNetBar.ComboBoxItem(); this.btn_page_next = new DevComponents.DotNetBar.ButtonItem(); this.btn_page_last = new DevComponents.DotNetBar.ButtonItem(); + this.id = new DevComponents.DotNetBar.Controls.DataGridViewLabelXColumn(); + this.rowno = new DevComponents.DotNetBar.Controls.DataGridViewLabelXColumn(); + this.code = new DevComponents.DotNetBar.Controls.DataGridViewLabelXColumn(); + this.role = new DevComponents.DotNetBar.Controls.DataGridViewLabelXColumn(); + this.btndel = new DevComponents.DotNetBar.Controls.DataGridViewButtonXColumn(); ((System.ComponentModel.ISupportInitialize)(this.bar1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bar2)).BeginInit(); @@ -66,7 +67,7 @@ this.btn_add}); this.bar1.Location = new System.Drawing.Point(0, 0); this.bar1.Name = "bar1"; - this.bar1.Size = new System.Drawing.Size(562, 27); + this.bar1.Size = new System.Drawing.Size(562, 26); this.bar1.Stretch = true; this.bar1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.bar1.TabIndex = 1; @@ -82,7 +83,6 @@ // this.txt_user_code.Name = "txt_user_code"; this.txt_user_code.TextBoxWidth = 100; - this.txt_user_code.WatermarkColor = System.Drawing.SystemColors.GrayText; // // btn_query // @@ -106,6 +106,7 @@ this.id, this.rowno, this.code, + this.role, this.btndel}); dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Window; @@ -124,42 +125,6 @@ this.dataGridViewX1.TabIndex = 2; this.dataGridViewX1.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridViewX1_CellContentClick); // - // id - // - this.id.DataPropertyName = "id"; - this.id.HeaderText = "Column1"; - this.id.Name = "id"; - this.id.ReadOnly = true; - this.id.Visible = false; - // - // rowno - // - this.rowno.DataPropertyName = "rowno"; - this.rowno.HeaderText = "rowno"; - this.rowno.Name = "rowno"; - this.rowno.ReadOnly = true; - this.rowno.Visible = false; - // - // code - // - this.code.DataPropertyName = "username"; - this.code.HeaderText = "账号"; - this.code.Name = "code"; - this.code.ReadOnly = true; - this.code.TextAlignment = System.Drawing.StringAlignment.Center; - // - // btndel - // - this.btndel.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCells; - this.btndel.DataPropertyName = "btndel"; - this.btndel.HeaderText = "删除"; - this.btndel.Name = "btndel"; - this.btndel.ReadOnly = true; - this.btndel.Resizable = System.Windows.Forms.DataGridViewTriState.True; - this.btndel.Text = "删除"; - this.btndel.UseColumnTextForButtonValue = true; - this.btndel.Width = 35; - // // bar2 // this.bar2.AntiAlias = true; @@ -217,6 +182,50 @@ this.btn_page_last.Text = "尾页>|"; this.btn_page_last.Click += new System.EventHandler(this.btn_page_last_Click); // + // id + // + this.id.DataPropertyName = "id"; + this.id.HeaderText = "Column1"; + this.id.Name = "id"; + this.id.ReadOnly = true; + this.id.Visible = false; + // + // rowno + // + this.rowno.DataPropertyName = "rowno"; + this.rowno.HeaderText = "rowno"; + this.rowno.Name = "rowno"; + this.rowno.ReadOnly = true; + this.rowno.Visible = false; + // + // code + // + this.code.DataPropertyName = "username"; + this.code.HeaderText = "账号"; + this.code.Name = "code"; + this.code.ReadOnly = true; + this.code.TextAlignment = System.Drawing.StringAlignment.Center; + // + // role + // + this.role.DataPropertyName = "rolename"; + this.role.HeaderText = "角色"; + this.role.Name = "role"; + this.role.ReadOnly = true; + this.role.TextAlignment = System.Drawing.StringAlignment.Center; + // + // btndel + // + this.btndel.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCells; + this.btndel.DataPropertyName = "btndel"; + this.btndel.HeaderText = "删除"; + this.btndel.Name = "btndel"; + this.btndel.ReadOnly = true; + this.btndel.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.btndel.Text = "删除"; + this.btndel.UseColumnTextForButtonValue = true; + this.btndel.Width = 35; + // // FrmSysUserInfoManger // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); @@ -259,7 +268,7 @@ private DataGridViewLabelXColumn id; private DataGridViewLabelXColumn rowno; private DataGridViewLabelXColumn code; + private DataGridViewLabelXColumn role; private DataGridViewButtonXColumn btndel; - } } \ No newline at end of file diff --git a/FrmSysUserInfoManger.cs b/FrmSysUserInfoManger.cs index 607d940..70cd139 100644 --- a/FrmSysUserInfoManger.cs +++ b/FrmSysUserInfoManger.cs @@ -107,7 +107,7 @@ btn_page_next.Enabled = true; } - String sqlrows = "select * from (select rownum as rowno,id,username,'删除' as btndel from casic_userinfotest where sysname='EMS' "; + String sqlrows = "select * from (select rownum as rowno,usr.id, usr.username, rol.nt as rolename, '删除' as btndel from casic_userinfotest usr left join casic_userroletest rol on rol.id = usr.rid where usr.sysname='EMS' "; if (!String.IsNullOrEmpty(txt_user_code.Text.Trim())) { sqlrows += " and username like '%" + txt_user_code.Text.Trim() + "%'"; diff --git a/FrmFlagManagers.cs b/FrmFlagManagers.cs index 5e11dbb..09993fa 100644 --- a/FrmFlagManagers.cs +++ b/FrmFlagManagers.cs @@ -233,7 +233,8 @@ string sqlData = "select 编号,标识器ID号,标识器型号,round(地面高程,2) as 地面高程,round(标识器埋深,2) as 标识器埋深,所属道路,LSSYS_ID as " + LSSYS_ID_VALUE + ",X坐标,Y坐标,使用状态,权属单位,备注 " + - "from (select t.*,rownum row_num from 标识器 t where 使用状态 = '使用中' order by 编号)b " + " where 1=1"; + "from (select t.编号, t.标识器ID号, t.标识器型号, t.地面高程, t.标识器埋深, " + + "t.所属道路, t.X坐标, t.Y坐标, t.使用状态, t.权属单位, t.备注, t.LSSYS_ID, rownum row_num from 标识器 t where 使用状态 = '使用中' order by 编号)b " + " where 1=1"; if (!String.IsNullOrEmpty(txt_no.Text.Trim())) { @@ -259,7 +260,8 @@ string sqlData = "select 编号,标识器ID号,标识器型号,round(地面高程,2) as 地面高程,round(标识器埋深,2) as 标识器埋深,所属道路,LSSYS_ID as " + LSSYS_ID_VALUE + ",X坐标,Y坐标,使用状态,权属单位,备注 " + - "from (select t.*,rownum row_num from 标识器 t where 使用状态 = '使用中'"; + "from (select t.编号, t.标识器ID号, t.标识器型号, t.地面高程, t.标识器埋深, " + + "t.所属道路, t.X坐标, t.Y坐标, t.使用状态, t.权属单位, t.备注, t.LSSYS_ID, rownum row_num from 标识器 t where 使用状态 = '使用中'"; if (!String.IsNullOrEmpty(txt_no.Text.Trim())) { diff --git a/FrmFlyToPosition.cs b/FrmFlyToPosition.cs index e1240f5..d0b6b39 100644 --- a/FrmFlyToPosition.cs +++ b/FrmFlyToPosition.cs @@ -17,6 +17,8 @@ globeControl2 = _globeControl2; foreach (Location l in Utility.locationList) comboBox1.Items.Add(l.NAME); + + comboBox1.SelectedIndex = 0; } public FrmFlyToPosition(GSOGlobeControl _globeControl1) @@ -26,6 +28,8 @@ foreach (Location l in Utility.locationList) comboBox1.Items.Add(l.NAME); + + comboBox1.SelectedIndex = 0; } private void buttonX1_Click(object sender, EventArgs e) diff --git a/FrmSysUserInfoManger.Designer.cs b/FrmSysUserInfoManger.Designer.cs index a297414..bf1d8ad 100644 --- a/FrmSysUserInfoManger.Designer.cs +++ b/FrmSysUserInfoManger.Designer.cs @@ -39,10 +39,6 @@ this.btn_query = new DevComponents.DotNetBar.ButtonItem(); this.btn_add = new DevComponents.DotNetBar.ButtonItem(); this.dataGridViewX1 = new DevComponents.DotNetBar.Controls.DataGridViewX(); - this.id = new DevComponents.DotNetBar.Controls.DataGridViewLabelXColumn(); - this.rowno = new DevComponents.DotNetBar.Controls.DataGridViewLabelXColumn(); - this.code = new DevComponents.DotNetBar.Controls.DataGridViewLabelXColumn(); - this.btndel = new DevComponents.DotNetBar.Controls.DataGridViewButtonXColumn(); this.bar2 = new DevComponents.DotNetBar.Bar(); this.lab_page_msg = new DevComponents.DotNetBar.LabelItem(); this.btn_page_first = new DevComponents.DotNetBar.ButtonItem(); @@ -50,6 +46,11 @@ this.combo_page_num = new DevComponents.DotNetBar.ComboBoxItem(); this.btn_page_next = new DevComponents.DotNetBar.ButtonItem(); this.btn_page_last = new DevComponents.DotNetBar.ButtonItem(); + this.id = new DevComponents.DotNetBar.Controls.DataGridViewLabelXColumn(); + this.rowno = new DevComponents.DotNetBar.Controls.DataGridViewLabelXColumn(); + this.code = new DevComponents.DotNetBar.Controls.DataGridViewLabelXColumn(); + this.role = new DevComponents.DotNetBar.Controls.DataGridViewLabelXColumn(); + this.btndel = new DevComponents.DotNetBar.Controls.DataGridViewButtonXColumn(); ((System.ComponentModel.ISupportInitialize)(this.bar1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bar2)).BeginInit(); @@ -66,7 +67,7 @@ this.btn_add}); this.bar1.Location = new System.Drawing.Point(0, 0); this.bar1.Name = "bar1"; - this.bar1.Size = new System.Drawing.Size(562, 27); + this.bar1.Size = new System.Drawing.Size(562, 26); this.bar1.Stretch = true; this.bar1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.bar1.TabIndex = 1; @@ -82,7 +83,6 @@ // this.txt_user_code.Name = "txt_user_code"; this.txt_user_code.TextBoxWidth = 100; - this.txt_user_code.WatermarkColor = System.Drawing.SystemColors.GrayText; // // btn_query // @@ -106,6 +106,7 @@ this.id, this.rowno, this.code, + this.role, this.btndel}); dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Window; @@ -124,42 +125,6 @@ this.dataGridViewX1.TabIndex = 2; this.dataGridViewX1.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridViewX1_CellContentClick); // - // id - // - this.id.DataPropertyName = "id"; - this.id.HeaderText = "Column1"; - this.id.Name = "id"; - this.id.ReadOnly = true; - this.id.Visible = false; - // - // rowno - // - this.rowno.DataPropertyName = "rowno"; - this.rowno.HeaderText = "rowno"; - this.rowno.Name = "rowno"; - this.rowno.ReadOnly = true; - this.rowno.Visible = false; - // - // code - // - this.code.DataPropertyName = "username"; - this.code.HeaderText = "账号"; - this.code.Name = "code"; - this.code.ReadOnly = true; - this.code.TextAlignment = System.Drawing.StringAlignment.Center; - // - // btndel - // - this.btndel.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCells; - this.btndel.DataPropertyName = "btndel"; - this.btndel.HeaderText = "删除"; - this.btndel.Name = "btndel"; - this.btndel.ReadOnly = true; - this.btndel.Resizable = System.Windows.Forms.DataGridViewTriState.True; - this.btndel.Text = "删除"; - this.btndel.UseColumnTextForButtonValue = true; - this.btndel.Width = 35; - // // bar2 // this.bar2.AntiAlias = true; @@ -217,6 +182,50 @@ this.btn_page_last.Text = "尾页>|"; this.btn_page_last.Click += new System.EventHandler(this.btn_page_last_Click); // + // id + // + this.id.DataPropertyName = "id"; + this.id.HeaderText = "Column1"; + this.id.Name = "id"; + this.id.ReadOnly = true; + this.id.Visible = false; + // + // rowno + // + this.rowno.DataPropertyName = "rowno"; + this.rowno.HeaderText = "rowno"; + this.rowno.Name = "rowno"; + this.rowno.ReadOnly = true; + this.rowno.Visible = false; + // + // code + // + this.code.DataPropertyName = "username"; + this.code.HeaderText = "账号"; + this.code.Name = "code"; + this.code.ReadOnly = true; + this.code.TextAlignment = System.Drawing.StringAlignment.Center; + // + // role + // + this.role.DataPropertyName = "rolename"; + this.role.HeaderText = "角色"; + this.role.Name = "role"; + this.role.ReadOnly = true; + this.role.TextAlignment = System.Drawing.StringAlignment.Center; + // + // btndel + // + this.btndel.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCells; + this.btndel.DataPropertyName = "btndel"; + this.btndel.HeaderText = "删除"; + this.btndel.Name = "btndel"; + this.btndel.ReadOnly = true; + this.btndel.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.btndel.Text = "删除"; + this.btndel.UseColumnTextForButtonValue = true; + this.btndel.Width = 35; + // // FrmSysUserInfoManger // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); @@ -259,7 +268,7 @@ private DataGridViewLabelXColumn id; private DataGridViewLabelXColumn rowno; private DataGridViewLabelXColumn code; + private DataGridViewLabelXColumn role; private DataGridViewButtonXColumn btndel; - } } \ No newline at end of file diff --git a/FrmSysUserInfoManger.cs b/FrmSysUserInfoManger.cs index 607d940..70cd139 100644 --- a/FrmSysUserInfoManger.cs +++ b/FrmSysUserInfoManger.cs @@ -107,7 +107,7 @@ btn_page_next.Enabled = true; } - String sqlrows = "select * from (select rownum as rowno,id,username,'删除' as btndel from casic_userinfotest where sysname='EMS' "; + String sqlrows = "select * from (select rownum as rowno,usr.id, usr.username, rol.nt as rolename, '删除' as btndel from casic_userinfotest usr left join casic_userroletest rol on rol.id = usr.rid where usr.sysname='EMS' "; if (!String.IsNullOrEmpty(txt_user_code.Text.Trim())) { sqlrows += " and username like '%" + txt_user_code.Text.Trim() + "%'"; diff --git a/FrmSysUserInfoManger.resx b/FrmSysUserInfoManger.resx index 095640a..8056566 100644 --- a/FrmSysUserInfoManger.resx +++ b/FrmSysUserInfoManger.resx @@ -117,6 +117,9 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 17, 17 + True @@ -126,7 +129,13 @@ True + + True + True + + 95, 17 + \ No newline at end of file