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

1兼容数智五环大屏，跳转方法调整

Browse Source
This commit is contained in:
夏菊
2026-06-09 19:35:12 +08:00
parent 6ccdec9b10
commit 855eec9965
24 changed files with 114 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/Login.aspx
+2 -1
View File
@@ -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;
}
}
})
SGGL/FineUIPro.Web/ProjectData/ProjectInformation.aspx.cs
+2 -1
View File
@@ -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
{
SGGL/FineUIPro.Web/ProjectData/ProjectList.aspx.cs
+4 -2
View File
@@ -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)
SGGL/FineUIPro.Web/ProjectData/ProjectSet.aspx.cs
+2 -1
View File
@@ -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
{
SGGL/FineUIPro.Web/ProjectData/ProjectSetSave.aspx
+1 -1
View File
@@ -75,7 +75,7 @@
<f:FormRow>
<Items>
<f:DropDownBox runat="server" ID="drpMasterBox1" Label="集团主数据" EmptyText="请从下拉表格中选择集团主数据项目" DataControlID="Grid1"
EnableMultiSelect="false" MatchFieldWidth="false" ShowRedStar="true" Required="true" AutoPostBack="true" OnTextChanged="MasterData_Changed">
EnableMultiSelect="false" MatchFieldWidth="false" ShowRedStar="true" AutoPostBack="true" OnTextChanged="MasterData_Changed">
<PopPanel>
<f:Panel ID="Panel7" runat="server" BodyPadding="10px" Width="1280px" Height="520px" Hidden="true"
ShowBorder="true" ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
SGGL/FineUIPro.Web/ProjectData/ProjectSetSave.aspx.cs
+6 -6
View File
@@ -263,11 +263,11 @@ namespace FineUIPro.Web.ProjectData
ShowNotify($"已存在关联此主数据的项目：（{relatePro.ProjectCode}）{relatePro.ProjectName}！", MessageBoxIcon.Warning);
}
}
else
{
ShowNotify($"请选择关联集团主数据项目！", MessageBoxIcon.Warning);
return;
}
//else
//{
// ShowNotify($"请选择关联集团主数据项目！", MessageBoxIcon.Warning);
// return;
//}
this.SaveData();
}
@@ -319,7 +319,7 @@ namespace FineUIPro.Web.ProjectData
{
project.JTProjectCode = project.ProjectCode;
}
if (!string.IsNullOrWhiteSpace(this.drpMasterBox1.Text))
if (!string.IsNullOrWhiteSpace(this.drpMasterBox1.Value))
{
project.MasterSysId = this.drpMasterBox1.Value;
}
SGGL/FineUIPro.Web/SelectProject.aspx.cs
+4 -2
View File
@@ -299,7 +299,8 @@ namespace FineUIPro.Web
{
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
{
@@ -331,7 +332,8 @@ namespace FineUIPro.Web
{
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
{
SGGL/FineUIPro.Web/WorkBench.aspx.cs
+2 -1
View File
@@ -357,7 +357,8 @@ namespace FineUIPro.Web
{
if (this.CurrUser.IsOffice == true || this.CurrUser.UserId == Const.sysglyId || this.CurrUser.UserId == Const.hfnbdId)
{
PageContext.Redirect("~/index.aspx", "_top");
//PageContext.Redirect("~/index.aspx", "_top");
PageContext.Redirect("~/index.aspx");
}
}
#endregion
SGGL/FineUIPro.Web/common/loading.aspx
+2 -1
View File
@@ -53,7 +53,8 @@
expires: 100 // 单位：天
});
top.window.location.reload();
// top.window.location.reload();
window.location.reload();
});
SGGL/FineUIPro.Web/common/loading.aspx.designer.cs
Generated
+11 -9
View File
@@ -2,16 +2,18 @@
// <自动生成>
// 此代码由工具生成。
//
// 对此文件的更改可能会导致不正确的行为，并且如果
// 重新生成代码，这些更改将会丢失。
// 对此文件的更改可能导致不正确的行为，如果
// 重新生成代码，则所做更改将丢失。
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.common {
public partial class loading {
namespace FineUIPro.Web.common
{
public partial class loading
{
/// <summary>
/// form1 控件。
/// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.common {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
/// <summary>
/// PageManager1 控件。
/// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.common {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.PageManager PageManager1;
/// <summary>
/// litIcons 控件。
/// </summary>
SGGL/FineUIPro.Web/common/main.aspx
+4 -2
View File
@@ -1654,7 +1654,8 @@
document.getElementById("hdNoticeId").value = noticeId;
document.getElementById("imgBtn").click();
window.open(data);
top.window.location.reload();
// top.window.location.reload();
window.location.reload();
}
})
</script>
@@ -2000,7 +2001,8 @@
$(".project-list>div").click(function () {
var $this = $(this)
top.window.location.href = "../indexProject.aspx?projectName=" + $this.html();
// top.window.location.href = "../indexProject.aspx?projectName=" + $this.html();
window.location.href = "../indexProject.aspx?projectName=" + $this.html();
});
})
$(".d-item-js").click(function (e) {
SGGL/FineUIPro.Web/common/main0.aspx
+4 -2
View File
@@ -1451,7 +1451,8 @@ padding-left: 2em;
document.getElementById("hdNoticeId").value = noticeId;
document.getElementById("imgBtn").click();
window.open(data);
top.window.location.reload();
// top.window.location.reload();
window.location.reload();
}
})
</script>
@@ -1833,7 +1834,8 @@ padding-left: 2em;
$(".project-list>div").click(function () {
var $this = $(this)
top.window.location.href = "../indexProject.aspx?projectName=" + $this.html();
// top.window.location.href = "../indexProject.aspx?projectName=" + $this.html();
window.location.href = "../indexProject.aspx?projectName=" + $this.html();
});
})
</script>
SGGL/FineUIPro.Web/common/mainI.aspx
+4 -2
View File
@@ -1493,7 +1493,8 @@ padding-left: 2em;
document.getElementById("hdNoticeId").value = noticeId;
document.getElementById("imgBtn").click();
window.open(data);
top.window.location.reload();
// top.window.location.reload();
window.location.reload();
}
})
</script>
@@ -1875,7 +1876,8 @@ padding-left: 2em;
$(".project-list>div").click(function () {
var $this = $(this)
top.window.location.href = "../indexProject.aspx?projectName=" + $this.html();
// top.window.location.href = "../indexProject.aspx?projectName=" + $this.html();
window.location.href = "../indexProject.aspx?projectName=" + $this.html();
});
})
</script>
SGGL/FineUIPro.Web/common/mainIII.aspx
+4 -2
View File
@@ -964,7 +964,8 @@
document.getElementById("hdNoticeId").value = noticeId;
document.getElementById("imgBtn").click();
window.open(data);
top.window.location.reload();
// top.window.location.reload();
window.location.reload();
}
})
var slidesNum = 5
@@ -991,7 +992,8 @@
$(".project-list>div").click(function () {
var $this = $(this)
top.window.location.href = "../indexProject.aspx?projectName=" + $this.html();
// top.window.location.href = "../indexProject.aspx?projectName=" + $this.html();
window.location.href = "../indexProject.aspx?projectName=" + $this.html();
});
$(".js-more-1").click(function () {
SGGL/FineUIPro.Web/common/mainIV.aspx
+4 -2
View File
@@ -964,7 +964,8 @@
document.getElementById("hdNoticeId").value = noticeId;
document.getElementById("imgBtn").click();
window.open(data);
top.window.location.reload();
// top.window.location.reload();
window.location.reload();
}
})
var slidesNum = 5
@@ -991,7 +992,8 @@
$(".project-list>div").click(function () {
var $this = $(this)
top.window.location.href = "../indexProject.aspx?projectName=" + $this.html();
// top.window.location.href = "../indexProject.aspx?projectName=" + $this.html();
window.location.href = "../indexProject.aspx?projectName=" + $this.html();
});
$(".js-more-1").click(function () {
SGGL/FineUIPro.Web/common/mainProject.aspx
+4 -2
View File
@@ -831,7 +831,8 @@ padding-left: 2em;
document.getElementById("hdNoticeId").value = noticeId;
document.getElementById("imgBtn").click();
window.open(data);
top.window.location.reload();
// top.window.location.reload();
window.location.reload();
}
})
var slidesNum = 5
@@ -858,7 +859,8 @@ padding-left: 2em;
$(".project-list>div").click(function () {
var $this = $(this)
top.window.location.href = "../indexProject.aspx?projectName=" + $this.html();
// top.window.location.href = "../indexProject.aspx?projectName=" + $this.html();
window.location.href = "../indexProject.aspx?projectName=" + $this.html();
});
$(".js-more-1").click(function () {
SGGL/FineUIPro.Web/common/mainProject0.aspx
+4 -2
View File
@@ -1169,7 +1169,8 @@ padding-left: 2em;
var data = $this.attr("data-id")
if (data != "") {
window.open(data);
top.window.location.reload();
// top.window.location.reload();
window.location.reload();
}
})
@@ -1181,7 +1182,8 @@ padding-left: 2em;
document.getElementById("hdNoticeId").value = noticeId;
document.getElementById("imgBtn").click();
window.open(data);
top.window.location.reload();
// top.window.location.reload();
window.location.reload();
}
})
</script>
SGGL/FineUIPro.Web/common/mainProject1.aspx
+4 -2
View File
@@ -608,7 +608,8 @@ padding-left: 2em;
document.getElementById("hdNoticeId").value = noticeId;
document.getElementById("imgBtn").click();
window.open(data);
top.window.location.reload();
// top.window.location.reload();
window.location.reload();
}
})
var slidesNum = 5
@@ -634,7 +635,8 @@ padding-left: 2em;
$(".project-list>div").click(function () {
var $this = $(this)
top.window.location.href = "../indexProject.aspx?projectName=" + $this.html();
// top.window.location.href = "../indexProject.aspx?projectName=" + $this.html();
window.location.href = "../indexProject.aspx?projectName=" + $this.html();
});
})
</script>
SGGL/FineUIPro.Web/common/themes.aspx
+2 -1
View File
@@ -412,7 +412,8 @@
expires: 100 // 单位：天
});
top.window.location.reload();
// top.window.location.reload();
window.location.reload();
});
SGGL/FineUIPro.Web/index.aspx
+10 -5
View File
@@ -728,14 +728,16 @@
function onSearchTrigger1Click(event) {
F.removeCookie('SearchText_Pro');
top.window.location.reload();
// top.window.location.reload();
window.location.reload();
}
function onSearchTrigger2Click(event) {
F.cookie('SearchText_Pro', this.getValue(), {
expires: 100 // 单位：天
});
top.window.location.reload();
// top.window.location.reload();
window.location.reload();
}
// 点击标题栏工具图标 - 刷新
function onToolRefreshClick(event) {
@@ -868,7 +870,8 @@
F.cookie('MenuStyle_Pro', menuStyle, {
expires: 100 // 单位：天
});
top.window.location.reload();
// top.window.location.reload();
window.location.reload();
}
// 点击显示模式
@@ -878,7 +881,8 @@
F.cookie('MenuMode_Pro', menuMode, {
expires: 100 // 单位：天
});
top.window.location.reload();
// top.window.location.reload();
window.location.reload();
}
// 点击语言
@@ -887,7 +891,8 @@
F.cookie('Language_Pro', lang, {
expires: 100 // 单位：天
});
top.window.location.reload();
// top.window.location.reload();
window.location.reload();
}
// 点击标题栏工具图标 - 退出
SGGL/FineUIPro.Web/index.aspx.cs
+4 -2
View File
@@ -466,7 +466,8 @@ namespace FineUIPro.Web
//{
// this.MenuSwitchMethod(string.Empty);
//}
PageContext.Redirect("~/index.aspx", "_top");
//PageContext.Redirect("~/index.aspx", "_top");
PageContext.Redirect("~/index.aspx");
}
protected void btnPerson_Click(object sender, EventArgs e)
@@ -642,7 +643,8 @@ namespace FineUIPro.Web
/// <param name="e"></param>
protected void btnWorkBench_Click(object sender, EventArgs e)
{
PageContext.Redirect("~/WorkBench.aspx", "_top");
//PageContext.Redirect("~/WorkBench.aspx", "_top");
PageContext.Redirect("~/WorkBench.aspx");
}
/// <summary>
/// 呼叫
SGGL/FineUIPro.Web/indexProject.aspx
+10 -5
View File
@@ -817,14 +817,16 @@
function onSearchTrigger1Click(event) {
F.removeCookie('SearchText_Pro');
top.window.location.reload();
// top.window.location.reload();
window.location.reload();
}
function onSearchTrigger2Click(event) {
F.cookie('SearchText_Pro', this.getValue(), {
expires: 100 // 单位：天
});
top.window.location.reload();
// top.window.location.reload();
window.location.reload();
}
// 点击标题栏工具图标 - 刷新
function onToolRefreshClick(event) {
@@ -962,7 +964,8 @@
F.cookie('MenuStyle_Pro', menuStyle, {
expires: 100 // 单位：天
});
top.window.location.reload();
// top.window.location.reload();
window.location.reload();
}
// 点击显示模式
@@ -972,7 +975,8 @@
F.cookie('MenuMode_Pro', menuMode, {
expires: 100 // 单位：天
});
top.window.location.reload();
// top.window.location.reload();
window.location.reload();
}
// 点击语言
@@ -981,7 +985,8 @@
F.cookie('Language_Pro', lang, {
expires: 100 // 单位：天
});
top.window.location.reload();
// top.window.location.reload();
window.location.reload();
}
// 点击标题栏工具图标 - 退出
SGGL/FineUIPro.Web/indexProject.aspx.cs
+4 -2
View File
@@ -786,7 +786,8 @@ namespace FineUIPro.Web
//{
// this.MenuSwitchMethod(string.Empty);
//}
PageContext.Redirect("~/indexProject.aspx", "_top");
//PageContext.Redirect("~/indexProject.aspx", "_top");
PageContext.Redirect("~/indexProject.aspx");
}
protected void btnCQMS_Click(object sender, EventArgs e)
{
@@ -995,7 +996,8 @@ namespace FineUIPro.Web
/// <param name="e"></param>
protected void btnWorkBench_Click(object sender, EventArgs e)
{
PageContext.Redirect("~/WorkBench.aspx", "_top");
//PageContext.Redirect("~/WorkBench.aspx", "_top");
PageContext.Redirect("~/WorkBench.aspx");
}
/// <summary>
SGGL/FineUIPro.Web/res/js/index.js
+16 -8
View File
@@ -236,13 +236,15 @@ function onShowOnlyBaseClick(event) {
var checked = this.isChecked();
setCookie('ShowOnlyBase', checked);
top.window.location.reload();
// top.window.location.reload();
window.location.reload();
}
function onSearchTrigger1Click(event) {
F.removeCookie('SearchText');
top.window.location.reload();
// top.window.location.reload();
window.location.reload();
}
function onSearchTrigger2Click(event) {
@@ -253,7 +255,8 @@ function onSearchTrigger2Click(event) {
var ttbxSearchValue = ttbxSearch.getValue();
if (ttbxSearchValue) {
setCookie('SearchText', this.getValue());
top.window.location.reload();
// top.window.location.reload();
window.location.reload();
}
}
}
@@ -301,7 +304,8 @@ function onToolRefreshClick(event) {
// 点击标题栏工具图标 - 刷新
function onPageClick(event) {
var url = "index.aspx?type=" + event.target.innerText;
top.window.location.href = url;
// top.window.location.href = url;
window.location.href = url;
}
// 点击标题栏工具图标 - 在新标签页中打开
@@ -423,7 +427,8 @@ function onMenuStyleCheckChange(event, item, checked) {
var menuStyle = item.getAttr('data-tag');
setCookie('MenuStyle', menuStyle);
top.window.location.reload();
// top.window.location.reload();
window.location.reload();
}
// 点击显示模式
@@ -431,7 +436,8 @@ function onMenuDisplayModeCheckChange(event, item, checked) {
var displayMode = item.getAttr('data-tag');
setCookie('DisplayMode', displayMode);
top.window.location.reload();
// top.window.location.reload();
window.location.reload();
}
// 点击语言
@@ -439,7 +445,8 @@ function onMenuLangCheckChange(event, item, checked) {
var lang = item.getAttr('data-tag');
setCookie('Language', lang);
top.window.location.reload();
// top.window.location.reload();
window.location.reload();
}
// 点击选项卡标签页
@@ -447,7 +454,8 @@ function onMenuMainTabsCheckChange(event, item, checked) {
var mainTabs = item.getAttr('data-tag');
setCookie('MainTabs', mainTabs);
top.window.location.reload();
// top.window.location.reload();
window.location.reload();
}