1、系统菜单调整;
2、系统看板UI调整; 3、事故事件功能 4、其他
This commit is contained in:
@@ -5,6 +5,8 @@ using System.Web.UI.WebControls;
|
||||
using System.Xml;
|
||||
using System.Linq;
|
||||
using System.Configuration;
|
||||
using System.Web.UI.DataVisualization.Charting;
|
||||
using System.Web.Security;
|
||||
|
||||
namespace FineUIPro.Web
|
||||
{
|
||||
@@ -15,6 +17,8 @@ namespace FineUIPro.Web
|
||||
private string _menuType = "menu";
|
||||
private int _examplesCount = 0;
|
||||
private string _searchText = "";
|
||||
protected string Title = "";
|
||||
|
||||
#region Page_Init
|
||||
|
||||
/// <summary>
|
||||
@@ -297,17 +301,26 @@ namespace FineUIPro.Web
|
||||
}
|
||||
//this.userName.InnerText = this.CurrUser.UserName;
|
||||
//this.spDate.InnerText = DateTime.Now.ToLongDateString().ToString() + " " + WeekDayService.CaculateWeekDayT(DateTime.Now);
|
||||
this.hdHomePage.Text = "1";
|
||||
if (this.CurrUser.HomePageType == "2")
|
||||
//this.hdHomePage.Text = "1";
|
||||
//if (this.CurrUser.HomePageType == "2")
|
||||
//{
|
||||
// this.Tab1.IFrameUrl = "~/common/main2.aspx";
|
||||
// this.hdHomePage.Text = "2";
|
||||
//}
|
||||
//this.btnPersonal.Text = this.CurrUser.UserName;
|
||||
//var getW = WeatherService.GetWeather(null);
|
||||
//if (getW != null)
|
||||
//{
|
||||
// //divWeather.InnerHtml = getW.WeatherRef + " " + getW.CurrTem+ "°C";
|
||||
//}
|
||||
|
||||
if (!string.IsNullOrEmpty(this.CurrUser.UnitId) && this.CurrUser.UnitId != CommonService.GetThisUnitId())
|
||||
{
|
||||
this.Tab1.IFrameUrl = "~/common/main2.aspx";
|
||||
this.hdHomePage.Text = "2";
|
||||
this.Title = "安全数据采集平台(分公司)";
|
||||
}
|
||||
this.btnPersonal.Text = this.CurrUser.UserName;
|
||||
var getW = WeatherService.GetWeather(null);
|
||||
if (getW != null)
|
||||
else
|
||||
{
|
||||
//divWeather.InnerHtml = getW.WeatherRef + " " + getW.CurrTem+ "°C";
|
||||
this.Title = "安全数据采集平台(公司)";
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -404,7 +417,8 @@ namespace FineUIPro.Web
|
||||
{
|
||||
this.leftPanel.Hidden = true;
|
||||
this.XmlDataSource1.DataFile = "common/Menu_Personal.xml";
|
||||
this.Tab1.IFrameUrl = "~/common/main3.aspx";
|
||||
//this.Tab1.IFrameUrl = "~/common/main3.aspx";
|
||||
this.Tab1.IFrameUrl = "~/common/main.aspx";
|
||||
}
|
||||
|
||||
UserService.UpdateLastUserInfo(this.CurrUser.UserId, type, true, string.Empty);
|
||||
@@ -506,6 +520,11 @@ namespace FineUIPro.Web
|
||||
this.MenuSwitchMethod(Const.Menu_Personal);
|
||||
}
|
||||
|
||||
protected void btnMenuSwitch_Click(object sender, EventArgs e)
|
||||
{
|
||||
string datatag = ((FineUIPro.ControlBase)sender).AttributeDataTag;
|
||||
this.MenuSwitchMethod(datatag);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 重新生成系统菜单
|
||||
@@ -519,5 +538,10 @@ namespace FineUIPro.Web
|
||||
MenuSwitchMethod(string.Empty);
|
||||
ShowNotify("菜单刷新完成!", MessageBoxIcon.Success);
|
||||
}
|
||||
protected void btnSignOut_Click(object sender, EventArgs e)
|
||||
{
|
||||
//重定向到登录界面
|
||||
PageContext.Redirect(FormsAuthentication.LoginUrl, "_top");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user