Merge branch 'master' of http://47.104.102.122:3000/lpf/SGGL_SeDin_New

DataBase/版本日志/SGGLDB_V2025-11-13-geh.sql

@@ -0,0 +1,7 @@
+
+--拆分前
+INSERT INTO [dbo].[Sys_Menu] ([MenuId], [MenuName], [Icon], [Url], [SortIndex], [SuperMenu], [MenuType], [IsOffice], [IsEnd], [IsUsed]) VALUES (N'F32D79E1-7116-45F2-9964-3F6CB243C403', N'安全数据统计', NULL, N'ZHGL/DataSync/ProjectDataSync/Project_HSSEData_HSSE.aspx', 80, N'C2297533-B7C0-441E-B29F-ADE87C6F8978', N'Menu_SysSet', '1', '1', '1');
+INSERT INTO [dbo].[Sys_Menu] ([MenuId], [MenuName], [Icon], [Url], [SortIndex], [SuperMenu], [MenuType], [IsOffice], [IsEnd], [IsUsed]) VALUES (N'7AF59776-21CD-4B6A-A765-2F888E4AF8BD', N'质量数据统计', NULL, N'ZHGL/DataSync/ProjectDataSync/Project_CQMSData_CQMS.aspx', 90, N'C2297533-B7C0-441E-B29F-ADE87C6F8978', N'Menu_SysSet', '1', '1', '1');
+INSERT INTO [dbo].[Sys_Menu] ([MenuId], [MenuName], [Icon], [Url], [SortIndex], [SuperMenu], [MenuType], [IsOffice], [IsEnd], [IsUsed]) VALUES (N'8358C2EE-2B65-4001-AC09-32B6936AA3CA', N'焊接数据统计', NULL, N'ZHGL/DataSync/ProjectDataSync/Project_HJGLData_HJGL.aspx', 100, N'C2297533-B7C0-441E-B29F-ADE87C6F8978', N'Menu_SysSet', '1', '1', '1');
+go
+

DataBase/版本日志/SGGLDB_V2025-11-13-geh（View_Project_CQMSData_CQMS）.sql

@@ -0,0 +1,36 @@
+
+
+
+
+
+CREATE View  [dbo].[View_Project_CQMSData_CQMS]
+as
+    WITH LatestData AS (
+    SELECT
+        person.CollCropCode,
+        MAX(ReportDate) AS LatestReportDate
+    FROM
+        dbo.Project_CQMSData_CQMS person
+    GROUP BY
+        person.CollCropCode
+),RankedData AS (
+	 SELECT
+        cqms.*
+    FROM
+        dbo.Project_CQMSData_CQMS cqms
+    INNER JOIN
+        LatestData l ON cqms.CollCropCode = l.CollCropCode AND cqms.ReportDate = l.LatestReportDate
+)
+SELECT
+    pro.ProjectName,
+    pro.ShortName,
+    rd.*
+FROM RankedData rd
+LEFT JOIN Base_Project pro ON pro.ProjectId = rd.ProjectId
+where pro.ProjectName !='' and pro.ProjectState='1'
+
+
+GO
+
+
+

DataBase/版本日志/SGGLDB_V2025-11-13-geh（View_Project_HJGLData_HJGL）.sql

@@ -0,0 +1,33 @@
+
+
+
+CREATE View  [dbo].[View_Project_HJGLData_HJGL]
+as
+WITH LatestData AS (
+    SELECT
+        person.CollCropCode,
+        MAX(ReportDate) AS LatestReportDate
+    FROM
+        dbo.Project_HJGLData_HJGL person
+    GROUP BY
+        person.CollCropCode
+),RankedData AS (
+	 SELECT
+        hjgl.*
+    FROM
+        dbo.Project_HJGLData_HJGL hjgl
+    INNER JOIN
+        LatestData l ON hjgl.CollCropCode = l.CollCropCode AND hjgl.ReportDate = l.LatestReportDate
+)
+SELECT
+    pro.ProjectName,
+    pro.ShortName,
+    rd.*
+FROM RankedData rd
+LEFT JOIN Base_Project pro ON pro.ProjectId = rd.ProjectId
+where pro.ProjectName !='' and pro.ProjectState='1'
+
+
+GO
+
+

DataBase/版本日志/SGGLDB_V2025-11-13-geh（View_Project_HSSEData_HSSE）.sql

@@ -0,0 +1,41 @@
+
+CREATE view [dbo].[View_Project_HSSEData_HSSE] as
+WITH LatestData AS (
+    SELECT
+        project.CollCropCode,
+        MAX(ReportDate) AS LatestReportDate
+    FROM
+        dbo.Project_HSSEData_HSSE project
+    GROUP BY
+        project.CollCropCode
+),RankedData AS (
+	 SELECT
+        hsse.*
+    FROM
+        dbo.Project_HSSEData_HSSE hsse
+    INNER JOIN
+        LatestData l ON hsse.CollCropCode = l.CollCropCode AND hsse.ReportDate = l.LatestReportDate
+),TotalWorkNumData as
+(
+		select t3.ProjectId,t3.ProjectName,sum(TotalWorkNum) as TotalWorkNum
+			from Base_Project t3 
+			join Information_MillionsMonthlyReportItem t1 on ((t1.Name = ('['+t3.ProjectCode+']'+t3.ProjectName)) OR
+				(t1.Name = t3.ProjectName) )  
+			join Information_MillionsMonthlyReport t2 on t1.MillionsMonthlyReportId = t2.MillionsMonthlyReportId
+			where t2.Year=Year(getdate()) and t2.Month <Month(getdate())
+			group by   t3.ProjectId,t3.ProjectName
+)
+SELECT
+    pro.ProjectName,
+    pro.ShortName,
+    rd.*,
+    t1.TotalWorkNum as TotalWorkNum
+FROM RankedData rd
+LEFT JOIN Base_Project pro ON pro.ProjectId = rd.ProjectId
+LEFT JOIN  TotalWorkNumData t1 on rd.ProjectId=t1.ProjectId
+where pro.ProjectName !='' and pro.ProjectState='1'
+
+
+GO
+
+

SGGL/BLL/API/APIBaseInfoService.cs

@@ -229,6 +229,25 @@ namespace BLL
         }
         #endregion
 
+        #region 根据类型获取巡检隐患类型表
+        /// <summary>
+        /// 根据类型获取巡检隐患类型表
+        /// </summary>
+        /// <param name="userInfo"></param>
+        /// <returns></returns>
+        public static List<Model.BaseInfoItem> getHazardRegisterTypes2(string type)
+        {
+            using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
+            {
+                var getDataLists = (from x in Funs.DB.Technique_CheckItemSet
+                                    where x.CheckType == "2" && x.SupCheckItem == type
+                                    orderby x.MapCode
+                                    select new Model.BaseInfoItem { BaseInfoId = x.CheckItemSetId, BaseInfoCode = x.MapCode, BaseInfoName = x.CheckItemName }).ToList();
+                return getDataLists;
+            }
+        }
+        #endregion                     
+
         #region 根据项目id获取项目图片
         /// <summary>
         /// 根据项目id获取项目图片

SGGL/BLL/BLL.csproj

@@ -747,6 +747,7 @@
     <Compile Include="TaskScheduling\TimerTask\CustomJobListener.cs" />
     <Compile Include="TaskScheduling\TimerTask\TaskJob.cs" />
     <Compile Include="TaskScheduling\TimerTask\TimerTaskBase.cs" />
+    <Compile Include="TokenHelper.cs" />
     <Compile Include="WebService\CNCECHSSEWebService.cs" />
     <Compile Include="WebService\FileStructService.cs" />
     <Compile Include="ZHGL\ConstructionMonthReport\ConstructionMonthReportMainCostService.cs" />

SGGL/BLL/HSSE/Check/Check_CheckSpecialService.cs

@@ -40,7 +40,9 @@ namespace BLL
         /// <returns></returns>
         public static IEnumerable getListData(string projectId, string states, string checkType, string checkItemSetId, DateTime? startTime, DateTime? endTime, Grid Grid1)
         {
-            IQueryable<Model.Check_CheckSpecial> getDataList = getDataLists;
+            Model.SGGLDB db = Funs.DB;
+            IQueryable<Model.Check_CheckSpecial> getDataList = from x in db.Check_CheckSpecial
+                                                               select x;
             if (!string.IsNullOrEmpty(projectId))
             {
                 getDataList = getDataList.Where(e => e.ProjectId == projectId);
@@ -87,7 +89,7 @@ namespace BLL
                        x.CheckSpecialId,
                        x.CheckTime,
                        x.CheckSpecialCode,
-                       CheckItemName = Funs.DB.Technique_CheckItemSet.First(y => y.CheckItemSetId == x.CheckItemSetId).CheckItemName,
+                       CheckItemName = db.Technique_CheckItemSet.First(y => y.CheckItemSetId == x.CheckItemSetId).CheckItemName,
                        CheckTypeName = x.CheckType == "1" ? "联合检查" : "专项检查",
                        StatesName = x.States == "2" ? "已完成" : (x.States == "1" ? "待整改" : "待提交"),
                    };

SGGL/BLL/HSSE/Check/Check_ProjectLeaderCheckService.cs

@@ -45,7 +45,9 @@ namespace BLL
         /// <returns></returns>
         public static IEnumerable getListData(string projectId, string startTime, string endTime, Grid Grid1)
         {
-            IQueryable<Model.Check_ProjectLeaderCheck> getDataList = getDataLists;
+            Model.SGGLDB db = Funs.DB;
+            IQueryable<Model.Check_ProjectLeaderCheck> getDataList = from x in db.Check_ProjectLeaderCheck
+                                                                     select x;
             if (!string.IsNullOrEmpty(projectId))
             {
                 getDataList = getDataList.Where(x => x.ProjectId == projectId);
@@ -72,16 +74,15 @@ namespace BLL
                 return null;
             }
             getDataList = SortConditionHelper.SortingAndPaging(getDataList, Grid1.SortField, Grid1.SortDirection, Grid1.PageIndex, Grid1.PageSize);
-            var db1 = Funs.DB;
             return from x in getDataList
-                   join y in db1.Base_Project on x.ProjectId equals y.ProjectId
+                   join y in db.Base_Project on x.ProjectId equals y.ProjectId
                    into ps
                    from y in ps.DefaultIfEmpty()
                    select new
                    {
                        x.ProjectLeaderCheckId,
                        x.ProjectId,
-                       db1.Base_Project.First(u => u.ProjectId == x.ProjectId).ProjectName,
+                       db.Base_Project.First(u => u.ProjectId == x.ProjectId).ProjectName,
                        x.CheckCode,
                        x.UnitIds,
                        x.LeaderIds,

SGGL/BLL/TokenHelper.cs

@@ -0,0 +1,127 @@
+using System;
+using System.IO;
+using System.Security.Cryptography;
+using System.Text;
+using Newtonsoft.Json;
+
+namespace BLL
+{
+    /// <summary>
+    /// Token加密解密工具类
+    /// 用于iframe跨域自动登录的token处理
+    /// </summary>
+    public static class TokenHelper
+    {
+        // 默认密钥，建议从配置文件中读取
+        private static readonly string SecretKey = "cncec-subqhse-256bit-secret-key-for-auth-token";
+
+        /// <summary>
+        /// 加密Token
+        /// </summary>
+        /// <param name="plainText">明文</param>
+        /// <returns>加密后的Base64字符串</returns>
+        public static string EncryptToken(string plainText)
+        {
+            try
+            {
+                // 确保密钥长度为32字节（256位）
+                string key = SecretKey.PadRight(32, '0').Substring(0, 32);
+
+                using (var aes = Aes.Create())
+                {
+                    aes.Key = Encoding.UTF8.GetBytes(key);
+                    aes.IV = new byte[16]; // 使用固定IV，简化实现
+                    aes.Mode = CipherMode.CBC;
+                    aes.Padding = PaddingMode.PKCS7;
+
+                    using (var encryptor = aes.CreateEncryptor())
+                    using (var msEncrypt = new MemoryStream())
+                    {
+                        using (var csEncrypt = new CryptoStream(msEncrypt, encryptor, CryptoStreamMode.Write))
+                        using (var swEncrypt = new StreamWriter(csEncrypt))
+                        {
+                            swEncrypt.Write(plainText);
+                        }
+                        return Convert.ToBase64String(msEncrypt.ToArray());
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                throw new Exception($"Token加密失败: {ex.Message}", ex);
+            }
+        }
+
+        /// <summary>
+        /// 解密Token
+        /// </summary>
+        /// <param name="cipherText">加密的Base64字符串</param>
+        /// <returns>解密后的明文</returns>
+        public static string DecryptToken(string cipherText)
+        {
+            try
+            {
+                // 确保密钥长度为32字节（256位）
+                string key = SecretKey.PadRight(32, '0').Substring(0, 32);
+
+                using (var aes = Aes.Create())
+                {
+                    aes.Key = Encoding.UTF8.GetBytes(key);
+                    aes.IV = new byte[16]; // 使用固定IV，与加密一致
+                    aes.Mode = CipherMode.CBC;
+                    aes.Padding = PaddingMode.PKCS7;
+
+                    using (var decryptor = aes.CreateDecryptor())
+                    using (var msDecrypt = new MemoryStream(Convert.FromBase64String(cipherText)))
+                    using (var csDecrypt = new CryptoStream(msDecrypt, decryptor, CryptoStreamMode.Read))
+                    using (var srDecrypt = new StreamReader(csDecrypt))
+                    {
+                        return srDecrypt.ReadToEnd();
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                throw new Exception($"Token解密失败: {ex.Message}", ex);
+            }
+        }
+
+        /// <summary>
+        /// 生成认证Token
+        /// </summary>
+        /// <param name="userId">用户ID</param>
+        /// <param name="source">来源标识</param>
+        /// <returns>加密的Token</returns>
+        public static string GenerateAuthToken(string userId, string source = "qhse.cncecoa.com")
+        {
+            var tokenData = new
+            {
+                user_id = userId,
+                timestamp = DateTimeOffset.Now.ToUnixTimeSeconds(),
+                source = source,
+                random = Guid.NewGuid().ToString("N").Substring(0, 8) // 添加8位随机数增强安全性
+            };
+
+            string json = JsonConvert.SerializeObject(tokenData);
+            return EncryptToken(json);
+        }
+
+        /// <summary>
+        /// 验证Token格式
+        /// </summary>
+        /// <param name="token">Token字符串</param>
+        /// <returns>是否为有效的Base64格式</returns>
+        public static bool IsValidTokenFormat(string token)
+        {
+            try
+            {
+                Convert.FromBase64String(token);
+                return true;
+            }
+            catch
+            {
+                return false;
+            }
+        }
+    }
+}

SGGL/BLL/ZHGL/DataSync/CQMSDataService.cs

@@ -705,7 +705,7 @@ namespace BLL
                 InspectionLotNum = inspectionLotNum.Sum(x => x.Sum),
 
                 ConstructSolutionNum = constructSolutionList.Count(),
-                ConstructSolutionProjectApproveNum = constructSolutionList.Where(x => x.State == "1").Count(),
+                ConstructSolutionProjectApproveNum = constructSolutionList.Where(x => x.State == "3").Count(),
                 ConstructSolutionUnitApproveNum = comprehensiveMajorPlanList.Count(),
                 SpecialEquipmentQualityAssuranceSystemNum = qualityAssuranceNum.Count(),
                 DesignDetailsNum = technicalDisclosePersonList.Count(),

SGGL/BLL/ZHGL/DataSync/HSSEData_HSSEService.cs

@@ -3865,7 +3865,8 @@ namespace BLL
         /// <returns></returns>
         public static List<LicenseOutput> GetLicenses()
         {
-            var result = (from x in Funs.DB.View_License_LicenseManager
+            List<LicenseOutput> result = new List<LicenseOutput>();
+            var result1 = (from x in Funs.DB.View_License_LicenseManager
                           where BeUnderConstructionList.Contains(x.ProjectId) && x.IsHighRisk == true &&
                       x.CompileDate > Const.DtmarkTime
                           select new Model.LicenseOutput
@@ -3884,6 +3885,159 @@ namespace BLL
                               EndDate = x.EndDate,
                               WorkStatesStr = ""
                           }).ToList();
+            var result2 = (from x in Funs.DB.License_FireWork
+                           where BeUnderConstructionList.Contains(x.ProjectId)
+                           select new Model.LicenseOutput
+                           {
+                               Id = x.FireWorkId,
+                               ProjectId = x.ProjectId,
+                               ProjectName = ProjectService.GetProjectNameByProjectId(x.ProjectId),
+                               UnitId = x.ApplyUnitId,
+                               UnitName = UnitService.GetUnitNameByUnitId(x.ApplyUnitId),
+                               LicenseTypeName = "动火作业票",
+                               UnitTypeName = "",
+                               IsHighRisk = false,
+                               WorkAreaName = "",
+                               CompileDate = x.ApplyDate,
+                               StartDate = x.ValidityStartTime,
+                               EndDate = x.ValidityEndTime,
+                               WorkStatesStr = ""
+                           }).ToList();
+            var result3 = (from x in Funs.DB.License_HeightWork
+                           where BeUnderConstructionList.Contains(x.ProjectId)
+                           select new Model.LicenseOutput
+                           {
+                               Id = x.HeightWorkId,
+                               ProjectId = x.ProjectId,
+                               ProjectName = ProjectService.GetProjectNameByProjectId(x.ProjectId),
+                               UnitId = x.ApplyUnitId,
+                               UnitName = UnitService.GetUnitNameByUnitId(x.ApplyUnitId),
+                               LicenseTypeName = "高处作业票",
+                               UnitTypeName = "",
+                               IsHighRisk = false,
+                               WorkAreaName = "",
+                               CompileDate = x.ApplyDate,
+                               StartDate = x.ValidityStartTime,
+                               EndDate = x.ValidityEndTime,
+                               WorkStatesStr = ""
+                           }).ToList();
+            var result4 = (from x in Funs.DB.License_LimitedSpace
+                           where BeUnderConstructionList.Contains(x.ProjectId)
+                           select new Model.LicenseOutput
+                           {
+                               Id = x.LimitedSpaceId,
+                               ProjectId = x.ProjectId,
+                               ProjectName = ProjectService.GetProjectNameByProjectId(x.ProjectId),
+                               UnitId = x.ApplyUnitId,
+                               UnitName = UnitService.GetUnitNameByUnitId(x.ApplyUnitId),
+                               LicenseTypeName = "受限空间作业票",
+                               UnitTypeName = "",
+                               IsHighRisk = false,
+                               WorkAreaName = "",
+                               CompileDate = x.ApplyDate,
+                               StartDate = x.ValidityStartTime,
+                               EndDate = x.ValidityEndTime,
+                               WorkStatesStr = ""
+                           }).ToList();
+            var result5 = (from x in Funs.DB.License_RadialWork
+                           where BeUnderConstructionList.Contains(x.ProjectId)
+                           select new Model.LicenseOutput
+                           {
+                               Id = x.RadialWorkId,
+                               ProjectId = x.ProjectId,
+                               ProjectName = ProjectService.GetProjectNameByProjectId(x.ProjectId),
+                               UnitId = x.ApplyUnitId,
+                               UnitName = UnitService.GetUnitNameByUnitId(x.ApplyUnitId),
+                               LicenseTypeName = "射线作业票",
+                               UnitTypeName = "",
+                               IsHighRisk = false,
+                               WorkAreaName = "",
+                               CompileDate = x.ApplyDate,
+                               StartDate = x.ValidityStartTime,
+                               EndDate = x.ValidityEndTime,
+                               WorkStatesStr = ""
+                           }).ToList();
+            var result6 = (from x in Funs.DB.License_OpenCircuit
+                           where BeUnderConstructionList.Contains(x.ProjectId)
+                           select new Model.LicenseOutput
+                           {
+                               Id = x.OpenCircuitId,
+                               ProjectId = x.ProjectId,
+                               ProjectName = ProjectService.GetProjectNameByProjectId(x.ProjectId),
+                               UnitId = x.ApplyUnitId,
+                               UnitName = UnitService.GetUnitNameByUnitId(x.ApplyUnitId),
+                               LicenseTypeName = "断路（占道）作业票",
+                               UnitTypeName = "",
+                               IsHighRisk = false,
+                               WorkAreaName = "",
+                               CompileDate = x.ApplyDate,
+                               StartDate = x.ValidityStartTime,
+                               EndDate = x.ValidityEndTime,
+                               WorkStatesStr = ""
+                           }).ToList();
+            var result7 = (from x in Funs.DB.License_BreakGround
+                           where BeUnderConstructionList.Contains(x.ProjectId)
+                           select new Model.LicenseOutput
+                           {
+                               Id = x.BreakGroundId,
+                               ProjectId = x.ProjectId,
+                               ProjectName = ProjectService.GetProjectNameByProjectId(x.ProjectId),
+                               UnitId = x.ApplyUnitId,
+                               UnitName = UnitService.GetUnitNameByUnitId(x.ApplyUnitId),
+                               LicenseTypeName = "动土作业票",
+                               UnitTypeName = "",
+                               IsHighRisk = false,
+                               WorkAreaName = "",
+                               CompileDate = x.ApplyDate,
+                               StartDate = x.ValidityStartTime,
+                               EndDate = x.ValidityEndTime,
+                               WorkStatesStr = ""
+                           }).ToList();
+            var result8 = (from x in Funs.DB.License_NightWork
+                           where BeUnderConstructionList.Contains(x.ProjectId)
+                           select new Model.LicenseOutput
+                           {
+                               Id = x.NightWorkId,
+                               ProjectId = x.ProjectId,
+                               ProjectName = ProjectService.GetProjectNameByProjectId(x.ProjectId),
+                               UnitId = x.ApplyUnitId,
+                               UnitName = UnitService.GetUnitNameByUnitId(x.ApplyUnitId),
+                               LicenseTypeName = "夜间施工作业票",
+                               UnitTypeName = "",
+                               IsHighRisk = false,
+                               WorkAreaName = "",
+                               CompileDate = x.ApplyDate,
+                               StartDate = x.ValidityStartTime,
+                               EndDate = x.ValidityEndTime,
+                               WorkStatesStr = ""
+                           }).ToList();
+            var result9 = (from x in Funs.DB.License_LiftingWork
+                           where BeUnderConstructionList.Contains(x.ProjectId)
+                           select new Model.LicenseOutput
+                           {
+                               Id = x.LiftingWorkId,
+                               ProjectId = x.ProjectId,
+                               ProjectName = ProjectService.GetProjectNameByProjectId(x.ProjectId),
+                               UnitId = x.ApplyUnitId,
+                               UnitName = UnitService.GetUnitNameByUnitId(x.ApplyUnitId),
+                               LicenseTypeName = "吊装作业票",
+                               UnitTypeName = "",
+                               IsHighRisk = false,
+                               WorkAreaName = "",
+                               CompileDate = x.ApplyDate,
+                               StartDate = x.ValidityStartTime,
+                               EndDate = x.ValidityEndTime,
+                               WorkStatesStr = ""
+                           }).ToList();
+            result.AddRange(result1);
+            result.AddRange(result2);
+            result.AddRange(result3);
+            result.AddRange(result4);
+            result.AddRange(result5);
+            result.AddRange(result6);
+            result.AddRange(result7);
+            result.AddRange(result8);
+            result.AddRange(result9);
             return result;
         }
         public static async Task<List<LicenseOutput>> GetLicensesAsync()

SGGL/FineUIPro.Web/FineUIPro.Web.csproj

@@ -16839,7 +16839,7 @@
     </COMReference>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v18.0\WebApplications\Microsoft.WebApplication.targets" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v15.0\WebApplications\Microsoft.WebApplication.targets" />
   <ProjectExtensions>
     <VisualStudio>
       <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">

SGGL/FineUIPro.Web/HSSE/Manager/ManagerMonth_SeDinEdit.aspx.cs

@@ -79,12 +79,17 @@ namespace FineUIPro.Web.HSSE.Manager
                 {
                     MonthReportId = Request.Params["MonthReportId"];
                 }
-
+                var units = BLL.ProjectUnitService.GetProjectUnitListByProjectIdUnitType(this.CurrUser.LoginProjectId,BLL.Const.ProjectUnitType_1);
-                BLL.Person_PersonsService.InitUserProjectIdUnitIdRoleIdDropDownList(this.CompileManId, this.CurrUser.LoginProjectId, Const.UnitId_SEDIN, null, false);
+                string unitId = Const.UnitId_SEDIN;
+                if (units.Count > 0)
+                {
+                    unitId = units[0].UnitId;
+                }
+                BLL.Person_PersonsService.InitUserProjectIdUnitIdRoleIdDropDownList(this.CompileManId, this.CurrUser.LoginProjectId, unitId, null, false);
                 this.CompileManId.SelectedValue = this.CurrUser.PersonId;
 
-                Person_PersonsService.InitUserProjectIdUnitIdRoleIdDropDownList(this.AuditManId, this.CurrUser.LoginProjectId, Const.UnitId_SEDIN, Const.ProjectSafetyDirector, false);
+                Person_PersonsService.InitUserProjectIdUnitIdRoleIdDropDownList(this.AuditManId, this.CurrUser.LoginProjectId, unitId, Const.ProjectSafetyDirector, false);
-                Person_PersonsService.InitUserProjectIdUnitIdRoleIdDropDownList(this.ApprovalManId, this.CurrUser.LoginProjectId, Const.UnitId_SEDIN, Const.ProjectAssistantManager + "," + Const.ProjectManager, false);
+                Person_PersonsService.InitUserProjectIdUnitIdRoleIdDropDownList(this.ApprovalManId, this.CurrUser.LoginProjectId, unitId, Const.ProjectAssistantManager + "," + Const.ProjectManager, false);
 
                 string montvalues = ReporMonth.Text;
                 var getMont = Funs.DB.SeDin_MonthReport.FirstOrDefault(x => x.MonthReportId == this.MonthReportId);
@@ -1373,7 +1378,13 @@ namespace FineUIPro.Web.HSSE.Manager
             if (this.rbIsAgree.SelectedValue == "0")
             {
                 this.drpStep.Hidden = true;
-                BLL.Person_PersonsService.InitUserProjectIdUnitIdRoleIdDropDownList(this.drpAudit, this.CurrUser.LoginProjectId, Const.UnitId_SEDIN, null, false);
+                var units = BLL.ProjectUnitService.GetProjectUnitListByProjectIdUnitType(this.CurrUser.LoginProjectId, BLL.Const.ProjectUnitType_1);
+                string unitId = Const.UnitId_SEDIN;
+                if (units.Count > 0)
+                {
+                    unitId = units[0].UnitId;
+                }
+                BLL.Person_PersonsService.InitUserProjectIdUnitIdRoleIdDropDownList(this.drpAudit, this.CurrUser.LoginProjectId, unitId, null, false);
                 this.drpAudit.SelectedValue = this.CompileManId.SelectedValue;
                 this.drpAudit.Readonly = true;
 
@@ -1412,13 +1423,19 @@ namespace FineUIPro.Web.HSSE.Manager
         private void SetStepDrp()
         {
             this.drpAudit.Items.Clear();
+            var units = BLL.ProjectUnitService.GetProjectUnitListByProjectIdUnitType(this.CurrUser.LoginProjectId, BLL.Const.ProjectUnitType_1);
+            string unitId = Const.UnitId_SEDIN;
+            if (units.Count > 0)
+            {
+                unitId = units[0].UnitId;
+            }
             if (this.drpStep.SelectedValue == Const.State_1)
             {
-                Person_PersonsService.InitUserProjectIdUnitIdRoleIdDropDownList(this.drpAudit, this.CurrUser.LoginProjectId, Const.UnitId_SEDIN, Const.ProjectSafetyDirector, false);
+                Person_PersonsService.InitUserProjectIdUnitIdRoleIdDropDownList(this.drpAudit, this.CurrUser.LoginProjectId, unitId, Const.ProjectSafetyDirector, false);
             }
             else
             {
-                Person_PersonsService.InitUserProjectIdUnitIdRoleIdDropDownList(this.drpAudit, this.CurrUser.LoginProjectId, Const.UnitId_SEDIN, Const.ProjectManager + "," + Const.ProjectAssistantManager, false);
+                Person_PersonsService.InitUserProjectIdUnitIdRoleIdDropDownList(this.drpAudit, this.CurrUser.LoginProjectId, unitId, Const.ProjectManager + "," + Const.ProjectAssistantManager, false);
             }
             if (this.States == Const.State_0 || string.IsNullOrEmpty(this.States)) ///待提交
             {

SGGL/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_CQMSData_CQMS.aspx

@@ -33,23 +33,26 @@
         <Items>
             <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="CQMS首页数据表" EnableCollapse="true"
                 runat="server" BoxFlex="1" DataKeyNames="Id" AllowCellEditing="true" 
-                ClicksToEdit="2" DataIDField="Id" AllowSorting="true" SortField="Id"
+                ClicksToEdit="2" DataIDField="Id" AllowSorting="true" SortField="ReportDate"
-                SortDirection="DESC" OnSort="Grid1_Sort"  EnableColumnLines="true"
+                SortDirection="DESC" OnSort="Grid1_Sort"  EnableColumnLines="true" AllowColumnLocking="true"
                 AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
                 EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick">
                 <Toolbars>
                     <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Right">
                         <Items>
-                            <f:Button ID="btnNew" ToolTip="新增" Hidden="true" Icon="Add" runat="server" 
+                            <%-- <f:Button ID="btnNew" ToolTip="新增" Hidden="true" Icon="Add" runat="server"  --%>
-                                OnClick="btnNew_Click">
+                            <%--     OnClick="btnNew_Click"> --%>
-                            </f:Button>
+                            <%-- </f:Button> --%>
-                            <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp"
+                            <f:TextBox ID="txtProjectName" runat="server" Label="项目名称" LabelAlign="left" LabelWidth="80px"></f:TextBox>
+                            <f:ToolbarFill runat="server"></f:ToolbarFill>
+                            <f:Button ID="btSearch" Text="查询" Icon="SystemSearch" runat="server" OnClick="btSearch_Click"></f:Button>
+                            <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server"  Text="导出" ToolTip="导出" Icon="FolderUp"
                                 EnableAjax="false" DisableControlBeforePostBack="false">
                             </f:Button>                            
                         </Items>
                     </f:Toolbar>
                 </Toolbars>
-                <Columns>
+                <%--<Columns>
                     <f:TemplateField ColumnID="tfNumber" Width="50px" HeaderText="序号" HeaderTextAlign="Center"
                         TextAlign="Center">
                         <ItemTemplate>
@@ -155,6 +158,144 @@
                              FieldType="String" HeaderText="检验批个数" TextAlign="Left" HeaderTextAlign="Center" >
                            </f:RenderField>
                      
+                </Columns>--%>
+                <Columns>
+                    <f:TemplateField ColumnID="tfNumber" Width="50px" HeaderText="序号" HeaderTextAlign="Center" Locked="true"
+                                     TextAlign="Center">
+                        <ItemTemplate>
+                            <asp:Label ID="lblNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
+                        </ItemTemplate>
+                    </f:TemplateField>
+
+                    <f:RenderField Width="150px" ColumnID="ProjectName" DataField="ProjectName" SortField="ProjectName" Locked="true"
+                                   FieldType="String" HeaderText="项目名称" TextAlign="Left" HeaderTextAlign="Center">
+                    </f:RenderField>
+                    <f:RenderField Width="150px" ColumnID="ShortName" DataField="ShortName" SortField="ShortName" Locked="true"
+                                   FieldType="String" HeaderText="项目简称" TextAlign="Left" HeaderTextAlign="Center">
+                    </f:RenderField>
+                    <f:RenderField Width="150px" ColumnID="ReportDate" DataField="ReportDate" SortField="ReportDate"
+                                   FieldType="String" HeaderText="更新时间" TextAlign="Left" HeaderTextAlign="Center">
+                    </f:RenderField>
+                    <f:RenderField Width="150px" ColumnID="TrainPersonNum" DataField="TrainPersonNum" SortField="TrainPersonNum"
+                                   FieldType="String" HeaderText="质量培训人次数" TextAlign="Left" HeaderTextAlign="Center">
+                    </f:RenderField>
+                    <f:RenderField Width="150px" ColumnID="TechnicalDisclosePersonNum" DataField="TechnicalDisclosePersonNum" SortField="TechnicalDisclosePersonNum"
+                                   FieldType="String" HeaderText="技术交底人次数" TextAlign="Left" HeaderTextAlign="Center">
+                    </f:RenderField>
+                    <f:RenderField Width="150px" ColumnID="UseNum" DataField="UseNum" SortField="UseNum"
+                                   FieldType="String" HeaderText="在用计量器具数" TextAlign="Left" HeaderTextAlign="Center">
+                    </f:RenderField>
+                    <f:RenderField Width="150px" ColumnID="OKNum" DataField="OKNum" SortField="OKNum"
+                                   FieldType="String" HeaderText="校准合格数" TextAlign="Left" HeaderTextAlign="Center">
+                    </f:RenderField>
+                    
+                    <f:RenderField Width="150px" ColumnID="ProjectPersonNum" DataField="ProjectPersonNum" SortField="ProjectPersonNum"
+                                   FieldType="String" HeaderText="项目部人数(质量)" TextAlign="Left" HeaderTextAlign="Center">
+                    </f:RenderField>
+                    <f:RenderField Width="150px" ColumnID="ProjectSubPersonNum" DataField="ProjectSubPersonNum" SortField="ProjectSubPersonNum"
+                                   FieldType="String" HeaderText="项目部人数(分包)(质量)" TextAlign="Left" HeaderTextAlign="Center">
+                    </f:RenderField>
+                    <f:RenderField Width="150px" ColumnID="ProblemNum" DataField="ProblemNum" SortField="ProblemNum"
+                                   FieldType="String" HeaderText="问题个数" TextAlign="Left" HeaderTextAlign="Center">
+                    </f:RenderField>
+                    <f:RenderField Width="150px" ColumnID="ProblemCompletedNum" DataField="ProblemCompletedNum" SortField="ProblemCompletedNum"
+                                   FieldType="String" HeaderText="整改完成数" TextAlign="Left" HeaderTextAlign="Center">
+                    </f:RenderField>
+                    <f:RenderField Width="150px" ColumnID="ProblemNotCompletedNum" DataField="ProblemNotCompletedNum" SortField="ProblemNotCompletedNum"
+                                   FieldType="String" HeaderText="未整改数" TextAlign="Left" HeaderTextAlign="Center">
+                    </f:RenderField>
+                    
+                    <f:RenderField Width="150px" ColumnID="KeyProcessNum" DataField="KeyProcessNum" SortField="KeyProcessNum"
+                                   FieldType="String" HeaderText="关键工序验收数" TextAlign="Left" HeaderTextAlign="Center">
+                    </f:RenderField>
+                    <f:RenderField Width="150px" ColumnID="KeyProcessOKNum" DataField="KeyProcessOKNum" SortField="KeyProcessOKNum"
+                                   FieldType="String" HeaderText="关键工序验收合格数" TextAlign="Left" HeaderTextAlign="Center">
+                    </f:RenderField>
+                    <f:RenderField Width="150px" ColumnID="SpecialProcessNum" DataField="SpecialProcessNum" SortField="SpecialProcessNum"
+                                   FieldType="String" HeaderText="特殊过程验收数" TextAlign="Left" HeaderTextAlign="Center">
+                    </f:RenderField>
+                    <f:RenderField Width="150px" ColumnID="SpecialProcessOKNum" DataField="SpecialProcessOKNum" SortField="SpecialProcessOKNum"
+                                   FieldType="String" HeaderText="特殊过程验收合格数" TextAlign="Left" HeaderTextAlign="Center">
+                    </f:RenderField>
+                    <f:RenderField Width="150px" ColumnID="ConcealedWorksNum" DataField="ConcealedWorksNum" SortField="ConcealedWorksNum"
+                                   FieldType="String" HeaderText="隐蔽工程验收数" TextAlign="Left" HeaderTextAlign="Center">
+                    </f:RenderField>
+                    <f:RenderField Width="150px" ColumnID="ConcealedWorksOKNum" DataField="ConcealedWorksOKNum" SortField="ConcealedWorksOKNum"
+                                   FieldType="String" HeaderText="隐蔽工程验收合格数" TextAlign="Left" HeaderTextAlign="Center">
+                    </f:RenderField>
+                    
+                    <f:RenderField Width="150px" ColumnID="UnitProjectNum" DataField="UnitProjectNum" SortField="UnitProjectNum"
+                                   FieldType="String" HeaderText="单位工程个数" TextAlign="Left" HeaderTextAlign="Center">
+                    </f:RenderField>
+                    <f:RenderField Width="150px" ColumnID="SubProjectNum" DataField="SubProjectNum" SortField="SubProjectNum"
+                                   FieldType="String" HeaderText="分部工程个数" TextAlign="Left" HeaderTextAlign="Center">
+                    </f:RenderField>
+                    <f:RenderField Width="150px" ColumnID="SubdivisionalWorksNum" DataField="SubdivisionalWorksNum" SortField="SubdivisionalWorksNum"
+                                   FieldType="String" HeaderText="分项工程个数" TextAlign="Left" HeaderTextAlign="Center">
+                    </f:RenderField>
+                    
+                    <f:RenderField Width="150px" ColumnID="EquipmentInspectionNum" DataField="EquipmentInspectionNum" SortField="EquipmentInspectionNum"
+                                   FieldType="String" HeaderText="设材报验-报检数" TextAlign="Left" HeaderTextAlign="Center">
+                    </f:RenderField>
+                    <f:RenderField Width="150px" ColumnID="EquipmentInspectionQualifiedNum" DataField="EquipmentInspectionQualifiedNum" SortField="EquipmentInspectionQualifiedNum"
+                                   FieldType="String" HeaderText="设材报验-报检合格数" TextAlign="Left" HeaderTextAlign="Center">
+                    </f:RenderField>
+                    <f:RenderField Width="150px" ColumnID="MachineInspectionNum" DataField="MachineInspectionNum" SortField="MachineInspectionNum"
+                                   FieldType="String" HeaderText="机具报验-报检数" TextAlign="Left" HeaderTextAlign="Center">
+                    </f:RenderField>
+                    <f:RenderField Width="150px" ColumnID="MachineInspectionQualifiedNum" DataField="MachineInspectionQualifiedNum" SortField="MachineInspectionQualifiedNum"
+                                   FieldType="String" HeaderText="机具报验-报检合格数" TextAlign="Left" HeaderTextAlign="Center">
+                    </f:RenderField>
+                    <f:RenderField Width="150px" ColumnID="PersonInspectionNum" DataField="PersonInspectionNum" SortField="PersonInspectionNum"
+                                   FieldType="String" HeaderText="人员报验-报检数" TextAlign="Left" HeaderTextAlign="Center">
+                    </f:RenderField>
+                    <f:RenderField Width="150px" ColumnID="PersonInspectionQualifiedNum" DataField="PersonInspectionQualifiedNum" SortField="PersonInspectionQualifiedNum"
+                                   FieldType="String" HeaderText="人员报验-报检合格数" TextAlign="Left" HeaderTextAlign="Center">
+                    </f:RenderField>
+                    
+                    <f:RenderField Width="150px" ColumnID="ConstructSolutionNum" DataField="ConstructSolutionNum" SortField="ConstructSolutionNum"
+                                   FieldType="String" HeaderText="施工方案数量" TextAlign="Left" HeaderTextAlign="Center">
+                    </f:RenderField>
+                    <f:RenderField Width="150px" ColumnID="ConstructSolutionProjectApproveNum" DataField="ConstructSolutionProjectApproveNum" SortField="ConstructSolutionProjectApproveNum"
+                                   FieldType="String" HeaderText="施工方案项目审批数量" TextAlign="Left" HeaderTextAlign="Center">
+                    </f:RenderField>
+                    <f:RenderField Width="150px" ColumnID="ConstructSolutionUnitApproveNum" DataField="ConstructSolutionUnitApproveNum" SortField="ConstructSolutionUnitApproveNum"
+                                   FieldType="String" HeaderText="施工方案企业审批数量" TextAlign="Left" HeaderTextAlign="Center">
+                    </f:RenderField>
+                    <f:RenderField Width="150px" ColumnID="SpecialEquipmentQualityAssuranceSystemNum" DataField="SpecialEquipmentQualityAssuranceSystemNum" SortField="SpecialEquipmentQualityAssuranceSystemNum"
+                                   FieldType="String" HeaderText="特种设备质保体系" TextAlign="Left" HeaderTextAlign="Center">
+                    </f:RenderField>
+                    <f:RenderField Width="150px" ColumnID="DesignDetailsNum" DataField="DesignDetailsNum" SortField="DesignDetailsNum"
+                                   FieldType="String" HeaderText="设计交底" TextAlign="Left" HeaderTextAlign="Center">
+                    </f:RenderField>
+                    <f:RenderField Width="150px" ColumnID="ComprehensiveReviewDrawingsNum" DataField="ComprehensiveReviewDrawingsNum" SortField="ComprehensiveReviewDrawingsNum"
+                                   FieldType="String" HeaderText="图纸会审" TextAlign="Left" HeaderTextAlign="Center">
+                    </f:RenderField>
+                    <f:RenderField Width="150px" ColumnID="ComprehensiveConTechnologyDisclosureNum" DataField="ComprehensiveConTechnologyDisclosureNum" SortField="ComprehensiveConTechnologyDisclosureNum"
+                                   FieldType="String" HeaderText="施工技术交底" TextAlign="Left" HeaderTextAlign="Center">
+                    </f:RenderField>
+                    <f:RenderField Width="150px" ColumnID="ComprehensiveConTechnologyDisclosurePersonNum" DataField="ComprehensiveConTechnologyDisclosurePersonNum" SortField="ComprehensiveConTechnologyDisclosurePersonNum"
+                                   FieldType="String" HeaderText="施工技术交底人次" TextAlign="Left" HeaderTextAlign="Center">
+                    </f:RenderField>
+                    <f:RenderField Width="150px" ColumnID="UnitProjectAcceptNum" DataField="UnitProjectAcceptNum" SortField="UnitProjectAcceptNum"
+                                   FieldType="String" HeaderText="单位工程验收数" TextAlign="Left" HeaderTextAlign="Center">
+                    </f:RenderField>
+                    <f:RenderField Width="150px" ColumnID="UnitProjectAcceptOKNum" DataField="UnitProjectAcceptOKNum" SortField="UnitProjectAcceptOKNum"
+                                   FieldType="String" HeaderText="单位工程合格数" TextAlign="Left" HeaderTextAlign="Center">
+                    </f:RenderField>
+                    <f:RenderField Width="150px" ColumnID="SubProjectAcceptNum" DataField="SubProjectAcceptNum" SortField="SubProjectAcceptNum"
+                                   FieldType="String" HeaderText="分部工程验收数" TextAlign="Left" HeaderTextAlign="Center">
+                    </f:RenderField>
+                    <f:RenderField Width="150px" ColumnID="SubProjectAcceptOKNum" DataField="SubProjectAcceptOKNum" SortField="SubProjectAcceptOKNum"
+                                   FieldType="String" HeaderText="分部工程合格数" TextAlign="Left" HeaderTextAlign="Center">
+                    </f:RenderField>
+                    <f:RenderField Width="150px" ColumnID="SubdivisionalWorksAcceptNum" DataField="SubdivisionalWorksAcceptNum" SortField="SubdivisionalWorksAcceptNum"
+                                   FieldType="String" HeaderText="分项工程验收数" TextAlign="Left" HeaderTextAlign="Center">
+                    </f:RenderField>
+                    <f:RenderField Width="150px" ColumnID="SubdivisionalWorksAcceptOKNum" DataField="SubdivisionalWorksAcceptOKNum" SortField="SubdivisionalWorksAcceptOKNum"
+                                   FieldType="String" HeaderText="分项工程合格数" TextAlign="Left" HeaderTextAlign="Center">
+                    </f:RenderField>
+
                 </Columns> 
                 <Listeners>
                     <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />

SGGL/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_CQMSData_CQMS.aspx.cs

@@ -1,8 +1,11 @@
-using BLL;
+using System;
-using System;
+using System.Data;
+using System.Data.SqlClient;
 using System.Text;
+using BLL;
 using AspNet = System.Web.UI.WebControls;
-
+using System.Collections.Generic;
+using System.Linq;
 namespace FineUIPro.Web.ZHGL.DataSync.ProjectDataSync
 {
     public partial class Project_CQMSData_CQMS : PageBase 
@@ -25,16 +28,23 @@ namespace FineUIPro.Web.ZHGL.DataSync.ProjectDataSync
         /// </summary>
         private void BindGrid()
         {
-            Model.Project_CQMSData_CQMS table = new Model.Project_CQMSData_CQMS();
+            var list = from x in Funs.DB.View_Project_CQMSData_CQMS select x;
-            table.ProjectId = this.CurrUser.LoginProjectId;
+            if (!string.IsNullOrEmpty(txtProjectName.Text.Trim()))
-            var tb = BLL.Project_CQMSDataService.getListData(table, Grid1);
+            {
-            Grid1.RecordCount = Project_CQMSDataService.count;
+                list = list.Where(x => x.ProjectName.Contains(txtProjectName.Text.Trim()));
-            //tb = GetFilteredTable(Grid1.FilteredData, tb);
+            }
-            Grid1.DataSource = tb;
+            int count = list.Count();
+            list = SortConditionHelper.SortingAndPaging(list, Grid1.SortField, Grid1.SortDirection, Grid1.PageIndex, Grid1.PageSize);
+
+            Grid1.RecordCount = count;
+            Grid1.DataSource = list.ToList();
             Grid1.DataBind();
         }
         #endregion
-
+        protected void btSearch_Click(object sender, EventArgs e)
+        {
+            BindGrid();
+        }
         #region GV 数据操作
         /// <summary>
         /// 过滤表头
@@ -138,7 +148,7 @@ namespace FineUIPro.Web.ZHGL.DataSync.ProjectDataSync
                 {
                     string rowID = Grid1.DataKeys[rowIndex][0].ToString();
                     var model = BLL.Project_CQMSDataService.GetProject_CQMSData_CQMSById(rowID);
-                    if (model != null)
+                    if (model!=null)
                     {
                         BLL.Project_CQMSDataService.DeleteProject_CQMSData_CQMSById(rowID);
 
@@ -177,7 +187,7 @@ namespace FineUIPro.Web.ZHGL.DataSync.ProjectDataSync
             {
                 if (buttonList.Contains(BLL.Const.BtnAdd))
                 {
-                    this.btnNew.Hidden = false;
+                    // this.btnNew.Hidden = false;
                 }
                 if (buttonList.Contains(BLL.Const.BtnModify))
                 {
@@ -203,7 +213,7 @@ namespace FineUIPro.Web.ZHGL.DataSync.ProjectDataSync
             Response.AddHeader("content-disposition", "attachment; filename=" + System.Web.HttpUtility.UrlEncode("CQMS首页数据表" + filename, System.Text.Encoding.UTF8) + ".xls");
             Response.ContentType = "application/excel";
             Response.ContentEncoding = System.Text.Encoding.UTF8;
-            this.Grid1.PageSize = 500;
+            this.Grid1.PageSize = 10000;
             this.BindGrid();
             Response.Write(GetGridTableHtml(Grid1));
             Response.End();

SGGL/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_CQMSData_CQMS.aspx.designer.cs

@@ -60,13 +60,22 @@ namespace FineUIPro.Web.ZHGL.DataSync.ProjectDataSync
         protected global::FineUIPro.Toolbar Toolbar2;
 
         /// <summary>
-        /// btnNew 控件。
+        /// txtProjectName 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.Button btnNew;
+        protected global::FineUIPro.TextBox txtProjectName;
+
+        /// <summary>
+        /// btSearch 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btSearch;
 
         /// <summary>
         /// btnOut 控件。

SGGL/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_HJGLData_HJGL.aspx

@@ -34,23 +34,26 @@
         <Items>
             <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="焊接首页数据表" EnableCollapse="true"
                 runat="server" BoxFlex="1" DataKeyNames="Id" AllowCellEditing="true"  ForceFit="true"
-                ClicksToEdit="2" DataIDField="Id" AllowSorting="true" SortField="Id"
+                ClicksToEdit="2" DataIDField="Id" AllowSorting="true" SortField="ReportDate"
-                SortDirection="DESC" OnSort="Grid1_Sort"  EnableColumnLines="true"
+                SortDirection="DESC" OnSort="Grid1_Sort"  EnableColumnLines="true" AllowColumnLocking="true"
                 AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
                 EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick">
                 <Toolbars>
                     <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Right">
                         <Items>
-                            <f:Button ID="btnNew" ToolTip="新增" Hidden="true" Icon="Add" runat="server" 
+                            <%-- <f:Button ID="btnNew" ToolTip="新增" Hidden="true" Icon="Add" runat="server"  --%>
-                                OnClick="btnNew_Click">
+                            <%--     OnClick="btnNew_Click"> --%>
-                            </f:Button>
+                            <%-- </f:Button> --%>
-                            <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp"
+                            <f:TextBox ID="txtProjectName" runat="server" Label="项目名称" LabelAlign="left" LabelWidth="80px"></f:TextBox>
+                            <f:ToolbarFill runat="server"></f:ToolbarFill>
+                            <f:Button ID="btSearch" Text="查询" Icon="SystemSearch" runat="server" OnClick="btSearch_Click"></f:Button>
+                            <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" Text="导出" ToolTip="导出" Icon="FolderUp"
                                 EnableAjax="false" DisableControlBeforePostBack="false">
                             </f:Button>                            
                         </Items>
                     </f:Toolbar>
                 </Toolbars>
-                <Columns>
+                <%--<Columns>
                     <f:TemplateField ColumnID="tfNumber" Width="50px" HeaderText="序号" HeaderTextAlign="Center"
                         TextAlign="Center">
                         <ItemTemplate>
@@ -83,6 +86,40 @@
                              FieldType="String" HeaderText="合格片数" TextAlign="Left" HeaderTextAlign="Center" >
                            </f:RenderField>
                      
+                </Columns>--%>
+                <Columns>
+                    <f:TemplateField ColumnID="tfNumber" Width="80px" HeaderText="序号" HeaderTextAlign="Center"
+                                     TextAlign="Center">
+                        <ItemTemplate>
+                            <asp:Label ID="lblNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
+                        </ItemTemplate>
+                    </f:TemplateField>
+
+                    <f:RenderField Width="150px" ColumnID="ProjectName" DataField="ProjectName" SortField="ProjectName"
+                                   FieldType="String" HeaderText="项目名称" TextAlign="Left" HeaderTextAlign="Center">
+                    </f:RenderField>
+                    <f:RenderField Width="150px" ColumnID="ShortName" DataField="ShortName" SortField="ShortName"
+                                   FieldType="String" HeaderText="项目简称" TextAlign="Left" HeaderTextAlign="Center">
+                    </f:RenderField>
+                    <f:RenderField Width="150px" ColumnID="ReportDate" DataField="ReportDate" SortField="ReportDate"
+                                   FieldType="String" HeaderText="更新时间" TextAlign="Left" HeaderTextAlign="Center">
+                    </f:RenderField>
+                    <f:RenderField Width="150px" ColumnID="WelderNum" DataField="WelderNum" SortField="WelderNum"
+                                   FieldType="String" HeaderText="焊工总数" TextAlign="Left" HeaderTextAlign="Center">
+                    </f:RenderField>
+                    <f:RenderField Width="150px" ColumnID="TotalDineNum" DataField="TotalDineNum" SortField="TotalDineNum"
+                                   FieldType="String" HeaderText="总达因数" TextAlign="Left" HeaderTextAlign="Center">
+                    </f:RenderField>
+                    <f:RenderField Width="150px" ColumnID="CompleteDineNum" DataField="CompleteDineNum" SortField="CompleteDineNum"
+                                   FieldType="String" HeaderText="完成达因数" TextAlign="Left" HeaderTextAlign="Center">
+                    </f:RenderField>
+                    <f:RenderField Width="150px" ColumnID="TotalFilmNum" DataField="TotalFilmNum" SortField="TotalFilmNum"
+                                   FieldType="String" HeaderText="总片数" TextAlign="Left" HeaderTextAlign="Center">
+                    </f:RenderField>
+                    <f:RenderField Width="150px" ColumnID="OKFilmNum" DataField="OKFilmNum" SortField="OKFilmNum"
+                                   FieldType="String" HeaderText="合格片数" TextAlign="Left" HeaderTextAlign="Center">
+                    </f:RenderField>
+
                 </Columns> 
                 <Listeners>
                     <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />

SGGL/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_HJGLData_HJGL.aspx.cs

@@ -1,8 +1,14 @@
-using BLL;
+using System;
-using System;
+using System.Collections.Generic;
+using System.Linq;
 using System.Text;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using BLL;
 using AspNet = System.Web.UI.WebControls;
-
+using System.Data;
+using System.Data.SqlClient;
 namespace FineUIPro.Web.ZHGL.DataSync.ProjectDataSync
 {
     public partial class Project_HJGLData_HJGL : PageBase
@@ -25,16 +31,25 @@ namespace FineUIPro.Web.ZHGL.DataSync.ProjectDataSync
         /// </summary>
         private void BindGrid()
         {
-            Model.Project_HJGLData_HJGL table = new Model.Project_HJGLData_HJGL();
+            var list = from x in Funs.DB.View_Project_HJGLData_HJGL select x;
-            table.ProjectId = this.CurrUser.LoginProjectId;
+            if (!string.IsNullOrEmpty(txtProjectName.Text.Trim()))
-            var tb = BLL.Project_HJGLData_HJGLService.getListData(table, Grid1);
+            {
-            Grid1.RecordCount = Project_HJGLData_HJGLService.count;
+                list = list.Where(x => x.ProjectName.Contains(txtProjectName.Text.Trim()));
-            //tb = GetFilteredTable(Grid1.FilteredData, tb);
+            }
-            Grid1.DataSource = tb;
+            int count = list.Count();
+            list = SortConditionHelper.SortingAndPaging(list, Grid1.SortField, Grid1.SortDirection, Grid1.PageIndex, Grid1.PageSize);
+
+            Grid1.RecordCount = count;
+            Grid1.DataSource = list.ToList();
             Grid1.DataBind();
         }
         #endregion
 
+        protected void btSearch_Click(object sender, EventArgs e)
+        {
+            BindGrid();
+        }
+        
         #region GV 数据操作
         /// <summary>
         /// 过滤表头
@@ -176,7 +191,7 @@ namespace FineUIPro.Web.ZHGL.DataSync.ProjectDataSync
             {
                 if (buttonList.Contains(BLL.Const.BtnAdd))
                 {
-                    this.btnNew.Hidden = false;
+                    // this.btnNew.Hidden = false;
                 }
                 if (buttonList.Contains(BLL.Const.BtnModify))
                 {
@@ -202,7 +217,7 @@ namespace FineUIPro.Web.ZHGL.DataSync.ProjectDataSync
             Response.AddHeader("content-disposition", "attachment; filename=" + System.Web.HttpUtility.UrlEncode("焊接首页数据表" + filename, System.Text.Encoding.UTF8) + ".xls");
             Response.ContentType = "application/excel";
             Response.ContentEncoding = System.Text.Encoding.UTF8;
-            this.Grid1.PageSize = 500;
+            this.Grid1.PageSize = 10000;
             this.BindGrid();
             Response.Write(GetGridTableHtml(Grid1));
             Response.End();

SGGL/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_HJGLData_HJGL.aspx.designer.cs

@@ -60,13 +60,22 @@ namespace FineUIPro.Web.ZHGL.DataSync.ProjectDataSync
         protected global::FineUIPro.Toolbar Toolbar2;
 
         /// <summary>
-        /// btnNew 控件。
+        /// txtProjectName 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.Button btnNew;
+        protected global::FineUIPro.TextBox txtProjectName;
+
+        /// <summary>
+        /// btSearch 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btSearch;
 
         /// <summary>
         /// btnOut 控件。

SGGL/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_HSSEData_HSSE.aspx

@@ -34,23 +34,26 @@
         <Items>
             <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="HSSE首页数据表" EnableCollapse="true"
                 runat="server" BoxFlex="1" DataKeyNames="Id" AllowCellEditing="true" 
-                ClicksToEdit="2" DataIDField="Id" AllowSorting="true" SortField="Id"
+                ClicksToEdit="2" DataIDField="Id" AllowSorting="true" SortField="ReportDate"
-                SortDirection="DESC" OnSort="Grid1_Sort"  EnableColumnLines="true"
+                SortDirection="DESC" OnSort="Grid1_Sort"  EnableColumnLines="true" AllowColumnLocking="true"
                 AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
                 EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick">
                 <Toolbars>
                     <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Right">
                         <Items>
-                            <f:Button ID="btnNew" ToolTip="新增" Hidden="true" Icon="Add" runat="server" 
+                            <%-- <f:Button ID="btnNew" ToolTip="新增" Hidden="true" Icon="Add" runat="server"  --%>
-                                OnClick="btnNew_Click">
+                            <%--     OnClick="btnNew_Click"> --%>
-                            </f:Button>
+                            <%-- </f:Button> --%>
-                            <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp"
+                            <f:TextBox ID="txtProjectName" runat="server" Label="项目名称" LabelAlign="left" LabelWidth="80px"></f:TextBox>
+                            <f:ToolbarFill runat="server"></f:ToolbarFill>
+                            <f:Button ID="btSearch" Text="查询" Icon="SystemSearch" runat="server" OnClick="btSearch_Click"></f:Button>
+                            <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" Text="导出" ToolTip="导出" Icon="FolderUp"
                                 EnableAjax="false" DisableControlBeforePostBack="false">
                             </f:Button>                            
                         </Items>
                     </f:Toolbar>
                 </Toolbars>
-                <Columns>
+                <%--<Columns>
                     <f:TemplateField ColumnID="tfNumber" Width="50px" HeaderText="序号" HeaderTextAlign="Center"
                         TextAlign="Center">
                         <ItemTemplate>
@@ -98,6 +101,9 @@
                           <f:RenderField Width="150px" ColumnID="SpecialOperationTrainNum" DataField="SpecialOperationTrainNum" SortField="SpecialOperationTrainNum"
                              FieldType="String" HeaderText="特种作业培训数" TextAlign="Left" HeaderTextAlign="Center" >
                            </f:RenderField>
+                         <f:RenderField Width="150px" ColumnID="EnvironmentalTrainNum" DataField="EnvironmentalTrainNum" SortField="EnvironmentalTrainNum"
+                              FieldType="String" HeaderText="环保培训数" TextAlign="Left" HeaderTextAlign="Center" >
+                            </f:RenderField>
                           <f:RenderField Width="150px" ColumnID="TotalEnergyConsumption" DataField="TotalEnergyConsumption" SortField="TotalEnergyConsumption"
                              FieldType="String" HeaderText="能耗总量" TextAlign="Left" HeaderTextAlign="Center" >
                            </f:RenderField>
@@ -213,10 +219,10 @@
                              FieldType="String" HeaderText="项目级演练次数" TextAlign="Left" HeaderTextAlign="Center" >
                            </f:RenderField>
                           <f:RenderField Width="150px" ColumnID="CostExtract" DataField="CostExtract" SortField="CostExtract"
-                             FieldType="String" HeaderText="费用提取（万元）" TextAlign="Left" HeaderTextAlign="Center" >
+                             FieldType="String" HeaderText="费用提取（元）" TextAlign="Left" HeaderTextAlign="Center" >
                            </f:RenderField>
                           <f:RenderField Width="150px" ColumnID="CostUse" DataField="CostUse" SortField="CostUse"
-                             FieldType="String" HeaderText="费用使用（万元）" TextAlign="Left" HeaderTextAlign="Center" >
+                             FieldType="String" HeaderText="费用使用（元）" TextAlign="Left" HeaderTextAlign="Center" >
                            </f:RenderField>
                           <f:RenderField Width="150px" ColumnID="UseEquipmentNum" DataField="UseEquipmentNum" SortField="UseEquipmentNum"
                              FieldType="String" HeaderText="施工机具在用数" TextAlign="Left" HeaderTextAlign="Center" >
@@ -277,9 +283,189 @@
                            </f:RenderField>
                           <f:RenderField Width="150px" ColumnID="SuperFinishedNum" DataField="SuperFinishedNum" SortField="SuperFinishedNum"
                              FieldType="String" HeaderText="超危大工程完工个数" TextAlign="Left" HeaderTextAlign="Center" >
-                           </f:RenderField>
+                           </f:RenderField>#1#
                     
-                </Columns>
+                </Columns>--%>
+            <Columns>
+                <f:TemplateField ColumnID="tfNumber" Width="50px" HeaderText="序号" HeaderTextAlign="Center" Locked="true"
+                                 TextAlign="Center">
+                    <ItemTemplate>
+                        <asp:Label ID="lblNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
+                    </ItemTemplate>
+                </f:TemplateField>
+                
+                <f:RenderField Width="150px" ColumnID="ProjectName" DataField="ProjectName" SortField="ProjectName"
+                               FieldType="String" HeaderText="项目名称" TextAlign="Left" HeaderTextAlign="Center" Locked="true">
+                </f:RenderField>
+                <f:RenderField Width="150px" ColumnID="ShortName" DataField="ShortName" SortField="ShortName"
+                               FieldType="String" HeaderText="项目简称" TextAlign="Left" HeaderTextAlign="Center" Locked="true">
+                </f:RenderField>
+                <f:RenderField Width="150px" ColumnID="ReportDate" DataField="ReportDate" SortField="ReportDate"
+                               FieldType="String" HeaderText="更新时间" TextAlign="Left" HeaderTextAlign="Center">
+                </f:RenderField>
+                <f:RenderField Width="150px" ColumnID="JoinConstructionPersonNum" DataField="JoinConstructionPersonNum" SortField="JoinConstructionPersonNum"
+                               FieldType="String" HeaderText="参建人数" TextAlign="Left" HeaderTextAlign="Center">
+                </f:RenderField>
+                <f:RenderField Width="150px" ColumnID="MajorProjectsUnderConstructionNum" DataField="MajorProjectsUnderConstructionNum" SortField="MajorProjectsUnderConstructionNum"
+                               FieldType="String" HeaderText="在施危大工程数" TextAlign="Left" HeaderTextAlign="Center">
+                </f:RenderField>
+                <f:RenderField Width="150px" ColumnID="TotalWorkNum" DataField="TotalWorkNum" SortField="TotalWorkNum"
+                               FieldType="String" HeaderText="总工时数(万)" TextAlign="Left" HeaderTextAlign="Center">
+                </f:RenderField>
+                <f:RenderField Width="150px" ColumnID="LostWorkingHour" DataField="LostWorkingHour" SortField="LostWorkingHour"
+                               FieldType="String" HeaderText="损失工时数" TextAlign="Left" HeaderTextAlign="Center">
+                </f:RenderField>
+                
+                <f:RenderField Width="150px" ColumnID="TotalWorkNum" DataField="TotalWorkNum" SortField="TotalWorkNum"
+                               FieldType="String" HeaderText="安全工时数(万)" TextAlign="Left" HeaderTextAlign="Center">
+                </f:RenderField>
+                <f:RenderField Width="150px" ColumnID="SafeTrainNum" DataField="SafeTrainNum" SortField="SafeTrainNum"
+                               FieldType="String" HeaderText="三级安全教育培训数" TextAlign="Left" HeaderTextAlign="Center">
+                </f:RenderField>
+                <f:RenderField Width="150px" ColumnID="SpecialTrainNum" DataField="SpecialTrainNum" SortField="SpecialTrainNum"
+                               FieldType="String" HeaderText="专项培训数" TextAlign="Left" HeaderTextAlign="Center">
+                </f:RenderField>
+                <f:RenderField Width="150px" ColumnID="SpecialOperationTrainNum" DataField="SpecialOperationTrainNum" SortField="SpecialOperationTrainNum"
+                               FieldType="String" HeaderText="特种作业培训数" TextAlign="Left" HeaderTextAlign="Center">
+                </f:RenderField>
+                
+                <f:RenderField Width="150px" ColumnID="ProjectInspectorGeneralNum" DataField="ProjectInspectorGeneralNum" SortField="ProjectInspectorGeneralNum"
+                               FieldType="String" HeaderText="项目总监人数" TextAlign="Left" HeaderTextAlign="Center">
+                </f:RenderField>
+                <f:RenderField Width="150px" ColumnID="ProjectFullTimeNum" DataField="ProjectFullTimeNum" SortField="ProjectFullTimeNum"
+                               FieldType="String" HeaderText="项目专职人数" TextAlign="Left" HeaderTextAlign="Center">
+                </f:RenderField>
+                <f:RenderField Width="150px" ColumnID="ProjectSubFullTimeNum" DataField="ProjectSubFullTimeNum" SortField="ProjectSubFullTimeNum"
+                               FieldType="String" HeaderText="项目专职人数(分包)" TextAlign="Left" HeaderTextAlign="Center">
+                </f:RenderField>
+                <f:RenderField Width="150px" ColumnID="ProjectSafetyMonitorNum" DataField="ProjectSafetyMonitorNum" SortField="ProjectSafetyMonitorNum"
+                               FieldType="String" HeaderText="项目安全监护人数" TextAlign="Left" HeaderTextAlign="Center">
+                </f:RenderField>
+                <f:RenderField Width="150px" ColumnID="SafetyInjectionEngineer" DataField="SafetyInjectionEngineer" SortField="SafetyInjectionEngineer"
+                               FieldType="String" HeaderText="在岗执业注安师" TextAlign="Left" HeaderTextAlign="Center">
+                </f:RenderField>
+                <f:RenderField Width="150px" ColumnID="CertificateANum" DataField="CertificateANum" SortField="CertificateANum"
+                               FieldType="String" HeaderText="A证人员" TextAlign="Left" HeaderTextAlign="Center">
+                </f:RenderField>
+                <f:RenderField Width="150px" ColumnID="CertificateBNum" DataField="CertificateBNum" SortField="CertificateBNum"
+                               FieldType="String" HeaderText="B证人员" TextAlign="Left" HeaderTextAlign="Center">
+                </f:RenderField>
+                <f:RenderField Width="150px" ColumnID="CertificateCNum" DataField="CertificateCNum" SortField="CertificateCNum"
+                               FieldType="String" HeaderText="C证人员" TextAlign="Left" HeaderTextAlign="Center">
+                </f:RenderField>
+                <f:RenderField Width="150px" ColumnID="QualityPersonNum" DataField="QualityPersonNum" SortField="QualityPersonNum"
+                               FieldType="String" HeaderText="特种作业人员" TextAlign="Left" HeaderTextAlign="Center">
+                </f:RenderField>
+                <f:RenderField Width="150px" ColumnID="ProjectSafetyLeadingGroupMeetingNum" DataField="ProjectSafetyLeadingGroupMeetingNum" SortField="ProjectSafetyLeadingGroupMeetingNum"
+                               FieldType="String" HeaderText="项目安全领导小组会议数" TextAlign="Left" HeaderTextAlign="Center">
+                </f:RenderField>
+                <f:RenderField Width="150px" ColumnID="ProjectSafetyMeetingNum" DataField="ProjectSafetyMeetingNum" SortField="ProjectSafetyMeetingNum"
+                               FieldType="String" HeaderText="项目安全例会数" TextAlign="Left" HeaderTextAlign="Center">
+                </f:RenderField>
+                <f:RenderField Width="150px" ColumnID="ProjectLeadShiftCheckNum" DataField="ProjectLeadShiftCheckNum" SortField="ProjectLeadShiftCheckNum"
+                               FieldType="String" HeaderText="项目负责人带班检查次数" TextAlign="Left" HeaderTextAlign="Center">
+                </f:RenderField>
+                <f:RenderField Width="150px" ColumnID="ProjectSpecialCheckNum" DataField="ProjectSpecialCheckNum" SortField="ProjectSpecialCheckNum"
+                               FieldType="String" HeaderText="项目专项检查次数" TextAlign="Left" HeaderTextAlign="Center">
+                </f:RenderField>
+                <f:RenderField Width="150px" ColumnID="ProjectMajorCheckNum" DataField="ProjectMajorCheckNum" SortField="ProjectMajorCheckNum"
+                               FieldType="String" HeaderText="项目专业检查次数" TextAlign="Left" HeaderTextAlign="Center">
+                </f:RenderField>
+                
+                <f:RenderField Width="150px" ColumnID="ProjectComprehensivePlanNum" DataField="ProjectComprehensivePlanNum" SortField="ProjectComprehensivePlanNum"
+                               FieldType="String" HeaderText="项目级综合预案" TextAlign="Left" HeaderTextAlign="Center">
+                </f:RenderField>
+                <f:RenderField Width="150px" ColumnID="ProjectSpecialPlanNum" DataField="ProjectSpecialPlanNum" SortField="ProjectSpecialPlanNum"
+                               FieldType="String" HeaderText="项目级专项预案数" TextAlign="Left" HeaderTextAlign="Center">
+                </f:RenderField>
+                <f:RenderField Width="150px" ColumnID="ProjectOnSiteDisposalPlan" DataField="ProjectOnSiteDisposalPlan" SortField="ProjectOnSiteDisposalPlan"
+                               FieldType="String" HeaderText="项目级现场处置预案" TextAlign="Left" HeaderTextAlign="Center">
+                </f:RenderField>
+                <f:RenderField Width="150px" ColumnID="ProjectDrillNum" DataField="ProjectDrillNum" SortField="ProjectDrillNum"
+                               FieldType="String" HeaderText="项目级演练次数" TextAlign="Left" HeaderTextAlign="Center">
+                </f:RenderField>
+                <f:RenderField Width="150px" ColumnID="ProjectDrillPersonNum" DataField="ProjectDrillPersonNum" SortField="ProjectDrillPersonNum"
+                               FieldType="String" HeaderText="项目级参演人数" TextAlign="Left" HeaderTextAlign="Center">
+                </f:RenderField>
+                
+                <f:RenderField Width="150px" ColumnID="UseEquipmentNum" DataField="UseEquipmentNum" SortField="UseEquipmentNum"
+                               FieldType="String" HeaderText="施工机具在用数" TextAlign="Left" HeaderTextAlign="Center">
+                </f:RenderField>
+                <f:RenderField Width="150px" ColumnID="SpecialEquipmentNum" DataField="SpecialEquipmentNum" SortField="SpecialEquipmentNum"
+                               FieldType="String" HeaderText="施工机具特种设备数" TextAlign="Left" HeaderTextAlign="Center">
+                </f:RenderField>
+                <f:RenderField Width="150px" ColumnID="LicensesNum" DataField="LicensesNum" SortField="LicensesNum"
+                               FieldType="String" HeaderText="作业许可项数" TextAlign="Left" HeaderTextAlign="Center">
+                </f:RenderField>
+                <f:RenderField Width="150px" ColumnID="LicensesCloseNum" DataField="LicensesCloseNum" SortField="LicensesCloseNum"
+                               FieldType="String" HeaderText="作业许可关闭项数" TextAlign="Left" HeaderTextAlign="Center">
+                </f:RenderField>
+                <f:RenderField Width="150px" ColumnID="GeneralClosedNum" DataField="GeneralClosedNum" SortField="GeneralClosedNum"
+                               FieldType="String" HeaderText="一般隐患整改闭环项" TextAlign="Left" HeaderTextAlign="Center">
+                </f:RenderField>
+                <f:RenderField Width="150px" ColumnID="GeneralNotClosedNum" DataField="GeneralNotClosedNum" SortField="GeneralNotClosedNum"
+                               FieldType="String" HeaderText="一般隐患未整改完成项" TextAlign="Left" HeaderTextAlign="Center">
+                </f:RenderField>
+                <f:RenderField Width="150px" ColumnID="MajorClosedNum" DataField="MajorClosedNum" SortField="MajorClosedNum"
+                               FieldType="String" HeaderText="重大隐患整改闭环项" TextAlign="Left" HeaderTextAlign="Center">
+                </f:RenderField>
+                <f:RenderField Width="150px" ColumnID="MajorNotClosedNum" DataField="MajorNotClosedNum" SortField="MajorNotClosedNum"
+                               FieldType="String" HeaderText="重大隐患未整改完成项" TextAlign="Left" HeaderTextAlign="Center">
+                </f:RenderField>
+                <f:RenderField Width="150px" ColumnID="GeneralRiskNum" DataField="GeneralRiskNum" SortField="GeneralRiskNum"
+                               FieldType="String" HeaderText="一般风险数" TextAlign="Left" HeaderTextAlign="Center">
+                </f:RenderField>
+                <f:RenderField Width="150px" ColumnID="LowRiskNum" DataField="LowRiskNum" SortField="LowRiskNum"
+                               FieldType="String" HeaderText="低风险数" TextAlign="Left" HeaderTextAlign="Center">
+                </f:RenderField>
+                <f:RenderField Width="150px" ColumnID="MediumRiskNum" DataField="MediumRiskNum" SortField="MediumRiskNum"
+                               FieldType="String" HeaderText="中风险数" TextAlign="Left" HeaderTextAlign="Center">
+                </f:RenderField>
+                <f:RenderField Width="150px" ColumnID="HighRiskNum" DataField="HighRiskNum" SortField="HighRiskNum"
+                               FieldType="String" HeaderText="高风险数" TextAlign="Left" HeaderTextAlign="Center">
+                </f:RenderField>
+                <f:RenderField Width="150px" ColumnID="CompletedNum" DataField="CompletedNum" SortField="CompletedNum"
+                               FieldType="String" HeaderText="危大工程审批完成数" TextAlign="Left" HeaderTextAlign="Center">
+                </f:RenderField>
+                <f:RenderField Width="150px" ColumnID="ConstructionNum" DataField="ConstructionNum" SortField="ConstructionNum"
+                               FieldType="String" HeaderText="危大工程施工个数" TextAlign="Left" HeaderTextAlign="Center">
+                </f:RenderField>
+                <f:RenderField Width="150px" ColumnID="FinishedNum" DataField="FinishedNum" SortField="FinishedNum"
+                               FieldType="String" HeaderText="危大工程完工个数" TextAlign="Left" HeaderTextAlign="Center">
+                </f:RenderField>
+                <f:RenderField Width="150px" ColumnID="ArgumentNum" DataField="ArgumentNum" SortField="ArgumentNum"
+                               FieldType="String" HeaderText="危大工程论证个数" TextAlign="Left" HeaderTextAlign="Center">
+                </f:RenderField>
+                <f:RenderField Width="150px" ColumnID="TrainPersonNum" DataField="TrainPersonNum" SortField="TrainPersonNum"
+                               FieldType="String" HeaderText="危大工程培训人次数" TextAlign="Left" HeaderTextAlign="Center">
+                </f:RenderField>
+                <f:RenderField Width="150px" ColumnID="OperativesNum" DataField="OperativesNum" SortField="OperativesNum"
+                               FieldType="String" HeaderText="危大工程作业人员数" TextAlign="Left" HeaderTextAlign="Center">
+                </f:RenderField>
+                <f:RenderField Width="150px" ColumnID="SuperCompletedNum" DataField="SuperCompletedNum" SortField="SuperCompletedNum"
+                               FieldType="String" HeaderText="超危大工程审批完成数" TextAlign="Left" HeaderTextAlign="Center">
+                </f:RenderField>
+                <f:RenderField Width="150px" ColumnID="SuperConstructionNum" DataField="SuperConstructionNum" SortField="SuperConstructionNum"
+                               FieldType="String" HeaderText="超危大工程施工个数" TextAlign="Left" HeaderTextAlign="Center">
+                </f:RenderField>
+                <f:RenderField Width="150px" ColumnID="SuperFinishedNum" DataField="SuperFinishedNum" SortField="SuperFinishedNum"
+                               FieldType="String" HeaderText="超危大工程完工个数" TextAlign="Left" HeaderTextAlign="Center">
+                </f:RenderField>
+                <f:RenderField Width="150px" ColumnID="SuperArgumentNum" DataField="SuperArgumentNum" SortField="SuperArgumentNum"
+                               FieldType="String" HeaderText="超危大工程论证个数" TextAlign="Left" HeaderTextAlign="Center">
+                </f:RenderField>
+                <f:RenderField Width="150px" ColumnID="SuperTrainPersonNum" DataField="SuperTrainPersonNum" SortField="SuperTrainPersonNum"
+                               FieldType="String" HeaderText="超危大工程培训人次数" TextAlign="Left" HeaderTextAlign="Center">
+                </f:RenderField>
+                <f:RenderField Width="150px" ColumnID="SuperOperativesNum" DataField="SuperOperativesNum" SortField="SuperOperativesNum"
+                               FieldType="String" HeaderText="超危大工程作业人员数" TextAlign="Left" HeaderTextAlign="Center">
+                </f:RenderField>
+                
+                <f:RenderField Width="150px" ColumnID="HseTechnicalNum" DataField="HseTechnicalNum" SortField="HseTechnicalNum"
+                               FieldType="String" HeaderText="安全技术交底数" TextAlign="Left" HeaderTextAlign="Center">
+                </f:RenderField>
+
+            </Columns>
                 <Listeners>
                     <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
                 </Listeners>

SGGL/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_HSSEData_HSSE.aspx.cs

@@ -1,10 +1,17 @@
-using BLL;
+using System;
-using System;
+using System.Collections.Generic;
+using System.Linq;
 using System.Text;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using BLL;
 using AspNet = System.Web.UI.WebControls;
+using System.Data;
+using System.Data.SqlClient;
 namespace FineUIPro.Web.ZHGL.DataSync.ProjectDataSync
 {
-    public partial class Project_HSSEData_HSSE : PageBase
+    public partial class Project_HSSEData_HSSE :PageBase
     {
 
         protected void Page_Load(object sender, EventArgs e)
@@ -24,12 +31,16 @@ namespace FineUIPro.Web.ZHGL.DataSync.ProjectDataSync
         /// </summary>
         private void BindGrid()
         {
-            Model.Project_HSSEData_HSSE table = new Model.Project_HSSEData_HSSE();
+            var list = from x in Funs.DB.View_Project_HSSEData_HSSE select x;
-            table.ProjectId = this.CurrUser.LoginProjectId;
+            if (!string.IsNullOrEmpty(txtProjectName.Text.Trim()))
-            var tb = BLL.Project_HSSEData_HSSEService.GetListData(table, Grid1);
+            {
-            Grid1.RecordCount = Project_HSSEData_HSSEService.Count;
+                list = list.Where(x => x.ProjectName.Contains(txtProjectName.Text.Trim()));
-            //tb = GetFilteredTable(Grid1.FilteredData, tb);
+            }
-            Grid1.DataSource = tb;
+            int count = list.Count();
+            list = SortConditionHelper.SortingAndPaging(list, Grid1.SortField, Grid1.SortDirection, Grid1.PageIndex, Grid1.PageSize);
+
+            Grid1.RecordCount = count;
+            Grid1.DataSource = list.ToList();
             Grid1.DataBind();
         }
         #endregion
@@ -68,6 +79,11 @@ namespace FineUIPro.Web.ZHGL.DataSync.ProjectDataSync
             this.BindGrid();
         }
 
+        protected void btSearch_Click(object sender, EventArgs e)
+        {
+            BindGrid();
+        }
+        
         /// <summary>
         /// 分页显示条数下拉框
         /// </summary>
@@ -135,7 +151,7 @@ namespace FineUIPro.Web.ZHGL.DataSync.ProjectDataSync
                 {
                     string rowID = Grid1.DataKeys[rowIndex][0].ToString();
                     var model = BLL.Project_HSSEData_HSSEService.GetProject_HSSEData_HSSEById(rowID);
-                    if (model != null)
+                    if (model!=null)
                     {
                         BLL.Project_HSSEData_HSSEService.DeleteProject_HSSEData_HSSEById(rowID);
                         BLL.HSSEData_HiddenDangerDetailService.DeleteHSSEData_HiddenDangerDetailByDate(model.ReportDate);
@@ -174,7 +190,7 @@ namespace FineUIPro.Web.ZHGL.DataSync.ProjectDataSync
             {
                 if (buttonList.Contains(BLL.Const.BtnAdd))
                 {
-                    this.btnNew.Hidden = false;
+                    // this.btnNew.Hidden = false;
                 }
                 if (buttonList.Contains(BLL.Const.BtnModify))
                 {
@@ -200,7 +216,7 @@ namespace FineUIPro.Web.ZHGL.DataSync.ProjectDataSync
             Response.AddHeader("content-disposition", "attachment; filename=" + System.Web.HttpUtility.UrlEncode("HSSE首页数据表" + filename, System.Text.Encoding.UTF8) + ".xls");
             Response.ContentType = "application/excel";
             Response.ContentEncoding = System.Text.Encoding.UTF8;
-            this.Grid1.PageSize = 500;
+            this.Grid1.PageSize = 10000;
             this.BindGrid();
             Response.Write(GetGridTableHtml(Grid1));
             Response.End();

SGGL/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_HSSEData_HSSE.aspx.designer.cs

@@ -60,13 +60,22 @@ namespace FineUIPro.Web.ZHGL.DataSync.ProjectDataSync
         protected global::FineUIPro.Toolbar Toolbar2;
 
         /// <summary>
-        /// btnNew 控件。
+        /// txtProjectName 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.Button btnNew;
+        protected global::FineUIPro.TextBox txtProjectName;
+
+        /// <summary>
+        /// btSearch 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btSearch;
 
         /// <summary>
         /// btnOut 控件。

SGGL/FineUIPro.Web/common/PageBase.cs

@@ -111,7 +111,38 @@ namespace FineUIPro.Web
                         pm.CustomLanguage = langValue;
                     }
                 }
+                // 检查auth_token参数实现iframe自动登录
+                string authToken = Request.QueryString["auth_token"];
+                if (!string.IsNullOrEmpty(authToken) && this.CurrUser == null)
+                {
+                    try
+                    {
+                        // 解密并验证token
+                        string decryptedToken = BLL.TokenHelper.DecryptToken(authToken);
+                        var tokenData = JsonConvert.DeserializeObject<dynamic>(decryptedToken);
 
+                        // 验证时间戳（2小时有效期）
+                        long timestamp = tokenData.timestamp;
+                        if (DateTimeOffset.Now.ToUnixTimeSeconds() - timestamp <= 7200) // 2小时 = 7200秒
+                        {
+                            // 验证用户ID
+                            string userId = tokenData.user_id;
+                            if (userId == Const.sysglyId)
+                            {
+                                var user = Person_PersonsService.GetPerson_PersonsById(Const.sysglyId);
+                                if (user != null)
+                                {
+                                    this.Session["CurrUser"] = user;
+                                    BLL.LogService.AddLog(Const.sysglyId, "iframe Token自动登录成功");
+                                }
+                            }
+                        }
+                    }
+                    catch (Exception ex)
+                    {
+                        BLL.LogService.AddLog("", $"iframe Token自动登录失败：{ex.Message}");
+                    }
+                }
                 // 1. 仅显示基础版示例， 2. 基础版 
                 // 上述两种情况都要禁用EnableAnimation、DisplayMode、MobileAdaption
                 bool showOnlyBase = false;

SGGL/WebAPI/Controllers/BaseInfoController.cs

@@ -33,6 +33,29 @@ namespace WebAPI.Controllers
         }
         #endregion
 
+        #region 根据groupType获取检查类型
+        /// <summary>
+        ///  根据groupType获取检查类型
+        /// </summary>
+        /// <param name="type"></param>
+        /// <returns></returns>
+        public Model.ResponeData getHazardRegisterTypes2(string type)
+        {
+            var responeData = new Model.ResponeData();
+            try
+            {
+                responeData.data = BLL.APIBaseInfoService.getHazardRegisterTypes(type);
+            }
+            catch (Exception ex)
+            {
+                responeData.code = 0;
+                responeData.message = ex.Message;
+            }
+
+            return responeData;
+        }
+        #endregion
+
         #region 获取项目列表
         /// <summary>
         /// 获取项目列表