From 3fc9aeab38d0ba6a6e30f007634f46958ebbae69 Mon Sep 17 00:00:00 2001 From: fei550 <1420031550@qq.com> Date: Thu, 25 Dec 2025 20:17:07 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=8E=AF=E5=A2=83?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E5=A2=9E=E5=8A=A0=E4=BA=91=E7=9C=B8=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProjectData/ProjectDevices.aspx.cs | 30 ++++++++-------- .../ProjectData/ProjectDevicesEdit.aspx.cs | 25 +++++++------ .../ProjectData/ProjectSysSet.aspx | 7 +--- .../ProjectData/ProjectSysSet.aspx.cs | 35 ++++++++++++++++++- 4 files changed, 64 insertions(+), 33 deletions(-) diff --git a/SGGL/FineUIPro.Web/ProjectData/ProjectDevices.aspx.cs b/SGGL/FineUIPro.Web/ProjectData/ProjectDevices.aspx.cs index f85822d3..696c9dd8 100644 --- a/SGGL/FineUIPro.Web/ProjectData/ProjectDevices.aspx.cs +++ b/SGGL/FineUIPro.Web/ProjectData/ProjectDevices.aspx.cs @@ -27,9 +27,8 @@ namespace FineUIPro.Web.ProjectData if (!IsPostBack) { Funs.DropDownPageSize(this.ddlPageSize); - this.ddlPageSize.SelectedValue = Grid1.PageSize.ToString(); - + // 绑定表格 this.BindGrid(); ////权限按钮方法 @@ -60,7 +59,7 @@ namespace FineUIPro.Web.ProjectData tb = GetFilteredTable(Grid1.FilteredData, tb); var table = this.GetPagedDataTable(Grid1, tb); Grid1.DataSource = table; - Grid1.DataBind(); + Grid1.DataBind(); } #region 操作 Events @@ -165,7 +164,7 @@ namespace FineUIPro.Web.ProjectData return; } - var device = Funs.DB.Project_Devices.FirstOrDefault(x=>x.DeviceId== Grid1.SelectedRowID) ; + var device = Funs.DB.Project_Devices.FirstOrDefault(x => x.DeviceId == Grid1.SelectedRowID); if (device != null) { var project = Funs.DB.Base_Project.FirstOrDefault(x => x.ProjectId == CurrUser.LoginProjectId); @@ -201,13 +200,14 @@ namespace FineUIPro.Web.ProjectData var project = Funs.DB.Base_Project.FirstOrDefault(x => x.ProjectId == CurrUser.LoginProjectId); var token = YunMouHelper.getToken(); var res = YunMouHelper.addDevicesToGroups(project.YunMouGroupId, new string[] { device.DeviceSerial }, token);//添加到权限组 - YunMouHelper.setDefence(device.DeviceSerial,"1",token); + YunMouHelper.setDefence(device.DeviceSerial, "1", token); if (string.IsNullOrEmpty(res)) { Alert.ShowInTop("关联权限出错！", MessageBoxIcon.Warning); } - else { + else + { device.YunMouPermission = "是"; Funs.DB.SubmitChanges(); ShowNotify("关联成功", MessageBoxIcon.Success); @@ -215,7 +215,7 @@ namespace FineUIPro.Web.ProjectData } } } - + protected void btnMenuDeletePermission_Click(object sender, EventArgs e) { if (Grid1.SelectedRowIndexArray.Length == 0) @@ -255,8 +255,8 @@ namespace FineUIPro.Web.ProjectData return; } - PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ProjectDevicesEdit.aspx?DeviceId={0}", Grid1.SelectedRowID), "编辑项目单位", 800, 300)); - + PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ProjectDevicesEdit.aspx?DeviceId={0}", Grid1.SelectedRowID), "编辑项目单位", 800, 300)); + } /// @@ -282,18 +282,18 @@ namespace FineUIPro.Web.ProjectData return; } string menuId = BLL.Const.ProjectDevicesMenuId; - + var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.PersonId, menuId); if (buttonList.Count() > 0) { if (buttonList.Contains(BLL.Const.BtnAdd)) { this.btnAdd.Hidden = false; - + } if (buttonList.Contains(BLL.Const.BtnModify)) { - this.btnMenuDeletePermission.Hidden= false; + this.btnMenuDeletePermission.Hidden = false; this.btnAdd.Hidden = false; this.btnMenuEdit.Hidden = false; this.btnMenuDeviceToYunMou.Hidden = false; @@ -304,7 +304,7 @@ namespace FineUIPro.Web.ProjectData this.btnMenuDelete.Hidden = false; } } - + } #endregion @@ -320,8 +320,8 @@ namespace FineUIPro.Web.ProjectData this.BindGrid(); this.GetButtonPower(); } - #endregion + #endregion + - } } \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/ProjectData/ProjectDevicesEdit.aspx.cs b/SGGL/FineUIPro.Web/ProjectData/ProjectDevicesEdit.aspx.cs index d2471ca8..13d8a6f3 100644 --- a/SGGL/FineUIPro.Web/ProjectData/ProjectDevicesEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/ProjectData/ProjectDevicesEdit.aspx.cs @@ -6,7 +6,10 @@ using System.Web; using System.Web.UI; using System.Web.UI.WebControls; using BLL; -using BLL.Common; +using BLL.Common; +using FastReport.Cloud.OAuth; +using FineUIPro.Web.DataShow; +using Org.BouncyCastle.Crypto; namespace FineUIPro.Web.ProjectData { @@ -39,11 +42,11 @@ namespace FineUIPro.Web.ProjectData { if (!IsPostBack) { - btnClose.OnClientClick = ActiveWindow.GetHideReference(); + btnClose.OnClientClick = ActiveWindow.GetHideReference(); this.DeviceId = Request.Params["DeviceId"]; if (!string.IsNullOrEmpty(this.DeviceId)) { - Model.Project_Devices device = Funs.DB.Project_Devices.FirstOrDefault(x=>x.DeviceId==this.DeviceId); + Model.Project_Devices device = Funs.DB.Project_Devices.FirstOrDefault(x => x.DeviceId == this.DeviceId); if (device != null) { this.txtDeviceName.Text = device.DeviceName; @@ -59,8 +62,8 @@ namespace FineUIPro.Web.ProjectData { this.dpCreateDate.Text = string.Format("{0:yyyy-MM-dd}", device.CreateDate); } - - } + + } } } } @@ -74,15 +77,15 @@ namespace FineUIPro.Web.ProjectData /// protected void btnSave_Click(object sender, EventArgs e) { - - + + Model.Project_Devices device = new Model.Project_Devices { ProjectId = this.CurrUser.LoginProjectId, DeviceName = this.txtDeviceName.Text.Trim(), DeviceSerial = this.txtDeviceSerial.Text.Trim(), Address = txtAddress.Text.Trim(), - ValidateCode=txtValidateCode.Text.Trim(), + ValidateCode = txtValidateCode.Text.Trim(), CreateDate = Funs.GetNewDateTime(this.dpCreateDate.Text.Trim()) }; if (this.drpInOut.SelectedValue != BLL.Const._Null) @@ -120,9 +123,9 @@ namespace FineUIPro.Web.ProjectData } #endregion - - - + + + } } \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/ProjectData/ProjectSysSet.aspx b/SGGL/FineUIPro.Web/ProjectData/ProjectSysSet.aspx index fca5e0d5..4c77b905 100644 --- a/SGGL/FineUIPro.Web/ProjectData/ProjectSysSet.aspx +++ b/SGGL/FineUIPro.Web/ProjectData/ProjectSysSet.aspx @@ -30,12 +30,7 @@ - - - - - - + diff --git a/SGGL/FineUIPro.Web/ProjectData/ProjectSysSet.aspx.cs b/SGGL/FineUIPro.Web/ProjectData/ProjectSysSet.aspx.cs index de5019cc..85a404b2 100644 --- a/SGGL/FineUIPro.Web/ProjectData/ProjectSysSet.aspx.cs +++ b/SGGL/FineUIPro.Web/ProjectData/ProjectSysSet.aspx.cs @@ -51,6 +51,35 @@ namespace FineUIPro.Web.common.ProjectSet ShowNotify("请选择项目！", MessageBoxIcon.Warning); return; } + #region 云眸 + ///通用 + var getProject = ProjectService.GetProjectByProjectId(projectId); + if (getProject != null) + { + getProject.IsYunMou = this.ckbIsYunMou.Checked; + if (this.ckbIsYunMou.Checked) + { + var token = YunMouHelper.getToken(); + string data; + data = Regex.Replace(getProject.ProjectCode, "[^0-9A-Fa-f]", "", RegexOptions.IgnoreCase); + YunMouHelper.addDevicesGroups(getProject.ProjectName, data, token); + var groupId = YunMouHelper.addPermissionGroups(getProject.ProjectName, token); + if (!string.IsNullOrEmpty(groupId)) + { + getProject.YunMouGroupId = groupId; + } + } + else + { + var token = YunMouHelper.getToken(); + string data; + data = Regex.Replace(getProject.ProjectCode, "[^0-9A-Fa-f]", "", RegexOptions.IgnoreCase); + YunMouHelper.deleteDevicesGroups(data, token);//删除设备分组，如果有子节点，可以不删除 + + } + Funs.DB.SubmitChanges(); + } + #endregion #region 焊接 // 焊接 Model.Project_Sys_Set dayReport = BLL.Project_SysSetService.GetSysSetBySetId("1", projectId); @@ -339,7 +368,11 @@ namespace FineUIPro.Web.common.ProjectSet SetCheckFromDict(dict, "10", this.ckPressMustCheckBItem); if (dict.ContainsKey("11")) this.rbMaterialColorAttribute.SelectedValue = dict["11"].SetValue == "1" ? "1" : "2"; } - + var getProject = ProjectService.GetProjectByProjectId(projectId); + if (getProject != null && getProject.IsYunMou == true) + { + this.ckbIsYunMou.Checked = true; + } //颜色模型设置 var m1 = BLL.Project_SysSetService.GetSysSetBySetName("管线未完成", this.CurrUser.LoginProjectId); if (m1 != null) this.txtPipelineNOComplete.Text = m1.SetValue; From 8fe384bb6ab670aaf27048dca9905d991aad7440 Mon Sep 17 00:00:00 2001 From: fei550 <1420031550@qq.com> Date: Fri, 26 Dec 2025 10:51:20 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E6=89=A9=E5=B1=95=E6=8B=9B=E6=A0=87?= =?UTF-8?q?=E6=96=B9=E5=BC=8F=E9=80=89=E9=A1=B9=E5=B9=B6=E4=BF=AE=E6=AD=A3?= =?UTF-8?q?=E4=B8=8B=E6=8B=89=E7=BB=91=E5=AE=9A=E5=AD=97=E6=AE=B5=E9=A1=BA?= =?UTF-8?q?=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SGGL/BLL/DropListService.cs | 15 +++++++++------ .../BidDocumentsReviewService.cs | 4 ++-- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/SGGL/BLL/DropListService.cs b/SGGL/BLL/DropListService.cs index f616d01e..76dd763a 100644 --- a/SGGL/BLL/DropListService.cs +++ b/SGGL/BLL/DropListService.cs @@ -463,12 +463,15 @@ namespace BLL /// public static ListItem[] GetBidType() { - ListItem[] list = new ListItem[5]; - list[0] = new ListItem("招标", "公开招标"); - list[1] = new ListItem("谈判", "邀请招标"); - list[2] = new ListItem("询比 ", "询比价"); - list[3] = new ListItem("竞价", "竞争性谈判"); - list[4] = new ListItem("直接分包", "单一来源"); + ListItem[] list = new ListItem[8]; + list[0] = new ListItem("公开招标", "公开招标"); + list[1] = new ListItem("邀请招标", "邀请招标"); + list[2] = new ListItem("公开询比 ", "公开询比"); + list[3] = new ListItem("邀请询比 ", "邀请询比"); + list[4] = new ListItem("公开谈判", "公开谈判"); + list[5] = new ListItem("邀请谈判", "邀请谈判"); + list[6] = new ListItem("竞价", "竞价"); + list[7] = new ListItem("直接分包", "直接分包"); return list; } diff --git a/SGGL/BLL/PHTGL/BiddingManagement/BidDocumentsReviewService.cs b/SGGL/BLL/PHTGL/BiddingManagement/BidDocumentsReviewService.cs index 840d9350..28803f2d 100644 --- a/SGGL/BLL/PHTGL/BiddingManagement/BidDocumentsReviewService.cs +++ b/SGGL/BLL/PHTGL/BiddingManagement/BidDocumentsReviewService.cs @@ -127,8 +127,8 @@ namespace BLL /// 是否显示请选择 public static void InitGetBidTypeDropDownList(FineUIPro.DropDownList dropName, bool isShowPlease) { - dropName.DataValueField = "Text"; - dropName.DataTextField = "Value"; + dropName.DataValueField = "Value"; + dropName.DataTextField = "Text"; dropName.DataSource = BLL.DropListService.GetBidType(); dropName.DataBind(); if (isShowPlease) From 70f08c69ab8a059b373a8f4571fd283ccd13bfa1 Mon Sep 17 00:00:00 2001 From: gaofei1985 <181547018@qq.com> Date: Fri, 26 Dec 2025 10:52:44 +0800 Subject: [PATCH 3/6] 1 --- ...B_V2025-12-26-xiaj（集团项目现场亮点照片）.sql | 146 ++++ SGGL/BLL/BLL.csproj | 1 + .../ProjectHighlightsSiteService.cs | 328 +++++++++ SGGL/BLL/Common/Const.cs | 14 + .../ProjectHighlightsSitePic.aspx | 162 ++++ .../ProjectHighlightsSitePic.aspx.cs | 292 ++++++++ .../ProjectHighlightsSitePic.aspx.designer.cs | 143 ++++ .../ProjectHighlightsSitePicEdit.aspx | 67 ++ .../ProjectHighlightsSitePicEdit.aspx.cs | 89 +++ ...jectHighlightsSitePicEdit.aspx.designer.cs | 143 ++++ .../ProjectHighlightsSitePicReport.aspx | 178 +++++ .../ProjectHighlightsSitePicReport.aspx.cs | 362 +++++++++ ...ctHighlightsSitePicReport.aspx.designer.cs | 188 +++++ .../ProjectHighlightsSiteType.aspx | 56 ++ .../ProjectHighlightsSiteType.aspx.cs | 132 ++++ ...ProjectHighlightsSiteType.aspx.designer.cs | 80 ++ SGGL/FineUIPro.Web/FineUIPro.Web.csproj | 34 +- SGGL/FineUIPro.Web/common/Menu_CQMS.xml | 2 + SGGL/FineUIPro.Web/common/Menu_DigData.xml | 63 +- SGGL/FineUIPro.Web/common/Menu_HJGL.xml | 8 +- SGGL/FineUIPro.Web/common/Menu_HSSE.xml | 3 +- SGGL/FineUIPro.Web/common/Menu_HTGL.xml | 6 +- SGGL/FineUIPro.Web/common/Menu_JDGL.xml | 6 +- SGGL/FineUIPro.Web/common/Menu_PHTGL.xml | 2 +- SGGL/FineUIPro.Web/common/Menu_ProjectSet.xml | 1 + SGGL/FineUIPro.Web/common/Menu_SysSet.xml | 3 + SGGL/FineUIPro.Web/common/Menu_ZHGL.xml | 45 ++ SGGL/Model/Model.cs | 692 ++++++++++++++++++ 28 files changed, 3177 insertions(+), 69 deletions(-) create mode 100644 DataBase/版本日志/SGGLDB_V2025-12-26-xiaj（集团项目现场亮点照片）.sql create mode 100644 SGGL/BLL/CQMS/ProjectHighlightsSite/ProjectHighlightsSiteService.cs create mode 100644 SGGL/FineUIPro.Web/CQMS/ProjectHighlightsSite/ProjectHighlightsSitePic.aspx create mode 100644 SGGL/FineUIPro.Web/CQMS/ProjectHighlightsSite/ProjectHighlightsSitePic.aspx.cs create mode 100644 SGGL/FineUIPro.Web/CQMS/ProjectHighlightsSite/ProjectHighlightsSitePic.aspx.designer.cs create mode 100644 SGGL/FineUIPro.Web/CQMS/ProjectHighlightsSite/ProjectHighlightsSitePicEdit.aspx create mode 100644 SGGL/FineUIPro.Web/CQMS/ProjectHighlightsSite/ProjectHighlightsSitePicEdit.aspx.cs create mode 100644 SGGL/FineUIPro.Web/CQMS/ProjectHighlightsSite/ProjectHighlightsSitePicEdit.aspx.designer.cs create mode 100644 SGGL/FineUIPro.Web/CQMS/ProjectHighlightsSite/ProjectHighlightsSitePicReport.aspx create mode 100644 SGGL/FineUIPro.Web/CQMS/ProjectHighlightsSite/ProjectHighlightsSitePicReport.aspx.cs create mode 100644 SGGL/FineUIPro.Web/CQMS/ProjectHighlightsSite/ProjectHighlightsSitePicReport.aspx.designer.cs create mode 100644 SGGL/FineUIPro.Web/CQMS/ProjectHighlightsSite/ProjectHighlightsSiteType.aspx create mode 100644 SGGL/FineUIPro.Web/CQMS/ProjectHighlightsSite/ProjectHighlightsSiteType.aspx.cs create mode 100644 SGGL/FineUIPro.Web/CQMS/ProjectHighlightsSite/ProjectHighlightsSiteType.aspx.designer.cs diff --git a/DataBase/版本日志/SGGLDB_V2025-12-26-xiaj（集团项目现场亮点照片）.sql b/DataBase/版本日志/SGGLDB_V2025-12-26-xiaj（集团项目现场亮点照片）.sql new file mode 100644 index 00000000..fbe7b254 --- /dev/null +++ b/DataBase/版本日志/SGGLDB_V2025-12-26-xiaj（集团项目现场亮点照片）.sql @@ -0,0 +1,146 @@ + +--˾Ŀֳ + IF NOT EXISTS (SELECT * FROM Sys_Menu WHERE MenuId = '42106F55-BE3A-4252-8D4D-0793E4777524') +BEGIN +INSERT INTO dbo.Sys_Menu (MenuId, MenuName,Url, SortIndex, SuperMenu, MenuType, IsOffice, IsEnd, IsUsed) +VALUES (N'42106F55-BE3A-4252-8D4D-0793E4777524', N'Ŀֳ', N'', 65, N'0', N'Menu_ZHGL', 1,0, 1); +END +GO +--˾Ŀֳ + IF NOT EXISTS (SELECT * FROM Sys_Menu WHERE MenuId = '67F04484-EC26-49AA-BFB4-6CF5DB06F8CA') +BEGIN +INSERT INTO dbo.Sys_Menu (MenuId, MenuName,Url, SortIndex, SuperMenu, MenuType, IsOffice, IsEnd, IsUsed) +VALUES (N'67F04484-EC26-49AA-BFB4-6CF5DB06F8CA', N'Ŀֳ', N'CQMS/ProjectHighlightsSite/ProjectHighlightsSiteType.aspx', 10, N'42106F55-BE3A-4252-8D4D-0793E4777524', N'Menu_ZHGL', 1,1, 1); +INSERT INTO dbo.Sys_Menu (MenuId, MenuName,Url, SortIndex, SuperMenu, MenuType, IsOffice, IsEnd, IsUsed) +VALUES (N'38177E89-4BA8-4D66-AFB9-93644DFE7451', N'ĿֳƬ', N'CQMS/ProjectHighlightsSite/ProjectHighlightsSitePicReport.aspx', 20, N'42106F55-BE3A-4252-8D4D-0793E4777524', N'Menu_ZHGL', 1,1, 1); +END +GO + + +--ĿĿֳ + IF NOT EXISTS (SELECT * FROM Sys_Menu WHERE MenuId = 'AB393E2F-7CC9-4ED2-AD32-202A961ED45D') +BEGIN +INSERT INTO dbo.Sys_Menu (MenuId, MenuName,Url, SortIndex, SuperMenu, MenuType, IsOffice, IsEnd, IsUsed) +VALUES (N'AB393E2F-7CC9-4ED2-AD32-202A961ED45D', N'Ŀֳ', N'', 110, N'0', N'Menu_CQMS',0,0, 1); +END +GO +--ĿĿֳ + IF NOT EXISTS (SELECT * FROM Sys_Menu WHERE MenuId = 'D81AE7C1-2022-4089-B0F9-49903798DEEF') +BEGIN +INSERT INTO dbo.Sys_Menu (MenuId, MenuName,Url, SortIndex, SuperMenu, MenuType, IsOffice, IsEnd, IsUsed) +VALUES (N'D81AE7C1-2022-4089-B0F9-49903798DEEF', N'ĿֳƬ', N'CQMS/ProjectHighlightsSite/ProjectHighlightsSitePic.aspx', 10, N'AB393E2F-7CC9-4ED2-AD32-202A961ED45D', N'Menu_CQMS', 1,1, 1); +END +GO + + +--ҵĿֳƬť +IF NOT EXISTS (SELECT * FROM Sys_ButtonToMenu WHERE MenuId = '38177E89-4BA8-4D66-AFB9-93644DFE7451') +BEGIN +INSERT INTO [dbo].[Sys_ButtonToMenu] ([ButtonToMenuId], [MenuId], [ButtonName], [SortIndex]) +VALUES (N'BCAA2928-80AF-486B-A266-75FDD8B3C8D5', N'38177E89-4BA8-4D66-AFB9-93644DFE7451', N'', 1); +INSERT INTO [dbo].[Sys_ButtonToMenu] ([ButtonToMenuId], [MenuId], [ButtonName], [SortIndex]) +VALUES (N'C54E07A1-EB5A-45BC-9E70-6CDE67E2F12A', N'38177E89-4BA8-4D66-AFB9-93644DFE7451', N'޸', 2); +INSERT INTO [dbo].[Sys_ButtonToMenu] ([ButtonToMenuId], [MenuId], [ButtonName], [SortIndex]) +VALUES (N'A50A19C9-ACC0-4CFC-B356-E28767126481', N'38177E89-4BA8-4D66-AFB9-93644DFE7451', N'ɾ', 3); +INSERT INTO [dbo].[Sys_ButtonToMenu] ([ButtonToMenuId], [MenuId], [ButtonName], [SortIndex]) +VALUES (N'0563E76D-98EE-4D91-A0DE-A64F6664765E', N'38177E89-4BA8-4D66-AFB9-93644DFE7451', N'', 4); +INSERT INTO [dbo].[Sys_ButtonToMenu] ([ButtonToMenuId], [MenuId], [ButtonName], [SortIndex]) +VALUES (N'84172E43-0005-4D65-8F5A-AC87D1B210A0', N'38177E89-4BA8-4D66-AFB9-93644DFE7451', N'沢ϱ', 5); +END +GO + +--ĿֳƬť +IF NOT EXISTS (SELECT * FROM Sys_ButtonToMenu WHERE MenuId = 'D81AE7C1-2022-4089-B0F9-49903798DEEF') +BEGIN +INSERT INTO [dbo].[Sys_ButtonToMenu] ([ButtonToMenuId], [MenuId], [ButtonName], [SortIndex]) +VALUES (N'53909252-6868-438D-AD0B-443186AA9DEF', N'D81AE7C1-2022-4089-B0F9-49903798DEEF', N'', 1); +INSERT INTO [dbo].[Sys_ButtonToMenu] ([ButtonToMenuId], [MenuId], [ButtonName], [SortIndex]) +VALUES (N'7E74086A-9846-4B2E-B08F-1CF058240F07', N'D81AE7C1-2022-4089-B0F9-49903798DEEF', N'޸', 2); +INSERT INTO [dbo].[Sys_ButtonToMenu] ([ButtonToMenuId], [MenuId], [ButtonName], [SortIndex]) +VALUES (N'FADC8D81-2DAF-4D7E-99E6-A4A605241953', N'D81AE7C1-2022-4089-B0F9-49903798DEEF', N'ɾ', 3); +INSERT INTO [dbo].[Sys_ButtonToMenu] ([ButtonToMenuId], [MenuId], [ButtonName], [SortIndex]) +VALUES (N'3A296D42-25E4-4DF2-85A7-1490969F1ABD', N'D81AE7C1-2022-4089-B0F9-49903798DEEF', N'', 4); +END +GO + + + + + + +--Ŀֳ +IF NOT EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'Base_ProjectHighlightsSiteType') AND type = N'U') +BEGIN +CREATE TABLE [dbo].[Base_ProjectHighlightsSiteType]( + [Id] [nvarchar](50) NOT NULL, + [MainType] [int] NOT NULL, + [MainTypeName] [nvarchar](50) NOT NULL, + [SubType] [nvarchar](200) NOT NULL, + [Remark] [nvarchar](50) NULL, + [CompileMan] [nvarchar](50) NOT NULL, + [CompileManName] [nvarchar](50) NULL, + [CompileDate] [datetime] NULL, + CONSTRAINT [PK_Base_ProjectHighlightsSiteType] PRIMARY KEY CLUSTERED +( + [Id] ASC +)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY] +) ON [PRIMARY] +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Base_ProjectHighlightsSiteType', @level2type=N'COLUMN',@level2name=N'Id' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Base_ProjectHighlightsSiteType', @level2type=N'COLUMN',@level2name=N'MainType' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Base_ProjectHighlightsSiteType', @level2type=N'COLUMN',@level2name=N'MainTypeName' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'С' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Base_ProjectHighlightsSiteType', @level2type=N'COLUMN',@level2name=N'SubType' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ע' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Base_ProjectHighlightsSiteType', @level2type=N'COLUMN',@level2name=N'Remark' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Base_ProjectHighlightsSiteType', @level2type=N'COLUMN',@level2name=N'CompileMan' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Base_ProjectHighlightsSiteType', @level2type=N'COLUMN',@level2name=N'CompileManName' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ʱ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Base_ProjectHighlightsSiteType', @level2type=N'COLUMN',@level2name=N'CompileDate' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Ŀֳ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Base_ProjectHighlightsSiteType' +END + +GO + +--ĿֳƬ +IF NOT EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'CQMS_ProjectHighlightsSitePic') AND type = N'U') +BEGIN +CREATE TABLE [dbo].[CQMS_ProjectHighlightsSitePic]( + [Id] [nvarchar](50) NOT NULL, + [ProjectId] [nvarchar](50) NOT NULL, + [TypeId] [nvarchar](50) NOT NULL, + [MainType] [int] NOT NULL, + [MainTypeName] [nvarchar](50) NOT NULL, + [SubType] [nvarchar](200) NOT NULL, + [Remark] [nvarchar](50) NULL, + [Resume] [nvarchar](500) NULL, + [PicUrl] [nvarchar](500) NULL, + [CompileMan] [nvarchar](50) NULL, + [CompileManName] [nvarchar](50) NULL, + [CompileDate] [datetime] NULL, + [IsReport] [bit] NOT NULL, + [ReportDate] [datetime] NULL, + [ReportMan] [nvarchar](50) NULL, + [ReportManName] [nvarchar](50) NULL, + CONSTRAINT [PK_CQMS_ProjectHighlightsSitePic] PRIMARY KEY CLUSTERED +( + [Id] ASC +)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY] +) ON [PRIMARY] +ALTER TABLE [dbo].[CQMS_ProjectHighlightsSitePic] ADD CONSTRAINT [DF_CQMS_ProjectHighlightsSitePic_IsReport] DEFAULT ((0)) FOR [IsReport] +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'CQMS_ProjectHighlightsSitePic', @level2type=N'COLUMN',@level2name=N'Id' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ƬId' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'CQMS_ProjectHighlightsSitePic', @level2type=N'COLUMN',@level2name=N'TypeId' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ĿId' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'CQMS_ProjectHighlightsSitePic', @level2type=N'COLUMN',@level2name=N'ProjectId' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'CQMS_ProjectHighlightsSitePic', @level2type=N'COLUMN',@level2name=N'MainType' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'CQMS_ProjectHighlightsSitePic', @level2type=N'COLUMN',@level2name=N'MainTypeName' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'С' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'CQMS_ProjectHighlightsSitePic', @level2type=N'COLUMN',@level2name=N'SubType' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ע' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'CQMS_ProjectHighlightsSitePic', @level2type=N'COLUMN',@level2name=N'Remark' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'CQMS_ProjectHighlightsSitePic', @level2type=N'COLUMN',@level2name=N'Resume' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Ƭ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'CQMS_ProjectHighlightsSitePic', @level2type=N'COLUMN',@level2name=N'PicUrl' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'CQMS_ProjectHighlightsSitePic', @level2type=N'COLUMN',@level2name=N'CompileMan' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'CQMS_ProjectHighlightsSitePic', @level2type=N'COLUMN',@level2name=N'CompileManName' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ʱ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'CQMS_ProjectHighlightsSitePic', @level2type=N'COLUMN',@level2name=N'CompileDate' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Ƿϱ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'CQMS_ProjectHighlightsSitePic', @level2type=N'COLUMN',@level2name=N'IsReport' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ϱʱ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'CQMS_ProjectHighlightsSitePic', @level2type=N'COLUMN',@level2name=N'ReportDate' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ϱ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'CQMS_ProjectHighlightsSitePic', @level2type=N'COLUMN',@level2name=N'ReportMan' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ϱ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'CQMS_ProjectHighlightsSitePic', @level2type=N'COLUMN',@level2name=N'ReportManName' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ĿֳƬ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'CQMS_ProjectHighlightsSitePic' +END + +GO diff --git a/SGGL/BLL/BLL.csproj b/SGGL/BLL/BLL.csproj index 72a496c3..6150c5b9 100644 --- a/SGGL/BLL/BLL.csproj +++ b/SGGL/BLL/BLL.csproj @@ -276,6 +276,7 @@ + diff --git a/SGGL/BLL/CQMS/ProjectHighlightsSite/ProjectHighlightsSiteService.cs b/SGGL/BLL/CQMS/ProjectHighlightsSite/ProjectHighlightsSiteService.cs new file mode 100644 index 00000000..dbb524f6 --- /dev/null +++ b/SGGL/BLL/CQMS/ProjectHighlightsSite/ProjectHighlightsSiteService.cs @@ -0,0 +1,328 @@ +using FineUIPro; +using Microsoft.SqlServer.Dts.Runtime; +using Model; +using Newtonsoft.Json; +using Newtonsoft.Json.Linq; +using NPOI.SS.Formula.Functions; +using System; +using System.Collections; +using System.Collections.Generic; +using System.Linq; + +namespace BLL +{ + /// + /// 项目现场亮点照片收集 + /// + public class ProjectHighlightsSiteService + { + #region 项目现场亮点类型 + + #region 获取集团项目现场亮点类型 + + /// + /// 获取项目现场亮点类型 + /// + /// + public static Model.ResponeData GetProjectHighlightsSiteTypeFromGroup() + { + var responeData = new Model.ResponeData(); + try + { + string unitId = BLL.Const.UnitId_SEDIN; + string baseurl = $"{SysConstSetService.CNCECPath}/api/CQMSData/getProjectHighlightsSiteType?unitId=" + unitId; + string contenttype = "application/json;charset=unicode"; + Hashtable newToken = new Hashtable + { + { "token", ServerService.GetToken().Token } + }; + var strJosn = APIGetHttpService.Http(baseurl, "GET", contenttype, newToken, null); + if (!string.IsNullOrEmpty(strJosn)) + { + JObject obj = JObject.Parse(strJosn); + responeData.code = Funs.GetNewIntOrZero(obj["code"].ToString()); + responeData.message = obj["message"].ToString(); + if (responeData.code == 1) + { + JArray getData = JArray.Parse(obj["data"].ToString()); + if (getData.Count() > 0) + { + using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + { + List ids = new List(); + foreach (var item in getData) + { + string Id = item["Id"].ToString(); + var model = db.Base_ProjectHighlightsSiteType.FirstOrDefault(e => e.Id == Id); + if (model == null) + { + Model.Base_ProjectHighlightsSiteType newModel = new Model.Base_ProjectHighlightsSiteType + { + Id = item["Id"].ToString(), + MainType = int.Parse(item["MainType"].ToString()), + MainTypeName = item["MainTypeName"].ToString(), + SubType = item["SubType"].ToString(), + Remark = item["Remark"].ToString(), + CompileMan = item["CompileMan"].ToString(), + CompileManName = item["CompileManName"].ToString(), + CompileDate = DateTime.Now + }; + db.Base_ProjectHighlightsSiteType.InsertOnSubmit(newModel); + db.SubmitChanges(); + } + else + { + model.MainType = int.Parse(item["MainType"].ToString()); + model.MainTypeName = item["MainTypeName"].ToString(); + model.SubType = item["SubType"].ToString(); + model.Remark = item["Remark"].ToString(); + model.CompileMan = item["CompileMan"].ToString(); + model.CompileManName = item["CompileManName"].ToString(); + model.CompileDate = DateTime.Now; + db.SubmitChanges(); + } + } + } + } + responeData.message = "获取成功：项目现场亮点类型" + getData.Count().ToString() + "条"; + } + } + } + catch (Exception ex) + { + responeData.code = 0; + responeData.message = "获取失败：" + ex.Message; + ErrLogInfo.WriteLog("获取集团项目现场亮点类型！", ex); + } + + return responeData; + } + + #endregion + + /// + /// 项目现场亮点类型下拉 + /// + /// + /// + public static void InitProjectHighlightsSiteTypeNameDropDownList(DropDownList dropName, bool isShowPlease) + { + dropName.DataValueField = "string"; + dropName.DataTextField = "string"; + dropName.DataSource = GetProjectHighlightsSiteTypeDropDownList(); + dropName.DataBind(); + if (isShowPlease) + { + Funs.FineUIPleaseSelect(dropName); + } + } + + /// + /// 项目现场亮点类型下拉 + /// + /// + public static List GetProjectHighlightsSiteTypeDropDownList() + { + return (from x in (from x in Funs.DB.Base_ProjectHighlightsSiteType select new { x.MainType, x.MainTypeName }).Distinct() + orderby x.MainType + select x.MainTypeName).ToList(); + } + + #endregion + + #region 项目现场亮点照片收集 + + /// + /// 项目亮点 + /// + /// + /// + public static Model.CQMS_ProjectHighlightsSitePic GetProjectHighlightsSiteById(string Id) + { + return Funs.DB.CQMS_ProjectHighlightsSitePic.FirstOrDefault(e => e.Id == Id); + } + + /// + /// 修改项目亮点 + /// + /// + public static void UpdateProjectHighlightsSite(Model.CQMS_ProjectHighlightsSitePic model) + { + Model.SGGLDB db = Funs.DB; + Model.CQMS_ProjectHighlightsSitePic newModel = db.CQMS_ProjectHighlightsSitePic.FirstOrDefault(e => e.Id == model.Id); + if (newModel != null) + { + newModel.IsReport = false;//维护项目亮点后，状态自动改为未上报 + newModel.Resume = model.Resume; + newModel.PicUrl = model.PicUrl; + newModel.CompileMan = model.CompileMan; + newModel.CompileManName = model.CompileManName; + newModel.CompileDate = model.CompileDate; + db.SubmitChanges(); + } + } + + /// + /// 根据主键Id重置项目亮点描述和照片信息 + /// + /// + public static void ResetProjectHighlightsSitePicById(string Id) + { + Model.SGGLDB db = Funs.DB; + Model.CQMS_ProjectHighlightsSitePic model = db.CQMS_ProjectHighlightsSitePic.FirstOrDefault(e => e.Id == Id); + if (model != null) + { + //删除亮点照片 + BLL.CommonService.DeleteAttachFileById(Id); + model.PicUrl = null; + model.IsReport = false; + model.Resume = string.Empty; + db.SubmitChanges(); + } + } + + /// + /// 更新项目亮点类型 + /// + /// + /// + public static bool UpdateProjectHighlightsSiteTypeFromGroup(string projectId) + { + using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + { + var lstBaseType = db.Base_ProjectHighlightsSiteType.ToList(); + var lstProPic = db.CQMS_ProjectHighlightsSitePic.Where(e => e.ProjectId == projectId); + + //var oldProPicList = db.CQMS_ProjectHighlightsSitePic.Where(x=> lstBaseType.Contains()); + foreach (var item in lstProPic) + { + if (!lstBaseType.Where(e => e.Id == item.TypeId).Any()) + {//项目亮点类型不存在集团项目亮点类型库中时，删除冗余数据 + //删除亮点照片 + BLL.CommonService.DeleteAttachFileById(item.Id); + //删除冗余数据 + db.CQMS_ProjectHighlightsSitePic.DeleteOnSubmit(item); + db.SubmitChanges(); + } + } + + lstProPic = db.CQMS_ProjectHighlightsSitePic.Where(e => e.ProjectId == projectId); + foreach (var item in lstBaseType) + { + var model = lstProPic.FirstOrDefault(e => e.TypeId == item.Id); + if (model == null) + { + Model.CQMS_ProjectHighlightsSitePic newModel = new Model.CQMS_ProjectHighlightsSitePic + { + Id = SQLHelper.GetNewID(), + ProjectId = projectId, + TypeId = item.Id, + MainType = item.MainType, + MainTypeName = item.MainTypeName, + SubType = item.SubType, + Remark = item.Remark + }; + db.CQMS_ProjectHighlightsSitePic.InsertOnSubmit(newModel); + db.SubmitChanges(); + } + else + { + model.MainType = item.MainType; + model.MainTypeName = item.MainTypeName; + model.SubType = item.SubType; + model.Remark = item.Remark; + db.SubmitChanges(); + } + } + return true; + } + } + + + #endregion + + + #region 上报项目现场亮点信息到集团 + + /// + /// 上报项目现场亮点信息到集团 + /// + /// + /// + /// + public static Model.ResponeData ReportProjectHighlightsSiteTypeToGroup(string projectId, Person_Persons currUser) + { + var responeData = new Model.ResponeData(); + var db = Funs.DB; + try + { + var lstPic = (from x in db.CQMS_ProjectHighlightsSitePic + //where x.IsReport == false + orderby x.MainType, x.SubType + select x).ToList(); + if (!string.IsNullOrWhiteSpace(projectId)) + { + lstPic = lstPic.Where(x => x.ProjectId == projectId).ToList(); + } + if (lstPic.Any()) + { + var thisUnit = CommonService.GetIsThisUnit(); + var newItem = new { CollCropCode = thisUnit.CollCropCode, ProjectId = projectId, Items = lstPic }; + string baseurl = $"{SysConstSetService.CNCECPath}/api/CQMSData/ReportProjectHighlightsSiteTypeToGroup"; + string contenttype = "application/json;charset=unicode"; + Hashtable newToken = new Hashtable { { "token", ServerService.GetToken().Token } }; + var pushContent = JsonConvert.SerializeObject(newItem); + var strJosn = APIGetHttpService.Http(baseurl, "Post", contenttype, newToken, pushContent); + if (!string.IsNullOrEmpty(strJosn)) + {//推送成功后，修改数据状态 + JObject obj = JObject.Parse(strJosn); + string code = obj["code"].ToString(); + string message = obj["message"].ToString(); + responeData.message = message; + if (code == "1") + { + var ReportDate = DateTime.Now; + foreach (var item in lstPic) + { + Model.CQMS_ProjectHighlightsSitePic model = db.CQMS_ProjectHighlightsSitePic.FirstOrDefault(e => e.Id == item.Id); + if (model != null) + { + model.IsReport = true; + model.ReportMan = currUser.PersonId; + model.ReportManName = currUser.PersonName; + model.ReportDate = ReportDate; + db.SubmitChanges(); + } + } + } + else + { + responeData.code = 0; + } + } + else + { + responeData.code = 0; + responeData.message = "上报失败，请稍候再试！"; + } + } + else + { + responeData.code = 0; + responeData.message = "当前没有未上报数据"; + } + } + catch (Exception ex) + { + responeData.code = 0; + responeData.message = "上报失败：" + ex.Message; + ErrLogInfo.WriteLog("上报项目现场亮点信息到集团！", ex); + } + + return responeData; + } + + #endregion + + } +} diff --git a/SGGL/BLL/Common/Const.cs b/SGGL/BLL/Common/Const.cs index 7ad3c8af..448727ea 100644 --- a/SGGL/BLL/Common/Const.cs +++ b/SGGL/BLL/Common/Const.cs @@ -5261,5 +5261,19 @@ namespace BLL public const string BaseMaterialcolorMenuId = "F6194C00-D256-485D-9056-171FAB75928A"; + + + #region 项目现场亮点照片 + + /// + /// 项目现场亮点照片 + /// + public const string ProjectHighlightsSitePicMenuId = "D81AE7C1-2022-4089-B0F9-49903798DEEF"; + /// + /// 公司级项目现场亮点照片 + /// + public const string ProjectHighlightsSitePicReportMenuId = "38177E89-4BA8-4D66-AFB9-93644DFE7451"; + + #endregion } } \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/CQMS/ProjectHighlightsSite/ProjectHighlightsSitePic.aspx b/SGGL/FineUIPro.Web/CQMS/ProjectHighlightsSite/ProjectHighlightsSitePic.aspx new file mode 100644 index 00000000..5a70253c --- /dev/null +++ b/SGGL/FineUIPro.Web/CQMS/ProjectHighlightsSite/ProjectHighlightsSitePic.aspx @@ -0,0 +1,162 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="ProjectHighlightsSitePic.aspx.cs" Inherits="FineUIPro.Web.CQMS.ProjectHighlightsSite.ProjectHighlightsSitePic" %> + + + + + + 项目现场亮点照片 + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + <%-- + --%> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+ + + diff --git a/SGGL/FineUIPro.Web/CQMS/ProjectHighlightsSite/ProjectHighlightsSitePic.aspx.cs b/SGGL/FineUIPro.Web/CQMS/ProjectHighlightsSite/ProjectHighlightsSitePic.aspx.cs new file mode 100644 index 00000000..51c19a21 --- /dev/null +++ b/SGGL/FineUIPro.Web/CQMS/ProjectHighlightsSite/ProjectHighlightsSitePic.aspx.cs @@ -0,0 +1,292 @@ +using BLL; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web.UI.WebControls; + +namespace FineUIPro.Web.CQMS.ProjectHighlightsSite +{ + public partial class ProjectHighlightsSitePic : PageBase + { + #region 定义项 + + /// + /// 项目id + /// + public string ProjectId + { + get + { + return (string)ViewState["ProjectId"]; + } + set + { + ViewState["ProjectId"] = value; + } + } + + #endregion + + #region 加载 + /// + /// 加载页面 + /// + /// + /// + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + this.ProjectId = this.CurrUser.LoginProjectId; + if (!string.IsNullOrEmpty(Request.Params["projectId"]) && Request.Params["projectId"] != this.CurrUser.LoginProjectId) + { + this.ProjectId = Request.Params["projectId"]; + } + + ////权限按钮方法 + this.GetButtonPower(); + UpdateProjectHighlightsSiteType(); + BLL.ProjectHighlightsSiteService.InitProjectHighlightsSiteTypeNameDropDownList(this.drpMainType, true); + // 绑定表格 + BindGrid(); + } + } + + /// + /// 绑定数据 + /// + private void BindGrid() + { + var q = (from x in Funs.DB.CQMS_ProjectHighlightsSitePic where x.ProjectId == this.ProjectId orderby x.MainType, x.SubType select x).ToList(); + if (!string.IsNullOrWhiteSpace(this.drpMainType.SelectedValue) && this.drpMainType.SelectedValue != Const._Null) + { + q = q.Where(x => x.MainTypeName == this.drpMainType.SelectedValue).ToList(); + } + if (!string.IsNullOrWhiteSpace(this.drpReport.SelectedValue) && this.drpReport.SelectedValue != Const._Null) + { + q = q.Where(x => x.IsReport == (this.drpReport.SelectedValue == "1")).ToList(); + } + if (!string.IsNullOrWhiteSpace(this.drpUploadPic.SelectedValue) && this.drpUploadPic.SelectedValue != Const._Null) + { + q = q.Where(x => string.IsNullOrWhiteSpace(x.PicUrl) == (this.drpUploadPic.SelectedValue == "0")).ToList(); + } + Grid1.RecordCount = q.Count(); + // 2.获取当前分页数据 + var table = GetPagedDataTable(Grid1.PageIndex, Grid1.PageSize); + Grid1.DataSource = table; + Grid1.DataBind(); + PageContext.RegisterStartupScript("showImg();"); + } + + /// + /// 项目亮点照片(放于Img中) + /// + /// + /// + protected string ConvertImageUrlByImage(object picUrl) + { + string url = string.Empty; + if (picUrl != null && !string.IsNullOrWhiteSpace(picUrl.ToString())) + { + string httpUrl = Funs.SGGLUrl; + //var sysSet6 = (from x in Funs.DB.Sys_Set where x.SetName == "程序访问地址" select x).ToList().FirstOrDefault(); + //if (sysSet6 != null) + //{ + // httpUrl = sysSet6.SetValue; + //} + url = BLL.UploadAttachmentService.ShowImage(httpUrl, picUrl.ToString()); + } + return url; + } + + /// + /// 分页 + /// + /// + private List GetPagedDataTable(int pageIndex, int pageSize) + { + List source = (from x in Funs.DB.CQMS_ProjectHighlightsSitePic where x.ProjectId == this.ProjectId orderby x.MainType, x.SubType select x).ToList(); + List paged = new List(); + if (!string.IsNullOrWhiteSpace(this.drpMainType.SelectedValue) && this.drpMainType.SelectedValue != Const._Null) + { + source = source.Where(x => x.MainTypeName == this.drpMainType.SelectedValue).ToList(); + } + if (!string.IsNullOrWhiteSpace(this.drpReport.SelectedValue) && this.drpReport.SelectedValue != Const._Null) + { + source = source.Where(x => x.IsReport == (this.drpReport.SelectedValue == "1")).ToList(); + } + if (!string.IsNullOrWhiteSpace(this.drpUploadPic.SelectedValue) && this.drpUploadPic.SelectedValue != Const._Null) + { + source = source.Where(x => string.IsNullOrWhiteSpace(x.PicUrl) == (this.drpUploadPic.SelectedValue == "0")).ToList(); + } + int rowbegin = pageIndex * pageSize; + int rowend = (pageIndex + 1) * pageSize; + if (rowend > source.Count()) + { + rowend = source.Count(); + } + + for (int i = rowbegin; i < rowend; i++) + { + paged.Add(source[i]); + } + + return paged; + } + + /// + /// 窗口关闭后刷新界面 + /// + /// + /// + protected void Window1_Close(object sender, WindowCloseEventArgs e) + { + BindGrid(); + } + + /// + /// 维护项目亮点 + /// + /// + /// + protected void btnMenuModify_Click(object sender, EventArgs e) + { + EditData(); + } + + /// + /// 双击维护项目亮点 + /// + /// + /// + protected void Grid1_RowDoubleClick(object sender, GridRowClickEventArgs e) + { + btnMenuModify_Click(sender, e); + } + + /// + /// 删除项目亮点 + /// + /// + /// + protected void btnMenuDel_Click(object sender, EventArgs e) + { + if (Grid1.SelectedRowIndexArray.Length > 0) + { + foreach (int rowIndex in Grid1.SelectedRowIndexArray) + { + string rowID = Grid1.DataKeys[rowIndex][0].ToString(); + ProjectHighlightsSiteService.ResetProjectHighlightsSitePicById(rowID); + } + + BindGrid(); + ShowNotify("删除数据成功!", MessageBoxIcon.Success); + } + } + + /// + /// 维护项目亮点 + /// + private void EditData() + { + if (Grid1.SelectedRowIndexArray.Length != 1) + { + Alert.ShowInTop("请选择一条记录", MessageBoxIcon.Warning); + return; + } + if (this.btnMenuModify.Hidden)////双击事件 编辑权限有：编辑页面，无：查看页面 或者状态是完成时查看页面 + { + Alert.ShowInTop("抱歉，您无权维护亮点！", MessageBoxIcon.Warning); + return; + //PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ProjectHighlightsSitePicView.aspx?Id={0}", Grid1.SelectedRowID), "查看项目亮点")); + } + else + { + PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ProjectHighlightsSitePicEdit.aspx?Id={0}", Grid1.SelectedRowID), "维护项目亮点")); + } + } + + /// + /// 大类下拉触发事件 + /// + /// + /// + protected void drpMainType_SelectedIndexChanged(object sender, EventArgs e) + { + BindGrid(); + } + + /// + /// 改变索引事件 + /// + /// + /// + protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e) + { + Grid1.PageIndex = e.NewPageIndex; + BindGrid(); + } + + /// + /// 过滤表头 + /// + /// + /// + protected void Grid1_FilterChange(object sender, EventArgs e) + { + BindGrid(); + } + + #endregion + + /// + /// 更新项目亮点类型 + /// + protected void UpdateProjectHighlightsSiteType() + { + var returnValue = ProjectHighlightsSiteService.UpdateProjectHighlightsSiteTypeFromGroup(this.ProjectId); + if (returnValue) + { + BindGrid(); + } + else + { + Alert.ShowInTop("更新项目亮点类型失败", MessageBoxIcon.Success); + } + } + + #region 获取按钮权限 + + /// + /// 获取按钮权限 + /// + /// + /// + private void GetButtonPower() + { + if (Request.Params["value"] == "0") + { + return; + } + var buttonList = BLL.CommonService.GetAllButtonList(this.ProjectId, this.CurrUser.PersonId, BLL.Const.ProjectHighlightsSitePicMenuId); + if (buttonList.Count() > 0) + { + //if (buttonList.Contains(BLL.Const.BtnAdd)) + //{ + // this.btnNew.Hidden = false; + //} + if (buttonList.Contains(BLL.Const.BtnModify)) + { + this.btnMenuModify.Hidden = false; + } + if (buttonList.Contains(BLL.Const.BtnDelete)) + { + this.btnMenuDel.Hidden = false; + } + } + } + + #endregion + + } +} \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/CQMS/ProjectHighlightsSite/ProjectHighlightsSitePic.aspx.designer.cs b/SGGL/FineUIPro.Web/CQMS/ProjectHighlightsSite/ProjectHighlightsSitePic.aspx.designer.cs new file mode 100644 index 00000000..856d473b --- /dev/null +++ b/SGGL/FineUIPro.Web/CQMS/ProjectHighlightsSite/ProjectHighlightsSitePic.aspx.designer.cs @@ -0,0 +1,143 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.CQMS.ProjectHighlightsSite +{ + + + public partial class ProjectHighlightsSitePic + { + + /// + /// form1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// PageManager1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.PageManager PageManager1; + + /// + /// Panel1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel Panel1; + + /// + /// Grid1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Grid Grid1; + + /// + /// Toolbar2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar2; + + /// + /// drpMainType 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpMainType; + + /// + /// drpReport 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpReport; + + /// + /// drpUploadPic 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpUploadPic; + + /// + /// Label3 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label Label3; + + /// + /// lbImageUrl1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.WebControls.Label lbImageUrl1; + + /// + /// Window1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Window Window1; + + /// + /// Menu1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Menu Menu1; + + /// + /// btnMenuModify 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.MenuButton btnMenuModify; + + /// + /// btnMenuDel 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.MenuButton btnMenuDel; + } +} diff --git a/SGGL/FineUIPro.Web/CQMS/ProjectHighlightsSite/ProjectHighlightsSitePicEdit.aspx b/SGGL/FineUIPro.Web/CQMS/ProjectHighlightsSite/ProjectHighlightsSitePicEdit.aspx new file mode 100644 index 00000000..1ea15b4e --- /dev/null +++ b/SGGL/FineUIPro.Web/CQMS/ProjectHighlightsSite/ProjectHighlightsSitePicEdit.aspx @@ -0,0 +1,67 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="ProjectHighlightsSitePicEdit.aspx.cs" Inherits="FineUIPro.Web.CQMS.ProjectHighlightsSite.ProjectHighlightsSitePicEdit" %> + + + + + + 维护项目亮点 + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SGGL/FineUIPro.Web/CQMS/ProjectHighlightsSite/ProjectHighlightsSitePicEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/ProjectHighlightsSite/ProjectHighlightsSitePicEdit.aspx.cs new file mode 100644 index 00000000..adb396a8 --- /dev/null +++ b/SGGL/FineUIPro.Web/CQMS/ProjectHighlightsSite/ProjectHighlightsSitePicEdit.aspx.cs @@ -0,0 +1,89 @@ +using BLL; +using System; +using System.Linq; + +namespace FineUIPro.Web.CQMS.ProjectHighlightsSite +{ + public partial class ProjectHighlightsSitePicEdit : PageBase + { + /// + /// 主键 + /// + public string Id + { + get + { + return (string)ViewState["Id"]; + } + set + { + ViewState["Id"] = value; + } + } + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + this.Id = Request.Params["Id"]; + if (!string.IsNullOrEmpty(Id)) + { + Model.CQMS_ProjectHighlightsSitePic model = BLL.ProjectHighlightsSiteService.GetProjectHighlightsSiteById(Id); + this.txtMainTypeName.Text = model.MainTypeName; + this.txtSubType.Text = model.SubType; + this.txtResume.Text = model.Resume; + } + else + { + Alert.ShowInTop("请选择一条记录", MessageBoxIcon.Warning); + return; + } + } + } + + protected void Grid1_Sort(object sender, GridSortEventArgs e) + { + + } + + protected void WindowAtt_Close(object sender, WindowCloseEventArgs e) + { + + } + + protected void imgBtnFile_Click(object sender, EventArgs e) + { + PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type=1&toKeyId={0}&path=FileUpload/CQMS/ProjectHighlightsSite&menuId={1}", this.Id, BLL.Const.ProjectHighlightsSitePicMenuId))); + } + + protected void btnSave_Click(object sender, EventArgs e) + { + SaveDate(); + } + + /// + /// 保存 + /// + public void SaveDate() + { + Model.CQMS_ProjectHighlightsSitePic model = new Model.CQMS_ProjectHighlightsSitePic(); + model.Id = this.Id; + model.Resume = this.txtResume.Text.Trim(); + model.CompileMan = this.CurrUser.PersonId; + model.CompileManName = this.CurrUser.PersonName; + model.CompileDate = DateTime.Now; + var attachFile = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == this.Id); + if (attachFile != null) + { + model.PicUrl = attachFile.AttachUrl; + } + else + { + Alert.ShowInTop("请上传项目亮点照片", MessageBoxIcon.Warning); + return; + } + ProjectHighlightsSiteService.UpdateProjectHighlightsSite(model); + LogService.AddSys_Log(CurrUser, $"{model.MainTypeName}-{model.SubType}", model.Id, Const.ProjectHighlightsSitePicMenuId, "维护项目亮点"); + PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference()); + } + } +} \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/CQMS/ProjectHighlightsSite/ProjectHighlightsSitePicEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/CQMS/ProjectHighlightsSite/ProjectHighlightsSitePicEdit.aspx.designer.cs new file mode 100644 index 00000000..8e6607f5 --- /dev/null +++ b/SGGL/FineUIPro.Web/CQMS/ProjectHighlightsSite/ProjectHighlightsSitePicEdit.aspx.designer.cs @@ -0,0 +1,143 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.CQMS.ProjectHighlightsSite +{ + + + public partial class ProjectHighlightsSitePicEdit + { + + /// + /// form1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// PageManager1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.PageManager PageManager1; + + /// + /// SimpleForm1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form SimpleForm1; + + /// + /// txtMainTypeName 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtMainTypeName; + + /// + /// txtSubType 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtSubType; + + /// + /// txtResume 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextArea txtResume; + + /// + /// Toolbar1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar1; + + /// + /// lbTemp 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label lbTemp; + + /// + /// imgBtnFile 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button imgBtnFile; + + /// + /// ToolbarFill1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarFill ToolbarFill1; + + /// + /// btnSave 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnSave; + + /// + /// hdId 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.HiddenField hdId; + + /// + /// hdAttachUrl 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.HiddenField hdAttachUrl; + + /// + /// WindowAtt 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Window WindowAtt; + } +} diff --git a/SGGL/FineUIPro.Web/CQMS/ProjectHighlightsSite/ProjectHighlightsSitePicReport.aspx b/SGGL/FineUIPro.Web/CQMS/ProjectHighlightsSite/ProjectHighlightsSitePicReport.aspx new file mode 100644 index 00000000..177d941b --- /dev/null +++ b/SGGL/FineUIPro.Web/CQMS/ProjectHighlightsSite/ProjectHighlightsSitePicReport.aspx @@ -0,0 +1,178 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="ProjectHighlightsSitePicReport.aspx.cs" Inherits="FineUIPro.Web.CQMS.ProjectHighlightsSite.ProjectHighlightsSitePicReport" %> + +<%@ Register Src="~/Controls/UnitProjectTControl.ascx" TagName="UnitProjectTControl" TagPrefix="uc1" %> + + + + + + 项目现场亮点照片 + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+ + + diff --git a/SGGL/FineUIPro.Web/CQMS/ProjectHighlightsSite/ProjectHighlightsSitePicReport.aspx.cs b/SGGL/FineUIPro.Web/CQMS/ProjectHighlightsSite/ProjectHighlightsSitePicReport.aspx.cs new file mode 100644 index 00000000..8c1714de --- /dev/null +++ b/SGGL/FineUIPro.Web/CQMS/ProjectHighlightsSite/ProjectHighlightsSitePicReport.aspx.cs @@ -0,0 +1,362 @@ +using BLL; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web.UI.WebControls; + +namespace FineUIPro.Web.CQMS.ProjectHighlightsSite +{ + public partial class ProjectHighlightsSitePicReport : PageBase + { + #region 定义项 + + /// + /// 项目id + /// + public string ProjectId + { + get + { + return (string)ViewState["ProjectId"]; + } + set + { + ViewState["ProjectId"] = value; + } + } + + #endregion + + #region 加载 + /// + /// 加载页面 + /// + /// + /// + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + this.ProjectId = this.CurrUser.LoginProjectId; + if (!string.IsNullOrEmpty(Request.Params["projectId"]) && Request.Params["projectId"] != this.CurrUser.LoginProjectId) + { + this.ProjectId = Request.Params["projectId"]; + } + + this.ucTree.UnitId = this.CurrUser.UnitId; + this.ucTree.ProjectId = this.ProjectId; + //if (!string.IsNullOrEmpty(this.ProjectId)) + //{ + // this.panelLeftRegion.Hidden = true; + //} + ////权限按钮方法 + this.GetButtonPower(); + //UpdateProjectHighlightsSiteType(); + BLL.ProjectHighlightsSiteService.InitProjectHighlightsSiteTypeNameDropDownList(this.drpMainType, true); + // 绑定表格 + BindGrid(); + } + } + + /// + /// 公司级树加载 + /// + /// + /// + protected void changeTree(object sender, EventArgs e) + { + this.ProjectId = this.ucTree.ProjectId; + //this.InitDropDownList(); + this.GetButtonPower(); + //if (string.IsNullOrEmpty(this.CurrUser.LoginProjectId)) + //{ + // btnNew.Hidden = true; + //} + this.BindGrid(); + } + /// + /// 绑定数据 + /// + private void BindGrid() + { + //var q = (from x in Funs.DB.CQMS_ProjectHighlightsSitePic where x.ProjectId == this.ProjectId orderby x.MainType, x.SubType select x).ToList(); + var q = (from x in Funs.DB.CQMS_ProjectHighlightsSitePic orderby x.MainType, x.SubType select x).ToList(); + if (!string.IsNullOrWhiteSpace(this.ProjectId)) + { + q = q.Where(x => x.ProjectId == this.ProjectId).ToList(); + } + if (!string.IsNullOrWhiteSpace(this.drpMainType.SelectedValue) && this.drpMainType.SelectedValue != Const._Null) + { + q = q.Where(x => x.MainTypeName == this.drpMainType.SelectedValue).ToList(); + } + if (!string.IsNullOrWhiteSpace(this.drpReport.SelectedValue) && this.drpReport.SelectedValue != Const._Null) + { + q = q.Where(x => x.IsReport == (this.drpReport.SelectedValue == "1")).ToList(); + } + if (!string.IsNullOrWhiteSpace(this.drpUploadPic.SelectedValue) && this.drpUploadPic.SelectedValue != Const._Null) + { + q = q.Where(x => string.IsNullOrWhiteSpace(x.PicUrl) == (this.drpUploadPic.SelectedValue == "0")).ToList(); + } + Grid1.RecordCount = q.Count(); + // 2.获取当前分页数据 + var table = GetPagedDataTable(Grid1.PageIndex, Grid1.PageSize); + Grid1.DataSource = table; + Grid1.DataBind(); + PageContext.RegisterStartupScript("showImg();"); + } + + /// + /// 项目亮点照片(放于Img中) + /// + /// + /// + protected string ConvertImageUrlByImage(object picUrl) + { + string url = string.Empty; + if (picUrl != null && !string.IsNullOrWhiteSpace(picUrl.ToString())) + { + string httpUrl = Funs.SGGLUrl; + //var sysSet6 = (from x in Funs.DB.Sys_Set where x.SetName == "程序访问地址" select x).ToList().FirstOrDefault(); + //if (sysSet6 != null) + //{ + // httpUrl = sysSet6.SetValue; + //} + url = BLL.UploadAttachmentService.ShowImage(httpUrl, picUrl.ToString()); + } + return url; + } + + /// + /// 分页 + /// + /// + private List GetPagedDataTable(int pageIndex, int pageSize) + { + List source = (from x in Funs.DB.CQMS_ProjectHighlightsSitePic orderby x.MainType, x.SubType select x).ToList(); + List paged = new List(); + if (!string.IsNullOrWhiteSpace(this.ProjectId)) + { + source = source.Where(x => x.ProjectId == this.ProjectId).ToList(); + } + if (!string.IsNullOrWhiteSpace(this.drpMainType.SelectedValue) && this.drpMainType.SelectedValue != Const._Null) + { + source = source.Where(x => x.MainTypeName == this.drpMainType.SelectedValue).ToList(); + } + if (!string.IsNullOrWhiteSpace(this.drpReport.SelectedValue) && this.drpReport.SelectedValue != Const._Null) + { + source = source.Where(x => x.IsReport == (this.drpReport.SelectedValue == "1")).ToList(); + } + if (!string.IsNullOrWhiteSpace(this.drpUploadPic.SelectedValue) && this.drpUploadPic.SelectedValue != Const._Null) + { + source = source.Where(x => string.IsNullOrWhiteSpace(x.PicUrl) == (this.drpUploadPic.SelectedValue == "0")).ToList(); + } + int rowbegin = pageIndex * pageSize; + int rowend = (pageIndex + 1) * pageSize; + if (rowend > source.Count()) + { + rowend = source.Count(); + } + + for (int i = rowbegin; i < rowend; i++) + { + paged.Add(source[i]); + } + + return paged; + } + + /// + /// 窗口关闭后刷新界面 + /// + /// + /// + protected void Window1_Close(object sender, WindowCloseEventArgs e) + { + BindGrid(); + } + + /// + /// 维护项目亮点 + /// + /// + /// + protected void btnMenuModify_Click(object sender, EventArgs e) + { + EditData(); + } + + /// + /// 双击维护项目亮点 + /// + /// + /// + protected void Grid1_RowDoubleClick(object sender, GridRowClickEventArgs e) + { + btnMenuModify_Click(sender, e); + } + + /// + /// 删除项目亮点 + /// + /// + /// + protected void btnMenuDel_Click(object sender, EventArgs e) + { + if (Grid1.SelectedRowIndexArray.Length > 0) + { + foreach (int rowIndex in Grid1.SelectedRowIndexArray) + { + string rowID = Grid1.DataKeys[rowIndex][0].ToString(); + ProjectHighlightsSiteService.ResetProjectHighlightsSitePicById(rowID); + } + + BindGrid(); + ShowNotify("删除数据成功!", MessageBoxIcon.Success); + } + } + + /// + /// 维护项目亮点 + /// + private void EditData() + { + if (Grid1.SelectedRowIndexArray.Length != 1) + { + Alert.ShowInTop("请选择一条记录", MessageBoxIcon.Warning); + return; + } + if (this.btnMenuModify.Hidden)////双击事件 编辑权限有：编辑页面，无：查看页面 或者状态是完成时查看页面 + { + Alert.ShowInTop("抱歉，您无权维护亮点！", MessageBoxIcon.Warning); + return; + //PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ProjectHighlightsSitePicView.aspx?Id={0}", Grid1.SelectedRowID), "查看项目亮点")); + } + else + { + PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ProjectHighlightsSitePicEdit.aspx?Id={0}", Grid1.SelectedRowID), "维护项目亮点")); + } + } + + /// + /// 大类下拉触发事件 + /// + /// + /// + protected void drpMainType_SelectedIndexChanged(object sender, EventArgs e) + { + BindGrid(); + } + + /// + /// 改变索引事件 + /// + /// + /// + protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e) + { + Grid1.PageIndex = e.NewPageIndex; + BindGrid(); + } + + /// + /// 过滤表头 + /// + /// + /// + protected void Grid1_FilterChange(object sender, EventArgs e) + { + BindGrid(); + } + + #endregion + + /// + /// 上报当前项目 + /// + /// + /// + protected void btnReportPro_Click(object sender, EventArgs e) + { + if (!string.IsNullOrWhiteSpace(this.ProjectId)) + { + //var report = ProjectHighlightsSiteService.ReportProjectHighlightsSiteTypeToGroup(this.ProjectId, this.CurrUser); + Report(this.ProjectId); + } + else + { + Alert.ShowInTop("请选择上报项目！", MessageBoxIcon.Warning); + return; + } + } + + /// + /// 上报所有项目 + /// + /// + /// + protected void btnReport_Click(object sender, EventArgs e) + { + //ProjectHighlightsSiteService.ReportProjectHighlightsSiteTypeToGroup("", this.CurrUser); + Report(""); + } + + /// + /// 上报集团 + /// + /// + private void Report(string projectId) + { + var report = ProjectHighlightsSiteService.ReportProjectHighlightsSiteTypeToGroup(projectId, this.CurrUser); + if (report.code == 1) + { + ShowNotify($"上报成功：{report.message}！", MessageBoxIcon.Success); + PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference()); + return; + } + else + { + Alert.ShowInParent($"上报失败：{report.message}！", MessageBoxIcon.Error); + } + } + + + #region 获取按钮权限 + + /// + /// 获取按钮权限 + /// + /// + /// + private void GetButtonPower() + { + if (Request.Params["value"] == "0") + { + return; + } + var buttonList = BLL.CommonService.GetAllButtonList(null, this.CurrUser.PersonId, BLL.Const.ProjectHighlightsSitePicReportMenuId); + if (buttonList.Count() > 0) + { + //if (buttonList.Contains(BLL.Const.BtnAdd)) + //{ + // this.btnNew.Hidden = false; + //} + if (buttonList.Contains(BLL.Const.BtnModify)) + { + this.btnMenuModify.Hidden = false; + } + if (buttonList.Contains(BLL.Const.BtnDelete)) + { + this.btnMenuDel.Hidden = false; + } + if (buttonList.Contains(BLL.Const.BtnSaveUp)) + { + this.btnReport.Hidden = false; + this.btnReportPro.Hidden = false; + } + } + } + + #endregion + + } +} \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/CQMS/ProjectHighlightsSite/ProjectHighlightsSitePicReport.aspx.designer.cs b/SGGL/FineUIPro.Web/CQMS/ProjectHighlightsSite/ProjectHighlightsSitePicReport.aspx.designer.cs new file mode 100644 index 00000000..9dfb13ce --- /dev/null +++ b/SGGL/FineUIPro.Web/CQMS/ProjectHighlightsSite/ProjectHighlightsSitePicReport.aspx.designer.cs @@ -0,0 +1,188 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.CQMS.ProjectHighlightsSite +{ + + + public partial class ProjectHighlightsSitePicReport + { + + /// + /// form1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// PageManager1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.PageManager PageManager1; + + /// + /// Panel1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel Panel1; + + /// + /// panelLeftRegion 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel panelLeftRegion; + + /// + /// ContentPanel1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ContentPanel ContentPanel1; + + /// + /// ucTree 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Web.Controls.UnitProjectTControl ucTree; + + /// + /// panelCenterRegion 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel panelCenterRegion; + + /// + /// Grid1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Grid Grid1; + + /// + /// Toolbar2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar2; + + /// + /// drpMainType 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpMainType; + + /// + /// drpReport 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpReport; + + /// + /// drpUploadPic 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpUploadPic; + + /// + /// btnReportPro 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnReportPro; + + /// + /// btnReport 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnReport; + + /// + /// lbImageUrl1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.WebControls.Label lbImageUrl1; + + /// + /// Window1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Window Window1; + + /// + /// Menu1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Menu Menu1; + + /// + /// btnMenuModify 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.MenuButton btnMenuModify; + + /// + /// btnMenuDel 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.MenuButton btnMenuDel; + } +} diff --git a/SGGL/FineUIPro.Web/CQMS/ProjectHighlightsSite/ProjectHighlightsSiteType.aspx b/SGGL/FineUIPro.Web/CQMS/ProjectHighlightsSite/ProjectHighlightsSiteType.aspx new file mode 100644 index 00000000..e41312c0 --- /dev/null +++ b/SGGL/FineUIPro.Web/CQMS/ProjectHighlightsSite/ProjectHighlightsSiteType.aspx @@ -0,0 +1,56 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="ProjectHighlightsSiteType.aspx.cs" Inherits="FineUIPro.Web.CQMS.ProjectHighlightsSite.ProjectHighlightsSiteType" %> + + + + + + 集团项目现场亮点类型 + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SGGL/FineUIPro.Web/CQMS/ProjectHighlightsSite/ProjectHighlightsSiteType.aspx.cs b/SGGL/FineUIPro.Web/CQMS/ProjectHighlightsSite/ProjectHighlightsSiteType.aspx.cs new file mode 100644 index 00000000..b79f15c3 --- /dev/null +++ b/SGGL/FineUIPro.Web/CQMS/ProjectHighlightsSite/ProjectHighlightsSiteType.aspx.cs @@ -0,0 +1,132 @@ +using BLL; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web.UI.WebControls; + +namespace FineUIPro.Web.CQMS.ProjectHighlightsSite +{ + public partial class ProjectHighlightsSiteType : PageBase + { + #region 加载 + /// + /// 加载页面 + /// + /// + /// + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + // 绑定表格 + BindGrid(); + GetProjectHighlightsSiteType(); + + BLL.ProjectHighlightsSiteService.InitProjectHighlightsSiteTypeNameDropDownList(this.drpMainType, true); + } + } + + /// + /// 绑定数据 + /// + private void BindGrid() + { + var q = (from x in Funs.DB.Base_ProjectHighlightsSiteType orderby x.MainType, x.SubType select x).ToList(); + if (!string.IsNullOrWhiteSpace(this.drpMainType.SelectedValue) && this.drpMainType.SelectedValue != Const._Null) + { + q = q.Where(x => x.MainTypeName == this.drpMainType.SelectedValue).ToList(); + } + Grid1.RecordCount = q.Count(); + // 2.获取当前分页数据 + var table = GetPagedDataTable(Grid1.PageIndex, Grid1.PageSize); + Grid1.DataSource = table; + Grid1.DataBind(); + } + + /// + /// 分页 + /// + /// + private List GetPagedDataTable(int pageIndex, int pageSize) + { + List source = (from x in Funs.DB.Base_ProjectHighlightsSiteType orderby x.MainType, x.SubType select x).ToList(); + List paged = new List(); + if (!string.IsNullOrWhiteSpace(this.drpMainType.SelectedValue) && this.drpMainType.SelectedValue != Const._Null) + { + source = source.Where(x => x.MainTypeName == this.drpMainType.SelectedValue).ToList(); + } + int rowbegin = pageIndex * pageSize; + int rowend = (pageIndex + 1) * pageSize; + if (rowend > source.Count()) + { + rowend = source.Count(); + } + + for (int i = rowbegin; i < rowend; i++) + { + paged.Add(source[i]); + } + + return paged; + } + + /// + /// + /// + /// + /// + protected void drpMainType_SelectedIndexChanged(object sender, EventArgs e) + { + BindGrid(); + } + + /// + /// 改变索引事件 + /// + /// + /// + protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e) + { + Grid1.PageIndex = e.NewPageIndex; + BindGrid(); + } + + /// + /// 过滤表头 + /// + /// + /// + protected void Grid1_FilterChange(object sender, EventArgs e) + { + BindGrid(); + } + #endregion + + /// + /// 从集团获取 + /// + /// + /// + protected void btnGet_Click(object sender, EventArgs e) + { + GetProjectHighlightsSiteType(); + } + + /// + /// 从集团获取项目现场亮点类型 + /// + protected void GetProjectHighlightsSiteType() + { + var returnValue = ProjectHighlightsSiteService.GetProjectHighlightsSiteTypeFromGroup(); + if (returnValue.code == 1) + { + ShowNotify(returnValue.message, MessageBoxIcon.Success); + BindGrid(); + } + else + { + Alert.ShowInTop(returnValue.message, MessageBoxIcon.Success); + } + } + } +} \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/CQMS/ProjectHighlightsSite/ProjectHighlightsSiteType.aspx.designer.cs b/SGGL/FineUIPro.Web/CQMS/ProjectHighlightsSite/ProjectHighlightsSiteType.aspx.designer.cs new file mode 100644 index 00000000..5168f994 --- /dev/null +++ b/SGGL/FineUIPro.Web/CQMS/ProjectHighlightsSite/ProjectHighlightsSiteType.aspx.designer.cs @@ -0,0 +1,80 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.CQMS.ProjectHighlightsSite +{ + + + public partial class ProjectHighlightsSiteType + { + + /// + /// form1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// PageManager1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.PageManager PageManager1; + + /// + /// Panel1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel Panel1; + + /// + /// Grid1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Grid Grid1; + + /// + /// Toolbar2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar2; + + /// + /// drpMainType 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpMainType; + + /// + /// btnGet 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnGet; + } +} diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj index c68fe42c..017734c8 100644 --- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj +++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj @@ -496,6 +496,10 @@ + + + + @@ -9228,6 +9232,34 @@ TechnicalProposalReviewView.aspx + + ProjectHighlightsSitePic.aspx + ASPXCodeBehind + + + ProjectHighlightsSitePic.aspx + + + ProjectHighlightsSitePicEdit.aspx + ASPXCodeBehind + + + ProjectHighlightsSitePicEdit.aspx + + + ProjectHighlightsSitePicReport.aspx + ASPXCodeBehind + + + ProjectHighlightsSitePicReport.aspx + + + ProjectHighlightsSiteType.aspx + ASPXCodeBehind + + + ProjectHighlightsSiteType.aspx + QCGroupRegistration.aspx ASPXCodeBehind @@ -16862,7 +16894,7 @@ - + diff --git a/SGGL/FineUIPro.Web/common/Menu_CQMS.xml b/SGGL/FineUIPro.Web/common/Menu_CQMS.xml index d9127244..4281cd15 100644 --- a/SGGL/FineUIPro.Web/common/Menu_CQMS.xml +++ b/SGGL/FineUIPro.Web/common/Menu_CQMS.xml @@ -52,6 +52,8 @@ + + diff --git a/SGGL/FineUIPro.Web/common/Menu_DigData.xml b/SGGL/FineUIPro.Web/common/Menu_DigData.xml index bb7a7a34..b532a9bb 100644 --- a/SGGL/FineUIPro.Web/common/Menu_DigData.xml +++ b/SGGL/FineUIPro.Web/common/Menu_DigData.xml @@ -1,51 +1,9 @@  - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + @@ -58,15 +16,12 @@ - - - - - - - - + + + + + \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/common/Menu_HJGL.xml b/SGGL/FineUIPro.Web/common/Menu_HJGL.xml index 5b2405ae..c6acad79 100644 --- a/SGGL/FineUIPro.Web/common/Menu_HJGL.xml +++ b/SGGL/FineUIPro.Web/common/Menu_HJGL.xml @@ -13,12 +13,12 @@ - + + - - + @@ -27,7 +27,7 @@ - + diff --git a/SGGL/FineUIPro.Web/common/Menu_HSSE.xml b/SGGL/FineUIPro.Web/common/Menu_HSSE.xml index e05adaad..dcddea56 100644 --- a/SGGL/FineUIPro.Web/common/Menu_HSSE.xml +++ b/SGGL/FineUIPro.Web/common/Menu_HSSE.xml @@ -25,7 +25,8 @@ - + + diff --git a/SGGL/FineUIPro.Web/common/Menu_HTGL.xml b/SGGL/FineUIPro.Web/common/Menu_HTGL.xml index 129ab5fd..95eeab91 100644 --- a/SGGL/FineUIPro.Web/common/Menu_HTGL.xml +++ b/SGGL/FineUIPro.Web/common/Menu_HTGL.xml @@ -1,8 +1,8 @@  - - - + + + diff --git a/SGGL/FineUIPro.Web/common/Menu_JDGL.xml b/SGGL/FineUIPro.Web/common/Menu_JDGL.xml index fd6a0762..8d4aa005 100644 --- a/SGGL/FineUIPro.Web/common/Menu_JDGL.xml +++ b/SGGL/FineUIPro.Web/common/Menu_JDGL.xml @@ -1,11 +1,7 @@  - + - - - - \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/common/Menu_PHTGL.xml b/SGGL/FineUIPro.Web/common/Menu_PHTGL.xml index 53b0bd32..56efca63 100644 --- a/SGGL/FineUIPro.Web/common/Menu_PHTGL.xml +++ b/SGGL/FineUIPro.Web/common/Menu_PHTGL.xml @@ -4,10 +4,10 @@ + - diff --git a/SGGL/FineUIPro.Web/common/Menu_ProjectSet.xml b/SGGL/FineUIPro.Web/common/Menu_ProjectSet.xml index a735527d..940d8fcb 100644 --- a/SGGL/FineUIPro.Web/common/Menu_ProjectSet.xml +++ b/SGGL/FineUIPro.Web/common/Menu_ProjectSet.xml @@ -8,5 +8,6 @@ + \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/common/Menu_SysSet.xml b/SGGL/FineUIPro.Web/common/Menu_SysSet.xml index fa21c6d3..5fcf8e98 100644 --- a/SGGL/FineUIPro.Web/common/Menu_SysSet.xml +++ b/SGGL/FineUIPro.Web/common/Menu_SysSet.xml @@ -8,6 +8,9 @@ + + + diff --git a/SGGL/FineUIPro.Web/common/Menu_ZHGL.xml b/SGGL/FineUIPro.Web/common/Menu_ZHGL.xml index 39daa18b..bd92c0e2 100644 --- a/SGGL/FineUIPro.Web/common/Menu_ZHGL.xml +++ b/SGGL/FineUIPro.Web/common/Menu_ZHGL.xml @@ -51,10 +51,55 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs index d873c5d0..214afbfe 100644 --- a/SGGL/Model/Model.cs +++ b/SGGL/Model/Model.cs @@ -203,6 +203,9 @@ namespace Model partial void InsertBase_Project(Base_Project instance); partial void UpdateBase_Project(Base_Project instance); partial void DeleteBase_Project(Base_Project instance); + partial void InsertBase_ProjectHighlightsSiteType(Base_ProjectHighlightsSiteType instance); + partial void UpdateBase_ProjectHighlightsSiteType(Base_ProjectHighlightsSiteType instance); + partial void DeleteBase_ProjectHighlightsSiteType(Base_ProjectHighlightsSiteType instance); partial void InsertBase_ProjectSate(Base_ProjectSate instance); partial void UpdateBase_ProjectSate(Base_ProjectSate instance); partial void DeleteBase_ProjectSate(Base_ProjectSate instance); @@ -443,6 +446,9 @@ namespace Model partial void InsertCostGoods_ExpenseDetail(CostGoods_ExpenseDetail instance); partial void UpdateCostGoods_ExpenseDetail(CostGoods_ExpenseDetail instance); partial void DeleteCostGoods_ExpenseDetail(CostGoods_ExpenseDetail instance); + partial void InsertCQMS_ProjectHighlightsSitePic(CQMS_ProjectHighlightsSitePic instance); + partial void UpdateCQMS_ProjectHighlightsSitePic(CQMS_ProjectHighlightsSitePic instance); + partial void DeleteCQMS_ProjectHighlightsSitePic(CQMS_ProjectHighlightsSitePic instance); partial void InsertCQMSData_CQMS(CQMSData_CQMS instance); partial void UpdateCQMSData_CQMS(CQMSData_CQMS instance); partial void DeleteCQMSData_CQMS(CQMSData_CQMS instance); @@ -2391,6 +2397,14 @@ namespace Model } } + public System.Data.Linq.Table Base_ProjectHighlightsSiteType + { + get + { + return this.GetTable(); + } + } + public System.Data.Linq.Table Base_ProjectSate { get @@ -3031,6 +3045,14 @@ namespace Model } } + public System.Data.Linq.Table CQMS_ProjectHighlightsSitePic + { + get + { + return this.GetTable(); + } + } + public System.Data.Linq.Table CQMSData_CQMS { get @@ -30506,6 +30528,236 @@ namespace Model } } + [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Base_ProjectHighlightsSiteType")] + public partial class Base_ProjectHighlightsSiteType : INotifyPropertyChanging, INotifyPropertyChanged + { + + private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty); + + private string _Id; + + private int _MainType; + + private string _MainTypeName; + + private string _SubType; + + private string _Remark; + + private string _CompileMan; + + private string _CompileManName; + + private System.Nullable _CompileDate; + + #region 可扩展性方法定义 + partial void OnLoaded(); + partial void OnValidate(System.Data.Linq.ChangeAction action); + partial void OnCreated(); + partial void OnIdChanging(string value); + partial void OnIdChanged(); + partial void OnMainTypeChanging(int value); + partial void OnMainTypeChanged(); + partial void OnMainTypeNameChanging(string value); + partial void OnMainTypeNameChanged(); + partial void OnSubTypeChanging(string value); + partial void OnSubTypeChanged(); + partial void OnRemarkChanging(string value); + partial void OnRemarkChanged(); + partial void OnCompileManChanging(string value); + partial void OnCompileManChanged(); + partial void OnCompileManNameChanging(string value); + partial void OnCompileManNameChanged(); + partial void OnCompileDateChanging(System.Nullable value); + partial void OnCompileDateChanged(); + #endregion + + public Base_ProjectHighlightsSiteType() + { + OnCreated(); + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Id", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)] + public string Id + { + get + { + return this._Id; + } + set + { + if ((this._Id != value)) + { + this.OnIdChanging(value); + this.SendPropertyChanging(); + this._Id = value; + this.SendPropertyChanged("Id"); + this.OnIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MainType", DbType="Int NOT NULL")] + public int MainType + { + get + { + return this._MainType; + } + set + { + if ((this._MainType != value)) + { + this.OnMainTypeChanging(value); + this.SendPropertyChanging(); + this._MainType = value; + this.SendPropertyChanged("MainType"); + this.OnMainTypeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MainTypeName", DbType="NVarChar(50) NOT NULL", CanBeNull=false)] + public string MainTypeName + { + get + { + return this._MainTypeName; + } + set + { + if ((this._MainTypeName != value)) + { + this.OnMainTypeNameChanging(value); + this.SendPropertyChanging(); + this._MainTypeName = value; + this.SendPropertyChanged("MainTypeName"); + this.OnMainTypeNameChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SubType", DbType="NVarChar(200) NOT NULL", CanBeNull=false)] + public string SubType + { + get + { + return this._SubType; + } + set + { + if ((this._SubType != value)) + { + this.OnSubTypeChanging(value); + this.SendPropertyChanging(); + this._SubType = value; + this.SendPropertyChanged("SubType"); + this.OnSubTypeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remark", DbType="NVarChar(50)")] + public string Remark + { + get + { + return this._Remark; + } + set + { + if ((this._Remark != value)) + { + this.OnRemarkChanging(value); + this.SendPropertyChanging(); + this._Remark = value; + this.SendPropertyChanged("Remark"); + this.OnRemarkChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CompileMan", DbType="NVarChar(50) NOT NULL", CanBeNull=false)] + public string CompileMan + { + get + { + return this._CompileMan; + } + set + { + if ((this._CompileMan != value)) + { + this.OnCompileManChanging(value); + this.SendPropertyChanging(); + this._CompileMan = value; + this.SendPropertyChanged("CompileMan"); + this.OnCompileManChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CompileManName", DbType="NVarChar(50)")] + public string CompileManName + { + get + { + return this._CompileManName; + } + set + { + if ((this._CompileManName != value)) + { + this.OnCompileManNameChanging(value); + this.SendPropertyChanging(); + this._CompileManName = value; + this.SendPropertyChanged("CompileManName"); + this.OnCompileManNameChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CompileDate", DbType="DateTime")] + public System.Nullable CompileDate + { + get + { + return this._CompileDate; + } + set + { + if ((this._CompileDate != value)) + { + this.OnCompileDateChanging(value); + this.SendPropertyChanging(); + this._CompileDate = value; + this.SendPropertyChanged("CompileDate"); + this.OnCompileDateChanged(); + } + } + } + + public event PropertyChangingEventHandler PropertyChanging; + + public event PropertyChangedEventHandler PropertyChanged; + + protected virtual void SendPropertyChanging() + { + if ((this.PropertyChanging != null)) + { + this.PropertyChanging(this, emptyChangingEventArgs); + } + } + + protected virtual void SendPropertyChanged(String propertyName) + { + if ((this.PropertyChanged != null)) + { + this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName)); + } + } + } + [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Base_ProjectSate")] public partial class Base_ProjectSate : INotifyPropertyChanging, INotifyPropertyChanged { @@ -65874,6 +66126,428 @@ namespace Model } } + [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.CQMS_ProjectHighlightsSitePic")] + public partial class CQMS_ProjectHighlightsSitePic : INotifyPropertyChanging, INotifyPropertyChanged + { + + private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty); + + private string _Id; + + private string _ProjectId; + + private string _TypeId; + + private int _MainType; + + private string _MainTypeName; + + private string _SubType; + + private string _Remark; + + private string _Resume; + + private string _PicUrl; + + private string _CompileMan; + + private string _CompileManName; + + private System.Nullable _CompileDate; + + private bool _IsReport; + + private System.Nullable _ReportDate; + + private string _ReportMan; + + private string _ReportManName; + + #region 可扩展性方法定义 + partial void OnLoaded(); + partial void OnValidate(System.Data.Linq.ChangeAction action); + partial void OnCreated(); + partial void OnIdChanging(string value); + partial void OnIdChanged(); + partial void OnProjectIdChanging(string value); + partial void OnProjectIdChanged(); + partial void OnTypeIdChanging(string value); + partial void OnTypeIdChanged(); + partial void OnMainTypeChanging(int value); + partial void OnMainTypeChanged(); + partial void OnMainTypeNameChanging(string value); + partial void OnMainTypeNameChanged(); + partial void OnSubTypeChanging(string value); + partial void OnSubTypeChanged(); + partial void OnRemarkChanging(string value); + partial void OnRemarkChanged(); + partial void OnResumeChanging(string value); + partial void OnResumeChanged(); + partial void OnPicUrlChanging(string value); + partial void OnPicUrlChanged(); + partial void OnCompileManChanging(string value); + partial void OnCompileManChanged(); + partial void OnCompileManNameChanging(string value); + partial void OnCompileManNameChanged(); + partial void OnCompileDateChanging(System.Nullable value); + partial void OnCompileDateChanged(); + partial void OnIsReportChanging(bool value); + partial void OnIsReportChanged(); + partial void OnReportDateChanging(System.Nullable value); + partial void OnReportDateChanged(); + partial void OnReportManChanging(string value); + partial void OnReportManChanged(); + partial void OnReportManNameChanging(string value); + partial void OnReportManNameChanged(); + #endregion + + public CQMS_ProjectHighlightsSitePic() + { + OnCreated(); + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Id", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)] + public string Id + { + get + { + return this._Id; + } + set + { + if ((this._Id != value)) + { + this.OnIdChanging(value); + this.SendPropertyChanging(); + this._Id = value; + this.SendPropertyChanged("Id"); + this.OnIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectId", DbType="NVarChar(50) NOT NULL", CanBeNull=false)] + public string ProjectId + { + get + { + return this._ProjectId; + } + set + { + if ((this._ProjectId != value)) + { + this.OnProjectIdChanging(value); + this.SendPropertyChanging(); + this._ProjectId = value; + this.SendPropertyChanged("ProjectId"); + this.OnProjectIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TypeId", DbType="NVarChar(50) NOT NULL", CanBeNull=false)] + public string TypeId + { + get + { + return this._TypeId; + } + set + { + if ((this._TypeId != value)) + { + this.OnTypeIdChanging(value); + this.SendPropertyChanging(); + this._TypeId = value; + this.SendPropertyChanged("TypeId"); + this.OnTypeIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MainType", DbType="Int NOT NULL")] + public int MainType + { + get + { + return this._MainType; + } + set + { + if ((this._MainType != value)) + { + this.OnMainTypeChanging(value); + this.SendPropertyChanging(); + this._MainType = value; + this.SendPropertyChanged("MainType"); + this.OnMainTypeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MainTypeName", DbType="NVarChar(50) NOT NULL", CanBeNull=false)] + public string MainTypeName + { + get + { + return this._MainTypeName; + } + set + { + if ((this._MainTypeName != value)) + { + this.OnMainTypeNameChanging(value); + this.SendPropertyChanging(); + this._MainTypeName = value; + this.SendPropertyChanged("MainTypeName"); + this.OnMainTypeNameChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SubType", DbType="NVarChar(200) NOT NULL", CanBeNull=false)] + public string SubType + { + get + { + return this._SubType; + } + set + { + if ((this._SubType != value)) + { + this.OnSubTypeChanging(value); + this.SendPropertyChanging(); + this._SubType = value; + this.SendPropertyChanged("SubType"); + this.OnSubTypeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remark", DbType="NVarChar(50)")] + public string Remark + { + get + { + return this._Remark; + } + set + { + if ((this._Remark != value)) + { + this.OnRemarkChanging(value); + this.SendPropertyChanging(); + this._Remark = value; + this.SendPropertyChanged("Remark"); + this.OnRemarkChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Resume", DbType="NVarChar(500)")] + public string Resume + { + get + { + return this._Resume; + } + set + { + if ((this._Resume != value)) + { + this.OnResumeChanging(value); + this.SendPropertyChanging(); + this._Resume = value; + this.SendPropertyChanged("Resume"); + this.OnResumeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PicUrl", DbType="NVarChar(500)")] + public string PicUrl + { + get + { + return this._PicUrl; + } + set + { + if ((this._PicUrl != value)) + { + this.OnPicUrlChanging(value); + this.SendPropertyChanging(); + this._PicUrl = value; + this.SendPropertyChanged("PicUrl"); + this.OnPicUrlChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CompileMan", DbType="NVarChar(50)")] + public string CompileMan + { + get + { + return this._CompileMan; + } + set + { + if ((this._CompileMan != value)) + { + this.OnCompileManChanging(value); + this.SendPropertyChanging(); + this._CompileMan = value; + this.SendPropertyChanged("CompileMan"); + this.OnCompileManChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CompileManName", DbType="NVarChar(50)")] + public string CompileManName + { + get + { + return this._CompileManName; + } + set + { + if ((this._CompileManName != value)) + { + this.OnCompileManNameChanging(value); + this.SendPropertyChanging(); + this._CompileManName = value; + this.SendPropertyChanged("CompileManName"); + this.OnCompileManNameChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CompileDate", DbType="DateTime")] + public System.Nullable CompileDate + { + get + { + return this._CompileDate; + } + set + { + if ((this._CompileDate != value)) + { + this.OnCompileDateChanging(value); + this.SendPropertyChanging(); + this._CompileDate = value; + this.SendPropertyChanged("CompileDate"); + this.OnCompileDateChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsReport", DbType="Bit NOT NULL")] + public bool IsReport + { + get + { + return this._IsReport; + } + set + { + if ((this._IsReport != value)) + { + this.OnIsReportChanging(value); + this.SendPropertyChanging(); + this._IsReport = value; + this.SendPropertyChanged("IsReport"); + this.OnIsReportChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ReportDate", DbType="DateTime")] + public System.Nullable ReportDate + { + get + { + return this._ReportDate; + } + set + { + if ((this._ReportDate != value)) + { + this.OnReportDateChanging(value); + this.SendPropertyChanging(); + this._ReportDate = value; + this.SendPropertyChanged("ReportDate"); + this.OnReportDateChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ReportMan", DbType="NVarChar(50)")] + public string ReportMan + { + get + { + return this._ReportMan; + } + set + { + if ((this._ReportMan != value)) + { + this.OnReportManChanging(value); + this.SendPropertyChanging(); + this._ReportMan = value; + this.SendPropertyChanged("ReportMan"); + this.OnReportManChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ReportManName", DbType="NVarChar(50)")] + public string ReportManName + { + get + { + return this._ReportManName; + } + set + { + if ((this._ReportManName != value)) + { + this.OnReportManNameChanging(value); + this.SendPropertyChanging(); + this._ReportManName = value; + this.SendPropertyChanged("ReportManName"); + this.OnReportManNameChanged(); + } + } + } + + public event PropertyChangingEventHandler PropertyChanging; + + public event PropertyChangedEventHandler PropertyChanged; + + protected virtual void SendPropertyChanging() + { + if ((this.PropertyChanging != null)) + { + this.PropertyChanging(this, emptyChangingEventArgs); + } + } + + protected virtual void SendPropertyChanged(String propertyName) + { + if ((this.PropertyChanged != null)) + { + this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName)); + } + } + } + [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.CQMSData_CQMS")] public partial class CQMSData_CQMS : INotifyPropertyChanging, INotifyPropertyChanged { @@ -313158,6 +313832,8 @@ namespace Model private string _States; + private string _YunMouState; + public View_SitePerson_Person() { } @@ -314249,6 +314925,22 @@ namespace Model } } } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_YunMouState", DbType="NVarChar(50)")] + public string YunMouState + { + get + { + return this._YunMouState; + } + set + { + if ((this._YunMouState != value)) + { + this._YunMouState = value; + } + } + } } [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.View_Solution_LargerHazardListItem")] From 8c09097e9438896075deab8e529fbde878db1e93 Mon Sep 17 00:00:00 2001 From: gaofei1985 <181547018@qq.com> Date: Fri, 26 Dec 2025 10:57:02 +0800 Subject: [PATCH 4/6] 1 --- .../ProjectHighlightsSitePic.aspx.cs | 14 ++++---- .../ProjectHighlightsSitePicEdit.aspx.cs | 4 +-- .../ProjectHighlightsSitePicReport.aspx.cs | 14 ++++---- SGGL/FineUIPro.Web/FineUIPro.Web.csproj | 34 ++++++++++++++++++- 4 files changed, 49 insertions(+), 17 deletions(-) diff --git a/SGGL/FineUIPro.Web/CQMS/ProjectHighlightsSite/ProjectHighlightsSitePic.aspx.cs b/SGGL/FineUIPro.Web/CQMS/ProjectHighlightsSite/ProjectHighlightsSitePic.aspx.cs index 51c19a21..e927f75f 100644 --- a/SGGL/FineUIPro.Web/CQMS/ProjectHighlightsSite/ProjectHighlightsSitePic.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/ProjectHighlightsSite/ProjectHighlightsSitePic.aspx.cs @@ -88,12 +88,12 @@ namespace FineUIPro.Web.CQMS.ProjectHighlightsSite string url = string.Empty; if (picUrl != null && !string.IsNullOrWhiteSpace(picUrl.ToString())) { - string httpUrl = Funs.SGGLUrl; - //var sysSet6 = (from x in Funs.DB.Sys_Set where x.SetName == "程序访问地址" select x).ToList().FirstOrDefault(); - //if (sysSet6 != null) - //{ - // httpUrl = sysSet6.SetValue; - //} + string httpUrl = string.Empty; + var sysSet6 = (from x in Funs.DB.Sys_Set where x.SetName == "程序访问地址" select x).ToList().FirstOrDefault(); + if (sysSet6 != null) + { + httpUrl = sysSet6.SetValue; + } url = BLL.UploadAttachmentService.ShowImage(httpUrl, picUrl.ToString()); } return url; @@ -268,7 +268,7 @@ namespace FineUIPro.Web.CQMS.ProjectHighlightsSite { return; } - var buttonList = BLL.CommonService.GetAllButtonList(this.ProjectId, this.CurrUser.PersonId, BLL.Const.ProjectHighlightsSitePicMenuId); + var buttonList = BLL.CommonService.GetAllButtonList(this.ProjectId, this.CurrUser.UserId, BLL.Const.ProjectHighlightsSitePicMenuId); if (buttonList.Count() > 0) { //if (buttonList.Contains(BLL.Const.BtnAdd)) diff --git a/SGGL/FineUIPro.Web/CQMS/ProjectHighlightsSite/ProjectHighlightsSitePicEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/ProjectHighlightsSite/ProjectHighlightsSitePicEdit.aspx.cs index adb396a8..4149d05e 100644 --- a/SGGL/FineUIPro.Web/CQMS/ProjectHighlightsSite/ProjectHighlightsSitePicEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/ProjectHighlightsSite/ProjectHighlightsSitePicEdit.aspx.cs @@ -68,8 +68,8 @@ namespace FineUIPro.Web.CQMS.ProjectHighlightsSite Model.CQMS_ProjectHighlightsSitePic model = new Model.CQMS_ProjectHighlightsSitePic(); model.Id = this.Id; model.Resume = this.txtResume.Text.Trim(); - model.CompileMan = this.CurrUser.PersonId; - model.CompileManName = this.CurrUser.PersonName; + model.CompileMan = this.CurrUser.UserId; + model.CompileManName = this.CurrUser.UserName; model.CompileDate = DateTime.Now; var attachFile = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == this.Id); if (attachFile != null) diff --git a/SGGL/FineUIPro.Web/CQMS/ProjectHighlightsSite/ProjectHighlightsSitePicReport.aspx.cs b/SGGL/FineUIPro.Web/CQMS/ProjectHighlightsSite/ProjectHighlightsSitePicReport.aspx.cs index 8c1714de..02f831a6 100644 --- a/SGGL/FineUIPro.Web/CQMS/ProjectHighlightsSite/ProjectHighlightsSitePicReport.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/ProjectHighlightsSite/ProjectHighlightsSitePicReport.aspx.cs @@ -115,12 +115,12 @@ namespace FineUIPro.Web.CQMS.ProjectHighlightsSite string url = string.Empty; if (picUrl != null && !string.IsNullOrWhiteSpace(picUrl.ToString())) { - string httpUrl = Funs.SGGLUrl; - //var sysSet6 = (from x in Funs.DB.Sys_Set where x.SetName == "程序访问地址" select x).ToList().FirstOrDefault(); - //if (sysSet6 != null) - //{ - // httpUrl = sysSet6.SetValue; - //} + string httpUrl = string.Empty; + var sysSet6 = (from x in Funs.DB.Sys_Set where x.SetName == "程序访问地址" select x).ToList().FirstOrDefault(); + if (sysSet6 != null) + { + httpUrl = sysSet6.SetValue; + } url = BLL.UploadAttachmentService.ShowImage(httpUrl, picUrl.ToString()); } return url; @@ -333,7 +333,7 @@ namespace FineUIPro.Web.CQMS.ProjectHighlightsSite { return; } - var buttonList = BLL.CommonService.GetAllButtonList(null, this.CurrUser.PersonId, BLL.Const.ProjectHighlightsSitePicReportMenuId); + var buttonList = BLL.CommonService.GetAllButtonList(null, this.CurrUser.UserId, BLL.Const.ProjectHighlightsSitePicReportMenuId); if (buttonList.Count() > 0) { //if (buttonList.Contains(BLL.Const.BtnAdd)) diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj index a36f6d86..017734c8 100644 --- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj +++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj @@ -496,6 +496,10 @@ + + + + @@ -9228,6 +9232,34 @@ TechnicalProposalReviewView.aspx + + ProjectHighlightsSitePic.aspx + ASPXCodeBehind + + + ProjectHighlightsSitePic.aspx + + + ProjectHighlightsSitePicEdit.aspx + ASPXCodeBehind + + + ProjectHighlightsSitePicEdit.aspx + + + ProjectHighlightsSitePicReport.aspx + ASPXCodeBehind + + + ProjectHighlightsSitePicReport.aspx + + + ProjectHighlightsSiteType.aspx + ASPXCodeBehind + + + ProjectHighlightsSiteType.aspx + QCGroupRegistration.aspx ASPXCodeBehind @@ -16862,7 +16894,7 @@ - + From d123dc5c9fd037024cbf6b01eb6aab75cb5515cb Mon Sep 17 00:00:00 2001 From: gaofei1985 <181547018@qq.com> Date: Fri, 26 Dec 2025 10:59:26 +0800 Subject: [PATCH 5/6] 1 --- .../ProjectHighlightsSitePic.aspx.cs | 14 +++++++------- .../ProjectHighlightsSitePicEdit.aspx.cs | 4 ++-- .../ProjectHighlightsSitePicReport.aspx.cs | 14 +++++++------- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/SGGL/FineUIPro.Web/CQMS/ProjectHighlightsSite/ProjectHighlightsSitePic.aspx.cs b/SGGL/FineUIPro.Web/CQMS/ProjectHighlightsSite/ProjectHighlightsSitePic.aspx.cs index e927f75f..51c19a21 100644 --- a/SGGL/FineUIPro.Web/CQMS/ProjectHighlightsSite/ProjectHighlightsSitePic.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/ProjectHighlightsSite/ProjectHighlightsSitePic.aspx.cs @@ -88,12 +88,12 @@ namespace FineUIPro.Web.CQMS.ProjectHighlightsSite string url = string.Empty; if (picUrl != null && !string.IsNullOrWhiteSpace(picUrl.ToString())) { - string httpUrl = string.Empty; - var sysSet6 = (from x in Funs.DB.Sys_Set where x.SetName == "程序访问地址" select x).ToList().FirstOrDefault(); - if (sysSet6 != null) - { - httpUrl = sysSet6.SetValue; - } + string httpUrl = Funs.SGGLUrl; + //var sysSet6 = (from x in Funs.DB.Sys_Set where x.SetName == "程序访问地址" select x).ToList().FirstOrDefault(); + //if (sysSet6 != null) + //{ + // httpUrl = sysSet6.SetValue; + //} url = BLL.UploadAttachmentService.ShowImage(httpUrl, picUrl.ToString()); } return url; @@ -268,7 +268,7 @@ namespace FineUIPro.Web.CQMS.ProjectHighlightsSite { return; } - var buttonList = BLL.CommonService.GetAllButtonList(this.ProjectId, this.CurrUser.UserId, BLL.Const.ProjectHighlightsSitePicMenuId); + var buttonList = BLL.CommonService.GetAllButtonList(this.ProjectId, this.CurrUser.PersonId, BLL.Const.ProjectHighlightsSitePicMenuId); if (buttonList.Count() > 0) { //if (buttonList.Contains(BLL.Const.BtnAdd)) diff --git a/SGGL/FineUIPro.Web/CQMS/ProjectHighlightsSite/ProjectHighlightsSitePicEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/ProjectHighlightsSite/ProjectHighlightsSitePicEdit.aspx.cs index 4149d05e..adb396a8 100644 --- a/SGGL/FineUIPro.Web/CQMS/ProjectHighlightsSite/ProjectHighlightsSitePicEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/ProjectHighlightsSite/ProjectHighlightsSitePicEdit.aspx.cs @@ -68,8 +68,8 @@ namespace FineUIPro.Web.CQMS.ProjectHighlightsSite Model.CQMS_ProjectHighlightsSitePic model = new Model.CQMS_ProjectHighlightsSitePic(); model.Id = this.Id; model.Resume = this.txtResume.Text.Trim(); - model.CompileMan = this.CurrUser.UserId; - model.CompileManName = this.CurrUser.UserName; + model.CompileMan = this.CurrUser.PersonId; + model.CompileManName = this.CurrUser.PersonName; model.CompileDate = DateTime.Now; var attachFile = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == this.Id); if (attachFile != null) diff --git a/SGGL/FineUIPro.Web/CQMS/ProjectHighlightsSite/ProjectHighlightsSitePicReport.aspx.cs b/SGGL/FineUIPro.Web/CQMS/ProjectHighlightsSite/ProjectHighlightsSitePicReport.aspx.cs index 02f831a6..8c1714de 100644 --- a/SGGL/FineUIPro.Web/CQMS/ProjectHighlightsSite/ProjectHighlightsSitePicReport.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/ProjectHighlightsSite/ProjectHighlightsSitePicReport.aspx.cs @@ -115,12 +115,12 @@ namespace FineUIPro.Web.CQMS.ProjectHighlightsSite string url = string.Empty; if (picUrl != null && !string.IsNullOrWhiteSpace(picUrl.ToString())) { - string httpUrl = string.Empty; - var sysSet6 = (from x in Funs.DB.Sys_Set where x.SetName == "程序访问地址" select x).ToList().FirstOrDefault(); - if (sysSet6 != null) - { - httpUrl = sysSet6.SetValue; - } + string httpUrl = Funs.SGGLUrl; + //var sysSet6 = (from x in Funs.DB.Sys_Set where x.SetName == "程序访问地址" select x).ToList().FirstOrDefault(); + //if (sysSet6 != null) + //{ + // httpUrl = sysSet6.SetValue; + //} url = BLL.UploadAttachmentService.ShowImage(httpUrl, picUrl.ToString()); } return url; @@ -333,7 +333,7 @@ namespace FineUIPro.Web.CQMS.ProjectHighlightsSite { return; } - var buttonList = BLL.CommonService.GetAllButtonList(null, this.CurrUser.UserId, BLL.Const.ProjectHighlightsSitePicReportMenuId); + var buttonList = BLL.CommonService.GetAllButtonList(null, this.CurrUser.PersonId, BLL.Const.ProjectHighlightsSitePicReportMenuId); if (buttonList.Count() > 0) { //if (buttonList.Contains(BLL.Const.BtnAdd)) From ee8b7e4ceb65023e1359e55f0e7568f459b90274 Mon Sep 17 00:00:00 2001 From: fei550 <1420031550@qq.com> Date: Wed, 31 Dec 2025 14:54:21 +0800 Subject: [PATCH 6/6] 1 --- SGGL/FineUIPro.Web/FineUIPro.Web.csproj | 2 +- .../PHTGL/BiddingManagement/ActionPlanReviewEdit.aspx.cs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj index 017734c8..36680653 100644 --- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj +++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj @@ -16894,7 +16894,7 @@ - + diff --git a/SGGL/FineUIPro.Web/PHTGL/BiddingManagement/ActionPlanReviewEdit.aspx.cs b/SGGL/FineUIPro.Web/PHTGL/BiddingManagement/ActionPlanReviewEdit.aspx.cs index c8dd8055..b7d74af7 100644 --- a/SGGL/FineUIPro.Web/PHTGL/BiddingManagement/ActionPlanReviewEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/PHTGL/BiddingManagement/ActionPlanReviewEdit.aspx.cs @@ -127,8 +127,8 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement SqlParameter[] parameter = listStr.ToArray(); DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter); Grid1.RecordCount = tb.Rows.Count; - var table = this.GetPagedDataTable(Grid1, tb); - Grid1.DataSource = table; + // var table = this.GetPagedDataTable(Grid1, tb); + Grid1.DataSource = tb; Grid1.DataBind(); }