From 855eec9965ad76b7fa0ad198bc94accd8fbedd58 Mon Sep 17 00:00:00 2001 From: xiaju <1784803958@qq.com> Date: Tue, 9 Jun 2026 19:35:12 +0800 Subject: [PATCH] =?UTF-8?q?1=E5=85=BC=E5=AE=B9=E6=95=B0=E6=99=BA=E4=BA=94?= =?UTF-8?q?=E7=8E=AF=E5=A4=A7=E5=B1=8F=EF=BC=8C=E8=B7=B3=E8=BD=AC=E6=96=B9?= =?UTF-8?q?=E6=B3=95=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SGGL/FineUIPro.Web/Login.aspx | 3 ++- .../ProjectData/ProjectInformation.aspx.cs | 3 ++- .../ProjectData/ProjectList.aspx.cs | 6 +++-- .../ProjectData/ProjectSet.aspx.cs | 3 ++- .../ProjectData/ProjectSetSave.aspx | 2 +- .../ProjectData/ProjectSetSave.aspx.cs | 12 +++++----- SGGL/FineUIPro.Web/SelectProject.aspx.cs | 6 +++-- SGGL/FineUIPro.Web/WorkBench.aspx.cs | 3 ++- SGGL/FineUIPro.Web/common/loading.aspx | 3 ++- .../common/loading.aspx.designer.cs | 20 +++++++++------- SGGL/FineUIPro.Web/common/main.aspx | 6 +++-- SGGL/FineUIPro.Web/common/main0.aspx | 6 +++-- SGGL/FineUIPro.Web/common/mainI.aspx | 6 +++-- SGGL/FineUIPro.Web/common/mainIII.aspx | 6 +++-- SGGL/FineUIPro.Web/common/mainIV.aspx | 6 +++-- SGGL/FineUIPro.Web/common/mainProject.aspx | 6 +++-- SGGL/FineUIPro.Web/common/mainProject0.aspx | 6 +++-- SGGL/FineUIPro.Web/common/mainProject1.aspx | 6 +++-- SGGL/FineUIPro.Web/common/themes.aspx | 3 ++- SGGL/FineUIPro.Web/index.aspx | 15 ++++++++---- SGGL/FineUIPro.Web/index.aspx.cs | 6 +++-- SGGL/FineUIPro.Web/indexProject.aspx | 15 ++++++++---- SGGL/FineUIPro.Web/indexProject.aspx.cs | 6 +++-- SGGL/FineUIPro.Web/res/js/index.js | 24 ++++++++++++------- 24 files changed, 114 insertions(+), 64 deletions(-) diff --git a/SGGL/FineUIPro.Web/Login.aspx b/SGGL/FineUIPro.Web/Login.aspx index 133dd338..759ecd30 100644 --- a/SGGL/FineUIPro.Web/Login.aspx +++ b/SGGL/FineUIPro.Web/Login.aspx @@ -216,7 +216,8 @@ setCookie("u", ''); setCookie("p", ''); } - top.window.location.href = data.d; + window.location.href = data.d; + // top.window.location.href = data.d; } } }) diff --git a/SGGL/FineUIPro.Web/ProjectData/ProjectInformation.aspx.cs b/SGGL/FineUIPro.Web/ProjectData/ProjectInformation.aspx.cs index 6b9a61c0..adffb8da 100644 --- a/SGGL/FineUIPro.Web/ProjectData/ProjectInformation.aspx.cs +++ b/SGGL/FineUIPro.Web/ProjectData/ProjectInformation.aspx.cs @@ -81,7 +81,8 @@ namespace FineUIPro.Web.ProjectData { string url = "~/indexProject.aspx?projectId=" + this.tvControlItem.SelectedNode.NodeID; UserService.UpdateLastUserInfo(this.CurrUser.UserId, null, false, this.tvControlItem.SelectedNode.NodeID); - PageContext.Redirect(url, "_top"); + //PageContext.Redirect(url, "_top"); + PageContext.Redirect(url); } else { diff --git a/SGGL/FineUIPro.Web/ProjectData/ProjectList.aspx.cs b/SGGL/FineUIPro.Web/ProjectData/ProjectList.aspx.cs index 0b03f9ae..f8164783 100644 --- a/SGGL/FineUIPro.Web/ProjectData/ProjectList.aspx.cs +++ b/SGGL/FineUIPro.Web/ProjectData/ProjectList.aspx.cs @@ -258,7 +258,8 @@ namespace FineUIPro.Web.ProjectData { string url = "~/indexProject.aspx?projectId=" + Grid1.SelectedRowID; UserService.UpdateLastUserInfo(this.CurrUser.UserId, null, false, Grid1.SelectedRowID); - PageContext.Redirect(url, "_top"); + //PageContext.Redirect(url, "_top"); + PageContext.Redirect(url); } else { @@ -277,7 +278,8 @@ namespace FineUIPro.Web.ProjectData CurrUser.CompanyProjectId = string.Join(",", this.Grid1.SelectedRowIDArray); } - PageContext.Redirect("~/index.aspx", "_top"); + //PageContext.Redirect("~/index.aspx", "_top"); + PageContext.Redirect("~/index.aspx"); } protected void Grid1_RowCommand(object sender, GridCommandEventArgs e) diff --git a/SGGL/FineUIPro.Web/ProjectData/ProjectSet.aspx.cs b/SGGL/FineUIPro.Web/ProjectData/ProjectSet.aspx.cs index 33751330..3d8e4a21 100644 --- a/SGGL/FineUIPro.Web/ProjectData/ProjectSet.aspx.cs +++ b/SGGL/FineUIPro.Web/ProjectData/ProjectSet.aspx.cs @@ -501,7 +501,8 @@ namespace FineUIPro.Web.ProjectData { string url = "~/indexProject.aspx?projectId=" + Grid1.SelectedRowID; UserService.UpdateLastUserInfo(this.CurrUser.UserId, null, false, Grid1.SelectedRowID); - PageContext.Redirect(url, "_top"); + //PageContext.Redirect(url, "_top"); + PageContext.Redirect(url); } else { diff --git a/SGGL/FineUIPro.Web/ProjectData/ProjectSetSave.aspx b/SGGL/FineUIPro.Web/ProjectData/ProjectSetSave.aspx index 632abdb2..65d706ef 100644 --- a/SGGL/FineUIPro.Web/ProjectData/ProjectSetSave.aspx +++ b/SGGL/FineUIPro.Web/ProjectData/ProjectSetSave.aspx @@ -75,7 +75,7 @@ + EnableMultiSelect="false" MatchFieldWidth="false" ShowRedStar="true" AutoPostBack="true" OnTextChanged="MasterData_Changed">