diff --git a/DataBase/版本日志/SUBQHSE_V2026-07-30-xiaj（数据治理大屏）.sql b/DataBase/版本日志/SUBQHSE_V2026-07-30-xiaj（数据治理大屏）.sql new file mode 100644 index 00000000..2bc8ab22 --- /dev/null +++ b/DataBase/版本日志/SUBQHSE_V2026-07-30-xiaj（数据治理大屏）.sql @@ -0,0 +1,19 @@ + + +--SELECT SortIndex, SuperMenu, MenuType,* +--FROM Sys_Menu +--WHERE MenuName='Ŀ' + +--ưע⣺ +--˵Ŀ棺SortIndex+1 +--˵ӢֶΣMenuEnName +--˵ӢƣData governance monitoring + + +--˾ĿԤ +IF NOT EXISTS (SELECT * FROM Sys_Menu WHERE MenuId = '204ACA82-15B4-4C80-AE9F-ACF25CE12345') +BEGIN + INSERT INTO dbo.Sys_Menu (MenuId, MenuName,Url, SortIndex, SuperMenu, MenuType, IsOffice, IsEnd, IsUsed) + VALUES (N'204ACA82-15B4-4C80-AE9F-ACF25CE12345', N'', N'ProjectData/DataGovernance.aspx', 11, '75AA6177-8AAD-4AA4-BC4E-3883FB095A65', 'Menu_SysSet', 1,1, 1); +END +GO \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj index 1704020a..e20fd346 100644 --- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj +++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj @@ -1715,6 +1715,7 @@ + @@ -16212,6 +16213,13 @@ PersonIn.aspx + + DataGovernance.aspx + ASPXCodeBehind + + + DataGovernance.aspx + Installation.aspx ASPXCodeBehind diff --git a/SGGL/FineUIPro.Web/ProjectData/DataGovernance.aspx b/SGGL/FineUIPro.Web/ProjectData/DataGovernance.aspx new file mode 100644 index 00000000..dded4302 --- /dev/null +++ b/SGGL/FineUIPro.Web/ProjectData/DataGovernance.aspx @@ -0,0 +1,28 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="DataGovernance.aspx.cs" Inherits="FineUIPro.Web.ProjectData.DataGovernance" %> + + + + + + + 数据治理监控 + + + + +
+ + + + + + + + + + + diff --git a/SGGL/FineUIPro.Web/ProjectData/DataGovernance.aspx.cs b/SGGL/FineUIPro.Web/ProjectData/DataGovernance.aspx.cs new file mode 100644 index 00000000..7f03536a --- /dev/null +++ b/SGGL/FineUIPro.Web/ProjectData/DataGovernance.aspx.cs @@ -0,0 +1,55 @@ +using BLL; +using Newtonsoft.Json; +using System; +using System.Linq; +using System.Web.Security; + +namespace FineUIPro.Web.ProjectData +{ + public partial class DataGovernance : PageBase + { + + + #region 加载页面 + /// + /// 加载页面 + /// + /// + /// + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + //string url = "../DataGovernance/index.html"; + //string url = "https://qhse.cncecoa.com/HSE/DataGovernance/index.html"; + //string url = "https://lygcgs.com.cn:8078/QHSE/DataGovernance/index.html"; + //string url = "https://lygcgs.com.cn:8078/QHSE/FileUpload/DataGovernance/index.html"; + //string roleName = RoleService.getRoleNamesRoleIds(this.CurrUser.RoleId); + //if (roleName.Contains("公司领导") || roleName.Contains("公司管理") || this.CurrUser.UserId == Const.sysglyId || this.CurrUser.UserId == Const.hfnbdId) + //{ + // url += "?type=1,2"; + //} + //else + //{ + // //url += "?type=1"; + // if (FormsAuthentication.LoginUrl.Contains("Hsse")) + // { + // url += "?type=1"; + // } + // else + // { + // url += "?type=2"; + // } + //} + string url = "https://qhse.cncecoa.com/QHSE/FileUpload/DataGovernance/index.html?type=1,2"; + var thisUnit = CommonService.GetIsThisUnit(); + url = $"{url}&fromUnit={thisUnit.UnitId}&random={DateTime.Now.ToString("yyyyMMddHHmmss")}-{new Random().Next(1000, 9999)}"; + ifDataGovernance.Src = url; + //Response.Write(""); + } + } + + #endregion + + } +} \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/ProjectData/DataGovernance.aspx.designer.cs b/SGGL/FineUIPro.Web/ProjectData/DataGovernance.aspx.designer.cs new file mode 100644 index 00000000..a5fe8b3a --- /dev/null +++ b/SGGL/FineUIPro.Web/ProjectData/DataGovernance.aspx.designer.cs @@ -0,0 +1,62 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.ProjectData +{ + + + public partial class DataGovernance + { + + /// + /// form1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// PageManager1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.PageManager PageManager1; + + /// + /// Panel1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel Panel1; + + /// + /// ContentPanel1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ContentPanel ContentPanel1; + + /// + /// ifDataGovernance 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlIframe ifDataGovernance; + } +} diff --git a/SGGL/FineUIPro.Web/ProjectData/PreProjectApply.aspx.cs b/SGGL/FineUIPro.Web/ProjectData/PreProjectApply.aspx.cs index 4e342cef..fd04e4b9 100644 --- a/SGGL/FineUIPro.Web/ProjectData/PreProjectApply.aspx.cs +++ b/SGGL/FineUIPro.Web/ProjectData/PreProjectApply.aspx.cs @@ -233,12 +233,12 @@ namespace FineUIPro.Web.ProjectData Alert.ShowInTop("请选择审批人！", MessageBoxIcon.Warning); return; } - var project = ProjectService.GetProjectByProjectName(projectName); - if (project != null) - { - Alert.ShowInTop($"系统中已存在同名项目，{project.ProjectName}（{project.ProjectCode}），无需申请！", MessageBoxIcon.Warning); - return; - } + //var project = ProjectService.GetProjectByProjectName(projectName); + //if (project != null) + //{ + // Alert.ShowInTop($"系统中已存在同名项目，{project.ProjectName}（{project.ProjectCode}），无需申请！", MessageBoxIcon.Warning); + // return; + //} var applyPro = PreProjectApplyService.GetPreProjectApplyByProjectName(projectName); if (applyPro != null) { diff --git a/SGGL/FineUIPro.Web/ProjectData/ProjectSetSave.aspx.cs b/SGGL/FineUIPro.Web/ProjectData/ProjectSetSave.aspx.cs index 0df004cb..2f7bcbfd 100644 --- a/SGGL/FineUIPro.Web/ProjectData/ProjectSetSave.aspx.cs +++ b/SGGL/FineUIPro.Web/ProjectData/ProjectSetSave.aspx.cs @@ -460,10 +460,10 @@ namespace FineUIPro.Web.ProjectData if (getProject != null) { project.FromProjectId = getProject.FromProjectId; - if (string.IsNullOrWhiteSpace(project.MasterSysId) && !string.IsNullOrWhiteSpace(getProject.MasterSysId)) - { - project.MasterSysId = getProject.MasterSysId; - } + //if (string.IsNullOrWhiteSpace(project.MasterSysId) && !string.IsNullOrWhiteSpace(getProject.MasterSysId)) + //{ + // project.MasterSysId = getProject.MasterSysId; + //} } project.ProjectId = this.ProjectId;