修改集团展示页

DataBase/版本日志/SGGLDB_WH_2023-03-27.sql

@@ -1,2 +1,358 @@
 alter table HSSE_Hazard_HazardRegister add HazardValue nvarchar(50) null
 GO
+alter table HSSE_Hazard_HazardRegister add Risk_Level nvarchar(50) null
+GO
+
+
+CREATE TABLE [dbo].[Person_CompanyBranchPerson](
+	[CompanyBranchPersonId] [nvarchar](50) NOT NULL,
+	[UnitId] [nvarchar](50) NULL,
+	[PersonName] [nvarchar](50) NULL,
+	[Sex] [char](1) NULL,
+	[IdentityCard] [nvarchar](50) NULL,
+	[WorkPostId] [nvarchar](50) NULL,
+	[Telephone] [nvarchar](50) NULL,
+	[Address] [nvarchar](500) NULL,
+	[IsOnJob] [bit] NULL,
+	[Remark] [nvarchar](500) NULL,
+ CONSTRAINT [PK_Person_Person] PRIMARY KEY CLUSTERED 
+(
+	[CompanyBranchPersonId] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+) ON [PRIMARY]
+
+GO
+
+SET ANSI_PADDING OFF
+GO
+
+ALTER TABLE [dbo].[Person_CompanyBranchPerson]  WITH CHECK ADD  CONSTRAINT [FK_Person_CompanyBranchPerson_Base_Unit] FOREIGN KEY([UnitId])
+REFERENCES [dbo].[Base_Unit] ([UnitId])
+GO
+
+ALTER TABLE [dbo].[Person_CompanyBranchPerson] CHECK CONSTRAINT [FK_Person_CompanyBranchPerson_Base_Unit]
+GO
+
+ALTER TABLE [dbo].[Person_CompanyBranchPerson]  WITH CHECK ADD  CONSTRAINT [FK_Person_CompanyBranchPerson_Base_WorkPost] FOREIGN KEY([WorkPostId])
+REFERENCES [dbo].[Base_WorkPost] ([WorkPostId])
+GO
+
+ALTER TABLE [dbo].[Person_CompanyBranchPerson] CHECK CONSTRAINT [FK_Person_CompanyBranchPerson_Base_WorkPost]
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'主键' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Person_CompanyBranchPerson', @level2type=N'COLUMN',@level2name=N'CompanyBranchPersonId'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'单位Id' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Person_CompanyBranchPerson', @level2type=N'COLUMN',@level2name=N'UnitId'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'姓名' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Person_CompanyBranchPerson', @level2type=N'COLUMN',@level2name=N'PersonName'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'性别' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Person_CompanyBranchPerson', @level2type=N'COLUMN',@level2name=N'Sex'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'身份证号' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Person_CompanyBranchPerson', @level2type=N'COLUMN',@level2name=N'IdentityCard'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'岗位Id' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Person_CompanyBranchPerson', @level2type=N'COLUMN',@level2name=N'WorkPostId'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'电话' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Person_CompanyBranchPerson', @level2type=N'COLUMN',@level2name=N'Telephone'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'家庭地址' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Person_CompanyBranchPerson', @level2type=N'COLUMN',@level2name=N'Address'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'是否在职' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Person_CompanyBranchPerson', @level2type=N'COLUMN',@level2name=N'IsOnJob'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'备注' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Person_CompanyBranchPerson', @level2type=N'COLUMN',@level2name=N'Remark'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'企业总部及分支机构人员表' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Person_CompanyBranchPerson'
+GO
+
+alter table [dbo].[Supervise_SuperviseCheckReport] add CheckType char(1) null
+GO
+alter table [dbo].[InApproveManager_EquipmentInItem] add IsUsed bit null
+GO
+alter table [dbo].[InApproveManager_GeneralEquipmentInItem] add IsUsed bit null
+GO
+
+
+/**********隐患巡检（手机端）视图*************/
+ALTER VIEW [dbo].[View_Hazard_HazardRegister]
+AS
+SELECT Registration.HazardRegisterId, 
+	Registration.HazardCode, 
+	Registration.RegisterDate, 
+	Registration.RegisterDef, 
+	Registration.Rectification, 
+	Registration.Place, 
+	Registration.ResponsibleUnit, 
+	Registration.Observer, 
+	Registration.RectifiedDate, 
+	Registration.ProjectId, 
+	Registration.states,
+	Registration.IsEffective,
+	Registration.ResponsibleMan,
+	Registration.CheckManId,
+	Registration.CheckTime,
+	Registration.RectificationPeriod,
+	Registration.ImageUrl,
+	Registration.RectificationImageUrl,
+	Registration.RectificationTime,
+	Registration.ConfirmMan,
+	Registration.ConfirmDate,
+	Registration.HandleIdea, 
+	Registration.CutPayment, 
+	Registration.ProblemTypes, 
+	Registration.CheckSpecialId,
+	Registration.CheckItemDetailId,
+	Registration.SupCheckItemSetId,
+	Registration.CheckItemSetId,
+	Registration.SafeSupervisionId,
+	Registration.SafeSupervisionIsOK,
+	Registration.Risk_Level,
+	Project.ProjectName,
+	Registration.CheckCycle,
+	ISNULL(WorkArea.UnitWorkName,'') AS WorkAreaName,
+	Unit.UnitName AS ResponsibilityUnitName,
+	ISNULL(User1.UserName,'') AS ResponsibilityManName,
+	ISNULL(User1.Telephone,'') AS ResponsibilityManTel,
+	ISNULL(User2.UserName,'') AS CheckManName,
+	ISNULL(User2.Telephone,'') AS  CheckManTel,
+	User2.UnitId AS SendUnitId,
+	ISNULL(User3.UserName,'') AS ConfirmManName,
+	ISNULL(User3.Telephone,'') AS  ConfirmManTel,
+	ISNULL(User4.UserName,'') AS ResponsibilityManName2,
+	ISNULL(User4.Telephone,'') AS  ResponsibilityMan2Tel,
+	(CASE WHEN Registration.states='1' and (Registration.SafeSupervisionIsOK is null OR Registration.SafeSupervisionIsOK=0) THEN '待整改' 
+	WHEN Registration.states='1' and Registration.SafeSupervisionIsOK=1 THEN '合格' 
+	WHEN Registration.states='2' THEN '已整改' 
+	WHEN Registration.states='3' THEN '已闭环' 
+	ELSE '已作废' END ) AS StatesStr,
+	RegisterTypes.RegisterTypesId,
+	RegisterTypes.RegisterTypesName,
+	Registration.DIC_ID,
+	Registration.CCManIds,
+	CCManNames = STUFF(( SELECT ',' + UserName FROM Sys_User
+				    where PATINDEX('%,' + RTRIM(Sys_User.UserId) + ',%',',' + Registration.CCManIds + ',')>0
+					ORDER BY PATINDEX('%,' + RTRIM(Registration.CCManIds) + ',%',',' + Registration.CCManIds + ',')
+					FOR XML PATH('')), 1, 1,''),
+	Registration.Requirements
+FROM dbo.HSSE_Hazard_HazardRegister AS Registration
+LEFT JOIN dbo.Base_Project AS Project ON Project.ProjectId = Registration.ProjectId
+LEFT JOIN dbo.WBS_UnitWork AS WorkArea ON WorkArea.UnitWorkId = Registration.Place 
+LEFT JOIN dbo.HSSE_Hazard_HazardRegisterTypes AS RegisterTypes ON RegisterTypes.RegisterTypesId = Registration.RegisterTypesId 
+LEFT JOIN dbo.Base_Unit AS Unit ON Unit.UnitId = Registration.ResponsibleUnit
+LEFT JOIN dbo.Sys_User AS User1 ON User1.UserId = Registration.ResponsibleMan   
+LEFT JOIN dbo.Sys_User AS User2 ON User2.UserId = Registration.CheckManId
+LEFT JOIN dbo.Sys_User AS User3 ON User3.UserId = Registration.ConfirmMan
+LEFT JOIN dbo.Sys_User AS User4 ON User4.UserId = Registration.ResponsibleMan2
+
+
+
+
+GO
+
+
+CREATE TABLE [dbo].[CH_Check](
+	[CHT_CheckID] [varchar](50) NOT NULL,
+	[CH_TrustID] [varchar](50) NULL,
+	[ProjectId] [nvarchar](50) NOT NULL,
+	[UnitId] [nvarchar](50) NOT NULL,
+	[InstallationId] [nvarchar](50) NULL,
+	[CHT_CheckCode] [varchar](50) NULL,
+	[CHT_CheckDate] [datetime] NULL,
+	[CHT_CheckType] [char](2) NULL,
+	[CHT_CheckMan] [varchar](50) NULL,
+	[CHT_Tabler] [varchar](50) NULL,
+	[CHT_TableDate] [datetime] NULL,
+	[CHT_AuditMan] [varchar](50) NULL,
+	[CHT_AuditDate] [datetime] NULL,
+	[CHT_Remark] [varchar](100) NULL,
+	[RepairTrustId] [nvarchar](50) NULL,
+	[ContractualUnits] [nvarchar](50) NULL,
+ CONSTRAINT [PK_CH_Check] PRIMARY KEY CLUSTERED 
+(
+	[CHT_CheckID] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+) ON [PRIMARY]
+
+GO
+
+SET ANSI_PADDING OFF
+GO
+
+ALTER TABLE [dbo].[CH_Check]  WITH CHECK ADD  CONSTRAINT [FK_CH_Check_Base_Project] FOREIGN KEY([ProjectId])
+REFERENCES [dbo].[Base_Project] ([ProjectId])
+GO
+
+ALTER TABLE [dbo].[CH_Check] CHECK CONSTRAINT [FK_CH_Check_Base_Project]
+GO
+
+ALTER TABLE [dbo].[CH_Check]  WITH CHECK ADD  CONSTRAINT [FK_CH_Check_Base_Unit] FOREIGN KEY([UnitId])
+REFERENCES [dbo].[Base_Unit] ([UnitId])
+GO
+
+ALTER TABLE [dbo].[CH_Check] CHECK CONSTRAINT [FK_CH_Check_Base_Unit]
+GO
+
+ALTER TABLE [dbo].[CH_Check]  WITH CHECK ADD  CONSTRAINT [FK_CH_Check_Base_Unit1] FOREIGN KEY([ContractualUnits])
+REFERENCES [dbo].[Base_Unit] ([UnitId])
+GO
+
+ALTER TABLE [dbo].[CH_Check] CHECK CONSTRAINT [FK_CH_Check_Base_Unit1]
+GO
+
+ALTER TABLE [dbo].[CH_Check]  WITH CHECK ADD  CONSTRAINT [FK_CH_Check_CH_Trust] FOREIGN KEY([CH_TrustID])
+REFERENCES [dbo].[CH_Trust] ([CH_TrustID])
+GO
+
+ALTER TABLE [dbo].[CH_Check] CHECK CONSTRAINT [FK_CH_Check_CH_Trust]
+GO
+
+
+
+CREATE TABLE [dbo].[CH_CheckItem](
+	[CHT_CheckItemID] [varchar](50) NOT NULL,
+	[CHT_CheckID] [varchar](50) NOT NULL,
+	[JOT_ID] [varchar](50) NULL,
+	[CH_TrustItemID] [varchar](50) NULL,
+	[CHT_CheckMethod] [varchar](50) NOT NULL,
+	[CHT_RequestDate] [datetime] NULL,
+	[CHT_RepairLocation] [varchar](20) NULL,
+	[CHT_TotalFilm] [int] NULL,
+	[CHT_PassFilm] [int] NULL,
+	[CHT_CheckResult] [varchar](20) NULL,
+	[CHT_CheckNo] [varchar](30) NULL,
+	[CHT_FilmDate] [datetime] NULL,
+	[CHT_ReportDate] [datetime] NULL,
+	[CHT_Remark] [varchar](100) NULL,
+	[CHT_FloorWelder1] [varchar](20) NULL,
+	[CHT_FloorWelder2] [varchar](20) NULL,
+	[CHT_AuditTime] [datetime] NULL,
+	[FilmSpecifications] [nvarchar](50) NULL,
+	[DefectLength] [decimal](9, 2) NULL,
+	[ExtendingRice] [decimal](9, 2) NULL,
+	[Defects_Definition] [varchar](50) NULL,
+	[DefectDepth] [decimal](9, 2) NULL,
+	[DefectHeight] [decimal](9, 2) NULL,
+ CONSTRAINT [PK_CH_CheckItem] PRIMARY KEY CLUSTERED 
+(
+	[CHT_CheckItemID] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+) ON [PRIMARY]
+
+GO
+
+SET ANSI_PADDING OFF
+GO
+
+ALTER TABLE [dbo].[CH_CheckItem]  WITH CHECK ADD  CONSTRAINT [FK_CH_CHECK_REFERENCE_CH_CHECK] FOREIGN KEY([CHT_CheckID])
+REFERENCES [dbo].[CH_Check] ([CHT_CheckID])
+GO
+
+ALTER TABLE [dbo].[CH_CheckItem] CHECK CONSTRAINT [FK_CH_CHECK_REFERENCE_CH_CHECK]
+GO
+
+ALTER TABLE [dbo].[CH_CheckItem]  WITH CHECK ADD  CONSTRAINT [FK_CH_CHECK_REFERENCE_CH_TRUST] FOREIGN KEY([CH_TrustItemID])
+REFERENCES [dbo].[CH_TrustItem] ([CH_TrustItemID])
+GO
+
+ALTER TABLE [dbo].[CH_CheckItem] CHECK CONSTRAINT [FK_CH_CHECK_REFERENCE_CH_TRUST]
+GO
+
+ALTER TABLE [dbo].[CH_CheckItem]  WITH CHECK ADD  CONSTRAINT [FK_CH_CHECK_REFERENCE_PW_JOINT] FOREIGN KEY([JOT_ID])
+REFERENCES [dbo].[PW_JointInfo] ([JOT_ID])
+GO
+
+ALTER TABLE [dbo].[CH_CheckItem] CHECK CONSTRAINT [FK_CH_CHECK_REFERENCE_PW_JOINT]
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'胶片规格' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'CH_CheckItem', @level2type=N'COLUMN',@level2name=N'FilmSpecifications'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'缺陷长度' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'CH_CheckItem', @level2type=N'COLUMN',@level2name=N'DefectLength'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'延长米' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'CH_CheckItem', @level2type=N'COLUMN',@level2name=N'ExtendingRice'
+GO
+
+
+alter table BS_Welder add TeamGroupId nvarchar(50) null
+GO
+alter table BS_Welder add WederType char(1) null
+GO
+
+
+ALTER VIEW [dbo].[View_License_LicenseManager]
+AS
+/*现场安全许可证*/
+SELECT LicenseManager.LicenseManagerId, 
+	LicenseManager.ProjectId, 
+	LicenseManager.LicenseTypeId, 
+	LicenseManager.LicenseManagerCode, 
+	LicenseManager.LicenseManageName, 
+	LicenseManager.UnitId, 
+	LicenseManager.LicenseManageContents, 
+	LicenseManager.CompileMan, 
+	LicenseManager.CompileDate, 
+	LicenseManager.CNProfessionalId,
+	CN.ProfessionalName,
+	LicenseManager.States,
+	Project.ProjectCode,
+	Project.ProjectName,
+	LicenseType.LicenseTypeName,
+	Unit.UnitName,
+	UnitType.UnitTypeId,
+	UnitType.UnitTypeName,
+	Users.UserName,
+	LicenseManager.WorkAreaId,
+	--WorkArea.WorkAreaName,
+	case LicenseManager.WorkStates when '1' then '待开工'
+	                               when '2' then '作业中'
+								   when '3' then '已关闭'
+								   when '-1' then '已取消'
+								   else '' end as WorkStatesStr,
+	LicenseManager.StartDate,
+	LicenseManager.EndDate,
+	LicenseManager.ApplicantMan,
+	WorkAreaName = STUFF(( SELECT ',' + UnitWorkName FROM WBS_UnitWork
+				    where PATINDEX('%,' + RTRIM(WBS_UnitWork.UnitWorkId) + ',%',',' + LicenseManager.WorkAreaId + ',')>0
+					ORDER BY PATINDEX('%,' + RTRIM(LicenseManager.WorkAreaId) + ',%',',' + LicenseManager.WorkAreaId + ',')
+					FOR XML PATH('')), 1, 1,'')
+FROM dbo.License_LicenseManager AS LicenseManager
+LEFT JOIN dbo.Base_Project AS Project ON Project.ProjectId = LicenseManager.ProjectId
+LEFT JOIN dbo.Base_LicenseType AS LicenseType ON LicenseType.LicenseTypeId = LicenseManager.LicenseTypeId
+LEFT JOIN dbo.Base_CNProfessional AS CN ON CN.CNProfessionalId = LicenseManager.CNProfessionalId
+LEFT JOIN dbo.Base_Unit AS Unit ON Unit.UnitId = LicenseManager.UnitId
+LEFT JOIN dbo.Sys_User AS Users ON Users.UserId = LicenseManager.CompileMan
+LEFT JOIN dbo.WBS_UnitWork AS WorkArea ON WorkArea.UnitWorkId = LicenseManager.WorkAreaId
+LEFT JOIN dbo.Base_UnitType as UnitType ON UnitType.UnitTypeId=Unit.UnitTypeId
+
+
+GO
+
+
+alter table Base_Project add ProjectAttribute nvarchar(50) null
+GO
+update Base_Project set ProjectAttribute='GONGCHENG'
+GO
+
+alter table [dbo].[WBS_DivisionProject] add [SubItemType] char(1) null
+GO
+alter table [dbo].WBS_BreakdownProject add CheckAcceptType char(1) null
+GO
+alter table [dbo].Comprehensive_InspectionMachine add Status nvarchar(2) null
+GO
+alter table [dbo].Comprehensive_InspectionPerson add Status nvarchar(2) null
+GO
+alter table [dbo].Comprehensive_DesignDetails add Status nvarchar(2) null
+GO
+alter table [dbo].Hazard_HazardSelectedItem add HazardSelectedItemId nvarchar(50) null
+GO
+
+

SGGL/FineUIPro.Web/DataShow/Accident.aspx

@@ -38,7 +38,7 @@
                                     <f:RadioItem Text="特别重大" Value="5" />
                                 </f:RadioButtonList>
                                 <f:ToolbarFill runat="server"></f:ToolbarFill>
-                                  <f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose" OnClientClick="close();">
+                                  <f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose" OnClientClick="closeNow();">
                                 </f:Button>
                             </Items>
                         </f:Toolbar>
@@ -111,13 +111,13 @@
             return false;
         }
         // 点击标题栏工具图标 - 退出
-        function close(event) {
+        function closeNow(event) {
             var bConfirmed = confirm('您确定要退出吗?');
             if (bConfirmed) { closePage(); }
         }
 
         function closePage() {
-            if (navigator.userAgent.indexOf("Firefox") != -1 || navigator.userAgent.indexOf("Chrome") != -1) {
+            if (navigator.userAgent.indexOf('Firefox') !== -1 || navigator.userAgent.indexOf('Chrome') !== -1) {
                 window.location.href = "about:blank";
                 window.close();
             } else {

SGGL/FineUIPro.Web/DataShow/Accident.aspx.cs

@@ -23,7 +23,6 @@ namespace FineUIPro.Web.DataShow
             if (!IsPostBack)
             {
                 Funs.DropDownPageSize(this.ddlPageSize);
-                btnClose.OnClientClick = ActiveWindow.GetHideReference();
                 ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
                 BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
                 // 绑定表格t

SGGL/FineUIPro.Web/DataShow/Check.aspx

@@ -44,7 +44,7 @@
                                     Width="130px">
                                 </f:DatePicker>
                                  <f:ToolbarFill runat="server"></f:ToolbarFill>
-                                <f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose" OnClientClick="close();">
+                                <f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose" OnClientClick="closeNow();">
                                 </f:Button>
                             </Items>
                         </f:Toolbar>
@@ -110,13 +110,13 @@
             return false;
         }
         // 点击标题栏工具图标 - 退出
-        function close(event) {
+        function closeNow(event) {
             var bConfirmed = confirm('您确定要退出吗?');
             if (bConfirmed) { closePage(); }
         }
 
         function closePage() {
-            if (navigator.userAgent.indexOf("Firefox") != -1 || navigator.userAgent.indexOf("Chrome") != -1) {
+            if (navigator.userAgent.indexOf('Firefox') !== -1 || navigator.userAgent.indexOf('Chrome') !== -1) {
                 window.location.href = "about:blank";
                 window.close();
             } else {

SGGL/FineUIPro.Web/DataShow/Check.aspx.cs

@@ -24,7 +24,6 @@ namespace FineUIPro.Web.DataShow
             if (!IsPostBack)
             {
                 Funs.DropDownPageSize(this.ddlPageSize);
-                btnClose.OnClientClick = ActiveWindow.GetHideReference();
                 ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
                 BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
                 // 绑定表格t

SGGL/FineUIPro.Web/DataShow/CompanyPerson.aspx

@@ -35,7 +35,7 @@
                                     <f:RadioItem Text="专职" Value="1" />
                                 </f:RadioButtonList>
                                  <f:ToolbarFill runat="server"></f:ToolbarFill>
-                                <f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose" OnClientClick="close();">
+                                <f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose" OnClientClick="closeNow();">
                                 </f:Button>
                             </Items>
                         </f:Toolbar>
@@ -96,13 +96,13 @@
             return false;
         }
         // 点击标题栏工具图标 - 退出
-        function close(event) {
+        function closeNow(event) {
             var bConfirmed = confirm('您确定要退出吗?');
             if (bConfirmed) { closePage(); }
         }
 
         function closePage() {
-            if (navigator.userAgent.indexOf("Firefox") != -1 || navigator.userAgent.indexOf("Chrome") != -1) {
+            if (navigator.userAgent.indexOf('Firefox') !== -1 || navigator.userAgent.indexOf('Chrome') !== -1) {
                 window.location.href = "about:blank";
                 window.close();
             } else {

SGGL/FineUIPro.Web/DataShow/CompanyPerson.aspx.cs

@@ -20,7 +20,6 @@ namespace FineUIPro.Web.DataShow
             if (!IsPostBack)
             {
                 Funs.DropDownPageSize(this.ddlPageSize);
-                btnClose.OnClientClick = ActiveWindow.GetHideReference();
                 ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
                 // 绑定表格t
                 BindGrid();

SGGL/FineUIPro.Web/DataShow/EduTrain.aspx

@@ -43,7 +43,7 @@
                                     Width="130px">
                                 </f:DatePicker>
                                 <f:ToolbarFill runat="server"></f:ToolbarFill>
-                                <f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose" OnClientClick="close();">
+                                <f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose" OnClientClick="closeNow();">
                                 </f:Button>
                             </Items>
                         </f:Toolbar>
@@ -113,13 +113,13 @@
         }
 
         // 点击标题栏工具图标 - 退出
-        function close(event) {
+        function closeNow(event) {
             var bConfirmed = confirm('您确定要退出吗?');
             if (bConfirmed) { closePage(); }
         }
 
         function closePage() {
-            if (navigator.userAgent.indexOf("Firefox") != -1 || navigator.userAgent.indexOf("Chrome") != -1) {
+            if (navigator.userAgent.indexOf('Firefox') !== -1 || navigator.userAgent.indexOf('Chrome') !== -1) {
                 window.location.href = "about:blank";
                 window.close();
             } else {

SGGL/FineUIPro.Web/DataShow/EduTrain.aspx.cs

@@ -19,7 +19,6 @@ namespace FineUIPro.Web.DataShow
             if (!IsPostBack)
             {
                 Funs.DropDownPageSize(this.ddlPageSize);
-             //   btnClose.OnClientClick = ActiveWindow.GetHideReference();
                 ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
                 BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
                 // 绑定表格t

SGGL/FineUIPro.Web/DataShow/Emergency.aspx

@@ -38,7 +38,7 @@
                                     Width="130px">
                                 </f:DatePicker>
                                 <f:ToolbarFill runat="server"></f:ToolbarFill>
-                               <f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose" OnClientClick="close();">
+                               <f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose" OnClientClick="closeNow();">
                                 </f:Button>
                             </Items>
                         </f:Toolbar>
@@ -195,13 +195,13 @@
         }
 
         // 点击标题栏工具图标 - 退出
-        function close(event) {
+        function closeNow(event) {
             var bConfirmed = confirm('您确定要退出吗?');
             if (bConfirmed) { closePage(); }
         }
 
         function closePage() {
-            if (navigator.userAgent.indexOf("Firefox") != -1 || navigator.userAgent.indexOf("Chrome") != -1) {
+            if (navigator.userAgent.indexOf('Firefox') !== -1 || navigator.userAgent.indexOf('Chrome') !== -1) {
                 window.location.href = "about:blank";
                 window.close();
             } else {

SGGL/FineUIPro.Web/DataShow/Emergency.aspx.cs

@@ -20,8 +20,6 @@ namespace FineUIPro.Web.DataShow
             if (!IsPostBack)
             {
                 Funs.DropDownPageSize(this.ddlPageSize);           
-                btnClose.OnClientClick = ActiveWindow.GetHideReference();
-           
                 BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
 
                 ddlPageSize.SelectedValue = Grid1.PageSize.ToString();

SGGL/FineUIPro.Web/DataShow/Environmental.aspx

@@ -38,7 +38,7 @@
                                     Width="130px">
                                 </f:DatePicker>
                                 <f:ToolbarFill runat="server"></f:ToolbarFill>
-                                <f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose" OnClientClick="close();">
+                                <f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose" OnClientClick="closeNow();">
                                 </f:Button>
                             </Items>
                         </f:Toolbar>
@@ -109,13 +109,13 @@
         }
 
         // 点击标题栏工具图标 - 退出
-        function close(event) {
+        function closeNow(event) {
             var bConfirmed = confirm('您确定要退出吗?');
             if (bConfirmed) { closePage(); }
         }
 
         function closePage() {
-            if (navigator.userAgent.indexOf("Firefox") != -1 || navigator.userAgent.indexOf("Chrome") != -1) {
+            if (navigator.userAgent.indexOf('Firefox') !== -1 || navigator.userAgent.indexOf('Chrome') !== -1) {
                 window.location.href = "about:blank";
                 window.close();
             } else {

SGGL/FineUIPro.Web/DataShow/Environmental.aspx.cs

@@ -21,7 +21,6 @@ namespace FineUIPro.Web.DataShow
             if (!IsPostBack)
             {
                 Funs.DropDownPageSize(this.ddlPageSize);
-             //   btnClose.OnClientClick = ActiveWindow.GetHideReference();
                 ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
                 // 绑定表格t
                 BindGrid();

SGGL/FineUIPro.Web/DataShow/HJGLDefect.aspx

@@ -35,7 +35,7 @@
                                     Width="130px">
                                 </f:DatePicker>--%>
                                 <f:ToolbarFill runat="server"></f:ToolbarFill>
-                         <f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose" OnClientClick="close();">
+                         <f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose" OnClientClick="closeNow();">
                                 </f:Button>
                             </Items>
                         </f:Toolbar>
@@ -95,13 +95,13 @@
             return false;
         }
         // 点击标题栏工具图标 - 退出
-        function close(event) {
+        function closeNow(event) {
             var bConfirmed = confirm('您确定要退出吗?');
             if (bConfirmed) { closePage(); }
         }
 
         function closePage() {
-            if (navigator.userAgent.indexOf("Firefox") != -1 || navigator.userAgent.indexOf("Chrome") != -1) {
+            if (navigator.userAgent.indexOf('Firefox') !== -1 || navigator.userAgent.indexOf('Chrome') !== -1) {
                 window.location.href = "about:blank";
                 window.close();
             } else {

SGGL/FineUIPro.Web/DataShow/HJGLDefect.aspx.cs

@@ -21,7 +21,6 @@ namespace FineUIPro.Web.DataShow
             if (!IsPostBack)
             {
                 Funs.DropDownPageSize(this.ddlPageSize);
-                btnClose.OnClientClick = ActiveWindow.GetHideReference();
                 ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
                 BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
                 // 绑定表格t

SGGL/FineUIPro.Web/DataShow/HJGLWelder.aspx

@@ -29,7 +29,7 @@
                                 </f:DropDownList>
                                 <f:ToolbarSeparator runat="server"></f:ToolbarSeparator>
                                  <f:ToolbarFill runat="server"></f:ToolbarFill>
-                                <f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose" OnClientClick="close();">
+                                <f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose" OnClientClick="closeNow();">
                                 </f:Button>
                             </Items>
                         </f:Toolbar>
@@ -109,13 +109,13 @@
             return false;
         }
         // 点击标题栏工具图标 - 退出
-        function close(event) {
+        function closeNow(event) {
             var bConfirmed = confirm('您确定要退出吗?');
             if (bConfirmed) { closePage(); }
         }
 
         function closePage() {
-            if (navigator.userAgent.indexOf("Firefox") != -1 || navigator.userAgent.indexOf("Chrome") != -1) {
+            if (navigator.userAgent.indexOf('Firefox') !== -1 || navigator.userAgent.indexOf('Chrome') !== -1) {
                 window.location.href = "about:blank";
                 window.close();
             } else {

SGGL/FineUIPro.Web/DataShow/HJGLWelder.aspx.cs

@@ -20,7 +20,6 @@ namespace FineUIPro.Web.DataShow
             if (!IsPostBack)
             {
                 Funs.DropDownPageSize(this.ddlPageSize);
-                btnClose.OnClientClick = ActiveWindow.GetHideReference();
                 ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
                 BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
                 // 绑定表格t

SGGL/FineUIPro.Web/DataShow/HJGLWelding.aspx

@@ -35,7 +35,7 @@
                                     Width="130px">
                                 </f:DatePicker>
                                  <f:ToolbarFill runat="server"></f:ToolbarFill>
-                                 <f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose" OnClientClick="close();">
+                                 <f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose" OnClientClick="closeNow();">
                                 </f:Button>
                             </Items>
                         </f:Toolbar>
@@ -95,7 +95,7 @@
         </f:Window>
         <f:Menu ID="Menu1" runat="server">
             <Items>
-                <f:MenuButton ID="btnView" EnablePostBack="true" runat="server"
+                <f:MenuButton ID="btnView" EnablePostBack="true" runat="server" Hidden="true"
                     Text="查看" Icon="Find" OnClick="btnView_Click">
                 </f:MenuButton>
             </Items>
@@ -110,13 +110,13 @@
             return false;
         }
         // 点击标题栏工具图标 - 退出
-        function close(event) {
+        function closeNow(event) {
             var bConfirmed = confirm('您确定要退出吗?');
             if (bConfirmed) { closePage(); }
         }
 
         function closePage() {
-            if (navigator.userAgent.indexOf("Firefox") != -1 || navigator.userAgent.indexOf("Chrome") != -1) {
+            if (navigator.userAgent.indexOf('Firefox') !== -1 || navigator.userAgent.indexOf('Chrome') !== -1) {
                 window.location.href = "about:blank";
                 window.close();
             } else {

SGGL/FineUIPro.Web/DataShow/HJGLWelding.aspx.cs

@@ -21,7 +21,6 @@ namespace FineUIPro.Web.DataShow
             if (!IsPostBack)
             {
                 Funs.DropDownPageSize(this.ddlPageSize);                
-                btnClose.OnClientClick = ActiveWindow.GetHideReference();
                 ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
                 BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
                 // 绑定表格t
@@ -140,13 +139,13 @@ namespace FineUIPro.Web.DataShow
         /// </summary>
         private void EditData()
         {
-            if (Grid1.SelectedRowIndexArray.Length == 0)
+            //if (Grid1.SelectedRowIndexArray.Length == 0)
-            {
+            //{
-                Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning);
+            //    Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning);
-                return;
+            //    return;
-            }
+            //}
 
-            PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("HJGLWeldingItem.aspx?projectId={0}", Grid1.SelectedRowID, "查看 - ")));
+            //PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("HJGLWeldingItem.aspx?projectId={0}", Grid1.SelectedRowID, "查看 - ")));
         }
         #endregion        
 
@@ -171,7 +170,10 @@ namespace FineUIPro.Web.DataShow
                             select x;
                 if (getD1.Count() > 0)
                 {
-                    cout1 = getD1.Sum(x => Funs.GetNewIntOrZero(x.TotalWeldQuantity ?? ""));
+                    foreach (var item in getD1)
+                    {
+                        cout1 += Funs.GetNewIntOrZero(item.TotalWeldQuantity);
+                    }
                 }
             }
             return cout1;
@@ -193,12 +195,15 @@ namespace FineUIPro.Web.DataShow
                 //            join y in Funs.DB.BO_WeldReportMain on x.DReportID equals y.DReportID
                 //            where x.ProjectId == projectId.ToString()
                 //            select new { x.JOT_DoneDin, y.JOT_WeldDate };
-                var getD1= from x in Funs.DB.HJGL_FL_TotalQuantity
+                var getD1 = from x in Funs.DB.HJGL_FL_TotalQuantity
-                           where x.ProjectId == projectId.ToString()
+                            where x.ProjectId == projectId.ToString()
-                           select x;
+                            select x;
                 if (getD1.Count() > 0)
                 {
-                    cout1 = getD1.Sum(x => Funs.GetNewIntOrZero(x.TotalWeldQuantity ?? ""));
+                    foreach (var item in getD1)
+                    {
+                        cout1 += Funs.GetNewIntOrZero(item.TotalWeldQuantity);
+                    }
                 }
                 //if (datetime1.HasValue)
                 //{
@@ -251,8 +256,12 @@ namespace FineUIPro.Web.DataShow
                             select x;
                 if (getD1.Count() > 0)
                 {
-                    cout1 = getD1.Sum(x => Funs.GetNewIntOrZero(x.OneTimeFilmAmount ?? ""));
+                    foreach (var item in getD1)
+                    {
+                        cout1 += Funs.GetNewIntOrZero(item.OneTimeFilmAmount);
+                    }
                 }
+
             }
             return cout1;
         }
@@ -291,8 +300,12 @@ namespace FineUIPro.Web.DataShow
                             select x;
                 if (getD1.Count() > 0)
                 {
-                    cout1 = getD1.Sum(x => Funs.GetNewIntOrZero(x.OneTimeFilmQualifiedAmount ?? ""));
+                    foreach (var item in getD1)
+                    {
+                        cout1 += Funs.GetNewIntOrZero(item.OneTimeFilmQualifiedAmount);
+                    }
                 }
+
             }
             return cout1;
         }

SGGL/FineUIPro.Web/DataShow/HiddenRectification.aspx

@@ -29,18 +29,18 @@
                                 <f:DatePicker ID="txtStartTime" runat="server" Label="检查时间" LabelAlign="Right"
                                     AutoPostBack="true" OnTextChanged="TextBox_TextChanged" Width="200px" LabelWidth="80px">
                                 </f:DatePicker>
-                                   <f:RadioButtonList runat="server" ID="rbType" Width="200px" Label="级别" LabelWidth="50px"
-                                    AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
-                                    <f:RadioItem Text="重大" Value="0" Selected="true" />
-                                    <f:RadioItem Text="一般" Value="1" />
-                                </f:RadioButtonList>
                                 <f:Label ID="Label3" runat="server" Text="至">
                                 </f:Label>
                                 <f:DatePicker ID="txtEndTime" runat="server" AutoPostBack="true" OnTextChanged="TextBox_TextChanged"
                                     Width="130px">
                                 </f:DatePicker>
+                                     <f:RadioButtonList runat="server" ID="rbType" Width="200px" Label="级别" LabelWidth="50px"
+                                    AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
+                                    <f:RadioItem Text="重大" Value="0" Selected="true" />
+                                    <f:RadioItem Text="一般" Value="1" />
+                                </f:RadioButtonList>
                                  <f:ToolbarFill runat="server"></f:ToolbarFill>
-                                <f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose" OnClientClick="close();">
+                                <f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose" OnClientClick="closeNow();">
                                 </f:Button>
                             </Items>
                         </f:Toolbar>
@@ -115,13 +115,13 @@
             return false;
         }
         // 点击标题栏工具图标 - 退出
-        function close(event) {
+        function closeNow(event) {
             var bConfirmed = confirm('您确定要退出吗?');
             if (bConfirmed) { closePage(); }
         }
 
         function closePage() {
-            if (navigator.userAgent.indexOf("Firefox") != -1 || navigator.userAgent.indexOf("Chrome") != -1) {
+            if (navigator.userAgent.indexOf('Firefox') !== -1 || navigator.userAgent.indexOf('Chrome') !== -1) {
                 window.location.href = "about:blank";
                 window.close();
             } else {

SGGL/FineUIPro.Web/DataShow/HiddenRectification.aspx.cs

@@ -177,11 +177,11 @@ namespace FineUIPro.Web.DataShow
                 }
                 if (this.rbType.SelectedValue == "0")
                 {
-                    getT = getT.Where(x => x.HazardValue == "3");
+                    getT = getT.Where(x => x.Risk_Level == "重大");
                 }
                 else
                 {
-                    getT = getT.Where(x => x.HazardValue != "3");
+                    getT = getT.Where(x => x.Risk_Level == "一般");
                 }
                 cout1 = getT.Count();
             }
@@ -206,11 +206,11 @@ namespace FineUIPro.Web.DataShow
                 }
                 if (this.rbType.SelectedValue == "0")
                 {
-                    getT = getT.Where(x => x.HazardValue == "3");
+                    getT = getT.Where(x => x.Risk_Level == "重大");
                 }
                 else
                 {
-                    getT = getT.Where(x => x.HazardValue != "3");
+                    getT = getT.Where(x => x.Risk_Level == "一般");
                 }
                 cout1 = getT.Count();
             }
@@ -224,7 +224,7 @@ namespace FineUIPro.Web.DataShow
             {
                 var datetime1 = Funs.GetNewDateTime(this.txtStartTime.Text);
                 var datetime2 = Funs.GetNewDateTime(this.txtStartTime.Text);
-                var getT = Funs.DB.HSSE_Hazard_HazardRegister.Where(x => x.ProjectId == projectId.ToString() && x.States != "3" &&  x.States != "4");
+                var getT = Funs.DB.HSSE_Hazard_HazardRegister.Where(x => x.ProjectId == projectId.ToString() && x.States != "3" && x.States != "4");
                 if (datetime1.HasValue)
                 {
                     getT = getT.Where(x => x.RegisterDate >= datetime1);
@@ -235,11 +235,11 @@ namespace FineUIPro.Web.DataShow
                 }
                 if (this.rbType.SelectedValue == "0")
                 {
-                    getT = getT.Where(x => x.HazardValue == "3");
+                    getT = getT.Where(x => x.Risk_Level == "重大");
                 }
                 else
                 {
-                    getT = getT.Where(x => x.HazardValue != "3");
+                    getT = getT.Where(x => x.Risk_Level == "一般");
                 }
                 cout1 = getT.Count();
             }
@@ -248,19 +248,19 @@ namespace FineUIPro.Web.DataShow
 
         protected string Count4(object projectId)
         {
-           string rate=string.Empty;
+            string rate = string.Empty;
             if (projectId != null)
             {
                 var datetime1 = Funs.GetNewDateTime(this.txtStartTime.Text);
                 var datetime2 = Funs.GetNewDateTime(this.txtStartTime.Text);
-                var getALL= Funs.DB.HSSE_Hazard_HazardRegister.Where(x => x.ProjectId == projectId.ToString()  && x.States != "4");
+                var getALL = Funs.DB.HSSE_Hazard_HazardRegister.Where(x => x.ProjectId == projectId.ToString() && x.States != "4");
                 if (this.rbType.SelectedValue == "0")
                 {
-                    getALL = getALL.Where(x => x.HazardValue == "3");
+                    getALL = getALL.Where(x => x.Risk_Level == "重大");
                 }
                 else
                 {
-                    getALL = getALL.Where(x => x.HazardValue != "3");
+                    getALL = getALL.Where(x => x.Risk_Level == "一般");
                 }
                 if (datetime1.HasValue)
                 {

SGGL/FineUIPro.Web/DataShow/HiddenRectification.aspx.designer.cs

@@ -77,15 +77,6 @@ namespace FineUIPro.Web.DataShow
         /// </remarks>
         protected global::FineUIPro.DatePicker txtStartTime;
 
-        /// <summary>
-        /// rbType 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.RadioButtonList rbType;
-
         /// <summary>
         /// Label3 控件。
         /// </summary>
@@ -104,6 +95,15 @@ namespace FineUIPro.Web.DataShow
         /// </remarks>
         protected global::FineUIPro.DatePicker txtEndTime;
 
+        /// <summary>
+        /// rbType 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.RadioButtonList rbType;
+
         /// <summary>
         /// btnClose 控件。
         /// </summary>

SGGL/FineUIPro.Web/DataShow/HiddenRectificationItem.aspx

@@ -32,14 +32,14 @@
                                 <f:DatePicker ID="txtEndTime" runat="server" AutoPostBack="true" OnTextChanged="TextBox_TextChanged"
                                     Width="130px">
                                 </f:DatePicker>
-                                  <f:RadioButtonList runat="server" ID="rbType" Width="200px" Label="级别" LabelWidth="50px"
+                                    <f:DropDownList ID="drpStates" runat="server" Label="状态" AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged"
+                                    LabelWidth="70px" LabelAlign="Right" Width="210px">
+                                </f:DropDownList>
+                                      <f:RadioButtonList runat="server" ID="rbType" Width="200px" Label="级别" LabelWidth="50px"
                                     AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
                                     <f:RadioItem Text="重大" Value="0" Selected="true" />
                                     <f:RadioItem Text="一般" Value="1" />
                                 </f:RadioButtonList>
-                                    <f:DropDownList ID="drpStates" runat="server" Label="状态" AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged"
-                                    LabelWidth="70px" LabelAlign="Right" Width="210px">
-                                </f:DropDownList>
                                  <f:ToolbarFill runat="server"></f:ToolbarFill>
                                 <f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose">
                                 </f:Button>

SGGL/FineUIPro.Web/DataShow/HiddenRectificationItem.aspx.cs

@@ -1,9 +1,13 @@
-using BLL;
+using Aspose.Words;
+using BLL;
+using Org.BouncyCastle.Asn1.Ocsp;
 using System;
 using System.Collections.Generic;
 using System.Data;
 using System.Data.SqlClient;
+using System.IO;
 using System.Linq;
+using System.Text;
 
 namespace FineUIPro.Web.DataShow
 {
@@ -81,14 +85,13 @@ namespace FineUIPro.Web.DataShow
             }
             if (this.rbType.SelectedValue == "0")
             {
-                strSql += " AND HazardValue =@HazardValue";             
+                strSql += " AND Risk_Level = '重大'";
             }
             else
             {
-                strSql += " AND HazardValue  != @HazardValue";
+                strSql += " AND  Risk_Level ='一般'";
             }
             listStr.Add(new SqlParameter("@HazardValue", "3"));
-
             SqlParameter[] parameter = listStr.ToArray();
             DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
 
@@ -153,12 +156,18 @@ namespace FineUIPro.Web.DataShow
         protected string ConvertImageUrlByImage(object registrationId)
         {
             string url = string.Empty;
+            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;
+            }
             if (registrationId != null)
             {
                 var registration = BLL.HSSE_Hazard_HazardRegisterService.GetHazardRegisterByHazardRegisterId(registrationId.ToString());
                 if (registration != null)
                 {
-                    url = BLL.UploadAttachmentService.ShowImage("../", registration.ImageUrl);
+                    url = BLL.UploadAttachmentService.ShowImage(httpUrl, registration.ImageUrl);
                 }
             }
             return url;
@@ -173,12 +182,18 @@ namespace FineUIPro.Web.DataShow
         protected string ConvertImgUrlByImage(object registrationId)
         {
             string url = string.Empty;
+            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;
+            }
             if (registrationId != null)
             {
                 var registration = BLL.HSSE_Hazard_HazardRegisterService.GetHazardRegisterByHazardRegisterId(registrationId.ToString());
                 if (registration != null)
                 {
-                    url = BLL.UploadAttachmentService.ShowImage("../", registration.RectificationImageUrl);
+                    url = BLL.UploadAttachmentService.ShowImage(httpUrl, registration.RectificationImageUrl);
                 }
             }
             return url;

SGGL/FineUIPro.Web/DataShow/HiddenRectificationItem.aspx.designer.cs

@@ -95,15 +95,6 @@ namespace FineUIPro.Web.DataShow
         /// </remarks>
         protected global::FineUIPro.DatePicker txtEndTime;
 
-        /// <summary>
-        /// rbType 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.RadioButtonList rbType;
-
         /// <summary>
         /// drpStates 控件。
         /// </summary>
@@ -113,6 +104,15 @@ namespace FineUIPro.Web.DataShow
         /// </remarks>
         protected global::FineUIPro.DropDownList drpStates;
 
+        /// <summary>
+        /// rbType 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.RadioButtonList rbType;
+
         /// <summary>
         /// btnClose 控件。
         /// </summary>

SGGL/FineUIPro.Web/DataShow/LargeEngineering.aspx

@@ -35,7 +35,7 @@
                                     Width="130px">
                                 </f:DatePicker>--%>
                                  <f:ToolbarFill runat="server"></f:ToolbarFill>
-                            <f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose" OnClientClick="close();">
+                            <f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose" OnClientClick="closeNow();">
                                 </f:Button>
                             </Items>
                         </f:Toolbar>
@@ -120,13 +120,13 @@
             return false;
         }
         // 点击标题栏工具图标 - 退出
-        function close(event) {
+        function closeNow(event) {
             var bConfirmed = confirm('您确定要退出吗?');
             if (bConfirmed) { closePage(); }
         }
 
         function closePage() {
-            if (navigator.userAgent.indexOf("Firefox") != -1 || navigator.userAgent.indexOf("Chrome") != -1) {
+            if (navigator.userAgent.indexOf('Firefox') !== -1 || navigator.userAgent.indexOf('Chrome') !== -1) {
                 window.location.href = "about:blank";
                 window.close();
             } else {

SGGL/FineUIPro.Web/DataShow/LargeEngineering.aspx.cs

@@ -25,7 +25,6 @@ namespace FineUIPro.Web.DataShow
             if (!IsPostBack)
             {
                 Funs.DropDownPageSize(this.ddlPageSize);
-                btnClose.OnClientClick = ActiveWindow.GetHideReference();
                 ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
                 BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
                 LargerHazard = (from x in Funs.DB.Solution_LargerHazard

SGGL/FineUIPro.Web/DataShow/License.aspx

@@ -42,7 +42,7 @@
                                     Width="130px">
                                 </f:DatePicker>
                                 <f:ToolbarFill runat="server"></f:ToolbarFill>
-                                <f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose" OnClientClick="close();">
+                                <f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose" OnClientClick="closeNow();">
                                 </f:Button>
                             </Items>
                         </f:Toolbar>
@@ -127,19 +127,19 @@
         }
 
         // 点击标题栏工具图标 - 退出
-        function close(event) {
+        function closeNow(event) {
             var bConfirmed = confirm('您确定要退出吗?');
             if (bConfirmed) { closePage(); }
         }
 
         function closePage() {
-            if (navigator.userAgent.indexOf("Firefox") != -1 || navigator.userAgent.indexOf("Chrome") != -1) {
+            if (navigator.userAgent.indexOf('Firefox') !== -1 || navigator.userAgent.indexOf('Chrome') !== -1) {
-                window.location.href = "about:blank";
+                window.location.href = 'about:blank'
-                window.close();
+                window.close()
             } else {
-                window.opener = null;
+                window.opener = null
-                window.open("", "_self");
+                window.open('', '_self')
-                window.close();
+                window.close()
             }
         }
     </script>

SGGL/FineUIPro.Web/DataShow/License.aspx.cs

@@ -21,7 +21,6 @@ namespace FineUIPro.Web.DataShow
             if (!IsPostBack)
             {
                 Funs.DropDownPageSize(this.ddlPageSize);
-             //   btnClose.OnClientClick = ActiveWindow.GetHideReference();
                 ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
                 BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
                 // 绑定表格t

SGGL/FineUIPro.Web/DataShow/Meeting.aspx

@@ -42,7 +42,7 @@
                                     Width="130px">
                                 </f:DatePicker>
                                  <f:ToolbarFill runat="server"></f:ToolbarFill>
-                              <f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose" OnClientClick="close();">
+                              <f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose" OnClientClick="closeNow();">
                                 </f:Button>
                             </Items>
                         </f:Toolbar>
@@ -110,13 +110,13 @@
             return false;
         }
         // 点击标题栏工具图标 - 退出
-        function close(event) {
+        function closeNow(event) {
             var bConfirmed = confirm('您确定要退出吗?');
             if (bConfirmed) { closePage(); }
         }
 
         function closePage() {
-            if (navigator.userAgent.indexOf("Firefox") != -1 || navigator.userAgent.indexOf("Chrome") != -1) {
+            if (navigator.userAgent.indexOf('Firefox') !== -1 || navigator.userAgent.indexOf('Chrome') !== -1) {
                 window.location.href = "about:blank";
                 window.close();
             } else {

SGGL/FineUIPro.Web/DataShow/Meeting.aspx.cs

@@ -24,7 +24,6 @@ namespace FineUIPro.Web.DataShow
             if (!IsPostBack)
             {
                 Funs.DropDownPageSize(this.ddlPageSize);
-                btnClose.OnClientClick = ActiveWindow.GetHideReference();
                 ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
                 BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
                 // 绑定表格t

SGGL/FineUIPro.Web/DataShow/Project.aspx

@@ -31,7 +31,7 @@
                                 <f:RadioItem Text="竣工" Value="3" />
                             </f:RadioButtonList>
                                  <f:ToolbarFill runat="server"></f:ToolbarFill>
-                                 <f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose" OnClientClick="close();">
+                                 <f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose" OnClientClick="closeNow();">
                                 </f:Button>
                             </Items>
                         </f:Toolbar>
@@ -133,13 +133,13 @@
             return false;
         }
         // 点击标题栏工具图标 - 退出
-        function close(event) {
+        function closeNow(event) {
             var bConfirmed = confirm('您确定要退出吗?');
             if (bConfirmed) { closePage(); }
         }
 
         function closePage() {
-            if (navigator.userAgent.indexOf("Firefox") != -1 || navigator.userAgent.indexOf("Chrome") != -1) {
+            if (navigator.userAgent.indexOf('Firefox') !== -1 || navigator.userAgent.indexOf('Chrome') !== -1) {
                 window.location.href = "about:blank";
                 window.close();
             } else {

SGGL/FineUIPro.Web/DataShow/Project.aspx.cs

@@ -20,7 +20,6 @@ namespace FineUIPro.Web.DataShow
             if (!IsPostBack)
             {
                 Funs.DropDownPageSize(this.ddlPageSize);
-                btnClose.OnClientClick = ActiveWindow.GetHideReference();
                 ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
                 // 绑定表格t
                 BindGrid();

SGGL/FineUIPro.Web/DataShow/ProjectDivision.aspx

@@ -35,7 +35,7 @@
                                     Width="130px">
                                 </f:DatePicker>--%>
                                  <f:ToolbarFill runat="server"></f:ToolbarFill>
-                               <f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose" OnClientClick="close();">
+                               <f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose" OnClientClick="closeNow();">
                                 </f:Button>
                             </Items>
                         </f:Toolbar>
@@ -105,13 +105,13 @@
         }
 
         // 点击标题栏工具图标 - 退出
-        function close(event) {
+        function closeNow(event) {
             var bConfirmed = confirm('您确定要退出吗?');
             if (bConfirmed) { closePage(); }
         }
 
         function closePage() {
-            if (navigator.userAgent.indexOf("Firefox") != -1 || navigator.userAgent.indexOf("Chrome") != -1) {
+            if (navigator.userAgent.indexOf('Firefox') !== -1 || navigator.userAgent.indexOf('Chrome') !== -1) {
                 window.location.href = "about:blank";
                 window.close();
             } else {

SGGL/FineUIPro.Web/DataShow/ProjectPerson.aspx

@@ -39,7 +39,7 @@
                                     <f:RadioItem Text="C证" Value="6" />
                                 </f:RadioButtonList>
                                  <f:ToolbarFill runat="server"></f:ToolbarFill>
-                               <f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose" OnClientClick="close();">
+                               <f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose" OnClientClick="closeNow();">
                                 </f:Button>
                             </Items>
                         </f:Toolbar>
@@ -117,13 +117,13 @@
         }
 
         // 点击标题栏工具图标 - 退出
-        function close(event) {
+        function closeNow(event) {
             var bConfirmed = confirm('您确定要退出吗?');
             if (bConfirmed) { closePage(); }
         }
 
         function closePage() {
-            if (navigator.userAgent.indexOf("Firefox") != -1 || navigator.userAgent.indexOf("Chrome") != -1) {
+            if (navigator.userAgent.indexOf('Firefox') !== -1 || navigator.userAgent.indexOf('Chrome') !== -1) {
                 window.location.href = "about:blank";
                 window.close();
             } else {

SGGL/FineUIPro.Web/DataShow/ProjectPerson.aspx.cs

@@ -20,7 +20,6 @@ namespace FineUIPro.Web.DataShow
             if (!IsPostBack)
             {
                 Funs.DropDownPageSize(this.ddlPageSize);
-                btnClose.OnClientClick = ActiveWindow.GetHideReference();
                 ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
                 BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
                 // 绑定表格t

SGGL/FineUIPro.Web/DataShow/QualityAcceptance.aspx

@@ -43,7 +43,7 @@
                                     Width="130px">
                                 </f:DatePicker>--%>
                                 <f:ToolbarFill runat="server"></f:ToolbarFill>
-                                <f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose" OnClientClick="close();">
+                                <f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose" OnClientClick="closeNow();">
                                 </f:Button>
                             </Items>
                         </f:Toolbar>
@@ -109,13 +109,13 @@
             return false;
         }
         // 点击标题栏工具图标 - 退出
-        function close(event) {
+        function closeNow(event) {
             var bConfirmed = confirm('您确定要退出吗?');
             if (bConfirmed) { closePage(); }
         }
 
         function closePage() {
-            if (navigator.userAgent.indexOf("Firefox") != -1 || navigator.userAgent.indexOf("Chrome") != -1) {
+            if (navigator.userAgent.indexOf('Firefox') !== -1 || navigator.userAgent.indexOf('Chrome') !== -1) {
                 window.location.href = "about:blank";
                 window.close();
             } else {

SGGL/FineUIPro.Web/DataShow/QualityAcceptance.aspx.cs

@@ -21,7 +21,6 @@ namespace FineUIPro.Web.DataShow
             if (!IsPostBack)
             {
                 Funs.DropDownPageSize(this.ddlPageSize);
-                btnClose.OnClientClick = ActiveWindow.GetHideReference();
                 ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
                 BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
                 // 绑定表格t

SGGL/FineUIPro.Web/DataShow/QualityControlPoint.aspx

@@ -35,7 +35,7 @@
                                     Width="130px">
                                 </f:DatePicker>--%>
                                  <f:ToolbarFill runat="server"></f:ToolbarFill>
-                              <f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose" OnClientClick="close();">
+                              <f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose" OnClientClick="closeNow();">
                                 </f:Button>
                             </Items>
                         </f:Toolbar>
@@ -109,13 +109,13 @@
             return false;
         }
         // 点击标题栏工具图标 - 退出
-        function close(event) {
+        function closeNow(event) {
             var bConfirmed = confirm('您确定要退出吗?');
             if (bConfirmed) { closePage(); }
         }
 
         function closePage() {
-            if (navigator.userAgent.indexOf("Firefox") != -1 || navigator.userAgent.indexOf("Chrome") != -1) {
+            if (navigator.userAgent.indexOf('Firefox') !== -1 || navigator.userAgent.indexOf('Chrome') !== -1) {
                 window.location.href = "about:blank";
                 window.close();
             } else {

SGGL/FineUIPro.Web/DataShow/QualityControlPoint.aspx.cs

@@ -21,7 +21,6 @@ namespace FineUIPro.Web.DataShow
             if (!IsPostBack)
             {
                 Funs.DropDownPageSize(this.ddlPageSize);
-                btnClose.OnClientClick = ActiveWindow.GetHideReference();
                 ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
                 BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
                 // 绑定表格t

SGGL/FineUIPro.Web/DataShow/QualityInstruments.aspx

@@ -35,7 +35,7 @@
                                     Width="130px">
                                 </f:DatePicker>
                                  <f:ToolbarFill runat="server"></f:ToolbarFill>
-                                 <f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose" OnClientClick="close();">
+                                 <f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose" OnClientClick="closeNow();">
                                 </f:Button>
                             </Items>
                         </f:Toolbar>
@@ -101,13 +101,13 @@
         }
 
         // 点击标题栏工具图标 - 退出
-        function close(event) {
+        function closeNow(event) {
             var bConfirmed = confirm('您确定要退出吗?');
             if (bConfirmed) { closePage(); }
         }
 
         function closePage() {
-            if (navigator.userAgent.indexOf("Firefox") != -1 || navigator.userAgent.indexOf("Chrome") != -1) {
+            if (navigator.userAgent.indexOf('Firefox') !== -1 || navigator.userAgent.indexOf('Chrome') !== -1) {
                 window.location.href = "about:blank";
                 window.close();
             } else {

SGGL/FineUIPro.Web/DataShow/QualityInstruments.aspx.cs

@@ -21,7 +21,6 @@ namespace FineUIPro.Web.DataShow
             if (!IsPostBack)
             {
                 Funs.DropDownPageSize(this.ddlPageSize);
-                btnClose.OnClientClick = ActiveWindow.GetHideReference();
                 ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
                 BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
                 // 绑定表格t

SGGL/FineUIPro.Web/DataShow/QualityPerson.aspx

@@ -33,7 +33,7 @@
                                     EnableEdit="true" OnSelectedIndexChanged="TextBox_TextChanged" AutoPostBack="true" Hidden="true">
                                 </f:DropDownList>
                                  <f:ToolbarFill runat="server"></f:ToolbarFill>
-                                 <f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose" OnClientClick="close();">
+                                 <f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose" OnClientClick="closeNow();">
                                 </f:Button>
                             </Items>
                         </f:Toolbar>
@@ -98,13 +98,13 @@
         }
 
         // 点击标题栏工具图标 - 退出
-        function close(event) {
+        function closeNow(event) {
             var bConfirmed = confirm('您确定要退出吗?');
             if (bConfirmed) { closePage(); }
         }
 
         function closePage() {
-            if (navigator.userAgent.indexOf("Firefox") != -1 || navigator.userAgent.indexOf("Chrome") != -1) {
+            if (navigator.userAgent.indexOf('Firefox') !== -1 || navigator.userAgent.indexOf('Chrome') !== -1) {
                 window.location.href = "about:blank";
                 window.close();
             } else {

SGGL/FineUIPro.Web/DataShow/QualityPerson.aspx.cs

@@ -20,7 +20,6 @@ namespace FineUIPro.Web.DataShow
             if (!IsPostBack)
             {
                 Funs.DropDownPageSize(this.ddlPageSize);
-                btnClose.OnClientClick = ActiveWindow.GetHideReference();
                 ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
                 BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
                 // 绑定表格t

SGGL/FineUIPro.Web/DataShow/QualityProblem.aspx

@@ -35,7 +35,7 @@
                                     Width="130px">
                                 </f:DatePicker>
                                  <f:ToolbarFill runat="server"></f:ToolbarFill>
-                                 <f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose" OnClientClick="close();">
+                                 <f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose" OnClientClick="closeNow();">
                                 </f:Button>
                             </Items>
                         </f:Toolbar>
@@ -103,13 +103,13 @@
         }
 
         // 点击标题栏工具图标 - 退出
-        function close(event) {
+        function closeNow(event) {
             var bConfirmed = confirm('您确定要退出吗?');
             if (bConfirmed) { closePage(); }
         }
 
         function closePage() {
-            if (navigator.userAgent.indexOf("Firefox") != -1 || navigator.userAgent.indexOf("Chrome") != -1) {
+            if (navigator.userAgent.indexOf('Firefox') !== -1 || navigator.userAgent.indexOf('Chrome') !== -1) {
                 window.location.href = "about:blank";
                 window.close();
             } else {

SGGL/FineUIPro.Web/DataShow/QualityProblem.aspx.cs

@@ -20,7 +20,6 @@ namespace FineUIPro.Web.DataShow
             if (!IsPostBack)
             {
                 Funs.DropDownPageSize(this.ddlPageSize);
-                btnClose.OnClientClick = ActiveWindow.GetHideReference();
                 ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
                 BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
                 // 绑定表格t

SGGL/FineUIPro.Web/DataShow/QualityTraining.aspx

@@ -40,7 +40,7 @@
                                     Width="130px">
                                 </f:DatePicker>
                                  <f:ToolbarFill runat="server"></f:ToolbarFill>
-                                 <f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose" OnClientClick="close();">
+                                 <f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose" OnClientClick="closeNow();">
                                 </f:Button>
                             </Items>
                         </f:Toolbar>
@@ -101,13 +101,13 @@
         }
 
         // 点击标题栏工具图标 - 退出
-        function close(event) {
+        function closeNow(event) {
             var bConfirmed = confirm('您确定要退出吗?');
             if (bConfirmed) { closePage(); }
         }
 
         function closePage() {
-            if (navigator.userAgent.indexOf("Firefox") != -1 || navigator.userAgent.indexOf("Chrome") != -1) {
+            if (navigator.userAgent.indexOf('Firefox') !== -1 || navigator.userAgent.indexOf('Chrome') !== -1) {
                 window.location.href = "about:blank";
                 window.close();
             } else {

SGGL/FineUIPro.Web/DataShow/QualityTraining.aspx.cs

@@ -1,12 +1,9 @@
-using Aspose.Words;
+using BLL;
-using BLL;
 using System;
 using System.Collections.Generic;
 using System.Data;
 using System.Data.SqlClient;
-using System.IO;
 using System.Linq;
-using System.Text;
 
 namespace FineUIPro.Web.DataShow
 {
@@ -24,7 +21,6 @@ namespace FineUIPro.Web.DataShow
             if (!IsPostBack)
             {
                 Funs.DropDownPageSize(this.ddlPageSize);
-                btnClose.OnClientClick = ActiveWindow.GetHideReference();
                 ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
                 BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
                 // 绑定表格t

SGGL/FineUIPro.Web/DataShow/SecurityCost.aspx

@@ -42,7 +42,7 @@
                                     Width="130px">
                                 </f:DatePicker>
                                 <f:ToolbarFill runat="server"></f:ToolbarFill>
-                                <f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose" OnClientClick="close();">
+                                <f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose" OnClientClick="closeNow();">
                                 </f:Button>
                             </Items>
                         </f:Toolbar>
@@ -106,13 +106,13 @@
         }
 
         // 点击标题栏工具图标 - 退出
-        function close(event) {
+        function closeNow(event) {
             var bConfirmed = confirm('您确定要退出吗?');
             if (bConfirmed) { closePage(); }
         }
 
         function closePage() {
-            if (navigator.userAgent.indexOf("Firefox") != -1 || navigator.userAgent.indexOf("Chrome") != -1) {
+            if (navigator.userAgent.indexOf('Firefox') !== -1 || navigator.userAgent.indexOf('Chrome') !== -1) {
                 window.location.href = "about:blank";
                 window.close();
             } else {

SGGL/FineUIPro.Web/DataShow/SecurityCost.aspx.cs

@@ -21,7 +21,6 @@ namespace FineUIPro.Web.DataShow
             if (!IsPostBack)
             {
                 Funs.DropDownPageSize(this.ddlPageSize);
-             //   btnClose.OnClientClick = ActiveWindow.GetHideReference();
                 ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
                 BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
                 // 绑定表格t

SGGL/FineUIPro.Web/DataShow/SecurityRisk.aspx

@@ -35,7 +35,7 @@
                                     Width="130px">
                                 </f:DatePicker>--%>
                                  <f:ToolbarFill runat="server"></f:ToolbarFill>
-                                <f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose" OnClientClick="close();">
+                                <f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose" OnClientClick="closeNow();">
                                 </f:Button>
                             </Items>
                         </f:Toolbar>
@@ -111,13 +111,13 @@
         }
 
         // 点击标题栏工具图标 - 退出
-        function close(event) {
+        function closeNow(event) {
             var bConfirmed = confirm('您确定要退出吗?');
             if (bConfirmed) { closePage(); }
         }
 
         function closePage() {
-            if (navigator.userAgent.indexOf("Firefox") != -1 || navigator.userAgent.indexOf("Chrome") != -1) {
+            if (navigator.userAgent.indexOf('Firefox') !== -1 || navigator.userAgent.indexOf('Chrome') !== -1) {
                 window.location.href = "about:blank";
                 window.close();
             } else {

SGGL/FineUIPro.Web/DataShow/SecurityRisk.aspx.cs

@@ -21,7 +21,6 @@ namespace FineUIPro.Web.DataShow
             if (!IsPostBack)
             {
                 Funs.DropDownPageSize(this.ddlPageSize);
-                btnClose.OnClientClick = ActiveWindow.GetHideReference();
                 ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
                 BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
                 // 绑定表格t

SGGL/FineUIPro.Web/DataShow/WorkingHours.aspx

@@ -35,7 +35,7 @@
                                     Width="130px">
                                 </f:DatePicker>
                                  <f:ToolbarFill runat="server"></f:ToolbarFill>
-                               <f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose" OnClientClick="close();">
+                               <f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose" OnClientClick="closeNow();">
                                 </f:Button>
                             </Items>
                         </f:Toolbar>
@@ -105,13 +105,13 @@
             return false;
         }
         // 点击标题栏工具图标 - 退出
-        function close(event) {
+        function closeNow(event) {
             var bConfirmed = confirm('您确定要退出吗?');
             if (bConfirmed) { closePage(); }
         }
 
         function closePage() {
-            if (navigator.userAgent.indexOf("Firefox") != -1 || navigator.userAgent.indexOf("Chrome") != -1) {
+            if (navigator.userAgent.indexOf('Firefox') !== -1 || navigator.userAgent.indexOf('Chrome') !== -1) {
                 window.location.href = "about:blank";
                 window.close();
             } else {

SGGL/FineUIPro.Web/DataShow/WorkingHours.aspx.cs

@@ -21,7 +21,6 @@ namespace FineUIPro.Web.DataShow
             if (!IsPostBack)
             {
                 Funs.DropDownPageSize(this.ddlPageSize);
-                btnClose.OnClientClick = ActiveWindow.GetHideReference();
                 ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
                 BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
                 // 绑定表格t