20250329 工作台

This commit is contained in:
2025-03-29 00:01:50 +08:00
parent 2d5e6785f1
commit 70169120e3
27 changed files with 770 additions and 795 deletions
+47 -27
View File
@@ -299,9 +299,21 @@ namespace FineUIPro.Web
Response.Expires = 0; //设置过期时间
Response.Cache.SetNoStore(); //在服务器端不缓存该页面
Response.AppendHeader("Pragma", "no-cache"); //在客户端不缓存
ProjectService.InitProjectShortNameByStateDropDownList(this.drpProject, this.CurrUser.UserId, BLL.Const.ProjectState_1, false,"1");
if (!string.IsNullOrEmpty(Request.Params["projectId"]))
{
var pro = BLL.ProjectService.GetProjectByProjectId(Request.Params["projectId"]);
if (pro != null)
{
if (pro.ProjectState != "1")
{
ProjectService.InitProjectShortNameByStateDropDownList(this.drpProject, this.CurrUser.UserId, pro.ProjectState, false, "1");
}
else
{
ProjectService.InitProjectShortNameByStateDropDownList(this.drpProject, this.CurrUser.UserId, BLL.Const.ProjectState_1, false, "1");
}
}
this.drpProject.SelectedValue = Request.Params["projectId"];
}
else if (!string.IsNullOrEmpty(Request.Params["projectName"]))
@@ -309,11 +321,31 @@ namespace FineUIPro.Web
var getproject = ProjectService.GetProjectByProjectName(Request.Params["projectName"]);
if (getproject != null)
{
if (getproject.ProjectState!="1")
{
ProjectService.InitProjectShortNameByStateDropDownList(this.drpProject, this.CurrUser.UserId, getproject.ProjectState, false, "1");
}
else
{
ProjectService.InitProjectShortNameByStateDropDownList(this.drpProject, this.CurrUser.UserId, BLL.Const.ProjectState_1, false, "1");
}
this.drpProject.SelectedValue = getproject.ProjectId;
}
}
else if (!string.IsNullOrEmpty(this.CurrUser.LoginProjectId))
{
var pro = BLL.ProjectService.GetProjectByProjectId(this.CurrUser.LoginProjectId);
if (pro != null)
{
if (pro.ProjectState != "1")
{
ProjectService.InitProjectShortNameByStateDropDownList(this.drpProject, this.CurrUser.UserId, pro.ProjectState, false, "1");
}
else
{
ProjectService.InitProjectShortNameByStateDropDownList(this.drpProject, this.CurrUser.UserId, BLL.Const.ProjectState_1, false, "1");
}
}
this.drpProject.SelectedValue = this.CurrUser.LoginProjectId;
}
this.CurrUser.LoginProjectId = this.drpProject.SelectedValue;
@@ -327,6 +359,7 @@ namespace FineUIPro.Web
var project = Funs.DB.Base_Project.FirstOrDefault(x => x.ProjectId == this.drpProject.SelectedValue);
if (project != null && !string.IsNullOrEmpty(project.ProjectCode))
{
this.lblProjectName.Text = project.ProjectName;
this.hfProjectCode.Text = project.ProjectCode;
}
if (project != null && !string.IsNullOrEmpty(project.MonitorPW))
@@ -636,7 +669,6 @@ namespace FineUIPro.Web
/// <param name="type"></param>
protected void MenuSwitchMethod(string type)
{
// this.CurrUser.LoginProjectId = this.drpProject.SelectedValue;
this.XmlDataSource1.DataFile = "common/Menu_Personal.xml";
this.leftPanel.Hidden = true;
var projectUser = BLL.ProjectUserService.GetProjectUserByUserIdProjectId(this.CurrUser.LoginProjectId, this.CurrUser.UserId);
@@ -661,19 +693,6 @@ namespace FineUIPro.Web
}
}
}
//if (roleTypes.Contains(Const.Role_III))
//{
// this.Tab1.IFrameUrl = "~/common/mainIII.aspx?roleCNs=" + roleCNs;
//}
//else if (roleTypes.Contains(Const.Role_IV))
//{
// this.Tab1.IFrameUrl = "~/common/mainIV.aspx?roleCNs=" + roleCNs + "&unitWorkIds=" + projectUser.WorkAreaId;
//}
//else
//{
// this.Tab1.IFrameUrl = "~/common/mainProject2.aspx";
//}
this.Tab1.IFrameUrl = "~/common/mainProject2.aspx";
}
else
@@ -749,17 +768,18 @@ namespace FineUIPro.Web
{
//修改本部用户都能进
//this.CurrUser.UnitId == Const.drpProject &&
if (string.IsNullOrEmpty(this.CurrUser.LastProjectId)
&& ((this.CurrUser.IsOffice == true) || this.CurrUser.UserId == Const.sysglyId || this.CurrUser.UserId == Const.hfnbdId))
{
UserService.UpdateLastUserInfo(this.CurrUser.UserId, this.CurrUser.LastMenuType, false, this.CurrUser.LoginProjectId);
this.CurrUser.LastProjectId = this.CurrUser.LoginProjectId;
PageContext.Redirect("~/index.aspx", "_top");
}
else
{
this.MenuSwitchMethod(string.Empty);
}
//if (string.IsNullOrEmpty(this.CurrUser.LastProjectId)
// && ((this.CurrUser.IsOffice == true) || this.CurrUser.UserId == Const.sysglyId || this.CurrUser.UserId == Const.hfnbdId))
//{
// UserService.UpdateLastUserInfo(this.CurrUser.UserId, this.CurrUser.LastMenuType, false, this.CurrUser.LoginProjectId);
// this.CurrUser.LastProjectId = this.CurrUser.LoginProjectId;
// PageContext.Redirect("~/index.aspx", "_top");
//}
//else
//{
//this.MenuSwitchMethod(string.Empty);
//}
PageContext.Redirect("~/indexProject.aspx", "_top");
}
protected void btnCQMS_Click(object sender, EventArgs e)
{
@@ -948,7 +968,7 @@ namespace FineUIPro.Web
/// <param name="e"></param>
protected void btnProjectLists_Click(object sender, EventArgs e)
{
PageContext.RegisterStartupScript(Window3.GetShowReference(String.Format("~/SelectProject.aspx", "查看 - ")));
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("~/SelectProject.aspx", "查看 - ")));
}