diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 6abc092..7ade871 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 6abc092..7ade871 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FrmPatrolerManager.cs b/FrmPatrolerManager.cs index 47779c2..6858714 100644 --- a/FrmPatrolerManager.cs +++ b/FrmPatrolerManager.cs @@ -183,7 +183,7 @@ { 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++) @@ -213,7 +213,7 @@ 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++) @@ -242,7 +242,8 @@ private string GetSql() { - string sqlCount = "select count(*) from equipment where status = 'USING'"; + // string sqlCount = "select count(*) from equipment where status = 'USING'"; + string sqlCount = "select count(1) from patroler"; 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 状态 " + @@ -258,7 +259,7 @@ { int minPage = (pageIndex - 1) * maxPageIndex + 1; int maxPage = pageIndex * maxPageIndex; - string sqlCount = "select count(*) from patroler where 1=1"; + string sqlCount = "select count(1) from patroler where 1=1"; 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"; @@ -296,9 +297,10 @@ { try { - initlizeDatagrid(); + // initlizeDatagrid(); LoadData(); initForm(); + // initlizeDatagrid(); IS_OPEN = true; } catch (Exception ex) diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 6abc092..7ade871 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FrmPatrolerManager.cs b/FrmPatrolerManager.cs index 47779c2..6858714 100644 --- a/FrmPatrolerManager.cs +++ b/FrmPatrolerManager.cs @@ -183,7 +183,7 @@ { 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++) @@ -213,7 +213,7 @@ 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++) @@ -242,7 +242,8 @@ private string GetSql() { - string sqlCount = "select count(*) from equipment where status = 'USING'"; + // string sqlCount = "select count(*) from equipment where status = 'USING'"; + string sqlCount = "select count(1) from patroler"; 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 状态 " + @@ -258,7 +259,7 @@ { int minPage = (pageIndex - 1) * maxPageIndex + 1; int maxPage = pageIndex * maxPageIndex; - string sqlCount = "select count(*) from patroler where 1=1"; + string sqlCount = "select count(1) from patroler where 1=1"; 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"; @@ -296,9 +297,10 @@ { try { - initlizeDatagrid(); + // initlizeDatagrid(); LoadData(); initForm(); + // initlizeDatagrid(); IS_OPEN = true; } catch (Exception ex) diff --git a/FrmRoleInfoManager.cs b/FrmRoleInfoManager.cs index 576fb87..c5f13d9 100644 --- a/FrmRoleInfoManager.cs +++ b/FrmRoleInfoManager.cs @@ -184,7 +184,7 @@ private string GetSql() { - string sqlCount = "select id,nt from casic_userroletest where sysname='EMS'"; + string sqlCount = "select count(1) from casic_userroletest where sysname='EMS'"; string sqlData = "select nt as 角色名称,id as 编号 " + "from (select t.*,rownum row_num from casic_userroletest t order by id desc)b " + @@ -198,7 +198,7 @@ { int minPage = (pageIndex - 1) * maxPageIndex + 1; int maxPage = pageIndex * maxPageIndex; - string sqlCount = "select id,nt from casic_userroletest where sysname='EMS'"; + string sqlCount = "select count(1) from casic_userroletest where sysname='EMS'"; 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.suo b/Cyberpipe.suo index 6abc092..7ade871 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FrmPatrolerManager.cs b/FrmPatrolerManager.cs index 47779c2..6858714 100644 --- a/FrmPatrolerManager.cs +++ b/FrmPatrolerManager.cs @@ -183,7 +183,7 @@ { 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++) @@ -213,7 +213,7 @@ 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++) @@ -242,7 +242,8 @@ private string GetSql() { - string sqlCount = "select count(*) from equipment where status = 'USING'"; + // string sqlCount = "select count(*) from equipment where status = 'USING'"; + string sqlCount = "select count(1) from patroler"; 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 状态 " + @@ -258,7 +259,7 @@ { int minPage = (pageIndex - 1) * maxPageIndex + 1; int maxPage = pageIndex * maxPageIndex; - string sqlCount = "select count(*) from patroler where 1=1"; + string sqlCount = "select count(1) from patroler where 1=1"; 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"; @@ -296,9 +297,10 @@ { try { - initlizeDatagrid(); + // initlizeDatagrid(); LoadData(); initForm(); + // initlizeDatagrid(); IS_OPEN = true; } catch (Exception ex) diff --git a/FrmRoleInfoManager.cs b/FrmRoleInfoManager.cs index 576fb87..c5f13d9 100644 --- a/FrmRoleInfoManager.cs +++ b/FrmRoleInfoManager.cs @@ -184,7 +184,7 @@ private string GetSql() { - string sqlCount = "select id,nt from casic_userroletest where sysname='EMS'"; + string sqlCount = "select count(1) from casic_userroletest where sysname='EMS'"; string sqlData = "select nt as 角色名称,id as 编号 " + "from (select t.*,rownum row_num from casic_userroletest t order by id desc)b " + @@ -198,7 +198,7 @@ { int minPage = (pageIndex - 1) * maxPageIndex + 1; int maxPage = pageIndex * maxPageIndex; - string sqlCount = "select id,nt from casic_userroletest where sysname='EMS'"; + string sqlCount = "select count(1) from casic_userroletest where sysname='EMS'"; 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/MainFrm.designer.cs b/MainFrm.designer.cs index e9b8b02..86c5474 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -82,6 +82,7 @@ this.sideBar1 = new DevComponents.DotNetBar.SideBar(); this.panelEx3 = new DevComponents.DotNetBar.PanelEx(); this.layerSensorTree = new System.Windows.Forms.TreeView(); + this.layerTree = new Cyberpipe.MyTreeView(); this.sideBarPanelItem3 = new DevComponents.DotNetBar.SideBarPanelItem(); this.controlContainerItem3 = new DevComponents.DotNetBar.ControlContainerItem(); this.sideBarPanelItem4 = new DevComponents.DotNetBar.SideBarPanelItem(); @@ -380,6 +381,10 @@ 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.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.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); @@ -560,10 +565,6 @@ this.buttonItem1 = new DevComponents.DotNetBar.ButtonItem(); this.btnlegendSet = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem89 = 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.ribbonTabItem1 = new DevComponents.DotNetBar.RibbonTabItem(); this.ribbonTabItem14 = new DevComponents.DotNetBar.RibbonTabItem(); this.ribbonTabItem2 = new DevComponents.DotNetBar.RibbonTabItem(); @@ -611,7 +612,6 @@ this.buttonItem75 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem76 = new DevComponents.DotNetBar.ButtonItem(); this.label1 = new System.Windows.Forms.Label(); - this.layerTree = new Cyberpipe.MyTreeView(); this.statusStrip1.SuspendLayout(); this.sideBar1.SuspendLayout(); this.panelEx3.SuspendLayout(); @@ -650,10 +650,10 @@ this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); + this.ribbonPanel7.SuspendLayout(); this.ribbonPanel2.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel1.SuspendLayout(); - this.ribbonPanel7.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); this.SuspendLayout(); // @@ -1048,6 +1048,16 @@ this.layerSensorTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerMarkerTree_AfterCheck); this.layerSensorTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerMarkerTree_NodeMouseClick); // + // layerTree + // + this.layerTree.CheckBoxes = true; + this.layerTree.ItemHeight = 18; + this.layerTree.Location = new System.Drawing.Point(30, 78); + this.layerTree.Name = "layerTree"; + this.layerTree.Size = new System.Drawing.Size(121, 97); + this.layerTree.TabIndex = 1; + this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); + // // sideBarPanelItem3 // this.sideBarPanelItem3.FontBold = true; @@ -4117,10 +4127,10 @@ 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.ribbonPanel7); this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel1); - this.ribbonControl1.Controls.Add(this.ribbonPanel7); this.ribbonControl1.Dock = System.Windows.Forms.DockStyle.Top; this.ribbonControl1.ImeMode = System.Windows.Forms.ImeMode.NoControl; this.ribbonControl1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { @@ -4267,10 +4277,10 @@ 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.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, 95); + this.ribbonPanel8.Size = new System.Drawing.Size(1328, 62); // // // @@ -4314,7 +4324,7 @@ 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.Size = new System.Drawing.Size(427, 59); this.ribbonBar_UserInfo.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonBar_UserInfo.TabIndex = 0; // @@ -4391,6 +4401,85 @@ this.btn_reset_password.Text = "重置密码"; this.btn_reset_password.Click += new System.EventHandler(this.btn_reset_password_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); + // // ribbonPanel2 // this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -5971,85 +6060,6 @@ this.buttonItem89.Visible = false; this.buttonItem89.Click += new System.EventHandler(this.buttonItem89_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); - // // ribbonTabItem1 // this.ribbonTabItem1.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; @@ -6429,16 +6439,6 @@ this.label1.Text = "label1"; this.label1.TextAlign = System.Drawing.ContentAlignment.TopRight; // - // layerTree - // - this.layerTree.CheckBoxes = true; - this.layerTree.ItemHeight = 18; - this.layerTree.Location = new System.Drawing.Point(30, 78); - this.layerTree.Name = "layerTree"; - this.layerTree.Size = new System.Drawing.Size(121, 97); - this.layerTree.TabIndex = 1; - this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); - // // MainFrm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; @@ -6515,10 +6515,10 @@ this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); + this.ribbonPanel7.ResumeLayout(false); this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel1.ResumeLayout(false); - this.ribbonPanel7.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 6abc092..7ade871 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FrmPatrolerManager.cs b/FrmPatrolerManager.cs index 47779c2..6858714 100644 --- a/FrmPatrolerManager.cs +++ b/FrmPatrolerManager.cs @@ -183,7 +183,7 @@ { 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++) @@ -213,7 +213,7 @@ 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++) @@ -242,7 +242,8 @@ private string GetSql() { - string sqlCount = "select count(*) from equipment where status = 'USING'"; + // string sqlCount = "select count(*) from equipment where status = 'USING'"; + string sqlCount = "select count(1) from patroler"; 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 状态 " + @@ -258,7 +259,7 @@ { int minPage = (pageIndex - 1) * maxPageIndex + 1; int maxPage = pageIndex * maxPageIndex; - string sqlCount = "select count(*) from patroler where 1=1"; + string sqlCount = "select count(1) from patroler where 1=1"; 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"; @@ -296,9 +297,10 @@ { try { - initlizeDatagrid(); + // initlizeDatagrid(); LoadData(); initForm(); + // initlizeDatagrid(); IS_OPEN = true; } catch (Exception ex) diff --git a/FrmRoleInfoManager.cs b/FrmRoleInfoManager.cs index 576fb87..c5f13d9 100644 --- a/FrmRoleInfoManager.cs +++ b/FrmRoleInfoManager.cs @@ -184,7 +184,7 @@ private string GetSql() { - string sqlCount = "select id,nt from casic_userroletest where sysname='EMS'"; + string sqlCount = "select count(1) from casic_userroletest where sysname='EMS'"; string sqlData = "select nt as 角色名称,id as 编号 " + "from (select t.*,rownum row_num from casic_userroletest t order by id desc)b " + @@ -198,7 +198,7 @@ { int minPage = (pageIndex - 1) * maxPageIndex + 1; int maxPage = pageIndex * maxPageIndex; - string sqlCount = "select id,nt from casic_userroletest where sysname='EMS'"; + string sqlCount = "select count(1) from casic_userroletest where sysname='EMS'"; 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/MainFrm.designer.cs b/MainFrm.designer.cs index e9b8b02..86c5474 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -82,6 +82,7 @@ this.sideBar1 = new DevComponents.DotNetBar.SideBar(); this.panelEx3 = new DevComponents.DotNetBar.PanelEx(); this.layerSensorTree = new System.Windows.Forms.TreeView(); + this.layerTree = new Cyberpipe.MyTreeView(); this.sideBarPanelItem3 = new DevComponents.DotNetBar.SideBarPanelItem(); this.controlContainerItem3 = new DevComponents.DotNetBar.ControlContainerItem(); this.sideBarPanelItem4 = new DevComponents.DotNetBar.SideBarPanelItem(); @@ -380,6 +381,10 @@ 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.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.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); @@ -560,10 +565,6 @@ this.buttonItem1 = new DevComponents.DotNetBar.ButtonItem(); this.btnlegendSet = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem89 = 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.ribbonTabItem1 = new DevComponents.DotNetBar.RibbonTabItem(); this.ribbonTabItem14 = new DevComponents.DotNetBar.RibbonTabItem(); this.ribbonTabItem2 = new DevComponents.DotNetBar.RibbonTabItem(); @@ -611,7 +612,6 @@ this.buttonItem75 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem76 = new DevComponents.DotNetBar.ButtonItem(); this.label1 = new System.Windows.Forms.Label(); - this.layerTree = new Cyberpipe.MyTreeView(); this.statusStrip1.SuspendLayout(); this.sideBar1.SuspendLayout(); this.panelEx3.SuspendLayout(); @@ -650,10 +650,10 @@ this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); + this.ribbonPanel7.SuspendLayout(); this.ribbonPanel2.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel1.SuspendLayout(); - this.ribbonPanel7.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); this.SuspendLayout(); // @@ -1048,6 +1048,16 @@ this.layerSensorTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerMarkerTree_AfterCheck); this.layerSensorTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerMarkerTree_NodeMouseClick); // + // layerTree + // + this.layerTree.CheckBoxes = true; + this.layerTree.ItemHeight = 18; + this.layerTree.Location = new System.Drawing.Point(30, 78); + this.layerTree.Name = "layerTree"; + this.layerTree.Size = new System.Drawing.Size(121, 97); + this.layerTree.TabIndex = 1; + this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); + // // sideBarPanelItem3 // this.sideBarPanelItem3.FontBold = true; @@ -4117,10 +4127,10 @@ 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.ribbonPanel7); this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel1); - this.ribbonControl1.Controls.Add(this.ribbonPanel7); this.ribbonControl1.Dock = System.Windows.Forms.DockStyle.Top; this.ribbonControl1.ImeMode = System.Windows.Forms.ImeMode.NoControl; this.ribbonControl1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { @@ -4267,10 +4277,10 @@ 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.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, 95); + this.ribbonPanel8.Size = new System.Drawing.Size(1328, 62); // // // @@ -4314,7 +4324,7 @@ 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.Size = new System.Drawing.Size(427, 59); this.ribbonBar_UserInfo.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonBar_UserInfo.TabIndex = 0; // @@ -4391,6 +4401,85 @@ this.btn_reset_password.Text = "重置密码"; this.btn_reset_password.Click += new System.EventHandler(this.btn_reset_password_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); + // // ribbonPanel2 // this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -5971,85 +6060,6 @@ this.buttonItem89.Visible = false; this.buttonItem89.Click += new System.EventHandler(this.buttonItem89_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); - // // ribbonTabItem1 // this.ribbonTabItem1.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; @@ -6429,16 +6439,6 @@ this.label1.Text = "label1"; this.label1.TextAlign = System.Drawing.ContentAlignment.TopRight; // - // layerTree - // - this.layerTree.CheckBoxes = true; - this.layerTree.ItemHeight = 18; - this.layerTree.Location = new System.Drawing.Point(30, 78); - this.layerTree.Name = "layerTree"; - this.layerTree.Size = new System.Drawing.Size(121, 97); - this.layerTree.TabIndex = 1; - this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); - // // MainFrm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; @@ -6515,10 +6515,10 @@ this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); + this.ribbonPanel7.ResumeLayout(false); this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel1.ResumeLayout(false); - this.ribbonPanel7.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 8924ace..5cadadd 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 6abc092..7ade871 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FrmPatrolerManager.cs b/FrmPatrolerManager.cs index 47779c2..6858714 100644 --- a/FrmPatrolerManager.cs +++ b/FrmPatrolerManager.cs @@ -183,7 +183,7 @@ { 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++) @@ -213,7 +213,7 @@ 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++) @@ -242,7 +242,8 @@ private string GetSql() { - string sqlCount = "select count(*) from equipment where status = 'USING'"; + // string sqlCount = "select count(*) from equipment where status = 'USING'"; + string sqlCount = "select count(1) from patroler"; 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 状态 " + @@ -258,7 +259,7 @@ { int minPage = (pageIndex - 1) * maxPageIndex + 1; int maxPage = pageIndex * maxPageIndex; - string sqlCount = "select count(*) from patroler where 1=1"; + string sqlCount = "select count(1) from patroler where 1=1"; 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"; @@ -296,9 +297,10 @@ { try { - initlizeDatagrid(); + // initlizeDatagrid(); LoadData(); initForm(); + // initlizeDatagrid(); IS_OPEN = true; } catch (Exception ex) diff --git a/FrmRoleInfoManager.cs b/FrmRoleInfoManager.cs index 576fb87..c5f13d9 100644 --- a/FrmRoleInfoManager.cs +++ b/FrmRoleInfoManager.cs @@ -184,7 +184,7 @@ private string GetSql() { - string sqlCount = "select id,nt from casic_userroletest where sysname='EMS'"; + string sqlCount = "select count(1) from casic_userroletest where sysname='EMS'"; string sqlData = "select nt as 角色名称,id as 编号 " + "from (select t.*,rownum row_num from casic_userroletest t order by id desc)b " + @@ -198,7 +198,7 @@ { int minPage = (pageIndex - 1) * maxPageIndex + 1; int maxPage = pageIndex * maxPageIndex; - string sqlCount = "select id,nt from casic_userroletest where sysname='EMS'"; + string sqlCount = "select count(1) from casic_userroletest where sysname='EMS'"; 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/MainFrm.designer.cs b/MainFrm.designer.cs index e9b8b02..86c5474 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -82,6 +82,7 @@ this.sideBar1 = new DevComponents.DotNetBar.SideBar(); this.panelEx3 = new DevComponents.DotNetBar.PanelEx(); this.layerSensorTree = new System.Windows.Forms.TreeView(); + this.layerTree = new Cyberpipe.MyTreeView(); this.sideBarPanelItem3 = new DevComponents.DotNetBar.SideBarPanelItem(); this.controlContainerItem3 = new DevComponents.DotNetBar.ControlContainerItem(); this.sideBarPanelItem4 = new DevComponents.DotNetBar.SideBarPanelItem(); @@ -380,6 +381,10 @@ 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.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.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); @@ -560,10 +565,6 @@ this.buttonItem1 = new DevComponents.DotNetBar.ButtonItem(); this.btnlegendSet = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem89 = 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.ribbonTabItem1 = new DevComponents.DotNetBar.RibbonTabItem(); this.ribbonTabItem14 = new DevComponents.DotNetBar.RibbonTabItem(); this.ribbonTabItem2 = new DevComponents.DotNetBar.RibbonTabItem(); @@ -611,7 +612,6 @@ this.buttonItem75 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem76 = new DevComponents.DotNetBar.ButtonItem(); this.label1 = new System.Windows.Forms.Label(); - this.layerTree = new Cyberpipe.MyTreeView(); this.statusStrip1.SuspendLayout(); this.sideBar1.SuspendLayout(); this.panelEx3.SuspendLayout(); @@ -650,10 +650,10 @@ this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); + this.ribbonPanel7.SuspendLayout(); this.ribbonPanel2.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel1.SuspendLayout(); - this.ribbonPanel7.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); this.SuspendLayout(); // @@ -1048,6 +1048,16 @@ this.layerSensorTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerMarkerTree_AfterCheck); this.layerSensorTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerMarkerTree_NodeMouseClick); // + // layerTree + // + this.layerTree.CheckBoxes = true; + this.layerTree.ItemHeight = 18; + this.layerTree.Location = new System.Drawing.Point(30, 78); + this.layerTree.Name = "layerTree"; + this.layerTree.Size = new System.Drawing.Size(121, 97); + this.layerTree.TabIndex = 1; + this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); + // // sideBarPanelItem3 // this.sideBarPanelItem3.FontBold = true; @@ -4117,10 +4127,10 @@ 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.ribbonPanel7); this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel1); - this.ribbonControl1.Controls.Add(this.ribbonPanel7); this.ribbonControl1.Dock = System.Windows.Forms.DockStyle.Top; this.ribbonControl1.ImeMode = System.Windows.Forms.ImeMode.NoControl; this.ribbonControl1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { @@ -4267,10 +4277,10 @@ 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.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, 95); + this.ribbonPanel8.Size = new System.Drawing.Size(1328, 62); // // // @@ -4314,7 +4324,7 @@ 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.Size = new System.Drawing.Size(427, 59); this.ribbonBar_UserInfo.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonBar_UserInfo.TabIndex = 0; // @@ -4391,6 +4401,85 @@ this.btn_reset_password.Text = "重置密码"; this.btn_reset_password.Click += new System.EventHandler(this.btn_reset_password_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); + // // ribbonPanel2 // this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -5971,85 +6060,6 @@ this.buttonItem89.Visible = false; this.buttonItem89.Click += new System.EventHandler(this.buttonItem89_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); - // // ribbonTabItem1 // this.ribbonTabItem1.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; @@ -6429,16 +6439,6 @@ this.label1.Text = "label1"; this.label1.TextAlign = System.Drawing.ContentAlignment.TopRight; // - // layerTree - // - this.layerTree.CheckBoxes = true; - this.layerTree.ItemHeight = 18; - this.layerTree.Location = new System.Drawing.Point(30, 78); - this.layerTree.Name = "layerTree"; - this.layerTree.Size = new System.Drawing.Size(121, 97); - this.layerTree.TabIndex = 1; - this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); - // // MainFrm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; @@ -6515,10 +6515,10 @@ this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); + this.ribbonPanel7.ResumeLayout(false); this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel1.ResumeLayout(false); - this.ribbonPanel7.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 8924ace..5cadadd 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 1f02683..5a1a279 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 6abc092..7ade871 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FrmPatrolerManager.cs b/FrmPatrolerManager.cs index 47779c2..6858714 100644 --- a/FrmPatrolerManager.cs +++ b/FrmPatrolerManager.cs @@ -183,7 +183,7 @@ { 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++) @@ -213,7 +213,7 @@ 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++) @@ -242,7 +242,8 @@ private string GetSql() { - string sqlCount = "select count(*) from equipment where status = 'USING'"; + // string sqlCount = "select count(*) from equipment where status = 'USING'"; + string sqlCount = "select count(1) from patroler"; 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 状态 " + @@ -258,7 +259,7 @@ { int minPage = (pageIndex - 1) * maxPageIndex + 1; int maxPage = pageIndex * maxPageIndex; - string sqlCount = "select count(*) from patroler where 1=1"; + string sqlCount = "select count(1) from patroler where 1=1"; 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"; @@ -296,9 +297,10 @@ { try { - initlizeDatagrid(); + // initlizeDatagrid(); LoadData(); initForm(); + // initlizeDatagrid(); IS_OPEN = true; } catch (Exception ex) diff --git a/FrmRoleInfoManager.cs b/FrmRoleInfoManager.cs index 576fb87..c5f13d9 100644 --- a/FrmRoleInfoManager.cs +++ b/FrmRoleInfoManager.cs @@ -184,7 +184,7 @@ private string GetSql() { - string sqlCount = "select id,nt from casic_userroletest where sysname='EMS'"; + string sqlCount = "select count(1) from casic_userroletest where sysname='EMS'"; string sqlData = "select nt as 角色名称,id as 编号 " + "from (select t.*,rownum row_num from casic_userroletest t order by id desc)b " + @@ -198,7 +198,7 @@ { int minPage = (pageIndex - 1) * maxPageIndex + 1; int maxPage = pageIndex * maxPageIndex; - string sqlCount = "select id,nt from casic_userroletest where sysname='EMS'"; + string sqlCount = "select count(1) from casic_userroletest where sysname='EMS'"; 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/MainFrm.designer.cs b/MainFrm.designer.cs index e9b8b02..86c5474 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -82,6 +82,7 @@ this.sideBar1 = new DevComponents.DotNetBar.SideBar(); this.panelEx3 = new DevComponents.DotNetBar.PanelEx(); this.layerSensorTree = new System.Windows.Forms.TreeView(); + this.layerTree = new Cyberpipe.MyTreeView(); this.sideBarPanelItem3 = new DevComponents.DotNetBar.SideBarPanelItem(); this.controlContainerItem3 = new DevComponents.DotNetBar.ControlContainerItem(); this.sideBarPanelItem4 = new DevComponents.DotNetBar.SideBarPanelItem(); @@ -380,6 +381,10 @@ 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.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.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); @@ -560,10 +565,6 @@ this.buttonItem1 = new DevComponents.DotNetBar.ButtonItem(); this.btnlegendSet = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem89 = 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.ribbonTabItem1 = new DevComponents.DotNetBar.RibbonTabItem(); this.ribbonTabItem14 = new DevComponents.DotNetBar.RibbonTabItem(); this.ribbonTabItem2 = new DevComponents.DotNetBar.RibbonTabItem(); @@ -611,7 +612,6 @@ this.buttonItem75 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem76 = new DevComponents.DotNetBar.ButtonItem(); this.label1 = new System.Windows.Forms.Label(); - this.layerTree = new Cyberpipe.MyTreeView(); this.statusStrip1.SuspendLayout(); this.sideBar1.SuspendLayout(); this.panelEx3.SuspendLayout(); @@ -650,10 +650,10 @@ this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); + this.ribbonPanel7.SuspendLayout(); this.ribbonPanel2.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel1.SuspendLayout(); - this.ribbonPanel7.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); this.SuspendLayout(); // @@ -1048,6 +1048,16 @@ this.layerSensorTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerMarkerTree_AfterCheck); this.layerSensorTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerMarkerTree_NodeMouseClick); // + // layerTree + // + this.layerTree.CheckBoxes = true; + this.layerTree.ItemHeight = 18; + this.layerTree.Location = new System.Drawing.Point(30, 78); + this.layerTree.Name = "layerTree"; + this.layerTree.Size = new System.Drawing.Size(121, 97); + this.layerTree.TabIndex = 1; + this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); + // // sideBarPanelItem3 // this.sideBarPanelItem3.FontBold = true; @@ -4117,10 +4127,10 @@ 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.ribbonPanel7); this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel1); - this.ribbonControl1.Controls.Add(this.ribbonPanel7); this.ribbonControl1.Dock = System.Windows.Forms.DockStyle.Top; this.ribbonControl1.ImeMode = System.Windows.Forms.ImeMode.NoControl; this.ribbonControl1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { @@ -4267,10 +4277,10 @@ 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.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, 95); + this.ribbonPanel8.Size = new System.Drawing.Size(1328, 62); // // // @@ -4314,7 +4324,7 @@ 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.Size = new System.Drawing.Size(427, 59); this.ribbonBar_UserInfo.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonBar_UserInfo.TabIndex = 0; // @@ -4391,6 +4401,85 @@ this.btn_reset_password.Text = "重置密码"; this.btn_reset_password.Click += new System.EventHandler(this.btn_reset_password_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); + // // ribbonPanel2 // this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -5971,85 +6060,6 @@ this.buttonItem89.Visible = false; this.buttonItem89.Click += new System.EventHandler(this.buttonItem89_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); - // // ribbonTabItem1 // this.ribbonTabItem1.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; @@ -6429,16 +6439,6 @@ this.label1.Text = "label1"; this.label1.TextAlign = System.Drawing.ContentAlignment.TopRight; // - // layerTree - // - this.layerTree.CheckBoxes = true; - this.layerTree.ItemHeight = 18; - this.layerTree.Location = new System.Drawing.Point(30, 78); - this.layerTree.Name = "layerTree"; - this.layerTree.Size = new System.Drawing.Size(121, 97); - this.layerTree.TabIndex = 1; - this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); - // // MainFrm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; @@ -6515,10 +6515,10 @@ this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); + this.ribbonPanel7.ResumeLayout(false); this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel1.ResumeLayout(false); - this.ribbonPanel7.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 8924ace..5cadadd 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 1f02683..5a1a279 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/download/activiti-userguide-5.15.pdf b/bin/x86/Debug/download/activiti-userguide-5.15.pdf new file mode 100644 index 0000000..72be2b2 --- /dev/null +++ b/bin/x86/Debug/download/activiti-userguide-5.15.pdf Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 6abc092..7ade871 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FrmPatrolerManager.cs b/FrmPatrolerManager.cs index 47779c2..6858714 100644 --- a/FrmPatrolerManager.cs +++ b/FrmPatrolerManager.cs @@ -183,7 +183,7 @@ { 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++) @@ -213,7 +213,7 @@ 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++) @@ -242,7 +242,8 @@ private string GetSql() { - string sqlCount = "select count(*) from equipment where status = 'USING'"; + // string sqlCount = "select count(*) from equipment where status = 'USING'"; + string sqlCount = "select count(1) from patroler"; 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 状态 " + @@ -258,7 +259,7 @@ { int minPage = (pageIndex - 1) * maxPageIndex + 1; int maxPage = pageIndex * maxPageIndex; - string sqlCount = "select count(*) from patroler where 1=1"; + string sqlCount = "select count(1) from patroler where 1=1"; 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"; @@ -296,9 +297,10 @@ { try { - initlizeDatagrid(); + // initlizeDatagrid(); LoadData(); initForm(); + // initlizeDatagrid(); IS_OPEN = true; } catch (Exception ex) diff --git a/FrmRoleInfoManager.cs b/FrmRoleInfoManager.cs index 576fb87..c5f13d9 100644 --- a/FrmRoleInfoManager.cs +++ b/FrmRoleInfoManager.cs @@ -184,7 +184,7 @@ private string GetSql() { - string sqlCount = "select id,nt from casic_userroletest where sysname='EMS'"; + string sqlCount = "select count(1) from casic_userroletest where sysname='EMS'"; string sqlData = "select nt as 角色名称,id as 编号 " + "from (select t.*,rownum row_num from casic_userroletest t order by id desc)b " + @@ -198,7 +198,7 @@ { int minPage = (pageIndex - 1) * maxPageIndex + 1; int maxPage = pageIndex * maxPageIndex; - string sqlCount = "select id,nt from casic_userroletest where sysname='EMS'"; + string sqlCount = "select count(1) from casic_userroletest where sysname='EMS'"; 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/MainFrm.designer.cs b/MainFrm.designer.cs index e9b8b02..86c5474 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -82,6 +82,7 @@ this.sideBar1 = new DevComponents.DotNetBar.SideBar(); this.panelEx3 = new DevComponents.DotNetBar.PanelEx(); this.layerSensorTree = new System.Windows.Forms.TreeView(); + this.layerTree = new Cyberpipe.MyTreeView(); this.sideBarPanelItem3 = new DevComponents.DotNetBar.SideBarPanelItem(); this.controlContainerItem3 = new DevComponents.DotNetBar.ControlContainerItem(); this.sideBarPanelItem4 = new DevComponents.DotNetBar.SideBarPanelItem(); @@ -380,6 +381,10 @@ 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.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.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); @@ -560,10 +565,6 @@ this.buttonItem1 = new DevComponents.DotNetBar.ButtonItem(); this.btnlegendSet = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem89 = 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.ribbonTabItem1 = new DevComponents.DotNetBar.RibbonTabItem(); this.ribbonTabItem14 = new DevComponents.DotNetBar.RibbonTabItem(); this.ribbonTabItem2 = new DevComponents.DotNetBar.RibbonTabItem(); @@ -611,7 +612,6 @@ this.buttonItem75 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem76 = new DevComponents.DotNetBar.ButtonItem(); this.label1 = new System.Windows.Forms.Label(); - this.layerTree = new Cyberpipe.MyTreeView(); this.statusStrip1.SuspendLayout(); this.sideBar1.SuspendLayout(); this.panelEx3.SuspendLayout(); @@ -650,10 +650,10 @@ this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); + this.ribbonPanel7.SuspendLayout(); this.ribbonPanel2.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel1.SuspendLayout(); - this.ribbonPanel7.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); this.SuspendLayout(); // @@ -1048,6 +1048,16 @@ this.layerSensorTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerMarkerTree_AfterCheck); this.layerSensorTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerMarkerTree_NodeMouseClick); // + // layerTree + // + this.layerTree.CheckBoxes = true; + this.layerTree.ItemHeight = 18; + this.layerTree.Location = new System.Drawing.Point(30, 78); + this.layerTree.Name = "layerTree"; + this.layerTree.Size = new System.Drawing.Size(121, 97); + this.layerTree.TabIndex = 1; + this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); + // // sideBarPanelItem3 // this.sideBarPanelItem3.FontBold = true; @@ -4117,10 +4127,10 @@ 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.ribbonPanel7); this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel1); - this.ribbonControl1.Controls.Add(this.ribbonPanel7); this.ribbonControl1.Dock = System.Windows.Forms.DockStyle.Top; this.ribbonControl1.ImeMode = System.Windows.Forms.ImeMode.NoControl; this.ribbonControl1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { @@ -4267,10 +4277,10 @@ 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.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, 95); + this.ribbonPanel8.Size = new System.Drawing.Size(1328, 62); // // // @@ -4314,7 +4324,7 @@ 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.Size = new System.Drawing.Size(427, 59); this.ribbonBar_UserInfo.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonBar_UserInfo.TabIndex = 0; // @@ -4391,6 +4401,85 @@ this.btn_reset_password.Text = "重置密码"; this.btn_reset_password.Click += new System.EventHandler(this.btn_reset_password_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); + // // ribbonPanel2 // this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -5971,85 +6060,6 @@ this.buttonItem89.Visible = false; this.buttonItem89.Click += new System.EventHandler(this.buttonItem89_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); - // // ribbonTabItem1 // this.ribbonTabItem1.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; @@ -6429,16 +6439,6 @@ this.label1.Text = "label1"; this.label1.TextAlign = System.Drawing.ContentAlignment.TopRight; // - // layerTree - // - this.layerTree.CheckBoxes = true; - this.layerTree.ItemHeight = 18; - this.layerTree.Location = new System.Drawing.Point(30, 78); - this.layerTree.Name = "layerTree"; - this.layerTree.Size = new System.Drawing.Size(121, 97); - this.layerTree.TabIndex = 1; - this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); - // // MainFrm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; @@ -6515,10 +6515,10 @@ this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); + this.ribbonPanel7.ResumeLayout(false); this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel1.ResumeLayout(false); - this.ribbonPanel7.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 8924ace..5cadadd 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 1f02683..5a1a279 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/download/activiti-userguide-5.15.pdf b/bin/x86/Debug/download/activiti-userguide-5.15.pdf new file mode 100644 index 0000000..72be2b2 --- /dev/null +++ b/bin/x86/Debug/download/activiti-userguide-5.15.pdf Binary files differ diff --git "a/bin/x86/Debug/download/\343\200\220EY-SHSJ-01\343\200\221\344\270\255\345\233\275\350\210\252\345\244\251\347\247\221\345\267\245\344\272\214\351\231\242\346\231\272\346\205\247\347\256\241\347\275\221\351\241\271\347\233\256\346\267\261\345\214\226\350\256\276\350\256\241\346\226\271\346\241\21020160131.docx" "b/bin/x86/Debug/download/\343\200\220EY-SHSJ-01\343\200\221\344\270\255\345\233\275\350\210\252\345\244\251\347\247\221\345\267\245\344\272\214\351\231\242\346\231\272\346\205\247\347\256\241\347\275\221\351\241\271\347\233\256\346\267\261\345\214\226\350\256\276\350\256\241\346\226\271\346\241\21020160131.docx" new file mode 100644 index 0000000..424e95f --- /dev/null +++ "b/bin/x86/Debug/download/\343\200\220EY-SHSJ-01\343\200\221\344\270\255\345\233\275\350\210\252\345\244\251\347\247\221\345\267\245\344\272\214\351\231\242\346\231\272\346\205\247\347\256\241\347\275\221\351\241\271\347\233\256\346\267\261\345\214\226\350\256\276\350\256\241\346\226\271\346\241\21020160131.docx" Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 6abc092..7ade871 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FrmPatrolerManager.cs b/FrmPatrolerManager.cs index 47779c2..6858714 100644 --- a/FrmPatrolerManager.cs +++ b/FrmPatrolerManager.cs @@ -183,7 +183,7 @@ { 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++) @@ -213,7 +213,7 @@ 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++) @@ -242,7 +242,8 @@ private string GetSql() { - string sqlCount = "select count(*) from equipment where status = 'USING'"; + // string sqlCount = "select count(*) from equipment where status = 'USING'"; + string sqlCount = "select count(1) from patroler"; 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 状态 " + @@ -258,7 +259,7 @@ { int minPage = (pageIndex - 1) * maxPageIndex + 1; int maxPage = pageIndex * maxPageIndex; - string sqlCount = "select count(*) from patroler where 1=1"; + string sqlCount = "select count(1) from patroler where 1=1"; 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"; @@ -296,9 +297,10 @@ { try { - initlizeDatagrid(); + // initlizeDatagrid(); LoadData(); initForm(); + // initlizeDatagrid(); IS_OPEN = true; } catch (Exception ex) diff --git a/FrmRoleInfoManager.cs b/FrmRoleInfoManager.cs index 576fb87..c5f13d9 100644 --- a/FrmRoleInfoManager.cs +++ b/FrmRoleInfoManager.cs @@ -184,7 +184,7 @@ private string GetSql() { - string sqlCount = "select id,nt from casic_userroletest where sysname='EMS'"; + string sqlCount = "select count(1) from casic_userroletest where sysname='EMS'"; string sqlData = "select nt as 角色名称,id as 编号 " + "from (select t.*,rownum row_num from casic_userroletest t order by id desc)b " + @@ -198,7 +198,7 @@ { int minPage = (pageIndex - 1) * maxPageIndex + 1; int maxPage = pageIndex * maxPageIndex; - string sqlCount = "select id,nt from casic_userroletest where sysname='EMS'"; + string sqlCount = "select count(1) from casic_userroletest where sysname='EMS'"; 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/MainFrm.designer.cs b/MainFrm.designer.cs index e9b8b02..86c5474 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -82,6 +82,7 @@ this.sideBar1 = new DevComponents.DotNetBar.SideBar(); this.panelEx3 = new DevComponents.DotNetBar.PanelEx(); this.layerSensorTree = new System.Windows.Forms.TreeView(); + this.layerTree = new Cyberpipe.MyTreeView(); this.sideBarPanelItem3 = new DevComponents.DotNetBar.SideBarPanelItem(); this.controlContainerItem3 = new DevComponents.DotNetBar.ControlContainerItem(); this.sideBarPanelItem4 = new DevComponents.DotNetBar.SideBarPanelItem(); @@ -380,6 +381,10 @@ 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.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.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); @@ -560,10 +565,6 @@ this.buttonItem1 = new DevComponents.DotNetBar.ButtonItem(); this.btnlegendSet = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem89 = 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.ribbonTabItem1 = new DevComponents.DotNetBar.RibbonTabItem(); this.ribbonTabItem14 = new DevComponents.DotNetBar.RibbonTabItem(); this.ribbonTabItem2 = new DevComponents.DotNetBar.RibbonTabItem(); @@ -611,7 +612,6 @@ this.buttonItem75 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem76 = new DevComponents.DotNetBar.ButtonItem(); this.label1 = new System.Windows.Forms.Label(); - this.layerTree = new Cyberpipe.MyTreeView(); this.statusStrip1.SuspendLayout(); this.sideBar1.SuspendLayout(); this.panelEx3.SuspendLayout(); @@ -650,10 +650,10 @@ this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); + this.ribbonPanel7.SuspendLayout(); this.ribbonPanel2.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel1.SuspendLayout(); - this.ribbonPanel7.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); this.SuspendLayout(); // @@ -1048,6 +1048,16 @@ this.layerSensorTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerMarkerTree_AfterCheck); this.layerSensorTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerMarkerTree_NodeMouseClick); // + // layerTree + // + this.layerTree.CheckBoxes = true; + this.layerTree.ItemHeight = 18; + this.layerTree.Location = new System.Drawing.Point(30, 78); + this.layerTree.Name = "layerTree"; + this.layerTree.Size = new System.Drawing.Size(121, 97); + this.layerTree.TabIndex = 1; + this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); + // // sideBarPanelItem3 // this.sideBarPanelItem3.FontBold = true; @@ -4117,10 +4127,10 @@ 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.ribbonPanel7); this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel1); - this.ribbonControl1.Controls.Add(this.ribbonPanel7); this.ribbonControl1.Dock = System.Windows.Forms.DockStyle.Top; this.ribbonControl1.ImeMode = System.Windows.Forms.ImeMode.NoControl; this.ribbonControl1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { @@ -4267,10 +4277,10 @@ 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.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, 95); + this.ribbonPanel8.Size = new System.Drawing.Size(1328, 62); // // // @@ -4314,7 +4324,7 @@ 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.Size = new System.Drawing.Size(427, 59); this.ribbonBar_UserInfo.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonBar_UserInfo.TabIndex = 0; // @@ -4391,6 +4401,85 @@ this.btn_reset_password.Text = "重置密码"; this.btn_reset_password.Click += new System.EventHandler(this.btn_reset_password_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); + // // ribbonPanel2 // this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -5971,85 +6060,6 @@ this.buttonItem89.Visible = false; this.buttonItem89.Click += new System.EventHandler(this.buttonItem89_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); - // // ribbonTabItem1 // this.ribbonTabItem1.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; @@ -6429,16 +6439,6 @@ this.label1.Text = "label1"; this.label1.TextAlign = System.Drawing.ContentAlignment.TopRight; // - // layerTree - // - this.layerTree.CheckBoxes = true; - this.layerTree.ItemHeight = 18; - this.layerTree.Location = new System.Drawing.Point(30, 78); - this.layerTree.Name = "layerTree"; - this.layerTree.Size = new System.Drawing.Size(121, 97); - this.layerTree.TabIndex = 1; - this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); - // // MainFrm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; @@ -6515,10 +6515,10 @@ this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); + this.ribbonPanel7.ResumeLayout(false); this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel1.ResumeLayout(false); - this.ribbonPanel7.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 8924ace..5cadadd 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 1f02683..5a1a279 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/download/activiti-userguide-5.15.pdf b/bin/x86/Debug/download/activiti-userguide-5.15.pdf new file mode 100644 index 0000000..72be2b2 --- /dev/null +++ b/bin/x86/Debug/download/activiti-userguide-5.15.pdf Binary files differ diff --git "a/bin/x86/Debug/download/\343\200\220EY-SHSJ-01\343\200\221\344\270\255\345\233\275\350\210\252\345\244\251\347\247\221\345\267\245\344\272\214\351\231\242\346\231\272\346\205\247\347\256\241\347\275\221\351\241\271\347\233\256\346\267\261\345\214\226\350\256\276\350\256\241\346\226\271\346\241\21020160131.docx" "b/bin/x86/Debug/download/\343\200\220EY-SHSJ-01\343\200\221\344\270\255\345\233\275\350\210\252\345\244\251\347\247\221\345\267\245\344\272\214\351\231\242\346\231\272\346\205\247\347\256\241\347\275\221\351\241\271\347\233\256\346\267\261\345\214\226\350\256\276\350\256\241\346\226\271\346\241\21020160131.docx" new file mode 100644 index 0000000..424e95f --- /dev/null +++ "b/bin/x86/Debug/download/\343\200\220EY-SHSJ-01\343\200\221\344\270\255\345\233\275\350\210\252\345\244\251\347\247\221\345\267\245\344\272\214\351\231\242\346\231\272\346\205\247\347\256\241\347\275\221\351\241\271\347\233\256\346\267\261\345\214\226\350\256\276\350\256\241\346\226\271\346\241\21020160131.docx" Binary files differ diff --git a/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache b/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache index 2aff211..8f01413 100644 --- a/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache +++ b/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 6abc092..7ade871 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FrmPatrolerManager.cs b/FrmPatrolerManager.cs index 47779c2..6858714 100644 --- a/FrmPatrolerManager.cs +++ b/FrmPatrolerManager.cs @@ -183,7 +183,7 @@ { 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++) @@ -213,7 +213,7 @@ 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++) @@ -242,7 +242,8 @@ private string GetSql() { - string sqlCount = "select count(*) from equipment where status = 'USING'"; + // string sqlCount = "select count(*) from equipment where status = 'USING'"; + string sqlCount = "select count(1) from patroler"; 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 状态 " + @@ -258,7 +259,7 @@ { int minPage = (pageIndex - 1) * maxPageIndex + 1; int maxPage = pageIndex * maxPageIndex; - string sqlCount = "select count(*) from patroler where 1=1"; + string sqlCount = "select count(1) from patroler where 1=1"; 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"; @@ -296,9 +297,10 @@ { try { - initlizeDatagrid(); + // initlizeDatagrid(); LoadData(); initForm(); + // initlizeDatagrid(); IS_OPEN = true; } catch (Exception ex) diff --git a/FrmRoleInfoManager.cs b/FrmRoleInfoManager.cs index 576fb87..c5f13d9 100644 --- a/FrmRoleInfoManager.cs +++ b/FrmRoleInfoManager.cs @@ -184,7 +184,7 @@ private string GetSql() { - string sqlCount = "select id,nt from casic_userroletest where sysname='EMS'"; + string sqlCount = "select count(1) from casic_userroletest where sysname='EMS'"; string sqlData = "select nt as 角色名称,id as 编号 " + "from (select t.*,rownum row_num from casic_userroletest t order by id desc)b " + @@ -198,7 +198,7 @@ { int minPage = (pageIndex - 1) * maxPageIndex + 1; int maxPage = pageIndex * maxPageIndex; - string sqlCount = "select id,nt from casic_userroletest where sysname='EMS'"; + string sqlCount = "select count(1) from casic_userroletest where sysname='EMS'"; 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/MainFrm.designer.cs b/MainFrm.designer.cs index e9b8b02..86c5474 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -82,6 +82,7 @@ this.sideBar1 = new DevComponents.DotNetBar.SideBar(); this.panelEx3 = new DevComponents.DotNetBar.PanelEx(); this.layerSensorTree = new System.Windows.Forms.TreeView(); + this.layerTree = new Cyberpipe.MyTreeView(); this.sideBarPanelItem3 = new DevComponents.DotNetBar.SideBarPanelItem(); this.controlContainerItem3 = new DevComponents.DotNetBar.ControlContainerItem(); this.sideBarPanelItem4 = new DevComponents.DotNetBar.SideBarPanelItem(); @@ -380,6 +381,10 @@ 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.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.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); @@ -560,10 +565,6 @@ this.buttonItem1 = new DevComponents.DotNetBar.ButtonItem(); this.btnlegendSet = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem89 = 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.ribbonTabItem1 = new DevComponents.DotNetBar.RibbonTabItem(); this.ribbonTabItem14 = new DevComponents.DotNetBar.RibbonTabItem(); this.ribbonTabItem2 = new DevComponents.DotNetBar.RibbonTabItem(); @@ -611,7 +612,6 @@ this.buttonItem75 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem76 = new DevComponents.DotNetBar.ButtonItem(); this.label1 = new System.Windows.Forms.Label(); - this.layerTree = new Cyberpipe.MyTreeView(); this.statusStrip1.SuspendLayout(); this.sideBar1.SuspendLayout(); this.panelEx3.SuspendLayout(); @@ -650,10 +650,10 @@ this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); + this.ribbonPanel7.SuspendLayout(); this.ribbonPanel2.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel1.SuspendLayout(); - this.ribbonPanel7.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); this.SuspendLayout(); // @@ -1048,6 +1048,16 @@ this.layerSensorTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerMarkerTree_AfterCheck); this.layerSensorTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerMarkerTree_NodeMouseClick); // + // layerTree + // + this.layerTree.CheckBoxes = true; + this.layerTree.ItemHeight = 18; + this.layerTree.Location = new System.Drawing.Point(30, 78); + this.layerTree.Name = "layerTree"; + this.layerTree.Size = new System.Drawing.Size(121, 97); + this.layerTree.TabIndex = 1; + this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); + // // sideBarPanelItem3 // this.sideBarPanelItem3.FontBold = true; @@ -4117,10 +4127,10 @@ 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.ribbonPanel7); this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel1); - this.ribbonControl1.Controls.Add(this.ribbonPanel7); this.ribbonControl1.Dock = System.Windows.Forms.DockStyle.Top; this.ribbonControl1.ImeMode = System.Windows.Forms.ImeMode.NoControl; this.ribbonControl1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { @@ -4267,10 +4277,10 @@ 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.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, 95); + this.ribbonPanel8.Size = new System.Drawing.Size(1328, 62); // // // @@ -4314,7 +4324,7 @@ 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.Size = new System.Drawing.Size(427, 59); this.ribbonBar_UserInfo.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonBar_UserInfo.TabIndex = 0; // @@ -4391,6 +4401,85 @@ this.btn_reset_password.Text = "重置密码"; this.btn_reset_password.Click += new System.EventHandler(this.btn_reset_password_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); + // // ribbonPanel2 // this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -5971,85 +6060,6 @@ this.buttonItem89.Visible = false; this.buttonItem89.Click += new System.EventHandler(this.buttonItem89_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); - // // ribbonTabItem1 // this.ribbonTabItem1.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; @@ -6429,16 +6439,6 @@ this.label1.Text = "label1"; this.label1.TextAlign = System.Drawing.ContentAlignment.TopRight; // - // layerTree - // - this.layerTree.CheckBoxes = true; - this.layerTree.ItemHeight = 18; - this.layerTree.Location = new System.Drawing.Point(30, 78); - this.layerTree.Name = "layerTree"; - this.layerTree.Size = new System.Drawing.Size(121, 97); - this.layerTree.TabIndex = 1; - this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); - // // MainFrm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; @@ -6515,10 +6515,10 @@ this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); + this.ribbonPanel7.ResumeLayout(false); this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel1.ResumeLayout(false); - this.ribbonPanel7.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 8924ace..5cadadd 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 1f02683..5a1a279 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/download/activiti-userguide-5.15.pdf b/bin/x86/Debug/download/activiti-userguide-5.15.pdf new file mode 100644 index 0000000..72be2b2 --- /dev/null +++ b/bin/x86/Debug/download/activiti-userguide-5.15.pdf Binary files differ diff --git "a/bin/x86/Debug/download/\343\200\220EY-SHSJ-01\343\200\221\344\270\255\345\233\275\350\210\252\345\244\251\347\247\221\345\267\245\344\272\214\351\231\242\346\231\272\346\205\247\347\256\241\347\275\221\351\241\271\347\233\256\346\267\261\345\214\226\350\256\276\350\256\241\346\226\271\346\241\21020160131.docx" "b/bin/x86/Debug/download/\343\200\220EY-SHSJ-01\343\200\221\344\270\255\345\233\275\350\210\252\345\244\251\347\247\221\345\267\245\344\272\214\351\231\242\346\231\272\346\205\247\347\256\241\347\275\221\351\241\271\347\233\256\346\267\261\345\214\226\350\256\276\350\256\241\346\226\271\346\241\21020160131.docx" new file mode 100644 index 0000000..424e95f --- /dev/null +++ "b/bin/x86/Debug/download/\343\200\220EY-SHSJ-01\343\200\221\344\270\255\345\233\275\350\210\252\345\244\251\347\247\221\345\267\245\344\272\214\351\231\242\346\231\272\346\205\247\347\256\241\347\275\221\351\241\271\347\233\256\346\267\261\345\214\226\350\256\276\350\256\241\346\226\271\346\241\21020160131.docx" Binary files differ diff --git a/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache b/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache index 2aff211..8f01413 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 8924ace..5cadadd 100644 --- a/obj/x86/Debug/EMSCyberpipe.exe +++ b/obj/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 6abc092..7ade871 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FrmPatrolerManager.cs b/FrmPatrolerManager.cs index 47779c2..6858714 100644 --- a/FrmPatrolerManager.cs +++ b/FrmPatrolerManager.cs @@ -183,7 +183,7 @@ { 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++) @@ -213,7 +213,7 @@ 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++) @@ -242,7 +242,8 @@ private string GetSql() { - string sqlCount = "select count(*) from equipment where status = 'USING'"; + // string sqlCount = "select count(*) from equipment where status = 'USING'"; + string sqlCount = "select count(1) from patroler"; 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 状态 " + @@ -258,7 +259,7 @@ { int minPage = (pageIndex - 1) * maxPageIndex + 1; int maxPage = pageIndex * maxPageIndex; - string sqlCount = "select count(*) from patroler where 1=1"; + string sqlCount = "select count(1) from patroler where 1=1"; 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"; @@ -296,9 +297,10 @@ { try { - initlizeDatagrid(); + // initlizeDatagrid(); LoadData(); initForm(); + // initlizeDatagrid(); IS_OPEN = true; } catch (Exception ex) diff --git a/FrmRoleInfoManager.cs b/FrmRoleInfoManager.cs index 576fb87..c5f13d9 100644 --- a/FrmRoleInfoManager.cs +++ b/FrmRoleInfoManager.cs @@ -184,7 +184,7 @@ private string GetSql() { - string sqlCount = "select id,nt from casic_userroletest where sysname='EMS'"; + string sqlCount = "select count(1) from casic_userroletest where sysname='EMS'"; string sqlData = "select nt as 角色名称,id as 编号 " + "from (select t.*,rownum row_num from casic_userroletest t order by id desc)b " + @@ -198,7 +198,7 @@ { int minPage = (pageIndex - 1) * maxPageIndex + 1; int maxPage = pageIndex * maxPageIndex; - string sqlCount = "select id,nt from casic_userroletest where sysname='EMS'"; + string sqlCount = "select count(1) from casic_userroletest where sysname='EMS'"; 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/MainFrm.designer.cs b/MainFrm.designer.cs index e9b8b02..86c5474 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -82,6 +82,7 @@ this.sideBar1 = new DevComponents.DotNetBar.SideBar(); this.panelEx3 = new DevComponents.DotNetBar.PanelEx(); this.layerSensorTree = new System.Windows.Forms.TreeView(); + this.layerTree = new Cyberpipe.MyTreeView(); this.sideBarPanelItem3 = new DevComponents.DotNetBar.SideBarPanelItem(); this.controlContainerItem3 = new DevComponents.DotNetBar.ControlContainerItem(); this.sideBarPanelItem4 = new DevComponents.DotNetBar.SideBarPanelItem(); @@ -380,6 +381,10 @@ 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.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.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); @@ -560,10 +565,6 @@ this.buttonItem1 = new DevComponents.DotNetBar.ButtonItem(); this.btnlegendSet = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem89 = 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.ribbonTabItem1 = new DevComponents.DotNetBar.RibbonTabItem(); this.ribbonTabItem14 = new DevComponents.DotNetBar.RibbonTabItem(); this.ribbonTabItem2 = new DevComponents.DotNetBar.RibbonTabItem(); @@ -611,7 +612,6 @@ this.buttonItem75 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem76 = new DevComponents.DotNetBar.ButtonItem(); this.label1 = new System.Windows.Forms.Label(); - this.layerTree = new Cyberpipe.MyTreeView(); this.statusStrip1.SuspendLayout(); this.sideBar1.SuspendLayout(); this.panelEx3.SuspendLayout(); @@ -650,10 +650,10 @@ this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); + this.ribbonPanel7.SuspendLayout(); this.ribbonPanel2.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel1.SuspendLayout(); - this.ribbonPanel7.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); this.SuspendLayout(); // @@ -1048,6 +1048,16 @@ this.layerSensorTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerMarkerTree_AfterCheck); this.layerSensorTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerMarkerTree_NodeMouseClick); // + // layerTree + // + this.layerTree.CheckBoxes = true; + this.layerTree.ItemHeight = 18; + this.layerTree.Location = new System.Drawing.Point(30, 78); + this.layerTree.Name = "layerTree"; + this.layerTree.Size = new System.Drawing.Size(121, 97); + this.layerTree.TabIndex = 1; + this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); + // // sideBarPanelItem3 // this.sideBarPanelItem3.FontBold = true; @@ -4117,10 +4127,10 @@ 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.ribbonPanel7); this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel1); - this.ribbonControl1.Controls.Add(this.ribbonPanel7); this.ribbonControl1.Dock = System.Windows.Forms.DockStyle.Top; this.ribbonControl1.ImeMode = System.Windows.Forms.ImeMode.NoControl; this.ribbonControl1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { @@ -4267,10 +4277,10 @@ 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.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, 95); + this.ribbonPanel8.Size = new System.Drawing.Size(1328, 62); // // // @@ -4314,7 +4324,7 @@ 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.Size = new System.Drawing.Size(427, 59); this.ribbonBar_UserInfo.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonBar_UserInfo.TabIndex = 0; // @@ -4391,6 +4401,85 @@ this.btn_reset_password.Text = "重置密码"; this.btn_reset_password.Click += new System.EventHandler(this.btn_reset_password_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); + // // ribbonPanel2 // this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -5971,85 +6060,6 @@ this.buttonItem89.Visible = false; this.buttonItem89.Click += new System.EventHandler(this.buttonItem89_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); - // // ribbonTabItem1 // this.ribbonTabItem1.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; @@ -6429,16 +6439,6 @@ this.label1.Text = "label1"; this.label1.TextAlign = System.Drawing.ContentAlignment.TopRight; // - // layerTree - // - this.layerTree.CheckBoxes = true; - this.layerTree.ItemHeight = 18; - this.layerTree.Location = new System.Drawing.Point(30, 78); - this.layerTree.Name = "layerTree"; - this.layerTree.Size = new System.Drawing.Size(121, 97); - this.layerTree.TabIndex = 1; - this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); - // // MainFrm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; @@ -6515,10 +6515,10 @@ this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); + this.ribbonPanel7.ResumeLayout(false); this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel1.ResumeLayout(false); - this.ribbonPanel7.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 8924ace..5cadadd 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 1f02683..5a1a279 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/download/activiti-userguide-5.15.pdf b/bin/x86/Debug/download/activiti-userguide-5.15.pdf new file mode 100644 index 0000000..72be2b2 --- /dev/null +++ b/bin/x86/Debug/download/activiti-userguide-5.15.pdf Binary files differ diff --git "a/bin/x86/Debug/download/\343\200\220EY-SHSJ-01\343\200\221\344\270\255\345\233\275\350\210\252\345\244\251\347\247\221\345\267\245\344\272\214\351\231\242\346\231\272\346\205\247\347\256\241\347\275\221\351\241\271\347\233\256\346\267\261\345\214\226\350\256\276\350\256\241\346\226\271\346\241\21020160131.docx" "b/bin/x86/Debug/download/\343\200\220EY-SHSJ-01\343\200\221\344\270\255\345\233\275\350\210\252\345\244\251\347\247\221\345\267\245\344\272\214\351\231\242\346\231\272\346\205\247\347\256\241\347\275\221\351\241\271\347\233\256\346\267\261\345\214\226\350\256\276\350\256\241\346\226\271\346\241\21020160131.docx" new file mode 100644 index 0000000..424e95f --- /dev/null +++ "b/bin/x86/Debug/download/\343\200\220EY-SHSJ-01\343\200\221\344\270\255\345\233\275\350\210\252\345\244\251\347\247\221\345\267\245\344\272\214\351\231\242\346\231\272\346\205\247\347\256\241\347\275\221\351\241\271\347\233\256\346\267\261\345\214\226\350\256\276\350\256\241\346\226\271\346\241\21020160131.docx" Binary files differ diff --git a/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache b/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache index 2aff211..8f01413 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 8924ace..5cadadd 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 1f02683..5a1a279 100644 --- a/obj/x86/Debug/EMSCyberpipe.pdb +++ b/obj/x86/Debug/EMSCyberpipe.pdb Binary files differ