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

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
+2 -1
View File
@@ -216,7 +216,8 @@
setCookie("u", ''); setCookie("u", '');
setCookie("p", ''); setCookie("p", '');
} }
top.window.location.href = data.d; window.location.href = data.d;
// top.window.location.href = data.d;
} }
} }
}) })
@@ -81,7 +81,8 @@ namespace FineUIPro.Web.ProjectData
{ {
string url = "~/indexProject.aspx?projectId=" + this.tvControlItem.SelectedNode.NodeID; string url = "~/indexProject.aspx?projectId=" + this.tvControlItem.SelectedNode.NodeID;
UserService.UpdateLastUserInfo(this.CurrUser.UserId, null, false, 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 else
{ {
@@ -258,7 +258,8 @@ namespace FineUIPro.Web.ProjectData
{ {
string url = "~/indexProject.aspx?projectId=" + Grid1.SelectedRowID; string url = "~/indexProject.aspx?projectId=" + Grid1.SelectedRowID;
UserService.UpdateLastUserInfo(this.CurrUser.UserId, null, false, Grid1.SelectedRowID); UserService.UpdateLastUserInfo(this.CurrUser.UserId, null, false, Grid1.SelectedRowID);
PageContext.Redirect(url, "_top"); //PageContext.Redirect(url, "_top");
PageContext.Redirect(url);
} }
else else
{ {
@@ -277,7 +278,8 @@ namespace FineUIPro.Web.ProjectData
CurrUser.CompanyProjectId = string.Join(",", this.Grid1.SelectedRowIDArray); 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) protected void Grid1_RowCommand(object sender, GridCommandEventArgs e)
@@ -501,7 +501,8 @@ namespace FineUIPro.Web.ProjectData
{ {
string url = "~/indexProject.aspx?projectId=" + Grid1.SelectedRowID; string url = "~/indexProject.aspx?projectId=" + Grid1.SelectedRowID;
UserService.UpdateLastUserInfo(this.CurrUser.UserId, null, false, Grid1.SelectedRowID); UserService.UpdateLastUserInfo(this.CurrUser.UserId, null, false, Grid1.SelectedRowID);
PageContext.Redirect(url, "_top"); //PageContext.Redirect(url, "_top");
PageContext.Redirect(url);
} }
else else
{ {
@@ -75,7 +75,7 @@
<f:FormRow> <f:FormRow>
<Items> <Items>
<f:DropDownBox runat="server" ID="drpMasterBox1" Label="集团主数据" EmptyText="请从下拉表格中选择集团主数据项目" DataControlID="Grid1" <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> <PopPanel>
<f:Panel ID="Panel7" runat="server" BodyPadding="10px" Width="1280px" Height="520px" Hidden="true" <f:Panel ID="Panel7" runat="server" BodyPadding="10px" Width="1280px" Height="520px" Hidden="true"
ShowBorder="true" ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch"> ShowBorder="true" ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
@@ -263,11 +263,11 @@ namespace FineUIPro.Web.ProjectData
ShowNotify($"已存在关联此主数据的项目:({relatePro.ProjectCode}{relatePro.ProjectName}", MessageBoxIcon.Warning); ShowNotify($"已存在关联此主数据的项目:({relatePro.ProjectCode}{relatePro.ProjectName}", MessageBoxIcon.Warning);
} }
} }
else //else
{ //{
ShowNotify($"请选择关联集团主数据项目!", MessageBoxIcon.Warning); // ShowNotify($"请选择关联集团主数据项目!", MessageBoxIcon.Warning);
return; // return;
} //}
this.SaveData(); this.SaveData();
} }
@@ -319,7 +319,7 @@ namespace FineUIPro.Web.ProjectData
{ {
project.JTProjectCode = project.ProjectCode; project.JTProjectCode = project.ProjectCode;
} }
if (!string.IsNullOrWhiteSpace(this.drpMasterBox1.Text)) if (!string.IsNullOrWhiteSpace(this.drpMasterBox1.Value))
{ {
project.MasterSysId = this.drpMasterBox1.Value; project.MasterSysId = this.drpMasterBox1.Value;
} }
+4 -2
View File
@@ -299,7 +299,8 @@ namespace FineUIPro.Web
{ {
string url = "~/indexProject.aspx?projectId=" + Grid1.SelectedRowID; string url = "~/indexProject.aspx?projectId=" + Grid1.SelectedRowID;
UserService.UpdateLastUserInfo(this.CurrUser.UserId, null, false, Grid1.SelectedRowID); UserService.UpdateLastUserInfo(this.CurrUser.UserId, null, false, Grid1.SelectedRowID);
PageContext.Redirect(url, "_top"); //PageContext.Redirect(url, "_top");
PageContext.Redirect(url);
} }
else else
{ {
@@ -331,7 +332,8 @@ namespace FineUIPro.Web
{ {
string url = "~/indexProject.aspx?projectId=" + Grid1.SelectedRowID; string url = "~/indexProject.aspx?projectId=" + Grid1.SelectedRowID;
UserService.UpdateLastUserInfo(this.CurrUser.UserId, null, false, Grid1.SelectedRowID); UserService.UpdateLastUserInfo(this.CurrUser.UserId, null, false, Grid1.SelectedRowID);
PageContext.Redirect(url, "_top"); //PageContext.Redirect(url, "_top");
PageContext.Redirect(url);
} }
else else
{ {
+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) 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 #endregion
+2 -1
View File
@@ -53,7 +53,8 @@
expires: 100 // 单位:天 expires: 100 // 单位:天
}); });
top.window.location.reload(); // top.window.location.reload();
window.location.reload();
}); });
+6 -4
View File
@@ -2,15 +2,17 @@
// <自动生成> // <自动生成>
// 此代码由工具生成。 // 此代码由工具生成。
// //
// 对此文件的更改可能导致不正确的行为,并且如果 // 对此文件的更改可能导致不正确的行为,如果
// 重新生成代码,这些更改将丢失。 // 重新生成代码,则所做更改将丢失。
// </自动生成> // </自动生成>
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
namespace FineUIPro.Web.common { namespace FineUIPro.Web.common
{
public partial class loading { public partial class loading
{
/// <summary> /// <summary>
/// form1 控件。 /// form1 控件。
+4 -2
View File
@@ -1654,7 +1654,8 @@
document.getElementById("hdNoticeId").value = noticeId; document.getElementById("hdNoticeId").value = noticeId;
document.getElementById("imgBtn").click(); document.getElementById("imgBtn").click();
window.open(data); window.open(data);
top.window.location.reload(); // top.window.location.reload();
window.location.reload();
} }
}) })
</script> </script>
@@ -2000,7 +2001,8 @@
$(".project-list>div").click(function () { $(".project-list>div").click(function () {
var $this = $(this) 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) { $(".d-item-js").click(function (e) {
+4 -2
View File
@@ -1451,7 +1451,8 @@ padding-left: 2em;
document.getElementById("hdNoticeId").value = noticeId; document.getElementById("hdNoticeId").value = noticeId;
document.getElementById("imgBtn").click(); document.getElementById("imgBtn").click();
window.open(data); window.open(data);
top.window.location.reload(); // top.window.location.reload();
window.location.reload();
} }
}) })
</script> </script>
@@ -1833,7 +1834,8 @@ padding-left: 2em;
$(".project-list>div").click(function () { $(".project-list>div").click(function () {
var $this = $(this) 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> </script>
+4 -2
View File
@@ -1493,7 +1493,8 @@ padding-left: 2em;
document.getElementById("hdNoticeId").value = noticeId; document.getElementById("hdNoticeId").value = noticeId;
document.getElementById("imgBtn").click(); document.getElementById("imgBtn").click();
window.open(data); window.open(data);
top.window.location.reload(); // top.window.location.reload();
window.location.reload();
} }
}) })
</script> </script>
@@ -1875,7 +1876,8 @@ padding-left: 2em;
$(".project-list>div").click(function () { $(".project-list>div").click(function () {
var $this = $(this) 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> </script>
+4 -2
View File
@@ -964,7 +964,8 @@
document.getElementById("hdNoticeId").value = noticeId; document.getElementById("hdNoticeId").value = noticeId;
document.getElementById("imgBtn").click(); document.getElementById("imgBtn").click();
window.open(data); window.open(data);
top.window.location.reload(); // top.window.location.reload();
window.location.reload();
} }
}) })
var slidesNum = 5 var slidesNum = 5
@@ -991,7 +992,8 @@
$(".project-list>div").click(function () { $(".project-list>div").click(function () {
var $this = $(this) 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 () { $(".js-more-1").click(function () {
+4 -2
View File
@@ -964,7 +964,8 @@
document.getElementById("hdNoticeId").value = noticeId; document.getElementById("hdNoticeId").value = noticeId;
document.getElementById("imgBtn").click(); document.getElementById("imgBtn").click();
window.open(data); window.open(data);
top.window.location.reload(); // top.window.location.reload();
window.location.reload();
} }
}) })
var slidesNum = 5 var slidesNum = 5
@@ -991,7 +992,8 @@
$(".project-list>div").click(function () { $(".project-list>div").click(function () {
var $this = $(this) 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 () { $(".js-more-1").click(function () {
+4 -2
View File
@@ -831,7 +831,8 @@ padding-left: 2em;
document.getElementById("hdNoticeId").value = noticeId; document.getElementById("hdNoticeId").value = noticeId;
document.getElementById("imgBtn").click(); document.getElementById("imgBtn").click();
window.open(data); window.open(data);
top.window.location.reload(); // top.window.location.reload();
window.location.reload();
} }
}) })
var slidesNum = 5 var slidesNum = 5
@@ -858,7 +859,8 @@ padding-left: 2em;
$(".project-list>div").click(function () { $(".project-list>div").click(function () {
var $this = $(this) 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 () { $(".js-more-1").click(function () {
+4 -2
View File
@@ -1169,7 +1169,8 @@ padding-left: 2em;
var data = $this.attr("data-id") var data = $this.attr("data-id")
if (data != "") { if (data != "") {
window.open(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("hdNoticeId").value = noticeId;
document.getElementById("imgBtn").click(); document.getElementById("imgBtn").click();
window.open(data); window.open(data);
top.window.location.reload(); // top.window.location.reload();
window.location.reload();
} }
}) })
</script> </script>
+4 -2
View File
@@ -608,7 +608,8 @@ padding-left: 2em;
document.getElementById("hdNoticeId").value = noticeId; document.getElementById("hdNoticeId").value = noticeId;
document.getElementById("imgBtn").click(); document.getElementById("imgBtn").click();
window.open(data); window.open(data);
top.window.location.reload(); // top.window.location.reload();
window.location.reload();
} }
}) })
var slidesNum = 5 var slidesNum = 5
@@ -634,7 +635,8 @@ padding-left: 2em;
$(".project-list>div").click(function () { $(".project-list>div").click(function () {
var $this = $(this) 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> </script>
+2 -1
View File
@@ -412,7 +412,8 @@
expires: 100 // 单位:天 expires: 100 // 单位:天
}); });
top.window.location.reload(); // top.window.location.reload();
window.location.reload();
}); });
+10 -5
View File
@@ -728,14 +728,16 @@
function onSearchTrigger1Click(event) { function onSearchTrigger1Click(event) {
F.removeCookie('SearchText_Pro'); F.removeCookie('SearchText_Pro');
top.window.location.reload(); // top.window.location.reload();
window.location.reload();
} }
function onSearchTrigger2Click(event) { function onSearchTrigger2Click(event) {
F.cookie('SearchText_Pro', this.getValue(), { F.cookie('SearchText_Pro', this.getValue(), {
expires: 100 // 单位:天 expires: 100 // 单位:天
}); });
top.window.location.reload(); // top.window.location.reload();
window.location.reload();
} }
// 点击标题栏工具图标 - 刷新 // 点击标题栏工具图标 - 刷新
function onToolRefreshClick(event) { function onToolRefreshClick(event) {
@@ -868,7 +870,8 @@
F.cookie('MenuStyle_Pro', menuStyle, { F.cookie('MenuStyle_Pro', menuStyle, {
expires: 100 // 单位:天 expires: 100 // 单位:天
}); });
top.window.location.reload(); // top.window.location.reload();
window.location.reload();
} }
// 点击显示模式 // 点击显示模式
@@ -878,7 +881,8 @@
F.cookie('MenuMode_Pro', menuMode, { F.cookie('MenuMode_Pro', menuMode, {
expires: 100 // 单位:天 expires: 100 // 单位:天
}); });
top.window.location.reload(); // top.window.location.reload();
window.location.reload();
} }
// 点击语言 // 点击语言
@@ -887,7 +891,8 @@
F.cookie('Language_Pro', lang, { F.cookie('Language_Pro', lang, {
expires: 100 // 单位:天 expires: 100 // 单位:天
}); });
top.window.location.reload(); // top.window.location.reload();
window.location.reload();
} }
// 点击标题栏工具图标 - 退出 // 点击标题栏工具图标 - 退出
+4 -2
View File
@@ -466,7 +466,8 @@ namespace FineUIPro.Web
//{ //{
// this.MenuSwitchMethod(string.Empty); // 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) protected void btnPerson_Click(object sender, EventArgs e)
@@ -642,7 +643,8 @@ namespace FineUIPro.Web
/// <param name="e"></param> /// <param name="e"></param>
protected void btnWorkBench_Click(object sender, EventArgs e) protected void btnWorkBench_Click(object sender, EventArgs e)
{ {
PageContext.Redirect("~/WorkBench.aspx", "_top"); //PageContext.Redirect("~/WorkBench.aspx", "_top");
PageContext.Redirect("~/WorkBench.aspx");
} }
/// <summary> /// <summary>
/// 呼叫 /// 呼叫
+10 -5
View File
@@ -817,14 +817,16 @@
function onSearchTrigger1Click(event) { function onSearchTrigger1Click(event) {
F.removeCookie('SearchText_Pro'); F.removeCookie('SearchText_Pro');
top.window.location.reload(); // top.window.location.reload();
window.location.reload();
} }
function onSearchTrigger2Click(event) { function onSearchTrigger2Click(event) {
F.cookie('SearchText_Pro', this.getValue(), { F.cookie('SearchText_Pro', this.getValue(), {
expires: 100 // 单位:天 expires: 100 // 单位:天
}); });
top.window.location.reload(); // top.window.location.reload();
window.location.reload();
} }
// 点击标题栏工具图标 - 刷新 // 点击标题栏工具图标 - 刷新
function onToolRefreshClick(event) { function onToolRefreshClick(event) {
@@ -962,7 +964,8 @@
F.cookie('MenuStyle_Pro', menuStyle, { F.cookie('MenuStyle_Pro', menuStyle, {
expires: 100 // 单位:天 expires: 100 // 单位:天
}); });
top.window.location.reload(); // top.window.location.reload();
window.location.reload();
} }
// 点击显示模式 // 点击显示模式
@@ -972,7 +975,8 @@
F.cookie('MenuMode_Pro', menuMode, { F.cookie('MenuMode_Pro', menuMode, {
expires: 100 // 单位:天 expires: 100 // 单位:天
}); });
top.window.location.reload(); // top.window.location.reload();
window.location.reload();
} }
// 点击语言 // 点击语言
@@ -981,7 +985,8 @@
F.cookie('Language_Pro', lang, { F.cookie('Language_Pro', lang, {
expires: 100 // 单位:天 expires: 100 // 单位:天
}); });
top.window.location.reload(); // top.window.location.reload();
window.location.reload();
} }
// 点击标题栏工具图标 - 退出 // 点击标题栏工具图标 - 退出
+4 -2
View File
@@ -786,7 +786,8 @@ namespace FineUIPro.Web
//{ //{
// this.MenuSwitchMethod(string.Empty); // 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) protected void btnCQMS_Click(object sender, EventArgs e)
{ {
@@ -995,7 +996,8 @@ namespace FineUIPro.Web
/// <param name="e"></param> /// <param name="e"></param>
protected void btnWorkBench_Click(object sender, EventArgs e) protected void btnWorkBench_Click(object sender, EventArgs e)
{ {
PageContext.Redirect("~/WorkBench.aspx", "_top"); //PageContext.Redirect("~/WorkBench.aspx", "_top");
PageContext.Redirect("~/WorkBench.aspx");
} }
/// <summary> /// <summary>
+16 -8
View File
@@ -236,13 +236,15 @@ function onShowOnlyBaseClick(event) {
var checked = this.isChecked(); var checked = this.isChecked();
setCookie('ShowOnlyBase', checked); setCookie('ShowOnlyBase', checked);
top.window.location.reload(); // top.window.location.reload();
window.location.reload();
} }
function onSearchTrigger1Click(event) { function onSearchTrigger1Click(event) {
F.removeCookie('SearchText'); F.removeCookie('SearchText');
top.window.location.reload(); // top.window.location.reload();
window.location.reload();
} }
function onSearchTrigger2Click(event) { function onSearchTrigger2Click(event) {
@@ -253,7 +255,8 @@ function onSearchTrigger2Click(event) {
var ttbxSearchValue = ttbxSearch.getValue(); var ttbxSearchValue = ttbxSearch.getValue();
if (ttbxSearchValue) { if (ttbxSearchValue) {
setCookie('SearchText', this.getValue()); 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) { function onPageClick(event) {
var url = "index.aspx?type=" + event.target.innerText; 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'); var menuStyle = item.getAttr('data-tag');
setCookie('MenuStyle', menuStyle); 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'); var displayMode = item.getAttr('data-tag');
setCookie('DisplayMode', displayMode); 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'); var lang = item.getAttr('data-tag');
setCookie('Language', lang); 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'); var mainTabs = item.getAttr('data-tag');
setCookie('MainTabs', mainTabs); setCookie('MainTabs', mainTabs);
top.window.location.reload(); // top.window.location.reload();
window.location.reload();
} }