diff --git a/Cyberpipe.suo b/Cyberpipe.suo index ad4c59f..e9f9b38 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index ad4c59f..e9f9b38 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/MainFrm.cs b/MainFrm.cs index a72a9e4..eff590e 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -166,250 +166,15 @@ balloonEx2 = new GSOBalloonEx(globeControl2.Handle); Utility.SetBallons(featureTooltip, balloonEx); panelOfTable.Height = 200; - /*if (Utility.isNeedLogin) - { - //RigthMenuSet(); - MenuSet(); - }*/ } - public void RigthMenuSet() - { - if (Utility.userRole.IndexOf("清除分析") < 0) - { - toolRightMenu.Items.Remove(清除分析ToolStripMenuItem); - } - - #region 区域分析 - - if (Utility.userRole.IndexOf("区域分析") < 0) - { - toolRightMenu.Items.Remove(区域分析ToolStripMenuItem); - } - - #endregion - - #region 视域分析 - - if (Utility.userRole.IndexOf("视域分析") < 0) - { - toolRightMenu.Items.Remove(视域分析ToolStripMenuItem); - } - - #endregion - - #region 开发分析 - - if (Utility.userRole.IndexOf("开挖分析") < 0) - { - toolRightMenu.Items.Remove(开挖分析ToolStripMenuItem); - } - - - #endregion - - #region 拓扑分析 - - if (Utility.userRole.IndexOf("拓扑分析") < 0) - { - toolRightMenu.Items.Remove(拓扑分析ToolStripMenuItem); - } - - #endregion - - #region 断面分析 - - if (Utility.userRole.IndexOf("断面分析") < 0) - { - toolRightMenu.Items.Remove(断面分析ToolStripMenuItem); - } - - #endregion - - #region 绘制区域统计 - - if (Utility.userRole.IndexOf("绘制区域统计") < 0) - { - toolRightMenu.Items.Remove(绘制区域统计ToolStripMenuItem); - } - - #endregion - - #region 全区域统计 - - if (Utility.userRole.IndexOf("全区域统计") < 0) - { - toolRightMenu.Items.Remove(全区域统计ToolStripMenuItem); - } - #endregion - - #region 查询 - - if (Utility.userRole.IndexOf("查询") < 0) - { - toolRightMenu.Items.Remove(查询ToolStripMenuItem); - } - - - #endregion - - #region 标注 - - if (Utility.userRole.IndexOf("标注") < 0) - { - toolRightMenu.Items.Remove(标注ToolStripMenuItem); - } - - #endregion - - #region 飞行 - - if (Utility.userRole.IndexOf("飞行") < 0) - { - toolRightMenu.Items.Remove(飞行ToolStripMenuItem); - } - - #endregion - - #region 编辑 - - if (Utility.userRole.IndexOf("编辑") < 0) - { - toolRightMenu.Items.Remove(编辑ToolStripMenuItem); - } - - #endregion - - #region 量算 - - if (Utility.userRole.IndexOf("量算") < 0) - { - toolRightMenu.Items.Remove(量算ToolStripMenuItem); - } - - #endregion - } - public void MenuSet() { - - #region 权限管理 - if (Utility.userRole.IndexOf("权限管理") < 0) { ribbonControl1.Items.Remove(ribbonTabItem2); } - /* - else - { - - if (Utility.userRole.IndexOf("用户管理") < 0) - { - btn_user_info.Visible = false; - } - if (Utility.userRole.IndexOf("角色管理") < 0) - { - btn_role_info.Visible = false; - } - if (Utility.userRole.IndexOf("资源管理") < 0) - { - btn_resc_info.Visible = false; - } - if (Utility.userRole.IndexOf("角色授权") < 0) - { - btn_role_resc.Visible = false; - } - if (Utility.userRole.IndexOf("用户授权") < 0) - { - btn_user_role.Visible = false; - } - if (Utility.userRole.IndexOf("密码修改") < 0) - { - btn_password_edit.Visible = false; - } - - } - */ - #endregion - - #region - /* - #region 基础工具 - - if (Utility.userRole.IndexOf("基础工具") < 0) - { - ribbonControl1.Items.Remove(ribbonTabItem1); - } - #endregion - - #region 一键审核 - - if (Utility.userRole.IndexOf("一键审核") < 0) - { - ribbonControl1.Items.Remove(ribbonTabItem11); - } - - #endregion - - #region 红线审核 - - if (Utility.userRole.IndexOf("红线审核") < 0) - { - ribbonControl1.Items.Remove(ribbonTabItem6); - } - - #endregion - - #region 双屏对比 - - if (Utility.userRole.IndexOf("双屏对比") < 0) - { - ribbonControl1.Items.Remove(ribbonTabItem9); - } - - #endregion - - #region 文档管理 - - if (Utility.userRole.IndexOf("文档管理") < 0) - { - ribbonControl1.Items.Remove(ribbonTabItem4); - } - - #endregion - - #region 基础管理 - - if (Utility.userRole.IndexOf("基础管理") < 0) - { - ribbonControl1.Items.Remove(ribbonTabItem14); - } - - #endregion - - #region 管线定位 - if (Utility.userRole.IndexOf("管线定位") < 0) - { - ribbonControl1.Items.Remove(ribbonTabItem7); - } - #endregion - - #region 标识器管理 - if (Utility.userRole.IndexOf("标识器管理") < 0) - { - ribbonControl1.Items.Remove(ribbonTabItem5); - } - - #endregion - - if (ribbonControl1.Items.Count <= 0) - { - ribbonControl1.Visible = false; - } - * */ - #endregion - } #region Fan Zhang 重构现有代码 diff --git a/Cyberpipe.suo b/Cyberpipe.suo index ad4c59f..e9f9b38 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/MainFrm.cs b/MainFrm.cs index a72a9e4..eff590e 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -166,250 +166,15 @@ balloonEx2 = new GSOBalloonEx(globeControl2.Handle); Utility.SetBallons(featureTooltip, balloonEx); panelOfTable.Height = 200; - /*if (Utility.isNeedLogin) - { - //RigthMenuSet(); - MenuSet(); - }*/ } - public void RigthMenuSet() - { - if (Utility.userRole.IndexOf("清除分析") < 0) - { - toolRightMenu.Items.Remove(清除分析ToolStripMenuItem); - } - - #region 区域分析 - - if (Utility.userRole.IndexOf("区域分析") < 0) - { - toolRightMenu.Items.Remove(区域分析ToolStripMenuItem); - } - - #endregion - - #region 视域分析 - - if (Utility.userRole.IndexOf("视域分析") < 0) - { - toolRightMenu.Items.Remove(视域分析ToolStripMenuItem); - } - - #endregion - - #region 开发分析 - - if (Utility.userRole.IndexOf("开挖分析") < 0) - { - toolRightMenu.Items.Remove(开挖分析ToolStripMenuItem); - } - - - #endregion - - #region 拓扑分析 - - if (Utility.userRole.IndexOf("拓扑分析") < 0) - { - toolRightMenu.Items.Remove(拓扑分析ToolStripMenuItem); - } - - #endregion - - #region 断面分析 - - if (Utility.userRole.IndexOf("断面分析") < 0) - { - toolRightMenu.Items.Remove(断面分析ToolStripMenuItem); - } - - #endregion - - #region 绘制区域统计 - - if (Utility.userRole.IndexOf("绘制区域统计") < 0) - { - toolRightMenu.Items.Remove(绘制区域统计ToolStripMenuItem); - } - - #endregion - - #region 全区域统计 - - if (Utility.userRole.IndexOf("全区域统计") < 0) - { - toolRightMenu.Items.Remove(全区域统计ToolStripMenuItem); - } - #endregion - - #region 查询 - - if (Utility.userRole.IndexOf("查询") < 0) - { - toolRightMenu.Items.Remove(查询ToolStripMenuItem); - } - - - #endregion - - #region 标注 - - if (Utility.userRole.IndexOf("标注") < 0) - { - toolRightMenu.Items.Remove(标注ToolStripMenuItem); - } - - #endregion - - #region 飞行 - - if (Utility.userRole.IndexOf("飞行") < 0) - { - toolRightMenu.Items.Remove(飞行ToolStripMenuItem); - } - - #endregion - - #region 编辑 - - if (Utility.userRole.IndexOf("编辑") < 0) - { - toolRightMenu.Items.Remove(编辑ToolStripMenuItem); - } - - #endregion - - #region 量算 - - if (Utility.userRole.IndexOf("量算") < 0) - { - toolRightMenu.Items.Remove(量算ToolStripMenuItem); - } - - #endregion - } - public void MenuSet() { - - #region 权限管理 - if (Utility.userRole.IndexOf("权限管理") < 0) { ribbonControl1.Items.Remove(ribbonTabItem2); } - /* - else - { - - if (Utility.userRole.IndexOf("用户管理") < 0) - { - btn_user_info.Visible = false; - } - if (Utility.userRole.IndexOf("角色管理") < 0) - { - btn_role_info.Visible = false; - } - if (Utility.userRole.IndexOf("资源管理") < 0) - { - btn_resc_info.Visible = false; - } - if (Utility.userRole.IndexOf("角色授权") < 0) - { - btn_role_resc.Visible = false; - } - if (Utility.userRole.IndexOf("用户授权") < 0) - { - btn_user_role.Visible = false; - } - if (Utility.userRole.IndexOf("密码修改") < 0) - { - btn_password_edit.Visible = false; - } - - } - */ - #endregion - - #region - /* - #region 基础工具 - - if (Utility.userRole.IndexOf("基础工具") < 0) - { - ribbonControl1.Items.Remove(ribbonTabItem1); - } - #endregion - - #region 一键审核 - - if (Utility.userRole.IndexOf("一键审核") < 0) - { - ribbonControl1.Items.Remove(ribbonTabItem11); - } - - #endregion - - #region 红线审核 - - if (Utility.userRole.IndexOf("红线审核") < 0) - { - ribbonControl1.Items.Remove(ribbonTabItem6); - } - - #endregion - - #region 双屏对比 - - if (Utility.userRole.IndexOf("双屏对比") < 0) - { - ribbonControl1.Items.Remove(ribbonTabItem9); - } - - #endregion - - #region 文档管理 - - if (Utility.userRole.IndexOf("文档管理") < 0) - { - ribbonControl1.Items.Remove(ribbonTabItem4); - } - - #endregion - - #region 基础管理 - - if (Utility.userRole.IndexOf("基础管理") < 0) - { - ribbonControl1.Items.Remove(ribbonTabItem14); - } - - #endregion - - #region 管线定位 - if (Utility.userRole.IndexOf("管线定位") < 0) - { - ribbonControl1.Items.Remove(ribbonTabItem7); - } - #endregion - - #region 标识器管理 - if (Utility.userRole.IndexOf("标识器管理") < 0) - { - ribbonControl1.Items.Remove(ribbonTabItem5); - } - - #endregion - - if (ribbonControl1.Items.Count <= 0) - { - ribbonControl1.Visible = false; - } - * */ - #endregion - } #region Fan Zhang 重构现有代码 diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 859c4b3..149770e 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -4571,7 +4571,7 @@ this.dataGridViewX2.RowHeadersDefaultCellStyle = dataGridViewCellStyle12; this.dataGridViewX2.RowHeadersVisible = false; this.dataGridViewX2.RowTemplate.Height = 23; - this.dataGridViewX2.Size = new System.Drawing.Size(54544, 92); + this.dataGridViewX2.Size = new System.Drawing.Size(54841, 92); this.dataGridViewX2.TabIndex = 11; // // dataGridViewTextBoxColumn10 @@ -4681,7 +4681,7 @@ this.dataGridViewX3.RowHeadersDefaultCellStyle = dataGridViewCellStyle15; this.dataGridViewX3.RowHeadersVisible = false; this.dataGridViewX3.RowTemplate.Height = 23; - this.dataGridViewX3.Size = new System.Drawing.Size(54543, 127); + this.dataGridViewX3.Size = new System.Drawing.Size(54840, 127); this.dataGridViewX3.TabIndex = 5; this.dataGridViewX3.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX3_MouseDoubleClick); // diff --git a/Cyberpipe.suo b/Cyberpipe.suo index ad4c59f..e9f9b38 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/MainFrm.cs b/MainFrm.cs index a72a9e4..eff590e 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -166,250 +166,15 @@ balloonEx2 = new GSOBalloonEx(globeControl2.Handle); Utility.SetBallons(featureTooltip, balloonEx); panelOfTable.Height = 200; - /*if (Utility.isNeedLogin) - { - //RigthMenuSet(); - MenuSet(); - }*/ } - public void RigthMenuSet() - { - if (Utility.userRole.IndexOf("清除分析") < 0) - { - toolRightMenu.Items.Remove(清除分析ToolStripMenuItem); - } - - #region 区域分析 - - if (Utility.userRole.IndexOf("区域分析") < 0) - { - toolRightMenu.Items.Remove(区域分析ToolStripMenuItem); - } - - #endregion - - #region 视域分析 - - if (Utility.userRole.IndexOf("视域分析") < 0) - { - toolRightMenu.Items.Remove(视域分析ToolStripMenuItem); - } - - #endregion - - #region 开发分析 - - if (Utility.userRole.IndexOf("开挖分析") < 0) - { - toolRightMenu.Items.Remove(开挖分析ToolStripMenuItem); - } - - - #endregion - - #region 拓扑分析 - - if (Utility.userRole.IndexOf("拓扑分析") < 0) - { - toolRightMenu.Items.Remove(拓扑分析ToolStripMenuItem); - } - - #endregion - - #region 断面分析 - - if (Utility.userRole.IndexOf("断面分析") < 0) - { - toolRightMenu.Items.Remove(断面分析ToolStripMenuItem); - } - - #endregion - - #region 绘制区域统计 - - if (Utility.userRole.IndexOf("绘制区域统计") < 0) - { - toolRightMenu.Items.Remove(绘制区域统计ToolStripMenuItem); - } - - #endregion - - #region 全区域统计 - - if (Utility.userRole.IndexOf("全区域统计") < 0) - { - toolRightMenu.Items.Remove(全区域统计ToolStripMenuItem); - } - #endregion - - #region 查询 - - if (Utility.userRole.IndexOf("查询") < 0) - { - toolRightMenu.Items.Remove(查询ToolStripMenuItem); - } - - - #endregion - - #region 标注 - - if (Utility.userRole.IndexOf("标注") < 0) - { - toolRightMenu.Items.Remove(标注ToolStripMenuItem); - } - - #endregion - - #region 飞行 - - if (Utility.userRole.IndexOf("飞行") < 0) - { - toolRightMenu.Items.Remove(飞行ToolStripMenuItem); - } - - #endregion - - #region 编辑 - - if (Utility.userRole.IndexOf("编辑") < 0) - { - toolRightMenu.Items.Remove(编辑ToolStripMenuItem); - } - - #endregion - - #region 量算 - - if (Utility.userRole.IndexOf("量算") < 0) - { - toolRightMenu.Items.Remove(量算ToolStripMenuItem); - } - - #endregion - } - public void MenuSet() { - - #region 权限管理 - if (Utility.userRole.IndexOf("权限管理") < 0) { ribbonControl1.Items.Remove(ribbonTabItem2); } - /* - else - { - - if (Utility.userRole.IndexOf("用户管理") < 0) - { - btn_user_info.Visible = false; - } - if (Utility.userRole.IndexOf("角色管理") < 0) - { - btn_role_info.Visible = false; - } - if (Utility.userRole.IndexOf("资源管理") < 0) - { - btn_resc_info.Visible = false; - } - if (Utility.userRole.IndexOf("角色授权") < 0) - { - btn_role_resc.Visible = false; - } - if (Utility.userRole.IndexOf("用户授权") < 0) - { - btn_user_role.Visible = false; - } - if (Utility.userRole.IndexOf("密码修改") < 0) - { - btn_password_edit.Visible = false; - } - - } - */ - #endregion - - #region - /* - #region 基础工具 - - if (Utility.userRole.IndexOf("基础工具") < 0) - { - ribbonControl1.Items.Remove(ribbonTabItem1); - } - #endregion - - #region 一键审核 - - if (Utility.userRole.IndexOf("一键审核") < 0) - { - ribbonControl1.Items.Remove(ribbonTabItem11); - } - - #endregion - - #region 红线审核 - - if (Utility.userRole.IndexOf("红线审核") < 0) - { - ribbonControl1.Items.Remove(ribbonTabItem6); - } - - #endregion - - #region 双屏对比 - - if (Utility.userRole.IndexOf("双屏对比") < 0) - { - ribbonControl1.Items.Remove(ribbonTabItem9); - } - - #endregion - - #region 文档管理 - - if (Utility.userRole.IndexOf("文档管理") < 0) - { - ribbonControl1.Items.Remove(ribbonTabItem4); - } - - #endregion - - #region 基础管理 - - if (Utility.userRole.IndexOf("基础管理") < 0) - { - ribbonControl1.Items.Remove(ribbonTabItem14); - } - - #endregion - - #region 管线定位 - if (Utility.userRole.IndexOf("管线定位") < 0) - { - ribbonControl1.Items.Remove(ribbonTabItem7); - } - #endregion - - #region 标识器管理 - if (Utility.userRole.IndexOf("标识器管理") < 0) - { - ribbonControl1.Items.Remove(ribbonTabItem5); - } - - #endregion - - if (ribbonControl1.Items.Count <= 0) - { - ribbonControl1.Visible = false; - } - * */ - #endregion - } #region Fan Zhang 重构现有代码 diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 859c4b3..149770e 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -4571,7 +4571,7 @@ this.dataGridViewX2.RowHeadersDefaultCellStyle = dataGridViewCellStyle12; this.dataGridViewX2.RowHeadersVisible = false; this.dataGridViewX2.RowTemplate.Height = 23; - this.dataGridViewX2.Size = new System.Drawing.Size(54544, 92); + this.dataGridViewX2.Size = new System.Drawing.Size(54841, 92); this.dataGridViewX2.TabIndex = 11; // // dataGridViewTextBoxColumn10 @@ -4681,7 +4681,7 @@ this.dataGridViewX3.RowHeadersDefaultCellStyle = dataGridViewCellStyle15; this.dataGridViewX3.RowHeadersVisible = false; this.dataGridViewX3.RowTemplate.Height = 23; - this.dataGridViewX3.Size = new System.Drawing.Size(54543, 127); + this.dataGridViewX3.Size = new System.Drawing.Size(54840, 127); this.dataGridViewX3.TabIndex = 5; this.dataGridViewX3.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX3_MouseDoubleClick); // diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs index 6aa9955..e34ba41 100644 --- a/Properties/AssemblyInfo.cs +++ b/Properties/AssemblyInfo.cs @@ -9,7 +9,7 @@ [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] [assembly: AssemblyProduct("Cyberpipe")] -[assembly: AssemblyCopyright("Copyright © 2013")] +[assembly: AssemblyCopyright("Copyright © 2019")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] @@ -31,5 +31,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] +[assembly: AssemblyVersion("1.1.0.0")] +[assembly: AssemblyFileVersion("1.1.0.0")] diff --git a/Cyberpipe.suo b/Cyberpipe.suo index ad4c59f..e9f9b38 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/MainFrm.cs b/MainFrm.cs index a72a9e4..eff590e 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -166,250 +166,15 @@ balloonEx2 = new GSOBalloonEx(globeControl2.Handle); Utility.SetBallons(featureTooltip, balloonEx); panelOfTable.Height = 200; - /*if (Utility.isNeedLogin) - { - //RigthMenuSet(); - MenuSet(); - }*/ } - public void RigthMenuSet() - { - if (Utility.userRole.IndexOf("清除分析") < 0) - { - toolRightMenu.Items.Remove(清除分析ToolStripMenuItem); - } - - #region 区域分析 - - if (Utility.userRole.IndexOf("区域分析") < 0) - { - toolRightMenu.Items.Remove(区域分析ToolStripMenuItem); - } - - #endregion - - #region 视域分析 - - if (Utility.userRole.IndexOf("视域分析") < 0) - { - toolRightMenu.Items.Remove(视域分析ToolStripMenuItem); - } - - #endregion - - #region 开发分析 - - if (Utility.userRole.IndexOf("开挖分析") < 0) - { - toolRightMenu.Items.Remove(开挖分析ToolStripMenuItem); - } - - - #endregion - - #region 拓扑分析 - - if (Utility.userRole.IndexOf("拓扑分析") < 0) - { - toolRightMenu.Items.Remove(拓扑分析ToolStripMenuItem); - } - - #endregion - - #region 断面分析 - - if (Utility.userRole.IndexOf("断面分析") < 0) - { - toolRightMenu.Items.Remove(断面分析ToolStripMenuItem); - } - - #endregion - - #region 绘制区域统计 - - if (Utility.userRole.IndexOf("绘制区域统计") < 0) - { - toolRightMenu.Items.Remove(绘制区域统计ToolStripMenuItem); - } - - #endregion - - #region 全区域统计 - - if (Utility.userRole.IndexOf("全区域统计") < 0) - { - toolRightMenu.Items.Remove(全区域统计ToolStripMenuItem); - } - #endregion - - #region 查询 - - if (Utility.userRole.IndexOf("查询") < 0) - { - toolRightMenu.Items.Remove(查询ToolStripMenuItem); - } - - - #endregion - - #region 标注 - - if (Utility.userRole.IndexOf("标注") < 0) - { - toolRightMenu.Items.Remove(标注ToolStripMenuItem); - } - - #endregion - - #region 飞行 - - if (Utility.userRole.IndexOf("飞行") < 0) - { - toolRightMenu.Items.Remove(飞行ToolStripMenuItem); - } - - #endregion - - #region 编辑 - - if (Utility.userRole.IndexOf("编辑") < 0) - { - toolRightMenu.Items.Remove(编辑ToolStripMenuItem); - } - - #endregion - - #region 量算 - - if (Utility.userRole.IndexOf("量算") < 0) - { - toolRightMenu.Items.Remove(量算ToolStripMenuItem); - } - - #endregion - } - public void MenuSet() { - - #region 权限管理 - if (Utility.userRole.IndexOf("权限管理") < 0) { ribbonControl1.Items.Remove(ribbonTabItem2); } - /* - else - { - - if (Utility.userRole.IndexOf("用户管理") < 0) - { - btn_user_info.Visible = false; - } - if (Utility.userRole.IndexOf("角色管理") < 0) - { - btn_role_info.Visible = false; - } - if (Utility.userRole.IndexOf("资源管理") < 0) - { - btn_resc_info.Visible = false; - } - if (Utility.userRole.IndexOf("角色授权") < 0) - { - btn_role_resc.Visible = false; - } - if (Utility.userRole.IndexOf("用户授权") < 0) - { - btn_user_role.Visible = false; - } - if (Utility.userRole.IndexOf("密码修改") < 0) - { - btn_password_edit.Visible = false; - } - - } - */ - #endregion - - #region - /* - #region 基础工具 - - if (Utility.userRole.IndexOf("基础工具") < 0) - { - ribbonControl1.Items.Remove(ribbonTabItem1); - } - #endregion - - #region 一键审核 - - if (Utility.userRole.IndexOf("一键审核") < 0) - { - ribbonControl1.Items.Remove(ribbonTabItem11); - } - - #endregion - - #region 红线审核 - - if (Utility.userRole.IndexOf("红线审核") < 0) - { - ribbonControl1.Items.Remove(ribbonTabItem6); - } - - #endregion - - #region 双屏对比 - - if (Utility.userRole.IndexOf("双屏对比") < 0) - { - ribbonControl1.Items.Remove(ribbonTabItem9); - } - - #endregion - - #region 文档管理 - - if (Utility.userRole.IndexOf("文档管理") < 0) - { - ribbonControl1.Items.Remove(ribbonTabItem4); - } - - #endregion - - #region 基础管理 - - if (Utility.userRole.IndexOf("基础管理") < 0) - { - ribbonControl1.Items.Remove(ribbonTabItem14); - } - - #endregion - - #region 管线定位 - if (Utility.userRole.IndexOf("管线定位") < 0) - { - ribbonControl1.Items.Remove(ribbonTabItem7); - } - #endregion - - #region 标识器管理 - if (Utility.userRole.IndexOf("标识器管理") < 0) - { - ribbonControl1.Items.Remove(ribbonTabItem5); - } - - #endregion - - if (ribbonControl1.Items.Count <= 0) - { - ribbonControl1.Visible = false; - } - * */ - #endregion - } #region Fan Zhang 重构现有代码 diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 859c4b3..149770e 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -4571,7 +4571,7 @@ this.dataGridViewX2.RowHeadersDefaultCellStyle = dataGridViewCellStyle12; this.dataGridViewX2.RowHeadersVisible = false; this.dataGridViewX2.RowTemplate.Height = 23; - this.dataGridViewX2.Size = new System.Drawing.Size(54544, 92); + this.dataGridViewX2.Size = new System.Drawing.Size(54841, 92); this.dataGridViewX2.TabIndex = 11; // // dataGridViewTextBoxColumn10 @@ -4681,7 +4681,7 @@ this.dataGridViewX3.RowHeadersDefaultCellStyle = dataGridViewCellStyle15; this.dataGridViewX3.RowHeadersVisible = false; this.dataGridViewX3.RowTemplate.Height = 23; - this.dataGridViewX3.Size = new System.Drawing.Size(54543, 127); + this.dataGridViewX3.Size = new System.Drawing.Size(54840, 127); this.dataGridViewX3.TabIndex = 5; this.dataGridViewX3.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX3_MouseDoubleClick); // diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs index 6aa9955..e34ba41 100644 --- a/Properties/AssemblyInfo.cs +++ b/Properties/AssemblyInfo.cs @@ -9,7 +9,7 @@ [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] [assembly: AssemblyProduct("Cyberpipe")] -[assembly: AssemblyCopyright("Copyright © 2013")] +[assembly: AssemblyCopyright("Copyright © 2019")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] @@ -31,5 +31,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] +[assembly: AssemblyVersion("1.1.0.0")] +[assembly: AssemblyFileVersion("1.1.0.0")] diff --git a/bin/x86/Debug/Cyberpipe.exe b/bin/x86/Debug/Cyberpipe.exe index c9f7d2f..9c0b303 100644 --- a/bin/x86/Debug/Cyberpipe.exe +++ b/bin/x86/Debug/Cyberpipe.exe Binary files differ