diff --git a/SGGL/FineUIPro.Web/indexProject.aspx b/SGGL/FineUIPro.Web/indexProject.aspx index b8c2622c..b723039a 100644 --- a/SGGL/FineUIPro.Web/indexProject.aspx +++ b/SGGL/FineUIPro.Web/indexProject.aspx @@ -234,7 +234,7 @@
  • -
  • diff --git a/SGGL/FineUIPro.Web/indexProject.aspx.cs b/SGGL/FineUIPro.Web/indexProject.aspx.cs index 4866882c..46eebbc5 100644 --- a/SGGL/FineUIPro.Web/indexProject.aspx.cs +++ b/SGGL/FineUIPro.Web/indexProject.aspx.cs @@ -384,7 +384,8 @@ namespace FineUIPro.Web this.btnWeather.ToolTip = date + " " + city + " " + oldWeather.WeatherRef + " " + oldWeather.AllTem; } } - } catch (Exception ex) + } + catch (Exception ex) { } } @@ -604,16 +605,14 @@ namespace FineUIPro.Web this.Tab1.IFrameUrl = "~/common/mainProject.aspx"; } this.CurrUser.LastProjectId = null; - if (!string.IsNullOrEmpty(type)) - { + { this.CurrUser.LastProjectId = this.CurrUser.LoginProjectId; if (CommonService.IsHaveSystemPower(this.CurrUser.UserId, type, this.CurrUser.LoginProjectId) || type == Const.Menu_Personal) - { + { this.XmlDataSource1.DataFile = "common/" + type + ".xml"; this.leftPanel.Hidden = false; this.Tab1.IFrameUrl = "~/common/main" + type + ".aspx"; - this.Tab1.Title = "首页"; if (type == Const.Menu_Personal) { this.Tab1.IFrameUrl = "~/Personal/PersonalInfo.aspx"; @@ -621,15 +620,8 @@ namespace FineUIPro.Web else if (type == Const.Menu_ProjectSet) { this.Tab1.IFrameUrl = "~/ProjectData/ProjectSetView.aspx"; - this.Tab1.Title = "项目"; } - else if (type == Const.Menu_DigitalSite) - { - this.Tab1.IFrameUrl = "~/Video/Video.aspx"; - this.leftPanel.Hidden = true; - this.Tab1.Title = "视频监控"; - } - else if (type == Const.Menu_PZHGL) + if (type == Const.Menu_PZHGL) { //this.Tab1.IFrameUrl = "~/PZHGL/InformationProject/ConstructionPlan.aspx"; this.Tab1.IFrameUrl = "~/HSSE/Manager/HSSELog.aspx"; @@ -640,6 +632,10 @@ namespace FineUIPro.Web this.Tab1.IFrameUrl = "~/PZHGL/GJSX/GJSXList.aspx"; this.Tab1.Title = "关键事项"; } + else + { + this.Tab1.Title = "首页"; + } } else { @@ -714,9 +710,9 @@ namespace FineUIPro.Web protected void btnDigitalSite_Click(object sender, EventArgs e) { - //string url = ConfigurationManager.AppSettings["Video_URL"] + "#/screen"; - //Response.Write(""); - this.MenuSwitchMethod(Const.Menu_DigitalSite); + string url = ConfigurationManager.AppSettings["Video_URL"] + "#/screen"; + Response.Write(""); + // this.MenuSwitchMethod(Const.Menu_DigitalSite); } protected string VideoURL