lpf
/
SGGL_SHJ
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitee.com/frane-yang/SGGL_SeDin_New

This commit is contained in:
杨红卫 2023-07-04 14:51:51 +08:00
parent ba56bd28ff 87799090e3
commit 9e33e4d6d3
2 changed files with 51 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
SGGL/FineUIPro.Web/index.aspx.cs
View File

@ -53,7 +53,7 @@ namespace FineUIPro.Web
if (!IsPostBack)
{
this.CurrUser.LoginProjectId = null;
//this.CurrUser.LoginProjectId = null;
}
}
@ -285,27 +285,6 @@ namespace FineUIPro.Web
{
if (!IsPostBack)
{
this.MenuSwitchMethod(Request.Params["menuType"]);
this.InitMenuStyleButton();
this.InitMenuModeButton();
this.InitLangMenuButton();
this.btnRetweet.Hidden = true;
if (this.CurrUser.PersonId == Const.hfnbdId)
{
this.btnRetweet.Hidden = false;
}
this.userName.InnerText = this.CurrUser.PersonName;
this.spDate.InnerText = DateTime.Now.ToLongDateString().ToString() + " " + WeekDayService.CaculateWeekDayT(DateTime.Now);
if (this.CurrUser.Password == Const.MD5pwd)
{
Alert.ShowInTop("当前密码不安全，请尽快更改！", MessageBoxIcon.Warning);
}
this.hdHomePage.Text = "1";
if (this.CurrUser.HomePageType == "2")
{
this.Tab1.IFrameUrl = "~/common/main2.aspx";
this.hdHomePage.Text = "2";
}
if (!string.IsNullOrEmpty(Request.Params["PHTUrl"]))
{
mainTabStrip.ShowTabHeader = true;
@ -330,6 +309,28 @@ namespace FineUIPro.Web
this.MenuSwitchMethod(Request.Params["menuType"]);
}
this.MenuSwitchMethod(Request.Params["menuType"]);
this.InitMenuStyleButton();
this.InitMenuModeButton();
this.InitLangMenuButton();
this.btnRetweet.Hidden = true;
if (this.CurrUser.PersonId == Const.hfnbdId)
{
this.btnRetweet.Hidden = false;
}
this.userName.InnerText = this.CurrUser.PersonName;
this.spDate.InnerText = DateTime.Now.ToLongDateString().ToString() + " " + WeekDayService.CaculateWeekDayT(DateTime.Now);
if (this.CurrUser.Password == Const.MD5pwd)
{
Alert.ShowInTop("当前密码不安全，请尽快更改！", MessageBoxIcon.Warning);
}
this.hdHomePage.Text = "1";
if (this.CurrUser.HomePageType == "2")
{
this.Tab1.IFrameUrl = "~/common/main2.aspx";
this.hdHomePage.Text = "2";
}
var getW = WeatherService.GetWeather(null);
if (getW != null)
{

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

@ -293,6 +293,32 @@ namespace FineUIPro.Web
{
if (!IsPostBack)
{
if (!string.IsNullOrEmpty(Request.Params["PHTUrl"]))
{
this.drpProject.SelectedValue = Request.Params["projectId"];
mainTabStrip.ShowTabHeader = true;
PageContext.RegisterStartupScript("parent.removeActiveTab();");
//btnPHTGL_Click(null, null);
if (!string.IsNullOrEmpty(Request.Params["PHTUserid"]))
{
var model_user = BLL.Person_PersonsService.GetPerson_PersonsById(Request.Params["PHTUserid"]);
var q = BLL.Funs.DB.Person_Persons.FirstOrDefault(x => x.Account == model_user.Account && x.Password == model_user.Password);
if (q != null)
{
Session["CurrUser"] = q;
Session["u"] = model_user.Account;
Session["p"] = model_user.Password;
}
}
btnPHTGL_Click(null, null);
PageContext.RegisterStartupScript(mainTabStrip.GetAddTabReference("dynamic_tab4", Request.Params["PHTUrl"], "审批", IconHelper.GetIconUrl(Icon.ApplicationAdd), true));
}
else
{
this.MenuSwitchMethod(Request.Params["menuType"]);
}
this.drpProject.DataValueField = "ProjectId";
this.drpProject.DataTextField = "ShortName";
var projectlist =ProjectService.GetSortIndexProjectByUserIdDropDownList(this.CurrUser.PersonId);
@ -328,32 +354,7 @@ namespace FineUIPro.Web
this.drpProject.SelectedValue = this.CurrUser.LoginProjectId;
}
if (!string.IsNullOrEmpty(Request.Params["PHTUrl"]))
{
this.drpProject.SelectedValue = Request.Params["projectId"];
mainTabStrip.ShowTabHeader = true;
PageContext.RegisterStartupScript("parent.removeActiveTab();");
//btnPHTGL_Click(null, null);
if (!string.IsNullOrEmpty(Request.Params["PHTUserid"]))
{
var model_user = BLL.Person_PersonsService.GetPerson_PersonsById(Request.Params["PHTUserid"]);
var q = BLL.Funs.DB.Person_Persons.FirstOrDefault(x => x.Account == model_user.Account && x.Password == model_user.Password);
if (q != null)
{
Session["CurrUser"] = q;
Session["u"] = model_user.Account;
Session["p"] = model_user.Password;
}
}
btnPHTGL_Click(null, null);
PageContext.RegisterStartupScript(mainTabStrip.GetAddTabReference("dynamic_tab4", Request.Params["PHTUrl"], "审批", IconHelper.GetIconUrl(Icon.ApplicationAdd), true));
}
else
{
this.MenuSwitchMethod(Request.Params["menuType"]);
}
this.InitMenuStyleButton();
this.InitMenuModeButton();
this.InitLangMenuButton();