lpf
/
CNCEC_SUBQHSE_WUHUAN
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

20211111 监控页面还原

This commit is contained in:
杨红卫 2021-11-11 14:38:02 +08:00
parent 56662ce2c8
commit 10ce5c40ac
2 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SGGL/FineUIPro.Web/indexProject.aspx
View File

@ -234,7 +234,7 @@
</f:Button> </f:Button>
</li> </li>
<li> <li>
<f:Button runat="server" CssClass="bgbtn" Text="视频监控" OnClick="btnDigitalSite_Click" OnClientClick="parent.removeActiveTab();" <f:Button runat="server" CssClass="bgbtn" Text="视频监控" OnClick="btnDigitalSite_Click" OnClientClick="openVideo();"
EnablePostBack="true" EnableDefaultState="true" EnableDefaultCorner="false" ID="btnDigitalSite"> EnablePostBack="true" EnableDefaultState="true" EnableDefaultCorner="false" ID="btnDigitalSite">
</f:Button> </f:Button>
</li> </li>

28
SGGL/FineUIPro.Web/indexProject.aspx.cs
View File

@ -384,7 +384,8 @@ namespace FineUIPro.Web
this.btnWeather.ToolTip = date + " " + city + " " + oldWeather.WeatherRef + " " + oldWeather.AllTem; 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.Tab1.IFrameUrl = "~/common/mainProject.aspx";
} }
this.CurrUser.LastProjectId = null; this.CurrUser.LastProjectId = null;
if (!string.IsNullOrEmpty(type)) if (!string.IsNullOrEmpty(type))
{ {
this.CurrUser.LastProjectId = this.CurrUser.LoginProjectId; this.CurrUser.LastProjectId = this.CurrUser.LoginProjectId;
if (CommonService.IsHaveSystemPower(this.CurrUser.UserId, type, this.CurrUser.LoginProjectId) || type == Const.Menu_Personal) if (CommonService.IsHaveSystemPower(this.CurrUser.UserId, type, this.CurrUser.LoginProjectId) || type == Const.Menu_Personal)
{ {
this.XmlDataSource1.DataFile = "common/" + type + ".xml"; this.XmlDataSource1.DataFile = "common/" + type + ".xml";
this.leftPanel.Hidden = false; this.leftPanel.Hidden = false;
this.Tab1.IFrameUrl = "~/common/main" + type + ".aspx"; this.Tab1.IFrameUrl = "~/common/main" + type + ".aspx";
this.Tab1.Title = "首页";
if (type == Const.Menu_Personal) if (type == Const.Menu_Personal)
{ {
this.Tab1.IFrameUrl = "~/Personal/PersonalInfo.aspx"; this.Tab1.IFrameUrl = "~/Personal/PersonalInfo.aspx";
@ -621,15 +620,8 @@ namespace FineUIPro.Web
else if (type == Const.Menu_ProjectSet) else if (type == Const.Menu_ProjectSet)
{ {
this.Tab1.IFrameUrl = "~/ProjectData/ProjectSetView.aspx"; this.Tab1.IFrameUrl = "~/ProjectData/ProjectSetView.aspx";
this.Tab1.Title = "项目";
} }
else if (type == Const.Menu_DigitalSite) if (type == Const.Menu_PZHGL)
{
this.Tab1.IFrameUrl = "~/Video/Video.aspx";
this.leftPanel.Hidden = true;
this.Tab1.Title = "视频监控";
}
else if (type == Const.Menu_PZHGL)
{ {
//this.Tab1.IFrameUrl = "~/PZHGL/InformationProject/ConstructionPlan.aspx"; //this.Tab1.IFrameUrl = "~/PZHGL/InformationProject/ConstructionPlan.aspx";
this.Tab1.IFrameUrl = "~/HSSE/Manager/HSSELog.aspx"; this.Tab1.IFrameUrl = "~/HSSE/Manager/HSSELog.aspx";
@ -640,6 +632,10 @@ namespace FineUIPro.Web
this.Tab1.IFrameUrl = "~/PZHGL/GJSX/GJSXList.aspx"; this.Tab1.IFrameUrl = "~/PZHGL/GJSX/GJSXList.aspx";
this.Tab1.Title = "关键事项"; this.Tab1.Title = "关键事项";
} }
else
{
this.Tab1.Title = "首页";
}
} }
else else
{ {
@ -714,9 +710,9 @@ namespace FineUIPro.Web
protected void btnDigitalSite_Click(object sender, EventArgs e) protected void btnDigitalSite_Click(object sender, EventArgs e)
{ {
//string url = ConfigurationManager.AppSettings["Video_URL"] + "#/screen"; string url = ConfigurationManager.AppSettings["Video_URL"] + "#/screen";
//Response.Write("<script>window.open(" + url + "'',''_blank'')</script>"); Response.Write("<script>window.open(" + url + "'',''_blank'')</script>");
this.MenuSwitchMethod(Const.Menu_DigitalSite); // this.MenuSwitchMethod(Const.Menu_DigitalSite);
} }
protected string VideoURL protected string VideoURL