diff --git a/.vs/CNCEC_SUBQHSE_WUHUAN/v17/.wsuo b/.vs/CNCEC_SUBQHSE_WUHUAN/v17/.wsuo index 7f519378..64fed920 100644 Binary files a/.vs/CNCEC_SUBQHSE_WUHUAN/v17/.wsuo and b/.vs/CNCEC_SUBQHSE_WUHUAN/v17/.wsuo differ diff --git a/.vs/CNCEC_SUBQHSE_WUHUAN/v17/DocumentLayout.backup.json b/.vs/CNCEC_SUBQHSE_WUHUAN/v17/DocumentLayout.backup.json new file mode 100644 index 00000000..0ee74a3a --- /dev/null +++ b/.vs/CNCEC_SUBQHSE_WUHUAN/v17/DocumentLayout.backup.json @@ -0,0 +1,79 @@ +{ + "Version": 1, + "WorkspaceRootPath": "D:\\\u6570\u636E\\\u8BFA\u5FC5\u8FBE\\\u4E94\u73AF\\CNCEC_SUBQHSE_WUHUAN\\", + "Documents": [], + "DocumentGroupContainers": [ + { + "Orientation": 1, + "VerticalTabListWidth": 256, + "DocumentGroups": [ + { + "DockedHeight": 200, + "SelectedChildIndex": -1, + "Children": [ + { + "$type": "Bookmark", + "Name": "ST:0:0:{e506b91c-c606-466a-90a9-123d1d1e12b3}" + }, + { + "$type": "Bookmark", + "Name": "ST:130:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}" + }, + { + "$type": "Bookmark", + "Name": "ST:132:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}" + }, + { + "$type": "Bookmark", + "Name": "ST:133:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}" + }, + { + "$type": "Bookmark", + "Name": "ST:134:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}" + }, + { + "$type": "Bookmark", + "Name": "ST:1:0:{f2bd8fb8-fc94-3dae-a733-fd993c73cc87}" + }, + { + "$type": "Bookmark", + "Name": "ST:131:0:{1fc202d4-d401-403c-9834-5b218574bb67}" + }, + { + "$type": "Bookmark", + "Name": "ST:129:0:{13b12e3e-c1b4-4539-9371-4fe9a0d523fc}" + }, + { + "$type": "Bookmark", + "Name": "ST:2:0:{f2bd8fb8-fc94-3dae-a733-fd993c73cc87}" + }, + { + "$type": "Bookmark", + "Name": "ST:3:0:{f2bd8fb8-fc94-3dae-a733-fd993c73cc87}" + }, + { + "$type": "Bookmark", + "Name": "ST:129:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}" + }, + { + "$type": "Bookmark", + "Name": "ST:131:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}" + }, + { + "$type": "Bookmark", + "Name": "ST:0:0:{aa2115a1-9712-457b-9047-dbb71ca2cdd2}" + }, + { + "$type": "Bookmark", + "Name": "ST:0:0:{1a46fd64-28d5-434c-8eb3-17a02d419b53}" + }, + { + "$type": "Bookmark", + "Name": "ST:0:0:{5726b0e3-1012-5233-81f9-d1fad48e7a56}" + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/.vs/CNCEC_SUBQHSE_WUHUAN/v17/DocumentLayout.json b/.vs/CNCEC_SUBQHSE_WUHUAN/v17/DocumentLayout.json index 0ee74a3a..ee21c543 100644 --- a/.vs/CNCEC_SUBQHSE_WUHUAN/v17/DocumentLayout.json +++ b/.vs/CNCEC_SUBQHSE_WUHUAN/v17/DocumentLayout.json @@ -59,10 +59,6 @@ "$type": "Bookmark", "Name": "ST:131:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}" }, - { - "$type": "Bookmark", - "Name": "ST:0:0:{aa2115a1-9712-457b-9047-dbb71ca2cdd2}" - }, { "$type": "Bookmark", "Name": "ST:0:0:{1a46fd64-28d5-434c-8eb3-17a02d419b53}" @@ -70,6 +66,14 @@ { "$type": "Bookmark", "Name": "ST:0:0:{5726b0e3-1012-5233-81f9-d1fad48e7a56}" + }, + { + "$type": "Bookmark", + "Name": "ST:0:0:{e1b7d1f8-9b3c-49b1-8f4f-bfc63a88835d}" + }, + { + "$type": "Bookmark", + "Name": "ST:0:0:{aa2115a1-9712-457b-9047-dbb71ca2cdd2}" } ] } diff --git a/DataBase/版本日志/SGGLDB_WH_V2025-03-13-xiaj（优化看板加载）.sql b/DataBase/版本日志/SGGLDB_WH_V2025-03-13-xiaj（优化看板加载）.sql deleted file mode 100644 index c958984d..00000000 --- a/DataBase/版本日志/SGGLDB_WH_V2025-03-13-xiaj（优化看板加载）.sql +++ /dev/null @@ -1,11 +0,0 @@ - - ---Ż -create index SitePerson_PersonInOutNow_ChangeTime_ProjectId_index -on dbo.SitePerson_PersonInOutNow (ChangeTime, ProjectId) -go - - - - - diff --git a/SGGL/BLL/OpenService/MonitorService.cs b/SGGL/BLL/OpenService/MonitorService.cs index 907cb7b1..32ffa43c 100644 --- a/SGGL/BLL/OpenService/MonitorService.cs +++ b/SGGL/BLL/OpenService/MonitorService.cs @@ -4,6 +4,7 @@ using System.DirectoryServices; using System.Linq; using System.Web.UI.WebControls; using System.Collections.Generic; +using System.Threading.Tasks; using Newtonsoft.Json.Linq; using Newtonsoft.Json; //using Microsoft.SqlServer.Dts.Runtime; @@ -16,9 +17,12 @@ namespace BLL private static Timer inOutTimer1; - public static void StartInOutSync() + public static async Task StartInOutSync() { + ErrLogInfo.WriteLog("启用出入定时器开始!"); + + // 停止并释放之前的定时器（如果存在） if (inOutTimer1 != null) { inOutTimer1.Stop(); @@ -26,24 +30,26 @@ namespace BLL inOutTimer1 = null; } + // 创建新的定时器 inOutTimer1 = new Timer { - AutoReset = true + AutoReset = true, + Interval = 1000 * 60 * 10 // 60分钟 }; - inOutTimer1.Elapsed += new ElapsedEventHandler(InOutProcess1); - inOutTimer1.Interval = 1000 * 60 * 10;// 60分钟 60000 * adTimeJ; + + // 使用异步事件处理方法 + inOutTimer1.Elapsed += async (sender, e) => await InOutProcess1Async(sender, e); + + // 启动定时器 inOutTimer1.Start(); - - - ErrLogInfo.WriteLog("启用出入定时器结束!"); } - public static void InOutProcess1(object sender, ElapsedEventArgs e) + public static async Task InOutProcess1Async(object sender, ElapsedEventArgs e) { ErrLogInfo.WriteLog("氟化工出入同步开始"); try diff --git a/SGGL/FineUIPro.Web/App_GlobalResources/Lan.designer.cs b/SGGL/FineUIPro.Web/App_GlobalResources/Lan.designer.cs new file mode 100644 index 00000000..01ba4bc7 --- /dev/null +++ b/SGGL/FineUIPro.Web/App_GlobalResources/Lan.designer.cs @@ -0,0 +1,927 @@ +//------------------------------------------------------------------------------ +// +// 此代码由工具生成。 +// 运行时版本:4.0.30319.42000 +// +// 对此文件的更改可能会导致不正确的行为，并且如果 +// 重新生成代码，这些更改将会丢失。 +// +//------------------------------------------------------------------------------ + +namespace Resources { + using System; + + + /// + /// 强类型资源类，用于查找本地化字符串等。 + /// + // 此类是由 StronglyTypedResourceBuilder + // 类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。 + // 若要添加或删除成员，请编辑 .ResX 文件，然后重新运行 ResGen + // (以 /str 作为命令选项)，或重新生成 Visual Studio 项目。 + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Web.Application.StronglyTypedResourceProxyBuilder", "15.0.0.0")] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + internal class Lan { + + private static global::System.Resources.ResourceManager resourceMan; + + private static global::System.Globalization.CultureInfo resourceCulture; + + [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] + internal Lan() { + } + + /// + /// 返回此类使用的缓存 ResourceManager 实例。 + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Resources.ResourceManager ResourceManager { + get { + if (object.ReferenceEquals(resourceMan, null)) { + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Resources.Lan", global::System.Reflection.Assembly.Load("App_GlobalResources")); + resourceMan = temp; + } + return resourceMan; + } + } + + /// + /// 覆盖当前线程的 CurrentUICulture 属性 + /// 使用此强类型的资源类的资源查找。 + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Globalization.CultureInfo Culture { + get { + return resourceCulture; + } + set { + resourceCulture = value; + } + } + + /// + /// 查找类似 竣工 的本地化字符串。 + /// + internal static string BeCompleted { + get { + return ResourceManager.GetString("BeCompleted", resourceCulture); + } + } + + /// + /// 查找类似 大数据中心 的本地化字符串。 + /// + internal static string BigDataCenter { + get { + return ResourceManager.GetString("BigDataCenter", resourceCulture); + } + } + + /// + /// 查找类似 证书预警 的本地化字符串。 + /// + internal static string CertificateWarning { + get { + return ResourceManager.GetString("CertificateWarning", resourceCulture); + } + } + + /// + /// 查找类似 中国 的本地化字符串。 + /// + internal static string China { + get { + return ResourceManager.GetString("China", resourceCulture); + } + } + + /// + /// 查找类似 中文 的本地化字符串。 + /// + internal static string Chinese { + get { + return ResourceManager.GetString("Chinese", resourceCulture); + } + } + + /// + /// 查找类似 土建基础交安 的本地化字符串。 + /// + internal static string CivilInfrastructure { + get { + return ResourceManager.GetString("CivilInfrastructure", resourceCulture); + } + } + + /// + /// 查找类似 已完成 的本地化字符串。 + /// + internal static string completed { + get { + return ResourceManager.GetString("completed", resourceCulture); + } + } + + /// + /// 查找类似 参建人数 的本地化字符串。 + /// + internal static string ConPersonCount { + get { + return ResourceManager.GetString("ConPersonCount", resourceCulture); + } + } + + /// + /// 查找类似 施工单位 的本地化字符串。 + /// + internal static string ConstructionUnit { + get { + return ResourceManager.GetString("ConstructionUnit", resourceCulture); + } + } + + /// + /// 查找类似 合同到期时间 的本地化字符串。 + /// + internal static string ContractExpirationTime { + get { + return ResourceManager.GetString("ContractExpirationTime", resourceCulture); + } + } + + /// + /// 查找类似 当前现场人数 的本地化字符串。 + /// + internal static string CurrentPersonnel { + get { + return ResourceManager.GetString("CurrentPersonnel", resourceCulture); + } + } + + /// + /// 查找类似 隐患总数 的本地化字符串。 + /// + internal static string DangersCount { + get { + return ResourceManager.GetString("DangersCount", resourceCulture); + } + } + + /// + /// 查找类似 员工管理 的本地化字符串。 + /// + internal static string EmployeeManage { + get { + return ResourceManager.GetString("EmployeeManage", resourceCulture); + } + } + + /// + /// 查找类似 英文 的本地化字符串。 + /// + internal static string English { + get { + return ResourceManager.GetString("English", resourceCulture); + } + } + + /// + /// 查找类似 现场动态 的本地化字符串。 + /// + internal static string FieldDynamics { + get { + return ResourceManager.GetString("FieldDynamics", resourceCulture); + } + } + + /// + /// 查找类似 首台设备到货 的本地化字符串。 + /// + internal static string FirstEquipmentArrived { + get { + return ResourceManager.GetString("FirstEquipmentArrived", resourceCulture); + } + } + + /// + /// 查找类似 焊接一次合格率 的本地化字符串。 + /// + internal static string FistPassRateWelding { + get { + return ResourceManager.GetString("FistPassRateWelding", resourceCulture); + } + } + + /// + /// 查找类似 全屏 的本地化字符串。 + /// + internal static string FullScreen { + get { + return ResourceManager.GetString("FullScreen", resourceCulture); + } + } + + /// + /// 查找类似 总承包商施工计划 的本地化字符串。 + /// + internal static string GeneralConPlan { + get { + return ResourceManager.GetString("GeneralConPlan", resourceCulture); + } + } + + /// + /// 查找类似 一般风险 的本地化字符串。 + /// + internal static string GeneralRisk { + get { + return ResourceManager.GetString("GeneralRisk", resourceCulture); + } + } + + /// + /// 查找类似 较大风险 的本地化字符串。 + /// + internal static string GreaterRisk { + get { + return ResourceManager.GetString("GreaterRisk", resourceCulture); + } + } + + /// + /// 查找类似 总部检查 的本地化字符串。 + /// + internal static string HeadquartersInspection { + get { + return ResourceManager.GetString("HeadquartersInspection", resourceCulture); + } + } + + /// + /// 查找类似 首页 的本地化字符串。 + /// + internal static string HomePage { + get { + return ResourceManager.GetString("HomePage", resourceCulture); + } + } + + /// + /// 查找类似 安全管理 的本地化字符串。 + /// + internal static string HSEManage { + get { + return ResourceManager.GetString("HSEManage", resourceCulture); + } + } + + /// + /// 查找类似 湿度 的本地化字符串。 + /// + internal static string humidness { + get { + return ResourceManager.GetString("humidness", resourceCulture); + } + } + + /// + /// 查找类似 综合管理 的本地化字符串。 + /// + internal static string IntegratedManage { + get { + return ResourceManager.GetString("IntegratedManage", resourceCulture); + } + } + + /// + /// 查找类似 在施危大工程数 的本地化字符串。 + /// + internal static string LargeRisk { + get { + return ResourceManager.GetString("LargeRisk", resourceCulture); + } + } + + /// + /// 查找类似 级 的本地化字符串。 + /// + internal static string Level { + get { + return ResourceManager.GetString("Level", resourceCulture); + } + } + + /// + /// 查找类似 现场视频 的本地化字符串。 + /// + internal static string LiveVideo { + get { + return ResourceManager.GetString("LiveVideo", resourceCulture); + } + } + + /// + /// 查找类似 现场相册 的本地化字符串。 + /// + internal static string Live_photo_album { + get { + return ResourceManager.GetString("Live_photo_album", resourceCulture); + } + } + + /// + /// 查找类似 低风险 的本地化字符串。 + /// + internal static string LowRisk { + get { + return ResourceManager.GetString("LowRisk", resourceCulture); + } + } + + /// + /// 查找类似 重大风险 的本地化字符串。 + /// + internal static string MajorRisk { + get { + return ResourceManager.GetString("MajorRisk", resourceCulture); + } + } + + /// + /// 查找类似 管理人员总数 的本地化字符串。 + /// + internal static string managersCount { + get { + return ResourceManager.GetString("managersCount", resourceCulture); + } + } + + /// + /// 查找类似 材料管理 的本地化字符串。 + /// + internal static string MaterialManagement { + get { + return ResourceManager.GetString("MaterialManagement", resourceCulture); + } + } + + /// + /// 查找类似 最大化 的本地化字符串。 + /// + internal static string maximize { + get { + return ResourceManager.GetString("maximize", resourceCulture); + } + } + + /// + /// 查找类似 机械竣工 的本地化字符串。 + /// + internal static string MechanicalCompletion { + get { + return ResourceManager.GetString("MechanicalCompletion", resourceCulture); + } + } + + /// + /// 查找类似 机械预警 的本地化字符串。 + /// + internal static string MechanicalWarning { + get { + return ResourceManager.GetString("MechanicalWarning", resourceCulture); + } + } + + /// + /// 查找类似 消息 的本地化字符串。 + /// + internal static string message { + get { + return ResourceManager.GetString("message", resourceCulture); + } + } + + /// + /// 查找类似 更多 的本地化字符串。 + /// + internal static string more { + get { + return ResourceManager.GetString("more", resourceCulture); + } + } + + /// + /// 查找类似 您没有此模块操作权限，请联系管理员授权！ 的本地化字符串。 + /// + internal static string NoAuthorize { + get { + return ResourceManager.GetString("NoAuthorize", resourceCulture); + } + } + + /// + /// 查找类似 噪音 的本地化字符串。 + /// + internal static string noise { + get { + return ResourceManager.GetString("noise", resourceCulture); + } + } + + /// + /// 查找类似 您没有权限进入项目管理模块！ 的本地化字符串。 + /// + internal static string NoPermission { + get { + return ResourceManager.GetString("NoPermission", resourceCulture); + } + } + + /// + /// 查找类似 通知管理 的本地化字符串。 + /// + internal static string NoticeManage { + get { + return ResourceManager.GetString("NoticeManage", resourceCulture); + } + } + + /// + /// 查找类似 现场考勤 的本地化字符串。 + /// + internal static string OnSiteAttendance { + get { + return ResourceManager.GetString("OnSiteAttendance", resourceCulture); + } + } + + /// + /// 查找类似 在新标签页中打开 的本地化字符串。 + /// + internal static string OpensNewTab { + get { + return ResourceManager.GetString("OpensNewTab", resourceCulture); + } + } + + /// + /// 查找类似 合格率 的本地化字符串。 + /// + internal static string PassRate { + get { + return ResourceManager.GetString("PassRate", resourceCulture); + } + } + + /// + /// 查找类似 桩基施工 的本地化字符串。 + /// + internal static string Pilefoundationconstruction { + get { + return ResourceManager.GetString("Pilefoundationconstruction", resourceCulture); + } + } + + /// + /// 查找类似 管道安装开始 的本地化字符串。 + /// + internal static string PipeInstallationStarts { + get { + return ResourceManager.GetString("PipeInstallationStarts", resourceCulture); + } + } + + /// + /// 查找类似 变电所受电 的本地化字符串。 + /// + internal static string PowerReceived { + get { + return ResourceManager.GetString("PowerReceived", resourceCulture); + } + } + + /// + /// 查找类似 问题总数 的本地化字符串。 + /// + internal static string ProblemTotal { + get { + return ResourceManager.GetString("ProblemTotal", resourceCulture); + } + } + + /// + /// 查找类似 项目地址 的本地化字符串。 + /// + internal static string ProjectAddress { + get { + return ResourceManager.GetString("ProjectAddress", resourceCulture); + } + } + + /// + /// 查找类似 项目清单 的本地化字符串。 + /// + internal static string ProjectList { + get { + return ResourceManager.GetString("ProjectList", resourceCulture); + } + } + + /// + /// 查找类似 项目名称 的本地化字符串。 + /// + internal static string ProjectName { + get { + return ResourceManager.GetString("ProjectName", resourceCulture); + } + } + + /// + /// 查找类似 项目进度计划 的本地化字符串。 + /// + internal static string ProjectSchedule { + get { + return ResourceManager.GetString("ProjectSchedule", resourceCulture); + } + } + + /// + /// 查找类似 项目统计 的本地化字符串。 + /// + internal static string ProjectStatistics { + get { + return ResourceManager.GetString("ProjectStatistics", resourceCulture); + } + } + + /// + /// 查找类似 在建项目 的本地化字符串。 + /// + internal static string ProjectUnderConstruction { + get { + return ResourceManager.GetString("ProjectUnderConstruction", resourceCulture); + } + } + + /// + /// 查找类似 质量管理 的本地化字符串。 + /// + internal static string QualityManage { + get { + return ResourceManager.GetString("QualityManage", resourceCulture); + } + } + + /// + /// 查找类似 质量统计 的本地化字符串。 + /// + internal static string QualityStatistics { + get { + return ResourceManager.GetString("QualityStatistics", resourceCulture); + } + } + + /// + /// 查找类似 质量预警 的本地化字符串。 + /// + internal static string QualityWarning { + get { + return ResourceManager.GetString("QualityWarning", resourceCulture); + } + } + + /// + /// 查找类似 质量问题统计 的本地化字符串。 + /// + internal static string Quality_problem_statistics { + get { + return ResourceManager.GetString("Quality_problem_statistics", resourceCulture); + } + } + + /// + /// 查找类似 资质预警 的本地化字符串。 + /// + internal static string Quawarning { + get { + return ResourceManager.GetString("Quawarning", resourceCulture); + } + } + + /// + /// 查找类似 退出 的本地化字符串。 + /// + internal static string quit { + get { + return ResourceManager.GetString("quit", resourceCulture); + } + } + + /// + /// 查找类似 实时视频 的本地化字符串。 + /// + internal static string RealTimeVideo { + get { + return ResourceManager.GetString("RealTimeVideo", resourceCulture); + } + } + + /// + /// 查找类似 整改率 的本地化字符串。 + /// + internal static string RectificationRate { + get { + return ResourceManager.GetString("RectificationRate", resourceCulture); + } + } + + /// + /// 查找类似 刷新 的本地化字符串。 + /// + internal static string Refresh { + get { + return ResourceManager.GetString("Refresh", resourceCulture); + } + } + + /// + /// 查找类似 刷新本页 的本地化字符串。 + /// + internal static string RefreshPage { + get { + return ResourceManager.GetString("RefreshPage", resourceCulture); + } + } + + /// + /// 查找类似 距竣工剩余 的本地化字符串。 + /// + internal static string RemainingTimeCompletion { + get { + return ResourceManager.GetString("RemainingTimeCompletion", resourceCulture); + } + } + + /// + /// 查找类似 风险管控 的本地化字符串。 + /// + internal static string RiskControl { + get { + return ResourceManager.GetString("RiskControl", resourceCulture); + } + } + + /// + /// 查找类似 安全人工时 的本地化字符串。 + /// + internal static string SafeLaborHours { + get { + return ResourceManager.GetString("SafeLaborHours", resourceCulture); + } + } + + /// + /// 查找类似 安全问题统计 的本地化字符串。 + /// + internal static string SafeProStat { + get { + return ResourceManager.GetString("SafeProStat", resourceCulture); + } + } + + /// + /// 查找类似 累计安全人工时 的本地化字符串。 + /// + internal static string SafetyLaborHours { + get { + return ResourceManager.GetString("SafetyLaborHours", resourceCulture); + } + } + + /// + /// 查找类似 安全统计 的本地化字符串。 + /// + internal static string SafetyStatistics { + get { + return ResourceManager.GetString("SafetyStatistics", resourceCulture); + } + } + + /// + /// 查找类似 进度管理 的本地化字符串。 + /// + internal static string ScheduleManage { + get { + return ResourceManager.GetString("ScheduleManage", resourceCulture); + } + } + + /// + /// 查找类似 选择语言 的本地化字符串。 + /// + internal static string SelectLanguage { + get { + return ResourceManager.GetString("SelectLanguage", resourceCulture); + } + } + + /// + /// 查找类似 劳务数据 的本地化字符串。 + /// + internal static string ServiceData { + get { + return ResourceManager.GetString("ServiceData", resourceCulture); + } + } + + /// + /// 查找类似 设置 的本地化字符串。 + /// + internal static string Settings { + get { + return ResourceManager.GetString("Settings", resourceCulture); + } + } + + /// + /// 查找类似 停工 的本地化字符串。 + /// + internal static string ShutDown { + get { + return ResourceManager.GetString("ShutDown", resourceCulture); + } + } + + /// + /// 查找类似 注销 的本地化字符串。 + /// + internal static string SignOUT { + get { + return ResourceManager.GetString("SignOUT", resourceCulture); + } + } + + /// + /// 查找类似 开工时间 的本地化字符串。 + /// + internal static string Start_time { + get { + return ResourceManager.GetString("Start_time", resourceCulture); + } + } + + /// + /// 查找类似 分包管理 的本地化字符串。 + /// + internal static string SubManagement { + get { + return ResourceManager.GetString("SubManagement", resourceCulture); + } + } + + /// + /// 查找类似 监理单位 的本地化字符串。 + /// + internal static string SupervisionUnit { + get { + return ResourceManager.GetString("SupervisionUnit", resourceCulture); + } + } + + /// + /// 查找类似 切换首页 的本地化字符串。 + /// + internal static string SwitchHomePage { + get { + return ResourceManager.GetString("SwitchHomePage", resourceCulture); + } + } + + /// + /// 查找类似 系统菜单 的本地化字符串。 + /// + internal static string SystemMenu { + get { + return ResourceManager.GetString("SystemMenu", resourceCulture); + } + } + + /// + /// 查找类似 智慧施工管理信息系统 的本地化字符串。 + /// + internal static string SystemName { + get { + return ResourceManager.GetString("SystemName", resourceCulture); + } + } + + /// + /// 查找类似 温度 的本地化字符串。 + /// + internal static string temperature { + get { + return ResourceManager.GetString("temperature", resourceCulture); + } + } + + /// + /// 查找类似 试车管理 的本地化字符串。 + /// + internal static string TestManagement { + get { + return ResourceManager.GetString("TestManagement", resourceCulture); + } + } + + /// + /// 查找类似 竣工时间 的本地化字符串。 + /// + internal static string TimeCompletion { + get { + return ResourceManager.GetString("TimeCompletion", resourceCulture); + } + } + + /// + /// 查找类似 待办事项 的本地化字符串。 + /// + internal static string TodoList { + get { + return ResourceManager.GetString("TodoList", resourceCulture); + } + } + + /// + /// 查找类似 合同总工期 的本地化字符串。 + /// + internal static string TotalContractDuration { + get { + return ResourceManager.GetString("TotalContractDuration", resourceCulture); + } + } + + /// + /// 查找类似 未完成 的本地化字符串。 + /// + internal static string uncompleted { + get { + return ResourceManager.GetString("uncompleted", resourceCulture); + } + } + + /// + /// 查找类似 在建 的本地化字符串。 + /// + internal static string UnderConstruction { + get { + return ResourceManager.GetString("UnderConstruction", resourceCulture); + } + } + + /// + /// 查找类似 用户 的本地化字符串。 + /// + internal static string user { + get { + return ResourceManager.GetString("user", resourceCulture); + } + } + + /// + /// 查找类似 视频监控 的本地化字符串。 + /// + internal static string VideoSurveillance { + get { + return ResourceManager.GetString("VideoSurveillance", resourceCulture); + } + } + + /// + /// 查找类似 焊接管理 的本地化字符串。 + /// + internal static string WeldingManage { + get { + return ResourceManager.GetString("WeldingManage", resourceCulture); + } + } + + /// + /// 查找类似 风速 的本地化字符串。 + /// + internal static string WindSpeed { + get { + return ResourceManager.GetString("WindSpeed", resourceCulture); + } + } + + /// + /// 查找类似 作业人员总数 的本地化字符串。 + /// + internal static string WorkPersonnel { + get { + return ResourceManager.GetString("WorkPersonnel", resourceCulture); + } + } + } +} diff --git a/SGGL/FineUIPro.Web/App_GlobalResources/Lan.en-US.designer.cs b/SGGL/FineUIPro.Web/App_GlobalResources/Lan.en-US.designer.cs new file mode 100644 index 00000000..e69de29b diff --git a/SGGL/FineUIPro.Web/App_GlobalResources/Lan.en-US.resx b/SGGL/FineUIPro.Web/App_GlobalResources/Lan.en-US.resx new file mode 100644 index 00000000..f14cd232 --- /dev/null +++ b/SGGL/FineUIPro.Web/App_GlobalResources/Lan.en-US.resx @@ -0,0 +1,796 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Chinese + 中文 + + + English + 英文 + + + Full screen + 全屏 + + + General contractor construction plan + 总承包商施工计划 + + + Home page + 首页 + + + HSE manage + 安全管理 + + + maximize + 最大化 + + + message + 消息 + + + You do not have permission to operate this module, please contact the administrator to authorize + 您没有此模块操作权限，请联系管理员授权！ + + + On-site attendance + 现场考勤 + + + Opens in a new TAB + 在新标签页中打开 + + + Quality manage + 质量管理 + + + quit + 退出 + + + Refresh this page + 刷新本页 + + + Schedule manage + 进度管理 + + + Choice language + 选择语言 + + + Settings + 设置 + + + Sign OUT + 注销 + + + Subcontract manage + 分包管理 + + + System menu + 系统菜单 + + + Intelligent construction management information system + 智慧施工管理信息系统 + + + user + 用户 + + + Video surveillance + 视频监控 + + + Welding manage + 焊接管理 + + + Big data center + 大数据中心 + + + Employee manage + 员工管理 + + + Headquarters inspection + 总部检查 + + + Integrated manage + 综合管理 + + + You do not have permission to enter the project management module + 您没有权限进入项目管理模块！ + + + Notification manage + 通知管理 + + + Project List + 项目清单 + + + Refresh + 刷新 + + + Switch home page + 切换首页 + + + Certificate + 证书预警 + + + Civil infrastructure maintenance + 土建基础交安 + + + Completed + 已完成 + + + Construction unit + 施工单位 + + + Contract expiration time + 合同到期时间 + + + Current field personnel + 当前现场人数 + + + Total number of hidden dangers + 隐患总数 + + + First equipment arrived + 首台设备到货 + + + First pass rate of welding + 焊接一次合格率 + + + General risk + 一般风险 + + + Greater risk + 较大风险 + + + humidness + 湿度 + + + Level + 级 + + + Low risk + 低风险 + + + Major risk + 重大风险 + + + Total number of managers + 管理人员总数 + + + Mechanical completion + 机械竣工 + + + Mechanical early + 机械预警 + + + more + 更多 + + + noise + 噪音 + + + Pass rate + 合格率 + + + Pile foundation construction + 桩基施工 + + + Pipe installation starts + 管道安装开始 + + + Power received by a substation + 变电所受电 + + + Problem total + 问题总数 + + + Project schedule + 项目进度计划 + + + Quality statistics + 质量统计 + + + Quality early warning + 质量预警 + + + Qualification early + 资质预警 + + + Real-time video + 实时视频 + + + Rectification rate + 整改率 + + + Remaining time to completion + 距竣工剩余 + + + Risk management and control + 风险管控 + + + Safe labor hours + 安全人工时 + + + Safety statistics + 安全统计 + + + Service data + 劳务数据 + + + Start time + 开工时间 + + + Supervision unit + 监理单位 + + + temperature + 温度 + + + Time of completion + 竣工时间 + + + To-do list + 待办事项 + + + Total contract duration + 合同总工期 + + + Uncompleted + 未完成 + + + Wind speed + 风速 + + + Total number of personnel + 作业人员总数 + + + China + 中国 + + + Number of construction participants + 参建人数 + + + Field dynamics + 现场动态 + + + Large number of projects at risk + 在施危大工程数 + + + Live video + 现场视频 + + + Live photo album + 现场相册 + + + Project address + 项目地址 + + + Project name + 项目名称 + + + Project statistics + 项目统计 + + + Project under construction + 在建项目 + + + Quality problem statistics + + + 质量问题统计 + + + Safety problem statistics + 安全问题统计 + + + Cumulative safety labor hours + 累计安全人工时 + + + Be completed + 竣工 + + + Material management + 材料管理 + + + Shut down + 停工 + + + Test management + 试车管理 + + + Under construction + 在建 + + + altitude + 高处 + + + Approval completed + 审批完成 + + + call + 呼叫 + + + Construction plan review batch + 施工方案审批量 + + + Coordination and communication + 协调与沟通 + + + Dangerous project + 危大工程 + + + help + 帮助 + + + Key issues and coordination communication + 关键事项与协调沟通 + + + lifting + 吊装 + + + Lose one's temper + 动火 + + + Number of completions + 完工个数 + + + Number of constructions + 施工个数 + + + Number of trainees + 培训人次数 + + + Opinion gathering + 意见收集 + + + other + 其他 + + + Quality profile + 质量概况 + + + Quality training accumulated personnel + 质量培训累计人员 + + + Risk early warning + 风险预警 + + + Super dangerous project + 超危大工程 + + + Transfer management + 移交管理 + + + Work permit + 作业许可 + + + New Project Home Page + + + Risk Early Warning + + + Quality Safety Warning + + + Mechanical Warning + + + Dangerous Project + + + Approval Completed + + + Number of Trainees + + + Number of Constructors + + + Number of Completions + + + Super Dangerous Project + + + Quality Profile + + + Quality Training + + + Construction Plan Review Batch + + + Work Permit + + + Level One High Temperature + + + High Altitude + + + Other + + + Cumulative Safe Work Hours + + + Safe Work Hours This Month + + + Total Safe Training Personnel + + + Safe Management Personnel + + + Near Miss Incidents + + + Total Rectification Data + + + Completed Rectification + + + Uncompleted Rectification + + + Rectification Rate + + + Contract Duration + + + Contract Expiry Date + + + Contract Remaining + + + Key Matters Timeliness Rate + + + Progress Statistics + + + Workbench + + + Key Matters + + + Pending Matters + + + Personal Process + + + Completed Tasks + + + Personnel Information + + + Current Onsite Personnel + + + Total Workers + + + Total Managers + + + Material Statistics + + + Pipe Materials + + + Equipment Materials + + + Material Category + + + Design Quantity + + + Purchase Quantity + + + Arrival Quantity + + + Issue Quantity + + + Percentage + + + Workbench + + + Personnel Information + + + Material Statistics + + + Full Screen + + + Open Pending Tasks + + + Actual value + 实际值 + + + Cumulative actual value + 累计实际值 + + + Cumulative planned value + 累计计划值 + + + Have arrived + 已到货 + + + Material received + 已领料 + + + Pass rate of one test + 一次共检合格率 + + + First pass rate of welding + 焊接一次合格率 + + + Planned value + 计划值 + + + Quality problem rectification rate + 质量问题整改率 + + + Rectification data + 整改数据 + + + total + 总计 + + \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/App_GlobalResources/Lan.en-US1.designer.cs b/SGGL/FineUIPro.Web/App_GlobalResources/Lan.en-US1.designer.cs new file mode 100644 index 00000000..e69de29b diff --git a/SGGL/FineUIPro.Web/App_GlobalResources/Lan.resx b/SGGL/FineUIPro.Web/App_GlobalResources/Lan.resx new file mode 100644 index 00000000..3b65cf19 --- /dev/null +++ b/SGGL/FineUIPro.Web/App_GlobalResources/Lan.resx @@ -0,0 +1,666 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 中文 + + + 英文 + + + 全屏 + + + 总承包商施工计划 + + + 首页 + + + 安全管理 + + + 最大化 + + + 消息 + + + 您没有此模块操作权限，请联系管理员授权！ + + + 现场考勤 + + + 在新标签页中打开 + + + 质量管理 + + + 退出 + + + 刷新本页 + + + 进度管理 + + + 选择语言 + + + 设置 + + + 注销 + + + 分包管理 + + + 系统菜单 + + + 智慧施工管理信息系统 + + + 用户 + + + 视频监控 + + + 焊接管理 + + + 大数据中心 + + + 员工管理 + + + 总部检查 + + + 综合管理 + + + 您没有权限进入项目管理模块！ + + + 通知管理 + + + 项目清单 + + + 刷新 + + + 切换首页 + + + 证书预警 + + + 土建基础交安 + + + 已完成 + + + 施工单位 + + + 合同到期时间 + + + 当前现场人数 + + + 隐患总数 + + + 首台设备到货 + + + 焊接一次合格率 + + + 一般风险 + + + 较大风险 + + + 湿度 + + + 级 + + + 低风险 + + + 重大风险 + + + 管理人员总数 + + + 机械竣工 + + + 机械预警 + + + 更多 + + + 噪音 + + + 合格率 + + + 桩基施工 + + + 管道安装开始 + + + 变电所受电 + + + 问题总数 + + + 项目进度计划 + + + 质量统计 + + + 质量预警 + + + 资质预警 + + + 实时视频 + + + 整改率 + + + 距竣工剩余 + + + 风险管控 + + + 安全人工时 + + + 安全统计 + + + 劳务数据 + + + 开工时间 + + + 监理单位 + + + 温度 + + + 竣工时间 + + + 待办事项 + + + 合同总工期 + + + 未完成 + + + 风速 + + + 作业人员总数 + + + 中国 + + + 参建人数 + + + 现场动态 + + + 在施危大工程数 + + + 现场视频 + + + 现场相册 + + + 项目地址 + + + 项目名称 + + + 项目统计 + + + 在建项目 + + + 质量问题统计 + + + 安全问题统计 + + + 累计安全人工时 + + + 竣工 + + + 材料管理 + + + 停工 + + + 试车管理 + + + 在建 + + + 高处 + + + 审批完成 + + + 呼叫 + + + 施工方案审批量 + + + 协调与沟通 + + + 危大工程 + + + 帮助 + + + 关键事项与协调沟通 + + + 吊装 + + + 动火 + + + 完工个数 + + + 施工个数 + + + 培训人次数 + + + 意见收集 + + + 其他 + + + 质量概况 + + + 质量培训累计人员 + + + 风险预警 + + + 超危大工程 + + + 移交管理 + + + 作业许可 + + + 项目级首页（新） + + + 风险预警 + + + 质量安全预警 + + + 机械预警 + + + 危险项目 + + + 审批完成 + + + 培训人数 + + + 施工人数 + + + 完工人数 + + + 超危险项目 + + + 质量概况 + + + 质量培训 + + + 施工方案审查批次 + + + 工作许可 + + + 一级高温 + + + 高空 + + + 其他 + + + 累计安全人工时 + + + 本月安全人工时 + + + 安全培训累计人员 + + + 安全管理人员 + + + 未遂事件 + + + 总数 + + + 已完成 + + + 未完成 + + + 整改率 + + + 合同工期 + + + 合同剩余 + + + 关键事项准点率 + + + 进度统计 + + + 工作台面 + + + 关键事项 + + + 待办事项 + + + 个人流程 + + + 已办任务 + + + 人员信息 + + + 当前现场人数 + + + 作业人员总数 + + + 管理人员总数 + + + 材料统计 + + + 管道材料 + + + 设备材料 + + + 材料类别 + + + 设计量 + + + 采购量 + + + 到货量 + + + 领料量 + + + 百分比 + + + 工作台面 + + + 人员信息 + + + 材料统计 + + + 全屏 + + + 打开代办 + + + 实际值 + + + 累计实际值 + + + 累计计划值 + + + 已到货 + + + 合同到期时间 + + + 已领料 + + + 一次共检合格率 + + + 焊接一次合格率 + + + 计划值 + + + 质量问题整改率 + + + 整改数据 + + + 总计 + + \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/App_GlobalResources/Lan.zh-CN.designer.cs b/SGGL/FineUIPro.Web/App_GlobalResources/Lan.zh-CN.designer.cs new file mode 100644 index 00000000..e69de29b diff --git a/SGGL/FineUIPro.Web/App_GlobalResources/Lan.zh-CN.resx b/SGGL/FineUIPro.Web/App_GlobalResources/Lan.zh-CN.resx new file mode 100644 index 00000000..7a0ef950 --- /dev/null +++ b/SGGL/FineUIPro.Web/App_GlobalResources/Lan.zh-CN.resx @@ -0,0 +1,666 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 中文 + + + 英文 + + + 全屏 + + + 总承包商施工计划 + + + 首页 + + + 安全管理 + + + 最大化 + + + 消息 + + + 您没有此模块操作权限，请联系管理员授权！ + + + 现场考勤 + + + 在新标签页中打开 + + + 质量管理 + + + 退出 + + + 刷新本页 + + + 进度管理 + + + 选择语言 + + + 设置 + + + 注销 + + + 分包管理 + + + 系统菜单 + + + 智慧施工管理信息系统 + + + 用户 + + + 视频监控 + + + 焊接管理 + + + 大数据中心 + + + 员工管理 + + + 总部检查 + + + 综合管理 + + + 通知管理 + + + 项目清单 + + + 刷新 + + + 切换首页 + + + 您没有权限进入项目管理模块！ + + + 证书预警 + + + 土建基础交安 + + + 已完成 + + + 施工单位 + + + 合同到期时间 + + + 当前现场人数 + + + 隐患总数 + + + 首台设备到货 + + + 焊接一次合格率 + + + 一般风险 + + + 较大风险 + + + 湿度 + + + 级 + + + 低风险 + + + 重大风险 + + + 管理人员总数 + + + 机械竣工 + + + 机械预警 + + + 更多 + + + 噪音 + + + 合格率 + + + 桩基施工 + + + 管道安装开始 + + + 变电所受电 + + + 问题总数 + + + 项目进度计划 + + + 质量统计 + + + 质量预警 + + + 资质预警 + + + 实时视频 + + + 整改率 + + + 距竣工剩余 + + + 风险管控 + + + 安全人工时 + + + 安全统计 + + + 劳务数据 + + + 开工时间 + + + 监理单位 + + + 温度 + + + 竣工时间 + + + 待办事项 + + + 合同总工期 + + + 未完成 + + + 风速 + + + 作业人员总数 + + + 中国 + + + 参建人数 + + + 现场动态 + + + 在施危大工程数 + + + 现场视频 + + + 现场相册 + + + 项目地址 + + + 项目名称 + + + 项目统计 + + + 在建项目 + + + 质量问题统计 + + + 安全问题统计 + + + 累计安全人工时 + + + 竣工 + + + 材料管理 + + + 停工 + + + 试车管理 + + + 在建 + + + 高处 + + + 审批完成 + + + 呼叫 + + + 施工方案审批量 + + + 协调与沟通 + + + 危大工程 + + + 帮助 + + + 关键事项与协调沟通 + + + 吊装 + + + 动火 + + + 完工个数 + + + 施工个数 + + + 培训人次数 + + + 意见收集 + + + 其他 + + + 质量概况 + + + 质量培训累计人员 + + + 风险预警 + + + 超危大工程 + + + 移交管理 + + + 作业许可 + + + 项目级首页（新） + + + 风险预警 + + + 质量安全预警 + + + 机械预警 + + + 危险项目 + + + 审批完成 + + + 培训人数 + + + 施工人数 + + + 完工人数 + + + 超危险项目 + + + 质量概况 + + + 质量培训 + + + 施工方案审查批次 + + + 工作许可 + + + 一级高温 + + + 高空 + + + 其他 + + + 累计安全人工时 + + + 本月安全人工时 + + + 安全培训累计人员 + + + 安全管理人员 + + + 未遂事件 + + + 总数 + + + 已完成 + + + 未完成 + + + 整改率 + + + 合同工期 + + + 合同到期时间 + + + 合同剩余 + + + 关键事项准点率 + + + 进度统计 + + + 工作台面 + + + 关键事项 + + + 待办事项 + + + 个人流程 + + + 已办任务 + + + 人员信息 + + + 当前现场人数 + + + 作业人员总数 + + + 管理人员总数 + + + 材料统计 + + + 管道材料 + + + 设备材料 + + + 材料类别 + + + 设计量 + + + 采购量 + + + 到货量 + + + 领料量 + + + 百分比 + + + 工作台面 + + + 人员信息 + + + 材料统计 + + + 全屏 + + + 打开代办 + + + 实际值 + + + 累计实际值 + + + 累计计划值 + + + 已到货 + + + 已领料 + + + 一次共检合格率 + + + 焊接一次合格率 + + + 计划值 + + + 质量问题整改率 + + + 整改数据 + + + 总计 + + \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/App_GlobalResources/Lan.zh-CN1.designer.cs b/SGGL/FineUIPro.Web/App_GlobalResources/Lan.zh-CN1.designer.cs new file mode 100644 index 00000000..e69de29b diff --git a/SGGL/FineUIPro.Web/App_GlobalResources/Lan1.designer.cs b/SGGL/FineUIPro.Web/App_GlobalResources/Lan1.designer.cs new file mode 100644 index 00000000..591860a1 --- /dev/null +++ b/SGGL/FineUIPro.Web/App_GlobalResources/Lan1.designer.cs @@ -0,0 +1,1701 @@ +//------------------------------------------------------------------------------ +// +// 此代码由工具生成。 +// 运行时版本:4.0.30319.42000 +// +// 对此文件的更改可能会导致不正确的行为，并且如果 +// 重新生成代码，这些更改将会丢失。 +// +//------------------------------------------------------------------------------ + +namespace Resources { + using System; + + + /// + /// 强类型资源类，用于查找本地化字符串等。 + /// + // 此类是由 StronglyTypedResourceBuilder + // 类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。 + // 若要添加或删除成员，请编辑 .ResX 文件，然后重新运行 ResGen + // (以 /str 作为命令选项)，或重新生成 Visual Studio 项目。 + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Web.Application.StronglyTypedResourceProxyBuilder", "15.0.0.0")] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + internal class Lan { + + private static global::System.Resources.ResourceManager resourceMan; + + private static global::System.Globalization.CultureInfo resourceCulture; + + [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] + internal Lan() { + } + + /// + /// 返回此类使用的缓存 ResourceManager 实例。 + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Resources.ResourceManager ResourceManager { + get { + if (object.ReferenceEquals(resourceMan, null)) { + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Resources.Lan", global::System.Reflection.Assembly.Load("App_GlobalResources")); + resourceMan = temp; + } + return resourceMan; + } + } + + /// + /// 覆盖当前线程的 CurrentUICulture 属性 + /// 使用此强类型的资源类的资源查找。 + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Globalization.CultureInfo Culture { + get { + return resourceCulture; + } + set { + resourceCulture = value; + } + } + + /// + /// 查找类似 实际值 的本地化字符串。 + /// + internal static string ActualValue { + get { + return ResourceManager.GetString("ActualValue", resourceCulture); + } + } + + /// + /// 查找类似 高处 的本地化字符串。 + /// + internal static string altitude { + get { + return ResourceManager.GetString("altitude", resourceCulture); + } + } + + /// + /// 查找类似 审批完成 的本地化字符串。 + /// + internal static string ApprovalCompleted { + get { + return ResourceManager.GetString("ApprovalCompleted", resourceCulture); + } + } + + /// + /// 查找类似 竣工 的本地化字符串。 + /// + internal static string BeCompleted { + get { + return ResourceManager.GetString("BeCompleted", resourceCulture); + } + } + + /// + /// 查找类似 大数据中心 的本地化字符串。 + /// + internal static string BigDataCenter { + get { + return ResourceManager.GetString("BigDataCenter", resourceCulture); + } + } + + /// + /// 查找类似 呼叫 的本地化字符串。 + /// + internal static string call { + get { + return ResourceManager.GetString("call", resourceCulture); + } + } + + /// + /// 查找类似 证书预警 的本地化字符串。 + /// + internal static string CertificateWarning { + get { + return ResourceManager.GetString("CertificateWarning", resourceCulture); + } + } + + /// + /// 查找类似 中国 的本地化字符串。 + /// + internal static string China { + get { + return ResourceManager.GetString("China", resourceCulture); + } + } + + /// + /// 查找类似 中文 的本地化字符串。 + /// + internal static string Chinese { + get { + return ResourceManager.GetString("Chinese", resourceCulture); + } + } + + /// + /// 查找类似 土建基础交安 的本地化字符串。 + /// + internal static string CivilInfrastructure { + get { + return ResourceManager.GetString("CivilInfrastructure", resourceCulture); + } + } + + /// + /// 查找类似 已完成 的本地化字符串。 + /// + internal static string completed { + get { + return ResourceManager.GetString("completed", resourceCulture); + } + } + + /// + /// 查找类似 参建人数 的本地化字符串。 + /// + internal static string ConPersonCount { + get { + return ResourceManager.GetString("ConPersonCount", resourceCulture); + } + } + + /// + /// 查找类似 施工方案审批量 的本地化字符串。 + /// + internal static string ConPlanReviewBatch { + get { + return ResourceManager.GetString("ConPlanReviewBatch", resourceCulture); + } + } + + /// + /// 查找类似 施工单位 的本地化字符串。 + /// + internal static string ConstructionUnit { + get { + return ResourceManager.GetString("ConstructionUnit", resourceCulture); + } + } + + /// + /// 查找类似 合同到期时间 的本地化字符串。 + /// + internal static string ContractExpirationTime { + get { + return ResourceManager.GetString("ContractExpirationTime", resourceCulture); + } + } + + /// + /// 查找类似 协调与沟通 的本地化字符串。 + /// + internal static string CoordinationCommunication { + get { + return ResourceManager.GetString("CoordinationCommunication", resourceCulture); + } + } + + /// + /// 查找类似 累计实际值 的本地化字符串。 + /// + internal static string Cumulative_actual_value { + get { + return ResourceManager.GetString("Cumulative_actual_value", resourceCulture); + } + } + + /// + /// 查找类似 累计计划值 的本地化字符串。 + /// + internal static string Cumulative_planned_value { + get { + return ResourceManager.GetString("Cumulative_planned_value", resourceCulture); + } + } + + /// + /// 查找类似 当前现场人数 的本地化字符串。 + /// + internal static string CurrentPersonnel { + get { + return ResourceManager.GetString("CurrentPersonnel", resourceCulture); + } + } + + /// + /// 查找类似 危大工程 的本地化字符串。 + /// + internal static string DangerousProject { + get { + return ResourceManager.GetString("DangerousProject", resourceCulture); + } + } + + /// + /// 查找类似 隐患总数 的本地化字符串。 + /// + internal static string DangersCount { + get { + return ResourceManager.GetString("DangersCount", resourceCulture); + } + } + + /// + /// 查找类似 员工管理 的本地化字符串。 + /// + internal static string EmployeeManage { + get { + return ResourceManager.GetString("EmployeeManage", resourceCulture); + } + } + + /// + /// 查找类似 英文 的本地化字符串。 + /// + internal static string English { + get { + return ResourceManager.GetString("English", resourceCulture); + } + } + + /// + /// 查找类似 现场动态 的本地化字符串。 + /// + internal static string FieldDynamics { + get { + return ResourceManager.GetString("FieldDynamics", resourceCulture); + } + } + + /// + /// 查找类似 首台设备到货 的本地化字符串。 + /// + internal static string FirstEquipmentArrived { + get { + return ResourceManager.GetString("FirstEquipmentArrived", resourceCulture); + } + } + + /// + /// 查找类似 焊接一次合格率 的本地化字符串。 + /// + internal static string FistPassRateWelding { + get { + return ResourceManager.GetString("FistPassRateWelding", resourceCulture); + } + } + + /// + /// 查找类似 全屏 的本地化字符串。 + /// + internal static string FullScreen { + get { + return ResourceManager.GetString("FullScreen", resourceCulture); + } + } + + /// + /// 查找类似 总承包商施工计划 的本地化字符串。 + /// + internal static string GeneralConPlan { + get { + return ResourceManager.GetString("GeneralConPlan", resourceCulture); + } + } + + /// + /// 查找类似 一般风险 的本地化字符串。 + /// + internal static string GeneralRisk { + get { + return ResourceManager.GetString("GeneralRisk", resourceCulture); + } + } + + /// + /// 查找类似 较大风险 的本地化字符串。 + /// + internal static string GreaterRisk { + get { + return ResourceManager.GetString("GreaterRisk", resourceCulture); + } + } + + /// + /// 查找类似 已到货 的本地化字符串。 + /// + internal static string HaveArrived { + get { + return ResourceManager.GetString("HaveArrived", resourceCulture); + } + } + + /// + /// 查找类似 总部检查 的本地化字符串。 + /// + internal static string HeadquartersInspection { + get { + return ResourceManager.GetString("HeadquartersInspection", resourceCulture); + } + } + + /// + /// 查找类似 帮助 的本地化字符串。 + /// + internal static string help { + get { + return ResourceManager.GetString("help", resourceCulture); + } + } + + /// + /// 查找类似 首页 的本地化字符串。 + /// + internal static string HomePage { + get { + return ResourceManager.GetString("HomePage", resourceCulture); + } + } + + /// + /// 查找类似 安全管理 的本地化字符串。 + /// + internal static string HSEManage { + get { + return ResourceManager.GetString("HSEManage", resourceCulture); + } + } + + /// + /// 查找类似 湿度 的本地化字符串。 + /// + internal static string humidness { + get { + return ResourceManager.GetString("humidness", resourceCulture); + } + } + + /// + /// 查找类似 综合管理 的本地化字符串。 + /// + internal static string IntegratedManage { + get { + return ResourceManager.GetString("IntegratedManage", resourceCulture); + } + } + + /// + /// 查找类似 关键事项与协调沟通 的本地化字符串。 + /// + internal static string keyc { + get { + return ResourceManager.GetString("keyc", resourceCulture); + } + } + + /// + /// 查找类似 在施危大工程数 的本地化字符串。 + /// + internal static string LargeRisk { + get { + return ResourceManager.GetString("LargeRisk", resourceCulture); + } + } + + /// + /// 查找类似 级 的本地化字符串。 + /// + internal static string Level { + get { + return ResourceManager.GetString("Level", resourceCulture); + } + } + + /// + /// 查找类似 吊装 的本地化字符串。 + /// + internal static string lifting { + get { + return ResourceManager.GetString("lifting", resourceCulture); + } + } + + /// + /// 查找类似 现场视频 的本地化字符串。 + /// + internal static string LiveVideo { + get { + return ResourceManager.GetString("LiveVideo", resourceCulture); + } + } + + /// + /// 查找类似 现场相册 的本地化字符串。 + /// + internal static string Live_photo_album { + get { + return ResourceManager.GetString("Live_photo_album", resourceCulture); + } + } + + /// + /// 查找类似 动火 的本地化字符串。 + /// + internal static string LoseOneSTemper { + get { + return ResourceManager.GetString("LoseOneSTemper", resourceCulture); + } + } + + /// + /// 查找类似 低风险 的本地化字符串。 + /// + internal static string LowRisk { + get { + return ResourceManager.GetString("LowRisk", resourceCulture); + } + } + + /// + /// 查找类似 高空 的本地化字符串。 + /// + internal static string mainProject2_altitude { + get { + return ResourceManager.GetString("mainProject2_altitude", resourceCulture); + } + } + + /// + /// 查找类似 审批完成 的本地化字符串。 + /// + internal static string mainProject2_ApprovalCompleted { + get { + return ResourceManager.GetString("mainProject2_ApprovalCompleted", resourceCulture); + } + } + + /// + /// 查找类似 到货量 的本地化字符串。 + /// + internal static string mainProject2_ArrivalQuantity { + get { + return ResourceManager.GetString("mainProject2_ArrivalQuantity", resourceCulture); + } + } + + /// + /// 查找类似 已完成 的本地化字符串。 + /// + internal static string mainProject2_CompletedRectification { + get { + return ResourceManager.GetString("mainProject2_CompletedRectification", resourceCulture); + } + } + + /// + /// 查找类似 已办任务 的本地化字符串。 + /// + internal static string mainProject2_CompletedTasks { + get { + return ResourceManager.GetString("mainProject2_CompletedTasks", resourceCulture); + } + } + + /// + /// 查找类似 施工方案审查批次 的本地化字符串。 + /// + internal static string mainProject2_ConPlanReviewBatch { + get { + return ResourceManager.GetString("mainProject2_ConPlanReviewBatch", resourceCulture); + } + } + + /// + /// 查找类似 合同工期 的本地化字符串。 + /// + internal static string mainProject2_ContractDuration { + get { + return ResourceManager.GetString("mainProject2_ContractDuration", resourceCulture); + } + } + + /// + /// 查找类似 合同到期时间 的本地化字符串。 + /// + internal static string mainProject2_ContractExpiryDate { + get { + return ResourceManager.GetString("mainProject2_ContractExpiryDate", resourceCulture); + } + } + + /// + /// 查找类似 合同剩余 的本地化字符串。 + /// + internal static string mainProject2_ContractRemaining { + get { + return ResourceManager.GetString("mainProject2_ContractRemaining", resourceCulture); + } + } + + /// + /// 查找类似 累计安全人工时 的本地化字符串。 + /// + internal static string mainProject2_CumulativeSafeWorkHours { + get { + return ResourceManager.GetString("mainProject2_CumulativeSafeWorkHours", resourceCulture); + } + } + + /// + /// 查找类似 当前现场人数 的本地化字符串。 + /// + internal static string mainProject2_CurrentOnsitePersonnel { + get { + return ResourceManager.GetString("mainProject2_CurrentOnsitePersonnel", resourceCulture); + } + } + + /// + /// 查找类似 危险项目 的本地化字符串。 + /// + internal static string mainProject2_DangerousProject { + get { + return ResourceManager.GetString("mainProject2_DangerousProject", resourceCulture); + } + } + + /// + /// 查找类似 设计量 的本地化字符串。 + /// + internal static string mainProject2_DesignQuantity { + get { + return ResourceManager.GetString("mainProject2_DesignQuantity", resourceCulture); + } + } + + /// + /// 查找类似 设备材料 的本地化字符串。 + /// + internal static string mainProject2_EquipmentMaterials { + get { + return ResourceManager.GetString("mainProject2_EquipmentMaterials", resourceCulture); + } + } + + /// + /// 查找类似 全屏 的本地化字符串。 + /// + internal static string mainProject2_FullScreen { + get { + return ResourceManager.GetString("mainProject2_FullScreen", resourceCulture); + } + } + + /// + /// 查找类似 领料量 的本地化字符串。 + /// + internal static string mainProject2_IssueQuantity { + get { + return ResourceManager.GetString("mainProject2_IssueQuantity", resourceCulture); + } + } + + /// + /// 查找类似 关键事项 的本地化字符串。 + /// + internal static string mainProject2_KeyMatters { + get { + return ResourceManager.GetString("mainProject2_KeyMatters", resourceCulture); + } + } + + /// + /// 查找类似 关键事项准点率 的本地化字符串。 + /// + internal static string mainProject2_KeyMattersTimelinessRate { + get { + return ResourceManager.GetString("mainProject2_KeyMattersTimelinessRate", resourceCulture); + } + } + + /// + /// 查找类似 一级高温 的本地化字符串。 + /// + internal static string mainProject2_LoseOneSTemper { + get { + return ResourceManager.GetString("mainProject2_LoseOneSTemper", resourceCulture); + } + } + + /// + /// 查找类似 材料类别 的本地化字符串。 + /// + internal static string mainProject2_MaterialCategory { + get { + return ResourceManager.GetString("mainProject2_MaterialCategory", resourceCulture); + } + } + + /// + /// 查找类似 材料统计 的本地化字符串。 + /// + internal static string mainProject2_MaterialLabel { + get { + return ResourceManager.GetString("mainProject2_MaterialLabel", resourceCulture); + } + } + + /// + /// 查找类似 材料统计 的本地化字符串。 + /// + internal static string mainProject2_MaterialStatistics { + get { + return ResourceManager.GetString("mainProject2_MaterialStatistics", resourceCulture); + } + } + + /// + /// 查找类似 机械预警 的本地化字符串。 + /// + internal static string mainProject2_MechanicalWarning { + get { + return ResourceManager.GetString("mainProject2_MechanicalWarning", resourceCulture); + } + } + + /// + /// 查找类似 未遂事件 的本地化字符串。 + /// + internal static string mainProject2_NearMissIncidents { + get { + return ResourceManager.GetString("mainProject2_NearMissIncidents", resourceCulture); + } + } + + /// + /// 查找类似 完工人数 的本地化字符串。 + /// + internal static string mainProject2_NumberOfCompletions { + get { + return ResourceManager.GetString("mainProject2_NumberOfCompletions", resourceCulture); + } + } + + /// + /// 查找类似 施工人数 的本地化字符串。 + /// + internal static string mainProject2_NumberOfConstructions { + get { + return ResourceManager.GetString("mainProject2_NumberOfConstructions", resourceCulture); + } + } + + /// + /// 查找类似 培训人数 的本地化字符串。 + /// + internal static string mainProject2_NumberOfTrainees { + get { + return ResourceManager.GetString("mainProject2_NumberOfTrainees", resourceCulture); + } + } + + /// + /// 查找类似 打开代办 的本地化字符串。 + /// + internal static string mainProject2_OpenPendingTasks { + get { + return ResourceManager.GetString("mainProject2_OpenPendingTasks", resourceCulture); + } + } + + /// + /// 查找类似 其他 的本地化字符串。 + /// + internal static string mainProject2_other { + get { + return ResourceManager.GetString("mainProject2_other", resourceCulture); + } + } + + /// + /// 查找类似 待办事项 的本地化字符串。 + /// + internal static string mainProject2_PendingMatters { + get { + return ResourceManager.GetString("mainProject2_PendingMatters", resourceCulture); + } + } + + /// + /// 查找类似 百分比 的本地化字符串。 + /// + internal static string mainProject2_Percentage { + get { + return ResourceManager.GetString("mainProject2_Percentage", resourceCulture); + } + } + + /// + /// 查找类似 个人流程 的本地化字符串。 + /// + internal static string mainProject2_PersonalProcess { + get { + return ResourceManager.GetString("mainProject2_PersonalProcess", resourceCulture); + } + } + + /// + /// 查找类似 人员信息 的本地化字符串。 + /// + internal static string mainProject2_PersonnelInformation { + get { + return ResourceManager.GetString("mainProject2_PersonnelInformation", resourceCulture); + } + } + + /// + /// 查找类似 人员信息 的本地化字符串。 + /// + internal static string mainProject2_PersonnelLabel { + get { + return ResourceManager.GetString("mainProject2_PersonnelLabel", resourceCulture); + } + } + + /// + /// 查找类似 管道材料 的本地化字符串。 + /// + internal static string mainProject2_PipeMaterials { + get { + return ResourceManager.GetString("mainProject2_PipeMaterials", resourceCulture); + } + } + + /// + /// 查找类似 进度统计 的本地化字符串。 + /// + internal static string mainProject2_ProgressStatistics { + get { + return ResourceManager.GetString("mainProject2_ProgressStatistics", resourceCulture); + } + } + + /// + /// 查找类似 采购量 的本地化字符串。 + /// + internal static string mainProject2_PurchaseQuantity { + get { + return ResourceManager.GetString("mainProject2_PurchaseQuantity", resourceCulture); + } + } + + /// + /// 查找类似 质量概况 的本地化字符串。 + /// + internal static string mainProject2_QualityProfile { + get { + return ResourceManager.GetString("mainProject2_QualityProfile", resourceCulture); + } + } + + /// + /// 查找类似 质量培训 的本地化字符串。 + /// + internal static string mainProject2_QualityTraining { + get { + return ResourceManager.GetString("mainProject2_QualityTraining", resourceCulture); + } + } + + /// + /// 查找类似 质量安全预警 的本地化字符串。 + /// + internal static string mainProject2_Quawarning { + get { + return ResourceManager.GetString("mainProject2_Quawarning", resourceCulture); + } + } + + /// + /// 查找类似 整改率 的本地化字符串。 + /// + internal static string mainProject2_RectificationRate { + get { + return ResourceManager.GetString("mainProject2_RectificationRate", resourceCulture); + } + } + + /// + /// 查找类似 风险预警 的本地化字符串。 + /// + internal static string mainProject2_RiskEarlyWarning { + get { + return ResourceManager.GetString("mainProject2_RiskEarlyWarning", resourceCulture); + } + } + + /// + /// 查找类似 安全管理人员 的本地化字符串。 + /// + internal static string mainProject2_SafeManagementPersonnel { + get { + return ResourceManager.GetString("mainProject2_SafeManagementPersonnel", resourceCulture); + } + } + + /// + /// 查找类似 本月安全人工时 的本地化字符串。 + /// + internal static string mainProject2_SafeWorkHoursThisMonth { + get { + return ResourceManager.GetString("mainProject2_SafeWorkHoursThisMonth", resourceCulture); + } + } + + /// + /// 查找类似 超危险项目 的本地化字符串。 + /// + internal static string mainProject2_SuperDangerousProject { + get { + return ResourceManager.GetString("mainProject2_SuperDangerousProject", resourceCulture); + } + } + + /// + /// 查找类似 项目级首页（新） 的本地化字符串。 + /// + internal static string mainProject2_title { + get { + return ResourceManager.GetString("mainProject2_title", resourceCulture); + } + } + + /// + /// 查找类似 管理人员总数 的本地化字符串。 + /// + internal static string mainProject2_TotalManagers { + get { + return ResourceManager.GetString("mainProject2_TotalManagers", resourceCulture); + } + } + + /// + /// 查找类似 总数 的本地化字符串。 + /// + internal static string mainProject2_TotalRectificationData { + get { + return ResourceManager.GetString("mainProject2_TotalRectificationData", resourceCulture); + } + } + + /// + /// 查找类似 安全培训累计人员 的本地化字符串。 + /// + internal static string mainProject2_TotalSafeTrainingPersonnel { + get { + return ResourceManager.GetString("mainProject2_TotalSafeTrainingPersonnel", resourceCulture); + } + } + + /// + /// 查找类似 作业人员总数 的本地化字符串。 + /// + internal static string mainProject2_TotalWorkers { + get { + return ResourceManager.GetString("mainProject2_TotalWorkers", resourceCulture); + } + } + + /// + /// 查找类似 未完成 的本地化字符串。 + /// + internal static string mainProject2_UncompletedRectification { + get { + return ResourceManager.GetString("mainProject2_UncompletedRectification", resourceCulture); + } + } + + /// + /// 查找类似 工作台面 的本地化字符串。 + /// + internal static string mainProject2_Workbench { + get { + return ResourceManager.GetString("mainProject2_Workbench", resourceCulture); + } + } + + /// + /// 查找类似 工作台面 的本地化字符串。 + /// + internal static string mainProject2_WorkbenchLabel { + get { + return ResourceManager.GetString("mainProject2_WorkbenchLabel", resourceCulture); + } + } + + /// + /// 查找类似 工作许可 的本地化字符串。 + /// + internal static string mainProject2_WorkPermit { + get { + return ResourceManager.GetString("mainProject2_WorkPermit", resourceCulture); + } + } + + /// + /// 查找类似 重大风险 的本地化字符串。 + /// + internal static string MajorRisk { + get { + return ResourceManager.GetString("MajorRisk", resourceCulture); + } + } + + /// + /// 查找类似 管理人员总数 的本地化字符串。 + /// + internal static string managersCount { + get { + return ResourceManager.GetString("managersCount", resourceCulture); + } + } + + /// + /// 查找类似 材料管理 的本地化字符串。 + /// + internal static string MaterialManagement { + get { + return ResourceManager.GetString("MaterialManagement", resourceCulture); + } + } + + /// + /// 查找类似 已领料 的本地化字符串。 + /// + internal static string MaterialReceived { + get { + return ResourceManager.GetString("MaterialReceived", resourceCulture); + } + } + + /// + /// 查找类似 最大化 的本地化字符串。 + /// + internal static string maximize { + get { + return ResourceManager.GetString("maximize", resourceCulture); + } + } + + /// + /// 查找类似 机械竣工 的本地化字符串。 + /// + internal static string MechanicalCompletion { + get { + return ResourceManager.GetString("MechanicalCompletion", resourceCulture); + } + } + + /// + /// 查找类似 机械预警 的本地化字符串。 + /// + internal static string MechanicalWarning { + get { + return ResourceManager.GetString("MechanicalWarning", resourceCulture); + } + } + + /// + /// 查找类似 消息 的本地化字符串。 + /// + internal static string message { + get { + return ResourceManager.GetString("message", resourceCulture); + } + } + + /// + /// 查找类似 更多 的本地化字符串。 + /// + internal static string more { + get { + return ResourceManager.GetString("more", resourceCulture); + } + } + + /// + /// 查找类似 您没有此模块操作权限，请联系管理员授权！ 的本地化字符串。 + /// + internal static string NoAuthorize { + get { + return ResourceManager.GetString("NoAuthorize", resourceCulture); + } + } + + /// + /// 查找类似 噪音 的本地化字符串。 + /// + internal static string noise { + get { + return ResourceManager.GetString("noise", resourceCulture); + } + } + + /// + /// 查找类似 您没有权限进入项目管理模块！ 的本地化字符串。 + /// + internal static string NoPermission { + get { + return ResourceManager.GetString("NoPermission", resourceCulture); + } + } + + /// + /// 查找类似 通知管理 的本地化字符串。 + /// + internal static string NoticeManage { + get { + return ResourceManager.GetString("NoticeManage", resourceCulture); + } + } + + /// + /// 查找类似 完工个数 的本地化字符串。 + /// + internal static string NumberOfCompletions { + get { + return ResourceManager.GetString("NumberOfCompletions", resourceCulture); + } + } + + /// + /// 查找类似 施工个数 的本地化字符串。 + /// + internal static string NumberOfConstructions { + get { + return ResourceManager.GetString("NumberOfConstructions", resourceCulture); + } + } + + /// + /// 查找类似 培训人次数 的本地化字符串。 + /// + internal static string NumberOfTrainees { + get { + return ResourceManager.GetString("NumberOfTrainees", resourceCulture); + } + } + + /// + /// 查找类似 一次共检合格率 的本地化字符串。 + /// + internal static string OnePassRate { + get { + return ResourceManager.GetString("OnePassRate", resourceCulture); + } + } + + /// + /// 查找类似 焊接一次合格率 的本地化字符串。 + /// + internal static string OnePassRateOfWelding { + get { + return ResourceManager.GetString("OnePassRateOfWelding", resourceCulture); + } + } + + /// + /// 查找类似 现场考勤 的本地化字符串。 + /// + internal static string OnSiteAttendance { + get { + return ResourceManager.GetString("OnSiteAttendance", resourceCulture); + } + } + + /// + /// 查找类似 在新标签页中打开 的本地化字符串。 + /// + internal static string OpensNewTab { + get { + return ResourceManager.GetString("OpensNewTab", resourceCulture); + } + } + + /// + /// 查找类似 意见收集 的本地化字符串。 + /// + internal static string OpinionGathering { + get { + return ResourceManager.GetString("OpinionGathering", resourceCulture); + } + } + + /// + /// 查找类似 其他 的本地化字符串。 + /// + internal static string other { + get { + return ResourceManager.GetString("other", resourceCulture); + } + } + + /// + /// 查找类似 合格率 的本地化字符串。 + /// + internal static string PassRate { + get { + return ResourceManager.GetString("PassRate", resourceCulture); + } + } + + /// + /// 查找类似 桩基施工 的本地化字符串。 + /// + internal static string Pilefoundationconstruction { + get { + return ResourceManager.GetString("Pilefoundationconstruction", resourceCulture); + } + } + + /// + /// 查找类似 管道安装开始 的本地化字符串。 + /// + internal static string PipeInstallationStarts { + get { + return ResourceManager.GetString("PipeInstallationStarts", resourceCulture); + } + } + + /// + /// 查找类似 计划值 的本地化字符串。 + /// + internal static string PlannedValue { + get { + return ResourceManager.GetString("PlannedValue", resourceCulture); + } + } + + /// + /// 查找类似 变电所受电 的本地化字符串。 + /// + internal static string PowerReceived { + get { + return ResourceManager.GetString("PowerReceived", resourceCulture); + } + } + + /// + /// 查找类似 问题总数 的本地化字符串。 + /// + internal static string ProblemTotal { + get { + return ResourceManager.GetString("ProblemTotal", resourceCulture); + } + } + + /// + /// 查找类似 项目地址 的本地化字符串。 + /// + internal static string ProjectAddress { + get { + return ResourceManager.GetString("ProjectAddress", resourceCulture); + } + } + + /// + /// 查找类似 项目清单 的本地化字符串。 + /// + internal static string ProjectList { + get { + return ResourceManager.GetString("ProjectList", resourceCulture); + } + } + + /// + /// 查找类似 项目名称 的本地化字符串。 + /// + internal static string ProjectName { + get { + return ResourceManager.GetString("ProjectName", resourceCulture); + } + } + + /// + /// 查找类似 项目进度计划 的本地化字符串。 + /// + internal static string ProjectSchedule { + get { + return ResourceManager.GetString("ProjectSchedule", resourceCulture); + } + } + + /// + /// 查找类似 项目统计 的本地化字符串。 + /// + internal static string ProjectStatistics { + get { + return ResourceManager.GetString("ProjectStatistics", resourceCulture); + } + } + + /// + /// 查找类似 在建项目 的本地化字符串。 + /// + internal static string ProjectUnderConstruction { + get { + return ResourceManager.GetString("ProjectUnderConstruction", resourceCulture); + } + } + + /// + /// 查找类似 质量管理 的本地化字符串。 + /// + internal static string QualityManage { + get { + return ResourceManager.GetString("QualityManage", resourceCulture); + } + } + + /// + /// 查找类似 质量概况 的本地化字符串。 + /// + internal static string QualityProfile { + get { + return ResourceManager.GetString("QualityProfile", resourceCulture); + } + } + + /// + /// 查找类似 质量问题整改率 的本地化字符串。 + /// + internal static string QualityRate { + get { + return ResourceManager.GetString("QualityRate", resourceCulture); + } + } + + /// + /// 查找类似 质量统计 的本地化字符串。 + /// + internal static string QualityStatistics { + get { + return ResourceManager.GetString("QualityStatistics", resourceCulture); + } + } + + /// + /// 查找类似 质量培训累计人员 的本地化字符串。 + /// + internal static string QualityTraining { + get { + return ResourceManager.GetString("QualityTraining", resourceCulture); + } + } + + /// + /// 查找类似 质量预警 的本地化字符串。 + /// + internal static string QualityWarning { + get { + return ResourceManager.GetString("QualityWarning", resourceCulture); + } + } + + /// + /// 查找类似 质量问题统计 的本地化字符串。 + /// + internal static string Quality_problem_statistics { + get { + return ResourceManager.GetString("Quality_problem_statistics", resourceCulture); + } + } + + /// + /// 查找类似 资质预警 的本地化字符串。 + /// + internal static string Quawarning { + get { + return ResourceManager.GetString("Quawarning", resourceCulture); + } + } + + /// + /// 查找类似 退出 的本地化字符串。 + /// + internal static string quit { + get { + return ResourceManager.GetString("quit", resourceCulture); + } + } + + /// + /// 查找类似 实时视频 的本地化字符串。 + /// + internal static string RealTimeVideo { + get { + return ResourceManager.GetString("RealTimeVideo", resourceCulture); + } + } + + /// + /// 查找类似 整改数据 的本地化字符串。 + /// + internal static string RectificationData { + get { + return ResourceManager.GetString("RectificationData", resourceCulture); + } + } + + /// + /// 查找类似 整改率 的本地化字符串。 + /// + internal static string RectificationRate { + get { + return ResourceManager.GetString("RectificationRate", resourceCulture); + } + } + + /// + /// 查找类似 刷新 的本地化字符串。 + /// + internal static string Refresh { + get { + return ResourceManager.GetString("Refresh", resourceCulture); + } + } + + /// + /// 查找类似 刷新本页 的本地化字符串。 + /// + internal static string RefreshPage { + get { + return ResourceManager.GetString("RefreshPage", resourceCulture); + } + } + + /// + /// 查找类似 距竣工剩余 的本地化字符串。 + /// + internal static string RemainingTimeCompletion { + get { + return ResourceManager.GetString("RemainingTimeCompletion", resourceCulture); + } + } + + /// + /// 查找类似 风险管控 的本地化字符串。 + /// + internal static string RiskControl { + get { + return ResourceManager.GetString("RiskControl", resourceCulture); + } + } + + /// + /// 查找类似 风险预警 的本地化字符串。 + /// + internal static string RiskEarlyWarning { + get { + return ResourceManager.GetString("RiskEarlyWarning", resourceCulture); + } + } + + /// + /// 查找类似 安全人工时 的本地化字符串。 + /// + internal static string SafeLaborHours { + get { + return ResourceManager.GetString("SafeLaborHours", resourceCulture); + } + } + + /// + /// 查找类似 安全问题统计 的本地化字符串。 + /// + internal static string SafeProStat { + get { + return ResourceManager.GetString("SafeProStat", resourceCulture); + } + } + + /// + /// 查找类似 累计安全人工时 的本地化字符串。 + /// + internal static string SafetyLaborHours { + get { + return ResourceManager.GetString("SafetyLaborHours", resourceCulture); + } + } + + /// + /// 查找类似 安全统计 的本地化字符串。 + /// + internal static string SafetyStatistics { + get { + return ResourceManager.GetString("SafetyStatistics", resourceCulture); + } + } + + /// + /// 查找类似 进度管理 的本地化字符串。 + /// + internal static string ScheduleManage { + get { + return ResourceManager.GetString("ScheduleManage", resourceCulture); + } + } + + /// + /// 查找类似 选择语言 的本地化字符串。 + /// + internal static string SelectLanguage { + get { + return ResourceManager.GetString("SelectLanguage", resourceCulture); + } + } + + /// + /// 查找类似 劳务数据 的本地化字符串。 + /// + internal static string ServiceData { + get { + return ResourceManager.GetString("ServiceData", resourceCulture); + } + } + + /// + /// 查找类似 设置 的本地化字符串。 + /// + internal static string Settings { + get { + return ResourceManager.GetString("Settings", resourceCulture); + } + } + + /// + /// 查找类似 停工 的本地化字符串。 + /// + internal static string ShutDown { + get { + return ResourceManager.GetString("ShutDown", resourceCulture); + } + } + + /// + /// 查找类似 注销 的本地化字符串。 + /// + internal static string SignOUT { + get { + return ResourceManager.GetString("SignOUT", resourceCulture); + } + } + + /// + /// 查找类似 开工时间 的本地化字符串。 + /// + internal static string Start_time { + get { + return ResourceManager.GetString("Start_time", resourceCulture); + } + } + + /// + /// 查找类似 分包管理 的本地化字符串。 + /// + internal static string SubManagement { + get { + return ResourceManager.GetString("SubManagement", resourceCulture); + } + } + + /// + /// 查找类似 超危大工程 的本地化字符串。 + /// + internal static string SuperDangerousProject { + get { + return ResourceManager.GetString("SuperDangerousProject", resourceCulture); + } + } + + /// + /// 查找类似 监理单位 的本地化字符串。 + /// + internal static string SupervisionUnit { + get { + return ResourceManager.GetString("SupervisionUnit", resourceCulture); + } + } + + /// + /// 查找类似 切换首页 的本地化字符串。 + /// + internal static string SwitchHomePage { + get { + return ResourceManager.GetString("SwitchHomePage", resourceCulture); + } + } + + /// + /// 查找类似 系统菜单 的本地化字符串。 + /// + internal static string SystemMenu { + get { + return ResourceManager.GetString("SystemMenu", resourceCulture); + } + } + + /// + /// 查找类似 智慧施工管理信息系统 的本地化字符串。 + /// + internal static string SystemName { + get { + return ResourceManager.GetString("SystemName", resourceCulture); + } + } + + /// + /// 查找类似 温度 的本地化字符串。 + /// + internal static string temperature { + get { + return ResourceManager.GetString("temperature", resourceCulture); + } + } + + /// + /// 查找类似 试车管理 的本地化字符串。 + /// + internal static string TestManagement { + get { + return ResourceManager.GetString("TestManagement", resourceCulture); + } + } + + /// + /// 查找类似 竣工时间 的本地化字符串。 + /// + internal static string TimeCompletion { + get { + return ResourceManager.GetString("TimeCompletion", resourceCulture); + } + } + + /// + /// 查找类似 待办事项 的本地化字符串。 + /// + internal static string TodoList { + get { + return ResourceManager.GetString("TodoList", resourceCulture); + } + } + + /// + /// 查找类似 总计 的本地化字符串。 + /// + internal static string total { + get { + return ResourceManager.GetString("total", resourceCulture); + } + } + + /// + /// 查找类似 合同总工期 的本地化字符串。 + /// + internal static string TotalContractDuration { + get { + return ResourceManager.GetString("TotalContractDuration", resourceCulture); + } + } + + /// + /// 查找类似 移交管理 的本地化字符串。 + /// + internal static string TransferManagement { + get { + return ResourceManager.GetString("TransferManagement", resourceCulture); + } + } + + /// + /// 查找类似 未完成 的本地化字符串。 + /// + internal static string uncompleted { + get { + return ResourceManager.GetString("uncompleted", resourceCulture); + } + } + + /// + /// 查找类似 在建 的本地化字符串。 + /// + internal static string UnderConstruction { + get { + return ResourceManager.GetString("UnderConstruction", resourceCulture); + } + } + + /// + /// 查找类似 用户 的本地化字符串。 + /// + internal static string user { + get { + return ResourceManager.GetString("user", resourceCulture); + } + } + + /// + /// 查找类似 视频监控 的本地化字符串。 + /// + internal static string VideoSurveillance { + get { + return ResourceManager.GetString("VideoSurveillance", resourceCulture); + } + } + + /// + /// 查找类似 焊接管理 的本地化字符串。 + /// + internal static string WeldingManage { + get { + return ResourceManager.GetString("WeldingManage", resourceCulture); + } + } + + /// + /// 查找类似 风速 的本地化字符串。 + /// + internal static string WindSpeed { + get { + return ResourceManager.GetString("WindSpeed", resourceCulture); + } + } + + /// + /// 查找类似 作业许可 的本地化字符串。 + /// + internal static string WorkPermit { + get { + return ResourceManager.GetString("WorkPermit", resourceCulture); + } + } + + /// + /// 查找类似 作业人员总数 的本地化字符串。 + /// + internal static string WorkPersonnel { + get { + return ResourceManager.GetString("WorkPersonnel", resourceCulture); + } + } + } +} diff --git a/SGGL/FineUIPro.Web/AttachFile/Look.aspx.cs b/SGGL/FineUIPro.Web/AttachFile/Look.aspx.cs index 47b69cf7..675f67cd 100644 --- a/SGGL/FineUIPro.Web/AttachFile/Look.aspx.cs +++ b/SGGL/FineUIPro.Web/AttachFile/Look.aspx.cs @@ -14,11 +14,11 @@ namespace FineUIPro.Web.AttachFile var url = Request.Params["fileUrl"]; var Baseurl = "https://view.officeapps.live.com/op/embed.aspx?src="; - // var Baseurl = "https://view.xdocin.com/view?src="; + // var Baseurl = "https://view.xdocin.com/view?src="; var Fileurl = Funs.SGGLUrl + url.Replace(Funs.RootPath, ""); var newurl = ""; var FiletExtension = Path.GetExtension(url); - if (FiletExtension == ".docx" || FiletExtension == ".doc"|| FiletExtension == ".xls" || FiletExtension == ".xlsx") + if (FiletExtension == ".docx" || FiletExtension == ".doc" || FiletExtension == ".xls" || FiletExtension == ".xlsx") { newurl = Baseurl + Fileurl; } @@ -26,11 +26,11 @@ namespace FineUIPro.Web.AttachFile { newurl = Fileurl; } - else - { - newurl = Fileurl; + else + { + newurl = Fileurl; } - if (AttachFileService.IsImage(FiletExtension)) + if (AttachFileService.IsImage(FiletExtension) && 1 > 2) { this.TabStrip1.Hidden = true; this.Image1.Hidden = false; diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachine.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachine.aspx.cs index 95c1599c..4df9c83e 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachine.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachine.aspx.cs @@ -111,19 +111,19 @@ namespace FineUIPro.Web.Comprehensive { if (IsVerification == "是" && !string.IsNullOrEmpty(NextTestDate)) //在校验期内 { - if (DateTime.Compare(DateTime.Parse(NextTestDate).AddDays(-15), DateTime.Now) < 0) + //if (DateTime.Compare(DateTime.Parse(NextTestDate).AddDays(-15), DateTime.Now) < 0) + //{ + if (DateTime.Parse(NextTestDate) < DateTime.Now) { // Grid1.Rows[e.RowIndex].RowCssClass = "Red"; //过期为红色 e.RowCssClass = "Red"; - } - } - else - { - e.RowCssClass = "Yellow"; - - + else if (DateTime.Parse(NextTestDate).AddDays(-15) < DateTime.Now && DateTime.Parse(NextTestDate) >= DateTime.Now) + { + //到期前15天黄色标识提醒 + e.RowCssClass = "Yellow"; + } } } //离场为灰色 diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj index 2e334ffe..fbb14cd0 100644 --- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj +++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj @@ -6433,6 +6433,21 @@ + + True + True + Lan.en-US.resx + + + True + True + Lan.zh-CN.resx + + + True + True + Lan.resx + fileupload.ashx ASPXCodeBehind @@ -19677,6 +19692,23 @@ + + + GlobalResourceProxyGenerator + Lan.en-US1.designer.cs + Designer + + + GlobalResourceProxyGenerator + Lan1.designer.cs + Designer + + + GlobalResourceProxyGenerator + Lan.zh-CN1.designer.cs + Designer + + diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.sln b/SGGL/FineUIPro.Web/FineUIPro.Web.sln new file mode 100644 index 00000000..61644947 --- /dev/null +++ b/SGGL/FineUIPro.Web/FineUIPro.Web.sln @@ -0,0 +1,24 @@ +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 17 +VisualStudioVersion = 17.5.2.0 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FineUIPro.Web", "FineUIPro.Web.csproj", "{5BFDC841-2DBC-F866-44C3-59D17FD957BC}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {5BFDC841-2DBC-F866-44C3-59D17FD957BC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {5BFDC841-2DBC-F866-44C3-59D17FD957BC}.Debug|Any CPU.Build.0 = Debug|Any CPU + {5BFDC841-2DBC-F866-44C3-59D17FD957BC}.Release|Any CPU.ActiveCfg = Release|Any CPU + {5BFDC841-2DBC-F866-44C3-59D17FD957BC}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {A9E8FD10-65F9-4E22-92C9-035EDA2902F7} + EndGlobalSection +EndGlobal diff --git a/SGGL/FineUIPro.Web/JDGL/Check/MonthPlanStatisc.aspx b/SGGL/FineUIPro.Web/JDGL/Check/MonthPlanStatisc.aspx index e2b41974..9524b60c 100644 --- a/SGGL/FineUIPro.Web/JDGL/Check/MonthPlanStatisc.aspx +++ b/SGGL/FineUIPro.Web/JDGL/Check/MonthPlanStatisc.aspx @@ -19,9 +19,18 @@ + + diff --git a/SGGL/FineUIPro.Web/JDGL/Check/MonthPlanStatisc.aspx.cs b/SGGL/FineUIPro.Web/JDGL/Check/MonthPlanStatisc.aspx.cs index d65a237e..daa3c215 100644 --- a/SGGL/FineUIPro.Web/JDGL/Check/MonthPlanStatisc.aspx.cs +++ b/SGGL/FineUIPro.Web/JDGL/Check/MonthPlanStatisc.aspx.cs @@ -20,6 +20,7 @@ namespace FineUIPro.Web.JDGL.Check if (!IsPostBack) { this.txtMonths.Text = string.Format("{0:yyyy-MM}", DateTime.Now); + this.txtYear.Text = string.Format("{0:yyyy}", DateTime.Now); BindStatisc(); } } @@ -32,6 +33,7 @@ namespace FineUIPro.Web.JDGL.Check } BindStatisc(); } + #region 绑定GridView /// /// 绑定 @@ -143,6 +145,38 @@ namespace FineUIPro.Web.JDGL.Check this.Grid1.DataBind(); } #endregion + + /// + /// 统计周期 + /// + /// + /// + protected void ckCycle_SelectedIndexChanged(object sender, EventArgs e) + { + var cycle = this.ckCycle.SelectedValue; + if (cycle == "1") + {//按月份 + this.txtMonths.Hidden = false; + this.txtYear.Hidden = true; + } + else if(cycle == "2") + {//按年份 + this.txtMonths.Hidden = true; + this.txtYear.Hidden = false; + } + else + {//按项目周期 + this.txtMonths.Hidden = true; + this.txtYear.Hidden = true; + } + BindStatisc(); + } + + /// + /// 统计汇总 + /// + /// + /// protected void ckType_SelectedIndexChanged(object sender, EventArgs e) { if (this.ckType.SelectedValue == "1") diff --git a/SGGL/FineUIPro.Web/JDGL/Check/MonthPlanStatisc.aspx.designer.cs b/SGGL/FineUIPro.Web/JDGL/Check/MonthPlanStatisc.aspx.designer.cs index 92ad596d..c7f357c8 100644 --- a/SGGL/FineUIPro.Web/JDGL/Check/MonthPlanStatisc.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/JDGL/Check/MonthPlanStatisc.aspx.designer.cs @@ -7,11 +7,13 @@ // //------------------------------------------------------------------------------ -namespace FineUIPro.Web.JDGL.Check { - - - public partial class MonthPlanStatisc { - +namespace FineUIPro.Web.JDGL.Check +{ + + + public partial class MonthPlanStatisc + { + /// /// form1 控件。 /// @@ -20,7 +22,7 @@ namespace FineUIPro.Web.JDGL.Check { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.HtmlControls.HtmlForm form1; - + /// /// PageManager1 控件。 /// @@ -29,7 +31,7 @@ namespace FineUIPro.Web.JDGL.Check { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.PageManager PageManager1; - + /// /// Panel1 控件。 /// @@ -38,7 +40,7 @@ namespace FineUIPro.Web.JDGL.Check { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Panel Panel1; - + /// /// Grid1 控件。 /// @@ -47,7 +49,7 @@ namespace FineUIPro.Web.JDGL.Check { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Grid Grid1; - + /// /// Toolbar1 控件。 /// @@ -56,7 +58,16 @@ namespace FineUIPro.Web.JDGL.Check { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Toolbar Toolbar1; - + + /// + /// ckCycle 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.RadioButtonList ckCycle; + /// /// txtMonths 控件。 /// @@ -65,7 +76,16 @@ namespace FineUIPro.Web.JDGL.Check { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DatePicker txtMonths; - + + /// + /// txtYear 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DatePicker txtYear; + /// /// ckType 控件。 /// @@ -74,7 +94,7 @@ namespace FineUIPro.Web.JDGL.Check { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.RadioButtonList ckType; - + /// /// btnSearch 控件。 /// @@ -83,7 +103,7 @@ namespace FineUIPro.Web.JDGL.Check { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnSearch; - + /// /// btnOut 控件。 /// @@ -92,7 +112,7 @@ namespace FineUIPro.Web.JDGL.Check { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnOut; - + /// /// lblPageIndex 控件。 /// @@ -101,7 +121,7 @@ namespace FineUIPro.Web.JDGL.Check { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.WebControls.Label lblPageIndex; - + /// /// ToolbarSeparator1 控件。 /// @@ -110,7 +130,7 @@ namespace FineUIPro.Web.JDGL.Check { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1; - + /// /// ToolbarText1 控件。 /// @@ -119,7 +139,7 @@ namespace FineUIPro.Web.JDGL.Check { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.ToolbarText ToolbarText1; - + /// /// ddlPageSize 控件。 /// diff --git a/SGGL/FineUIPro.Web/PZHGL/GJSX/GJSXListEdit.aspx b/SGGL/FineUIPro.Web/PZHGL/GJSX/GJSXListEdit.aspx index ac5b51e0..1e38ce4c 100644 --- a/SGGL/FineUIPro.Web/PZHGL/GJSX/GJSXListEdit.aspx +++ b/SGGL/FineUIPro.Web/PZHGL/GJSX/GJSXListEdit.aspx @@ -46,7 +46,7 @@ - + @@ -54,13 +54,13 @@ - - diff --git a/SGGL/FineUIPro.Web/PZHGL/GJSX/GJSXListEdit.aspx.cs b/SGGL/FineUIPro.Web/PZHGL/GJSX/GJSXListEdit.aspx.cs index dbb3e75f..46319a18 100644 --- a/SGGL/FineUIPro.Web/PZHGL/GJSX/GJSXListEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/PZHGL/GJSX/GJSXListEdit.aspx.cs @@ -90,12 +90,12 @@ namespace FineUIPro.Web.PZHGL.GJSX Alert.ShowInParent("事项类别！", MessageBoxIcon.Warning); return; } - if (this.DropUser_Acceptance.SelectedValue == Const._Null) + if (this.DropUser_Acceptance.SelectedValue == null || this.DropUser_Acceptance.SelectedValue == Const._Null) { Alert.ShowInParent("请选择责任人！", MessageBoxIcon.Warning); return; } - if (this.DropUser_ReceiveID.SelectedValue == Const._Null) + if (this.DropUser_ReceiveID.SelectedValue == null || this.DropUser_ReceiveID.SelectedValue == Const._Null) { Alert.ShowInParent("请选择跟踪人！", MessageBoxIcon.Warning); return; @@ -818,12 +818,12 @@ namespace FineUIPro.Web.PZHGL.GJSX Alert.ShowInParent("事项类别！", MessageBoxIcon.Warning); return; } - if (this.DropUser_Acceptance.SelectedValue == Const._Null) + if (this.DropUser_Acceptance.SelectedValue == null || this.DropUser_Acceptance.SelectedValue == Const._Null) { Alert.ShowInParent("请选择责任人！", MessageBoxIcon.Warning); return; } - if (this.DropUser_ReceiveID.SelectedValue == Const._Null) + if (this.DropUser_ReceiveID.SelectedValue == null || this.DropUser_ReceiveID.SelectedValue == Const._Null) { Alert.ShowInParent("请选择跟踪人！", MessageBoxIcon.Warning); return; @@ -886,7 +886,7 @@ namespace FineUIPro.Web.PZHGL.GJSX } else { - + var gjsx = BLL.GJSXService.GetGJSXById(txtGJSXID.Text); if (gjsx.User_Acceptance.Contains(this.CurrUser.UserId)) {//责任人的时候保存关键事项 @@ -1014,12 +1014,12 @@ namespace FineUIPro.Web.PZHGL.GJSX Alert.ShowInParent("事项类别！", MessageBoxIcon.Warning); return; } - if (this.DropUser_Acceptance.SelectedValue == Const._Null) + if (this.DropUser_Acceptance.SelectedValue == null || this.DropUser_Acceptance.SelectedValue == Const._Null) { Alert.ShowInParent("请选择责任人！", MessageBoxIcon.Warning); return; } - if (this.DropUser_ReceiveID.SelectedValue == Const._Null) + if (this.DropUser_ReceiveID.SelectedValue == null || this.DropUser_ReceiveID.SelectedValue == Const._Null) { Alert.ShowInParent("请选择跟踪人！", MessageBoxIcon.Warning); return; diff --git a/SGGL/FineUIPro.Web/common/Menu_JDGL.xml b/SGGL/FineUIPro.Web/common/Menu_JDGL.xml index 101ae28b..88a255c8 100644 --- a/SGGL/FineUIPro.Web/common/Menu_JDGL.xml +++ b/SGGL/FineUIPro.Web/common/Menu_JDGL.xml @@ -22,6 +22,4 @@ - - \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/common/Menu_PGJSX.xml b/SGGL/FineUIPro.Web/common/Menu_PGJSX.xml index 2b9b3fb8..d3beefd2 100644 --- a/SGGL/FineUIPro.Web/common/Menu_PGJSX.xml +++ b/SGGL/FineUIPro.Web/common/Menu_PGJSX.xml @@ -1,9 +1,8 @@  - + - diff --git a/SGGL/FineUIPro.Web/common/Menu_SysSet.xml b/SGGL/FineUIPro.Web/common/Menu_SysSet.xml index f0871715..51a57bc0 100644 --- a/SGGL/FineUIPro.Web/common/Menu_SysSet.xml +++ b/SGGL/FineUIPro.Web/common/Menu_SysSet.xml @@ -22,8 +22,7 @@ - - + @@ -65,8 +64,6 @@ - - diff --git a/SGGL/FineUIPro.Web/common/Menu_TestRun.xml b/SGGL/FineUIPro.Web/common/Menu_TestRun.xml index 4056ca52..a02a6f60 100644 --- a/SGGL/FineUIPro.Web/common/Menu_TestRun.xml +++ b/SGGL/FineUIPro.Web/common/Menu_TestRun.xml @@ -49,9 +49,9 @@ - + @@ -69,11 +69,9 @@ - - diff --git a/SGGL/FineUIPro.Web/common/Menu_Transfer.xml b/SGGL/FineUIPro.Web/common/Menu_Transfer.xml index 283e3429..3abd6e40 100644 --- a/SGGL/FineUIPro.Web/common/Menu_Transfer.xml +++ b/SGGL/FineUIPro.Web/common/Menu_Transfer.xml @@ -3,17 +3,4 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/common/Menu_ZHGL.xml b/SGGL/FineUIPro.Web/common/Menu_ZHGL.xml index e3c0f11a..4536b2ad 100644 --- a/SGGL/FineUIPro.Web/common/Menu_ZHGL.xml +++ b/SGGL/FineUIPro.Web/common/Menu_ZHGL.xml @@ -27,8 +27,8 @@ - - + + @@ -88,6 +88,4 @@ - - \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/common/PageBase.cs b/SGGL/FineUIPro.Web/common/PageBase.cs index 4a4518af..f88df4a0 100644 --- a/SGGL/FineUIPro.Web/common/PageBase.cs +++ b/SGGL/FineUIPro.Web/common/PageBase.cs @@ -4,11 +4,13 @@ using Newtonsoft.Json.Linq; using System; using System.Collections.Generic; using System.Collections.Specialized; +using System.Configuration; using System.Data; using System.IO; using System.Linq; using System.Reflection; using System.Text; +using System.Threading; using System.Web; using System.Web.UI; using static FineUIPro.Web.CQMS.Performance.Performance; @@ -1299,5 +1301,64 @@ namespace FineUIPro.Web } } #endregion + + #region 中英文切换 + /// + /// 语言国际化 + /// + protected override void InitializeCulture() + { + string https = ConfigurationManager.AppSettings["Https"]; + if (Request.Cookies["SelectLan"] != null) + { + HttpCookie lanCookie = Request.Cookies["SelectLan"]; + + //从Session或Cookie里面读取 + string language = lanCookie["lan"]; + + //当前线程的语言采用哪种语言（比如zh，en等） + Thread.CurrentThread.CurrentUICulture = new System.Globalization.CultureInfo(language); + //决定各种数据类型是如何组织，如数字与日期 + Thread.CurrentThread.CurrentCulture = System.Globalization.CultureInfo.CreateSpecificCulture(language); + } + else + { + HttpCookie lanCookie = new HttpCookie("SelectLan"); + //默认为中文 + lanCookie["lan"] = "zh-CN"; + lanCookie.Expires = DateTime.Now.AddDays(1); + if (https == "true") + { + lanCookie.Secure = true; + } + Response.Cookies.Add(lanCookie); + } + } + + #region 获取语言 + /// + /// 获取语言 + /// + public string GetLanguage + { + get + { + string lan = "zh-CN"; + if (Request.Cookies["SelectLan"] != null) + { + HttpCookie lanCookie = Request.Cookies["SelectLan"]; + if (lanCookie["lan"] != null) + { + if (lanCookie["lan"] == "en-US") + { + lan = "en-US"; + } + } + } + return lan; + } + } + #endregion + #endregion } } \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/common/mainMenu_PGJSX.aspx b/SGGL/FineUIPro.Web/common/mainMenu_PGJSX.aspx index 5d5cca19..98ec808f 100644 --- a/SGGL/FineUIPro.Web/common/mainMenu_PGJSX.aspx +++ b/SGGL/FineUIPro.Web/common/mainMenu_PGJSX.aspx @@ -205,7 +205,7 @@
-
+
@@ -746,7 +746,7 @@ var option = { title: { // left:'center', - text: '关键事项超期平均时间', + text: '关键事项超期平均时间统计（单位：天）', textStyle: { color: '#1C1C1C', fontSize: 16, @@ -756,11 +756,12 @@ }, tooltip: {}, legend: { + data: ['关键事项超期平均时间'], left: '3%', show: true, selectedMode: false, textStyle: {//图例文字的样式 - color: '#1C1C1C', + //color: '#1C1C1C', fontSize: 16, fontWeight: 700 } @@ -842,10 +843,11 @@ // 使用刚指定的配置项和数据显示图表。 myChart.setOption(option) } + var four =<%=Four %>; var xArr = four.categories; var series = [{ - name: '关键事项超期平均时间统计（单位：天）', + name: '关键事项超期平均时间', type: 'bar', barWidth: 30, barGap: 0, @@ -858,6 +860,7 @@ label: { show: true, position: "middle" }, lineStyle: { type: "dashed", + width: 2, color: "#3c78d8" } }, @@ -867,10 +870,12 @@ label: { show: true, position: "middle" }, lineStyle: { type: "dashed", + width: 2, color: "#FF0000" } } - ] + ], + symbol: ['none', 'none']//标记线箭头 }, label: { //柱体上显示数值 show: true,//开启显示 diff --git a/SGGL/FineUIPro.Web/common/mainMenu_PGJSX.aspx.cs b/SGGL/FineUIPro.Web/common/mainMenu_PGJSX.aspx.cs index 9b389796..d069391e 100644 --- a/SGGL/FineUIPro.Web/common/mainMenu_PGJSX.aspx.cs +++ b/SGGL/FineUIPro.Web/common/mainMenu_PGJSX.aspx.cs @@ -12,6 +12,7 @@ using NPOI.SS.Formula.Functions; using NPOI.XSSF.Streaming.Values; using System.Web.UI.HtmlControls; using System.Text; +using FineUIPro.Web.SysManage; namespace FineUIPro.Web { @@ -140,19 +141,32 @@ namespace FineUIPro.Web List listCategories = new List(); businessColumn.title = "关键事项统计"; businessColumn.xFontNum = 5; - var userIds = BLL.GJSXService.GetGJSXUserList(this.ProjectId); + //var userIds = BLL.GJSXService.GetGJSXUserList(this.ProjectId); var allItems = from x in Funs.DB.GJSX where x.ProjectId == this.ProjectId select x; + //按照未关闭数取前10 + var groupedUser = (from x in Funs.DB.GJSX + where x.ProjectId == this.ProjectId && x.State != "0" + select x).GroupBy(p => p.User_Acceptance) + .Select(g => new + { + UserId = g.Key, + Count = g.Count() + }) + .OrderByDescending(x => x.Count) + .Take(10) + .ToList(); + Model.SingleSerie s = new Model.SingleSerie(); Model.SingleSerie s2 = new Model.SingleSerie(); List listdata = new List(); List listdata2 = new List(); int closeNum = 0; - foreach (var userid in userIds) + foreach (var userid in groupedUser) { - listCategories.Add(UserService.GetUserNameByUserId(userid)); - var typeItems = allItems.Where(x => x.User_Acceptance == userid); + listCategories.Add(UserService.GetUserNameByUserId(userid.UserId)); + var typeItems = allItems.Where(x => x.User_Acceptance == userid.UserId); closeNum = typeItems.Where(x => x.State == "0").Count(); listdata.Add(typeItems.Count() - closeNum); listdata2.Add(closeNum); @@ -481,7 +495,7 @@ namespace FineUIPro.Web double averageTypeDiffDay = 0; if (typelst.Any()) { - averageTypeDiffDay = typelst.Average(p => p.DiffDay); + averageTypeDiffDay = Math.Round(typelst.Average(p => p.DiffDay), 1); } listdata.Add(averageTypeDiffDay); } diff --git a/SGGL/FineUIPro.Web/common/mainProject2.aspx b/SGGL/FineUIPro.Web/common/mainProject2.aspx index db2d21a1..37e12395 100644 --- a/SGGL/FineUIPro.Web/common/mainProject2.aspx +++ b/SGGL/FineUIPro.Web/common/mainProject2.aspx @@ -76,65 +76,65 @@
- 风险预警 +
-
资质预警
+
<%=getEarlyWarningCounts() %>
-
机械预警
+
<%=GetJxyjNum() %>
-
危大工程
+
-
审批完成
+
<%=GetCompletedNum() %>
-
培训人次数
+
<%=GetTrainPersonNum() %>
-
施工个数
+
<%=GetConstructionNum() %>
-
完工个数
+
<%=GetFinishedNum() %>
-
超危大工程
+
-
审批完成
+
<%=GetSuperCompletedNum() %>
-
培训人次数
+
<%=GetSuperTrainPersonNum() %>
-
施工个数
+
<%=GetSuperConstructionNum() %>
-
完工个数
+
<%=GetSuperFinishedNum() %>
@@ -145,16 +145,16 @@
- 质量概况 +
-
质量培训累计人员
+
1307
-
施工方案审批量
+
5217
@@ -167,23 +167,23 @@
- 作业许可 +
-
动火
+
<%=getWrokCount0() %>/<%=getALLWrokCount0() %>
-
高处
+
<%=getWrokCount1() %>/<%=getALLWrokCount1() %>
-
吊装
+
<%=getWrokCount2() %>/<%=getALLWrokCount2() %>
-
其他
+
<%=getWrokCount3() %>/<%=getALLWrokCount3() %>
@@ -206,54 +206,54 @@
1656059
-
累计安全人工时
+
0
-
本月安全人工时
+
1161
-
安全培训累计人员
+
3
-
安全管理人员
+
4564
-
未遂事件
+
-
整改数据
+
-

总数

+

265

-

已完成

+

265

-

未完成

+

12

-

整改率

+

100%

@@ -290,24 +290,24 @@
-
合同工期
+
0天
-
合同到期时间
+
-
合同剩余
+
0天
-
关键事项准点率 <%=gjsxRate %>
+
<%=gjsxRate %>
- 进度统计 +
<%--
--%> @@ -318,24 +318,24 @@
- 工作台面 +
-
关键事项
+
0
-
待办事项
+
0
-
个人流程
+
0
-
已办任务
+
0
@@ -358,19 +358,19 @@
- 人员信息 +
-
当前现场人数
+
0
-
作业人员总数
+
0
-
管理人员总数
+
0
@@ -378,28 +378,28 @@
- 材料统计 +
-
管道材料
-
设备材料
+
+
-
材料类别
-
设计量
+
+
-

采购量

-

采购量百分比

+

+

-

到货量

-

已到货百分比

+

+

-

领料量

-

已领料百分比

+

+

@@ -1787,9 +1787,9 @@ weekData.forEach(e => { createZL(e) })--%> - createZL({ name: '质量问题整改率', value1: <%=zlallNumber%>, value2: <%=zlfinishNumber%>, el: 'zl-map1' }) - createZL({ name: '一次共检合格率', value1: <%=zlgjallNumber%>, value2: <%=zlgjfinishNumber%>, el: 'zl-map2' }) - createZL({ name: '焊接一次合格率', value1: <%=hjallNumber%>, value2: <%=hjfinishNumber%>, el: 'zl-map3' }) + createZL({ name: '<%=QualityRate%>', value1: <%=zlallNumber%>, value2: <%=zlfinishNumber%>, el: 'zl-map1' }) + createZL({ name: '<%=OnePassRate%>', value1: <%=zlgjallNumber%>, value2: <%=zlgjfinishNumber%>, el: 'zl-map2' }) + createZL({ name: '<%=OnePassRateOfWelding%>', value1: <%=hjallNumber%>, value2: <%=hjfinishNumber%>, el: 'zl-map3' }) function createZL(obj) { let AOption1 = { title: [{ @@ -1803,7 +1803,7 @@ } }, { // text: `总计：${obj.value1} | 完成：${obj.value2}`, - text: [`{a|总计：}{b|${obj.value1}}{c||}{a|完成：}{d|${obj.value2}}`], + text: [`{a|<%=total%>：}{b|${obj.value1}}{c||}{a|<%=completed%>：}{d|${obj.value2}}`], top: '80%', left: 'center', textStyle: { @@ -1958,10 +1958,10 @@ function createFXMap() { const list = [ - { TypeName: "重大风险", ValueAmount: <%=riskData4%> }, - { TypeName: "低风险", ValueAmount: <%=riskData1%> }, - { TypeName: "一般风险", ValueAmount: <%=riskData3%> }, - { TypeName: "较大风险", ValueAmount: <%=riskData2%> }, + { TypeName: "<%=majorRisk%>", ValueAmount: <%=riskData4%> }, + { TypeName: "<%=LowRisk%>", ValueAmount: <%=riskData1%> }, + { TypeName: "<%=GeneralRisk%>", ValueAmount: <%=riskData3%> }, + { TypeName: "<%=GreaterRisk%>", ValueAmount: <%=riskData2%> }, ] @@ -1999,7 +1999,7 @@ } } }, { - text: '重大风险', + text: '<%=majorRisk%>', top: 110, left: 'center', textStyle: { @@ -2282,7 +2282,7 @@ var two =<%=Tree %> var xArr1 = two.categories var data1 = [{ - name: '计划值', + name: '<%=PlannedValue%>', type: 'bar', //smooth: true, data: two.series[0].data, @@ -2299,7 +2299,7 @@ //color: 'rgba(200,201,10, 1)' } }, { - name: '实际值', + name: '<%=ActualValue%>', type: 'bar', //smooth: true, data: two.series[2].data, @@ -2313,7 +2313,7 @@ formatter: '{c}', }, }, { - name: '累计计划值', + name: '<%=Cumulative_planned_value%>', type: 'line', //smooth: true, data: two.series[1].data, @@ -2330,7 +2330,7 @@ //color: 'rgba(200,201,10, 1)' } }, { - name: '累计实际值', + name: '<%=Cumulative_actual_value%>', type: 'line', //smooth: true, data: two.series[3].data, diff --git a/SGGL/FineUIPro.Web/common/mainProject2.aspx.cs b/SGGL/FineUIPro.Web/common/mainProject2.aspx.cs index 3556ac9e..62214521 100644 --- a/SGGL/FineUIPro.Web/common/mainProject2.aspx.cs +++ b/SGGL/FineUIPro.Web/common/mainProject2.aspx.cs @@ -132,6 +132,8 @@ namespace FineUIPro.Web.common //材料到货 getCldh(); + + getCNEN();//中英文翻译 } } @@ -1236,5 +1238,40 @@ namespace FineUIPro.Web.common } } #endregion + + + /// + /// 中英文 + /// + protected string QualityRate = string.Empty;//质量问题整改率 + protected string OnePassRate = string.Empty;//一次共检合格率 + protected string OnePassRateOfWelding = string.Empty;//焊接一次合格率 + protected string total = string.Empty;//总计 + protected string completed = string.Empty;//已完成 + protected string majorRisk = string.Empty;//重大风险 + protected string LowRisk = string.Empty;//低风险 + protected string GeneralRisk = string.Empty;//一般风险 + protected string GreaterRisk = string.Empty;//较大风险 + protected string PlannedValue = string.Empty;//计划值 + protected string ActualValue = string.Empty;//实际值 + protected string Cumulative_planned_value = string.Empty;//累计计划值 + protected string Cumulative_actual_value = string.Empty;//累计实际值 + + private void getCNEN() + { + QualityRate = Resources.Lan.QualityRate; + OnePassRate = Resources.Lan.OnePassRate; + OnePassRateOfWelding = Resources.Lan.OnePassRateOfWelding; + total = Resources.Lan.total; + completed = Resources.Lan.completed; + majorRisk = Resources.Lan.MajorRisk; + LowRisk = Resources.Lan.LowRisk; + GeneralRisk = Resources.Lan.GeneralRisk; + GreaterRisk = Resources.Lan.GreaterRisk; + PlannedValue = Resources.Lan.PlannedValue; + ActualValue = Resources.Lan.ActualValue; + Cumulative_planned_value = Resources.Lan.Cumulative_planned_value; + Cumulative_actual_value = Resources.Lan.Cumulative_actual_value; + } } } \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/common/main_new.aspx b/SGGL/FineUIPro.Web/common/main_new.aspx index f178c5cb..d5afd85d 100644 --- a/SGGL/FineUIPro.Web/common/main_new.aspx +++ b/SGGL/FineUIPro.Web/common/main_new.aspx @@ -1,4 +1,4 @@ -<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="main_new.aspx.cs" Inherits="FineUIPro.Web.common.main_new" %> +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="main_new.aspx.cs" Inherits="FineUIPro.Web.common.main_new" Async="true"%> diff --git a/SGGL/FineUIPro.Web/common/main_new.aspx.cs b/SGGL/FineUIPro.Web/common/main_new.aspx.cs index 47b1c2dc..05a40cc9 100644 --- a/SGGL/FineUIPro.Web/common/main_new.aspx.cs +++ b/SGGL/FineUIPro.Web/common/main_new.aspx.cs @@ -1,10 +1,12 @@ using BLL; +using FineUIPro.Web.DataShow; using Model; using Newtonsoft.Json; using System; using System.Collections; using System.Collections.Generic; using System.Linq; +using System.Threading.Tasks; using System.Web; using System.Web.UI; using System.Web.UI.WebControls; @@ -17,278 +19,38 @@ namespace FineUIPro.Web.common public static List LargerHazard = new List(); public string[] pids { get; set; } - protected void Page_Load(object sender, EventArgs e) + protected async void Page_Load(object sender, EventArgs e) { - /* if (!IsPostBack) - { - Model.SGGLDB db = Funs.DB; - if (!string.IsNullOrEmpty(CurrUser.CompanyProjectId)) - { - pids = CurrUser.CompanyProjectId.Split(','); - } - else - { - //加载所有在建项目的数据 - var pidArray = Funs.DB.Base_Project.Where(x => x.ProjectState == "1").Select(x => x.ProjectId).ToArray(); - if (pidArray.Length > 0) - { - pids = pidArray; - } - } - - - //未遂事故 - this.divWS.InnerHtml = GetNearMissNum().ToString(); - - //安全人工时 - var countAqrgsSum = Convert.ToDecimal(0); - if (pids == null) - { - countAqrgsSum = CountAqrgs(); - } - else - { - countAqrgsSum = CountAqrgs(null, null, pids); - } - - if (countAqrgsSum > 10000) - { - countAqrgsSum = countAqrgsSum / Convert.ToDecimal(10000.00); - - this.divSafeWorkTime.InnerHtml = Math.Round(countAqrgsSum, 2).ToString() + "万"; - } - else - { - this.divSafeWorkTime.InnerHtml = countAqrgsSum.ToString().Split('.')[0]; - } - - - - //本月安全人工时 - //int wHoursMonth = 0; - //DateTime? sDate = Funs.GetNewDateTime(DateTime.Now.Year.ToString() + "-" + DateTime.Now.Month.ToString()); - //var dayReports = getMonthReportsByCompany(sDate); - //if (dayReports.Count > 0) - //{ - // wHoursMonth = Convert.ToInt32(dayReports[0].DayWorkTime); - //} - DateTime d1 = getStartMonth(); - DateTime d2 = getEndMonth(); - var countMonthAqrgs = Convert.ToDecimal(0); - if (pids == null) - { - countMonthAqrgs = CountAqrgs(d1, d2); - } - else - { - countMonthAqrgs = CountAqrgs(d1, d2, pids); - } - if (countMonthAqrgs > 10000) - { - countMonthAqrgs = countMonthAqrgs / Convert.ToDecimal(10000.00); - - this.divSafeWorkTimeMonth.InnerHtml = Math.Round(countMonthAqrgs, 2).ToString() + "万"; - } - else - { - this.divSafeWorkTimeMonth.InnerHtml = CountAqrgs(d1, d2).ToString().Split('.')[0]; - } - - - - //int wHoursMonth = db.SitePerson_PersonInOutNumber.Where(x => x.InOutDate > DateTime.Now.AddDays(-Convert.ToInt32(DateTime.Now.Date.Day))) - // .Max(x => x.WorkHours) ?? 0; - //this.divSafeWorkTimeMonth.InnerHtml = wHoursMonth.ToString(); - - //安全培训累计人员 - var getTrainRecord = 0; - var boShengCount = 0; - if (pids == null) - { - getTrainRecord = db.EduTrain_TrainRecord.Sum(x => x.TrainPersonNum) ?? 0; - //修改：增加博晟教育中的人数 - boShengCount = db.Bo_Sheng_TrainPerson.Where(x => (x.DeleteTag == "False" || x.DeleteTag == null)).ToList().Count; - this.divSafePersonNum.InnerHtml = (getTrainRecord + boShengCount).ToString(); - } - else - { - getTrainRecord = db.EduTrain_TrainRecord.Where(x => pids.Contains(x.ProjectId)).Sum(x => x.TrainPersonNum) ?? 0; - //修改：增加博晟教育中的人数 - boShengCount = db.Bo_Sheng_TrainPerson.Where(x => (x.DeleteTag == "False" || x.DeleteTag == null) - && pids.Contains(x.ProjectId)).ToList().Count; - - this.divSafePersonNum.InnerHtml = (getTrainRecord + boShengCount).ToString(); - } - - - if (pids == null) - { - //安全管理人员 - var allSum = from x in Funs.DB.SitePerson_Person - where x.IsUsed == true && x.InTime < DateTime.Now && (x.OutTime == null || x.OutTime > DateTime.Now) - select x; - - var glAllPerson = from x in allSum - join y in Funs.DB.Base_WorkPost on x.WorkPostId equals y.WorkPostId - //where (y.PostType == "1" || y.PostType == "4") //一般管理岗位和特种管理人员 - where y.IsHsse == true - select x; - this.divSafeManagePersonNum.InnerText = glAllPerson.Count().ToString(); - } - else - { - //安全管理人员 - var allSum = from x in Funs.DB.SitePerson_Person - where x.IsUsed == true && x.InTime < DateTime.Now && (x.OutTime == null || x.OutTime > DateTime.Now) - && pids.Contains(x.ProjectId) - select x; - - var glAllPerson = from x in allSum - join y in Funs.DB.Base_WorkPost on x.WorkPostId equals y.WorkPostId - //where (y.PostType == "1" || y.PostType == "4") //一般管理岗位和特种管理人员 - where y.IsHsse == true - select x; - this.divSafeManagePersonNum.InnerText = glAllPerson.Count().ToString(); - } - - #region 质量管理人员，质量培训人员 增加公司级 - int CqmsManageNum = 0; - int CqmsPxNum = 0; - //质量培训人员 - DateTime date = DateTime.Now.AddDays(-1); - if (pids == null) - { - CqmsManageNum = (from x in Funs.DB.Person_CompanyBranchPerson - join y in Funs.DB.Base_WorkPost on x.WorkPostId equals y.WorkPostId - where x.IsOnJob == true && y.IsCQMS == true - select x).Count() + - (from x in Funs.DB.SitePerson_Person - join y in Funs.DB.Base_WorkPost on x.WorkPostId equals y.WorkPostId - where x.IsUsed == true && y.IsCQMS == true - select x).Count(); - this.divCqmsManageNum.InnerText = CqmsManageNum.ToString(); - - CqmsPxNum = (from x in Funs.DB.Comprehensive_InspectionPerson - where x.IsTrain == true - select x).Count(); - divCqmsPxNum.InnerText = CqmsPxNum.ToString(); - } - else - { - CqmsManageNum = (from x in Funs.DB.SitePerson_Person - join y in Funs.DB.Base_WorkPost on x.WorkPostId equals y.WorkPostId - where x.IsUsed == true && y.IsCQMS == true && pids.Contains(x.ProjectId) - select x).Count(); - this.divCqmsManageNum.InnerText = CqmsManageNum.ToString(); - - CqmsPxNum = (from x in Funs.DB.Comprehensive_InspectionPerson - where x.IsTrain == true && pids.Contains(x.ProjectId) - select x).Count(); - divCqmsPxNum.InnerText = CqmsPxNum.ToString(); - } - #endregion - - //在建项目 - if (pids == null) - { - allProjects = ProjectService.GetAllProjectDropDownList(); - } - else - { - allProjects = ProjectService.GetAllProjectDropDownList(pids); - } - - int acount = allProjects.Count(); - int pcount1 = 0; - int pcount2 = 0; - int pcount3 = 0; - if (acount > 0) - { - pcount1 = allProjects.Where(x => x.ProjectState == Const.ProjectState_1 || x.ProjectState == null).Count(); - var pidzjsg = string.Join(",", allProjects.Where(x => x.ProjectState == Const.ProjectState_1 || x.ProjectState == null).Select(x => x.ProjectId)).Split(','); - if (pids == null) - { - pcount2 = (from x in Funs.DB.SitePerson_Person where x.IsUsed == true && pidzjsg.Contains(x.ProjectId) select x).Count(); - } - else - { - pidzjsg = pids; - pcount2 = (from x in Funs.DB.SitePerson_Person where x.IsUsed == true && pids.Contains(x.ProjectId) select x).Count(); - } - pcount3 = Count3(pidzjsg); - } - div_zjxmCount.InnerHtml = pcount1.ToString() + "
个
"; - div_cjrsCount.InnerHtml = pcount2.ToString() + "
人
"; - div_wdgcCount.InnerHtml = pcount3.ToString() + "
个
"; - - //质量问题 - getZlwt(); - - //质量共检 - getZlgj(); - - //焊接 - getHj(); - - //关键事项 - getGjsx(); - - //人员信息 - getSitePerson(); - - //项目人员图表 - getProjectSitePerson(); - - //进度 - getJd(); - - //整改数据 - getZgsj(); - - //材料到货表格 - getCldh(); - } - */ - - if (!IsPostBack) { InitializeProjectIds(); // 项目ID初始化封装 - BindSafetyStatistics(); // 安全统计模块 - BindQualityStatistics(); // 质量统计模块 - BindProjectStatistics(); // 项目统计模块 - getZlwt(); - //质量共检 - getZlgj(); + var projectTask = GetProjectAsync(); + var project2Task = GetProject2Async(); + var otherTasks = new List + { + BindSafetyStatisticsAsync(), // 安全统计模块 + BindQualityStatisticsAsync(), // 质量统计模块 + BindProjectStatisticsAsync(), // 项目统计模块 + GetZlwtAsync(), // 质量问题 + GetZlgjAsync(), // 质量共检 + GetHjAsync(), // 焊接 + GetGjsxAsync(), // 关键事项 + GetSitePersonAsync(), // 人员信息 + GetProjectSitePersonAsync(), // 项目人员图表 + GetJdAsync(), // 进度 + GetZgsjAsync(), // 整改数据 + GetCldhAsync() // 材料到货表格 + }; - //焊接 - getHj(); + await Task.WhenAll(otherTasks.Concat(new[] { projectTask, project2Task })); - //关键事项 - getGjsx(); - - //人员信息 - getSitePerson(); - - //项目人员图表 - getProjectSitePerson(); - - //进度 - getJd(); - - //整改数据 - getZgsj(); - - //材料到货表格 - getCldh(); + // 设置项目信息 + Project = await projectTask; + Project2 = await project2Task; } - - } - - // 初始化项目ID集合 private void InitializeProjectIds() { @@ -299,77 +61,89 @@ namespace FineUIPro.Web.common .Where(x => x.ProjectState == "1") .Select(x => x.ProjectId) .ToArray(); + //在建项目 + if (pids == null) + { + allProjects = ProjectService.GetAllProjectDropDownList(); + } + else + { + allProjects = ProjectService.GetAllProjectDropDownList(pids); + } } // 安全统计模块封装 - private void BindSafetyStatistics() + private async Task BindSafetyStatisticsAsync() { - var db = Funs.DB; - // 未遂事故 - divWS.InnerHtml = GetNearMissNum().ToString(); - // 安全人工时（合并重复逻辑） - var countAqrgsSum = pids?.Any() == true - ? CountAqrgs(d1: null, d2: null, pids) - : CountAqrgs(); - - if (countAqrgsSum > 10000) + await Task.Run(() => { - countAqrgsSum = countAqrgsSum / Convert.ToDecimal(10000.00); + var db = Funs.DB; + // 未遂事故 + divWS.InnerHtml = GetNearMissNum().ToString(); + // 安全人工时（合并重复逻辑） + var countAqrgsSum = pids?.Any() == true + ? CountAqrgs(d1: null, d2: null, pids) + : CountAqrgs(); - this.divSafeWorkTime.InnerHtml = Math.Round(countAqrgsSum, 2).ToString() + "万"; - } - else - { - this.divSafeWorkTime.InnerHtml = countAqrgsSum.ToString().Split('.')[0]; - } + if (countAqrgsSum > 10000) + { + countAqrgsSum = countAqrgsSum / Convert.ToDecimal(10000.00); - // 当月安全人工时 - var countMonthAqrgs = pids?.Any() == true - ? CountAqrgs(getStartMonth(), getEndMonth(), pids) - : CountAqrgs(getStartMonth(), getEndMonth()); + this.divSafeWorkTime.InnerHtml = Math.Round(countAqrgsSum, 2).ToString() + "万"; + } + else + { + this.divSafeWorkTime.InnerHtml = countAqrgsSum.ToString().Split('.')[0]; + } + + // 当月安全人工时 + var countMonthAqrgs = pids?.Any() == true + ? CountAqrgs(getStartMonth(), getEndMonth(), pids) + : CountAqrgs(getStartMonth(), getEndMonth()); - if (countMonthAqrgs > 10000) - { - countMonthAqrgs = countMonthAqrgs / Convert.ToDecimal(10000.00); + if (countMonthAqrgs > 10000) + { + countMonthAqrgs = countMonthAqrgs / Convert.ToDecimal(10000.00); - this.divSafeWorkTimeMonth.InnerHtml = Math.Round(countMonthAqrgs, 2).ToString() + "万"; - } - else - { - this.divSafeWorkTimeMonth.InnerHtml = countMonthAqrgs.ToString().Split('.')[0]; - } - // 安全培训人员（合并数据库查询） - var trainingQuery = db.EduTrain_TrainRecord - .Where(x => pids.Contains(x.ProjectId)) - .GroupBy(x => 1) - .Select(g => new { - TrainCount = g.Sum(x => x.TrainPersonNum) ?? 0, - BoShengCount = db.Bo_Sheng_TrainPerson - .Where(x => (x.DeleteTag == "False" || x.DeleteTag == null)) - .Where(x => pids.Contains(x.ProjectId)) - .Count() - }).FirstOrDefault(); + this.divSafeWorkTimeMonth.InnerHtml = Math.Round(countMonthAqrgs, 2).ToString() + "万"; + } + else + { + this.divSafeWorkTimeMonth.InnerHtml = countMonthAqrgs.ToString().Split('.')[0]; + } + // 安全培训人员（合并数据库查询） + var trainingQuery = db.EduTrain_TrainRecord + .Where(x => pids.Contains(x.ProjectId)) + .GroupBy(x => 1) + .Select(g => new { + TrainCount = g.Sum(x => x.TrainPersonNum) ?? 0, + BoShengCount = db.Bo_Sheng_TrainPerson + .Where(x => (x.DeleteTag == "False" || x.DeleteTag == null)) + .Where(x => pids.Contains(x.ProjectId)) + .Count() + }).FirstOrDefault(); - divSafePersonNum.InnerHtml = trainingQuery != null - ? (trainingQuery.TrainCount + trainingQuery.BoShengCount).ToString() - : "0"; + divSafePersonNum.InnerHtml = trainingQuery != null + ? (trainingQuery.TrainCount + trainingQuery.BoShengCount).ToString() + : "0"; - // 安全管理人员（优化关联查询） - var safetyStaffCount = db.SitePerson_Person - .Where(x=> x.IsUsed == true && x.InTime < DateTime.Now && (x.OutTime == null || x.OutTime > DateTime.Now)) - .Where(x => pids.Contains(x.ProjectId)) - .Join(db.Base_WorkPost.Where(x => x.IsHsse==true), - person => person.WorkPostId, - post => post.WorkPostId, - (person, post) => person) - .Count(); - divSafeManagePersonNum.InnerText = safetyStaffCount.ToString(); + // 安全管理人员（优化关联查询） + var safetyStaffCount = db.SitePerson_Person + .Where(x=> x.IsUsed == true && x.InTime < DateTime.Now && (x.OutTime == null || x.OutTime > DateTime.Now)) + .Where(x => pids.Contains(x.ProjectId)) + .Join(db.Base_WorkPost.Where(x => x.IsHsse==true), + person => person.WorkPostId, + post => post.WorkPostId, + (person, post) => person) + .Count(); + divSafeManagePersonNum.InnerText = safetyStaffCount.ToString(); + }); } // 质量统计模块封装 - private void BindQualityStatistics() + private async Task BindQualityStatisticsAsync() { var db = Funs.DB; // 质量管理人员（合并公司+项目级查询） @@ -389,18 +163,10 @@ namespace FineUIPro.Web.common .Count(x => x.IsTrain == true).ToString(); } // 项目统计优化 - private void BindProjectStatistics() + private async Task BindProjectStatisticsAsync() { var db = Funs.DB; - //在建项目 - if (pids == null) - { - allProjects = ProjectService.GetAllProjectDropDownList(); - } - else - { - allProjects = ProjectService.GetAllProjectDropDownList(pids); - } + int acount = allProjects.Count(); int pcount1 = 0; @@ -573,7 +339,13 @@ namespace FineUIPro.Web.common #region 项目信息 protected string Project { - get + get; + set; + } + + protected async Task GetProjectAsync() + { + return await Task.Run(() => { Model.SingleSerie series = new Model.SingleSerie(); var project1s = allProjects.Where(x => x.ProjectState == Const.ProjectState_1 || x.ProjectState == null); @@ -782,14 +554,20 @@ namespace FineUIPro.Web.common series.convert = convert; series.loc = loc; return JsonConvert.SerializeObject(series); - } + }); } #endregion #region 项目信息 protected string Project2 { - get + get; + set; + } + + protected async Task GetProject2Async() + { + return await Task.Run(() => { Model.SingleSerie series = new Model.SingleSerie(); var project1s = allProjects.Where(x => x.ProjectState == Const.ProjectState_1 || x.ProjectState == null); @@ -809,7 +587,6 @@ namespace FineUIPro.Web.common if (item.EndDate != null) { endDate = string.Format("{0:yyyy-MM-dd}", item.EndDate); - //获取剩余天数 residueDay = DateDiff(DateTime.Now, Convert.ToDateTime(item.EndDate)).ToString(); } decimal jdNum = 0; @@ -826,7 +603,7 @@ namespace FineUIPro.Web.common str = str.Substring(0, str.Length - 1); } return str; - } + }); } /// @@ -867,51 +644,53 @@ namespace FineUIPro.Web.common protected string zlzgl; protected string zgzglDataValue; - protected void getZlwt() + private async Task GetZlwtAsync() { - if (pids == null) + await Task.Run(() => { - zlallNumber = (from x in Funs.DB.Check_CheckControl - where x.CheckDate <= DateTime.Now - select x).Count().ToString(); + if (pids == null) + { + zlallNumber = (from x in Funs.DB.Check_CheckControl + where x.CheckDate <= DateTime.Now + select x).Count().ToString(); - var num2 = (from x in Funs.DB.Check_CheckControl - where x.CheckDate <= DateTime.Now && x.State == "7" - select x).Count(); + var num2 = (from x in Funs.DB.Check_CheckControl + where x.CheckDate <= DateTime.Now && x.State == "7" + select x).Count(); - zlfinishNumber = num2.ToString(); - var num3 = (from x in Funs.DB.Check_CheckControl - where x.CheckDate <= DateTime.Now && x.State != "7" - select x).Count(); + zlfinishNumber = num2.ToString(); + var num3 = (from x in Funs.DB.Check_CheckControl + where x.CheckDate <= DateTime.Now && x.State != "7" + select x).Count(); - var zgl = String.Format("{0:N2}", 100.0 * num2 / (num2 + num3)); + var zgl = String.Format("{0:N2}", 100.0 * num2 / (num2 + num3)); - zlzgl = zgl.ToString(); + zlzgl = zgl.ToString(); - zgzglDataValue = (100 - (100.0 * num2 / (num2 + num3))).ToString(); - } - else - { - zlallNumber = (from x in Funs.DB.Check_CheckControl - where x.CheckDate <= DateTime.Now && pids.Contains(x.ProjectId) - select x).Count().ToString(); + zgzglDataValue = (100 - (100.0 * num2 / (num2 + num3))).ToString(); + } + else + { + zlallNumber = (from x in Funs.DB.Check_CheckControl + where x.CheckDate <= DateTime.Now && pids.Contains(x.ProjectId) + select x).Count().ToString(); - var num2 = (from x in Funs.DB.Check_CheckControl - where x.CheckDate <= DateTime.Now && x.State == "7" && pids.Contains(x.ProjectId) - select x).Count(); + var num2 = (from x in Funs.DB.Check_CheckControl + where x.CheckDate <= DateTime.Now && x.State == "7" && pids.Contains(x.ProjectId) + select x).Count(); - zlfinishNumber = num2.ToString(); - var num3 = (from x in Funs.DB.Check_CheckControl - where x.CheckDate <= DateTime.Now && x.State != "7" && pids.Contains(x.ProjectId) - select x).Count(); + zlfinishNumber = num2.ToString(); + var num3 = (from x in Funs.DB.Check_CheckControl + where x.CheckDate <= DateTime.Now && x.State != "7" && pids.Contains(x.ProjectId) + select x).Count(); - var zgl = String.Format("{0:N2}", 100.0 * num2 / (num2 + num3)); + var zgl = String.Format("{0:N2}", 100.0 * num2 / (num2 + num3)); - zlzgl = zgl.ToString(); - - zgzglDataValue = (100 - (100.0 * num2 / (num2 + num3))).ToString(); - } + zlzgl = zgl.ToString(); + zgzglDataValue = (100 - (100.0 * num2 / (num2 + num3))).ToString(); + } + }); } #endregion @@ -921,42 +700,42 @@ namespace FineUIPro.Web.common protected string zlgjzgl; protected string zggjzglDataValue; - protected void getZlgj() + private async Task GetZlgjAsync() { - if (pids == null) + await Task.Run(() => { - var num1 = (from x in Funs.DB.ProcessControl_InspectionManagement - select x).Count(); - //Check_JointCheck - zlgjallNumber = num1.ToString(); + if (pids == null) + { + var num1 = (from x in Funs.DB.ProcessControl_InspectionManagement + select x).Count(); + zlgjallNumber = num1.ToString(); - var num2 = (from x in Funs.DB.ProcessControl_InspectionManagement - where x.IsOnceQualified == true - select x).Count(); - zlgjfinishNumber = num2.ToString(); + var num2 = (from x in Funs.DB.ProcessControl_InspectionManagement + where x.IsOnceQualified == true + select x).Count(); + zlgjfinishNumber = num2.ToString(); - var zgl = String.Format("{0:N2}", 100.0 * num2 / num1); - zlgjzgl = zgl.ToString(); - zggjzglDataValue = (100 - (100.0 * num2 / num1)).ToString(); - } - else - { - var num1 = (from x in Funs.DB.ProcessControl_InspectionManagement - where pids.Contains(x.ProjectId) - select x).Count(); - //Check_JointCheck - zlgjallNumber = num1.ToString(); + var zgl = String.Format("{0:N2}", 100.0 * num2 / num1); + zlgjzgl = zgl.ToString(); + zggjzglDataValue = (100 - (100.0 * num2 / num1)).ToString(); + } + else + { + var num1 = (from x in Funs.DB.ProcessControl_InspectionManagement + where pids.Contains(x.ProjectId) + select x).Count(); + zlgjallNumber = num1.ToString(); - var num2 = (from x in Funs.DB.ProcessControl_InspectionManagement - where x.IsOnceQualified == true && pids.Contains(x.ProjectId) - select x).Count(); - zlgjfinishNumber = num2.ToString(); - - var zgl = String.Format("{0:N2}", 100.0 * num2 / num1); - zlgjzgl = zgl.ToString(); - zggjzglDataValue = (100 - (100.0 * num2 / num1)).ToString(); - } + var num2 = (from x in Funs.DB.ProcessControl_InspectionManagement + where x.IsOnceQualified == true && pids.Contains(x.ProjectId) + select x).Count(); + zlgjfinishNumber = num2.ToString(); + var zgl = String.Format("{0:N2}", 100.0 * num2 / num1); + zlgjzgl = zgl.ToString(); + zggjzglDataValue = (100 - (100.0 * num2 / num1)).ToString(); + } + }); } #endregion @@ -967,84 +746,50 @@ namespace FineUIPro.Web.common protected string hjzgl = "0"; protected string hjDataValue = "0"; - protected void getHj() + private async Task GetHjAsync() { - Model.SingleSerie series = new Model.SingleSerie(); - Model.BusinessColumn businessColumn = new Model.BusinessColumn(); - List listdata = new List(); - double result = 0; - Model.SGGLDB db = Funs.DB; - var ndtLists = from x in db.ProcessControl_NondestructiveTest_New where x.ProfessionalName == "工艺管道" select x; - if (pids != null) + await Task.Run(() => { - ndtLists = ndtLists.Where(x=>pids.Contains(x.ProjectId)); - } - decimal a = 0, b = 0; + Model.SingleSerie series = new Model.SingleSerie(); + Model.BusinessColumn businessColumn = new Model.BusinessColumn(); + List listdata = new List(); + double result = 0; + Model.SGGLDB db = Funs.DB; + var ndtLists = from x in db.ProcessControl_NondestructiveTest_New where x.ProfessionalName == "工艺管道" select x; + if (pids != null) + { + ndtLists = ndtLists.Where(x=>pids.Contains(x.ProjectId)); + } + decimal a = 0, b = 0; - - var sumResult = ndtLists - .GroupBy(x => x.ProjectId) - .Select(g => new { - TotalQ = g.OrderByDescending(x => x.CreateDate) - .Select(x => x.TotalQuantity) - .FirstOrDefault(), - Rate = g.OrderByDescending(x => x.CreateDate) - .Select(x => x.TotalRate) - .FirstOrDefault() - }) - .Where(x => x.TotalQ.HasValue).ToList() - .Select(x => new { - A = Math.Floor(x.TotalQ.Value * (decimal.Parse(x.Rate)) / 100), - B = x.TotalQ.Value - }); - a = sumResult.Sum(x=>x.A); - b = sumResult.Sum(x => x.B); - /* if (ndtLists.Count() > 0) - { - foreach (var project in allProjects) - { - var ndt = (from x in ndtLists - where x.ProjectId == project.ProjectId - orderby x.CreateDate descending - select x).FirstOrDefault(); - if (ndt != null) - { - if (ndt.TotalQuantity.HasValue) - { - a += Math.Floor(ndt.TotalQuantity.Value * Funs.GetNewDecimalOrZero(ndt.TotalRate) / 100); - b += ndt.TotalQuantity.Value; - } - } - } - }*/ - if (b > 0) - { - result = Convert.ToDouble(decimal.Round(decimal.Parse((a / b * 100).ToString()), 2)); + var sumResult = ndtLists + .GroupBy(x => x.ProjectId) + .Select(g => new { + TotalQ = g.OrderByDescending(x => x.CreateDate) + .Select(x => x.TotalQuantity) + .FirstOrDefault(), + Rate = g.OrderByDescending(x => x.CreateDate) + .Select(x => x.TotalRate) + .FirstOrDefault() + }) + .Where(x => x.TotalQ.HasValue).ToList() + .Select(x => new { + A = Math.Floor(x.TotalQ.Value * (decimal.Parse(x.Rate)) / 100), + B = x.TotalQ.Value + }); + a = sumResult.Sum(x=>x.A); + b = sumResult.Sum(x => x.B); - hjallNumber = b.ToString(); - hjfinishNumber = a.ToString(); - hjzgl = result.ToString(); - hjDataValue = (100 - result).ToString(); - } + if (b > 0) + { + result = Convert.ToDouble(decimal.Round(decimal.Parse((a / b * 100).ToString()), 2)); - //if (ndtLists.Count() > 0) - //{ - - // foreach (var item in ndtLists) - // { - // //a += Funs.GetNewDecimalOrZero(item.OneTimeFilmQualifiedAmount); - // //b += Funs.GetNewDecimalOrZero(item.OneTimeFilmAmount); - // } - // if (b > 0) - // { - // result = Convert.ToDouble(decimal.Round(decimal.Parse((a / b * 100).ToString()), 2)); - - // hjallNumber = b.ToString(); - // hjfinishNumber = a.ToString(); - // hjzgl = result.ToString(); - // hjDataValue = (100 - result).ToString(); - // } - //} + hjallNumber = b.ToString(); + hjfinishNumber = a.ToString(); + hjzgl = result.ToString(); + hjDataValue = (100 - result).ToString(); + } + }); } #endregion @@ -1052,127 +797,122 @@ namespace FineUIPro.Web.common #region 关键事项 //准点率 protected string gjsxZdl = "0"; - protected void getGjsx() + private async Task GetGjsxAsync() { - if (pids == null) + await Task.Run(() => { - //Check_JointCheck - var znum = (from x in Funs.DB.GJSX - select x).Count(); - divGjsxzj.InnerHtml = znum.ToString(); + if (pids == null) + { + var znum = (from x in Funs.DB.GJSX select x).Count(); + divGjsxzj.InnerHtml = znum.ToString(); - //到期应完成 - var dqnum = (from x in Funs.DB.GJSX - where x.CompleteDate <= DateTime.Now - select x).Count().ToString(); - divGjsxdq.InnerHtml = dqnum; + var dqnum = (from x in Funs.DB.GJSX + where x.CompleteDate <= DateTime.Now + select x).Count().ToString(); + divGjsxdq.InnerHtml = dqnum; - //未准点完成 - var wzdnum = (from x in Funs.DB.GJSX - where x.CompleteDate <= DateTime.Now - && x.State != "0" - select x).Count().ToString(); - divGjsxwzd.InnerHtml = wzdnum; + var wzdnum = (from x in Funs.DB.GJSX + where x.CompleteDate <= DateTime.Now + && x.State != "0" + select x).Count().ToString(); + divGjsxwzd.InnerHtml = wzdnum; - //准点率，已完成/总数*100 - var ywcnum = (from x in Funs.DB.GJSX - where x.CompleteDate <= DateTime.Now - && x.State == "0" - select x).Count(); - gjsxZdl = Math.Round((100.0 * ywcnum / znum), 2).ToString(); - } - else - { - //Check_JointCheck - var znum = (from x in Funs.DB.GJSX - where pids.Contains(x.ProjectId) - select x).Count(); - divGjsxzj.InnerHtml = znum.ToString(); + var ywcnum = (from x in Funs.DB.GJSX + where x.CompleteDate <= DateTime.Now + && x.State == "0" + select x).Count(); + gjsxZdl = Math.Round((100.0 * ywcnum / znum), 2).ToString(); + } + else + { + var znum = (from x in Funs.DB.GJSX + where pids.Contains(x.ProjectId) + select x).Count(); + divGjsxzj.InnerHtml = znum.ToString(); - //到期应完成 - var dqnum = (from x in Funs.DB.GJSX - where x.CompleteDate <= DateTime.Now && pids.Contains(x.ProjectId) - select x).Count().ToString(); - divGjsxdq.InnerHtml = dqnum; + var dqnum = (from x in Funs.DB.GJSX + where x.CompleteDate <= DateTime.Now && pids.Contains(x.ProjectId) + select x).Count().ToString(); + divGjsxdq.InnerHtml = dqnum; - //未准点完成 - var wzdnum = (from x in Funs.DB.GJSX - where x.CompleteDate <= DateTime.Now - && x.State != "0" && pids.Contains(x.ProjectId) - select x).Count().ToString(); - divGjsxwzd.InnerHtml = wzdnum; - - //准点率，已完成/总数*100 - var ywcnum = (from x in Funs.DB.GJSX - where x.CompleteDate <= DateTime.Now - && x.State == "0" && pids.Contains(x.ProjectId) - select x).Count(); - gjsxZdl = Math.Round((100.0 * ywcnum / znum), 2).ToString(); - } + var wzdnum = (from x in Funs.DB.GJSX + where x.CompleteDate <= DateTime.Now + && x.State != "0" && pids.Contains(x.ProjectId) + select x).Count().ToString(); + divGjsxwzd.InnerHtml = wzdnum; + var ywcnum = (from x in Funs.DB.GJSX + where x.CompleteDate <= DateTime.Now + && x.State == "0" && pids.Contains(x.ProjectId) + select x).Count(); + gjsxZdl = Math.Round((100.0 * ywcnum / znum), 2).ToString(); + } + }); } #endregion #region 人员信息 - private void getSitePerson() + private async Task GetSitePersonAsync() { - int AllCount = 0; - int MCount = 0; - var getallin = new List(); - if (pids == null) + await Task.Run(() => { - getallin = APIPageDataService.getPersonNumByCompany(DateTime.Now); - } - else - { - getallin = APIPageDataService.getPersonNumByCompany(DateTime.Now, pids); - } - AllCount = getallin.Count(); - if (AllCount > 0) - { - MCount = getallin.Where(x => x.PostType == Const.PostType_1).Count(); - } + int AllCount = 0; + int MCount = 0; + var getallin = new List(); + if (pids == null) + { + getallin = APIPageDataService.getPersonNumByCompany(DateTime.Now); + } + else + { + getallin = APIPageDataService.getPersonNumByCompany(DateTime.Now, pids); + } + AllCount = getallin.Count(); + if (AllCount > 0) + { + MCount = getallin.Where(x => x.PostType == Const.PostType_1).Count(); + } - ////当前现场总人数 - div_xcrs.InnerHtml = AllCount.ToString(); - //作业人数 - div_zyxcrs.InnerHtml = (AllCount - MCount).ToString(); - //管理人数 - div_glxcrs.InnerHtml = MCount.ToString(); + div_xcrs.InnerHtml = AllCount.ToString(); + div_zyxcrs.InnerHtml = (AllCount - MCount).ToString(); + div_glxcrs.InnerHtml = MCount.ToString(); + }); } #endregion #region 项目人员图表 protected string ProjectPersonCount; protected string ProjectPersonMc; - private void getProjectSitePerson() + private async Task GetProjectSitePersonAsync() { - var list = new List(); - if (pids == null) + await Task.Run(() => { - list = Funs.DB.Base_Project.Where(x => (x.ProjectState == Const.ProjectState_1 || x.ProjectState == null)).ToList(); - } - else - { - list = Funs.DB.Base_Project.Where(x => pids.Contains(x.ProjectId)).ToList(); - } + var list = new List(); + if (pids == null) + { + list = Funs.DB.Base_Project.Where(x => (x.ProjectState == Const.ProjectState_1 || x.ProjectState == null)).ToList(); + } + else + { + list = Funs.DB.Base_Project.Where(x => pids.Contains(x.ProjectId)).ToList(); + } - - foreach (var item in list) - { - ProjectPersonMc += "'" + item.ShortName + "',"; - ProjectPersonCount += "'" + APIPageDataService.getPersonNum(item.ProjectId, DateTime.Now).Count() + "',"; - } - ProjectPersonMc = ProjectPersonMc.TrimEnd(','); - ProjectPersonCount = ProjectPersonCount.TrimEnd(','); + foreach (var item in list) + { + ProjectPersonMc += "'" + item.ShortName + "',"; + ProjectPersonCount += "'" + APIPageDataService.getPersonNum(item.ProjectId, DateTime.Now).Count() + "',"; + } + ProjectPersonMc = ProjectPersonMc.TrimEnd(','); + ProjectPersonCount = ProjectPersonCount.TrimEnd(','); + }); } #endregion #region 进度情况 protected string ProjectJd; protected string ProjectMc; - protected void getJd() + protected async Task GetJdAsync() { var list = new List(); if (pids == null) @@ -1195,12 +935,11 @@ namespace FineUIPro.Web.common ProjectJd = ProjectJd.TrimEnd(','); ProjectMc = ProjectMc.TrimEnd(','); } - } #endregion #region 整改数据 - protected void getZgsj() + protected async Task GetZgsjAsync() { div_zgsj.InnerHtml = (GetGeneralClosedNum() + GetGeneralNotClosedNum()).ToString(); div_zgywc.InnerHtml = GetGeneralClosedNum().ToString(); @@ -1260,10 +999,8 @@ namespace FineUIPro.Web.common protected string gdclHead = "
项目
管子
管件
阀门
垫片
紧固件
"; protected string sbclHead = "
项目
采购量
到货量
已到货百分比
"; - private void getCldh() + private async Task GetCldhAsync() { - - //项目 var list = new List(); if (pids == null) { @@ -1382,12 +1119,6 @@ namespace FineUIPro.Web.common sbclHtml += "
"; #endregion } - - - - - - } #endregion @@ -1414,7 +1145,6 @@ namespace FineUIPro.Web.common select x).Count(); return result; } - } } } \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/indexProject.aspx b/SGGL/FineUIPro.Web/indexProject.aspx index 69fbd111..28c9bcbe 100644 --- a/SGGL/FineUIPro.Web/indexProject.aspx +++ b/SGGL/FineUIPro.Web/indexProject.aspx @@ -236,6 +236,13 @@
+
+ + + + +
竣工
-
质量管理
-
安全管理
-
进度管理
-
焊接管理
-
材料管理
-
试车管理
+
+
+
+
+
+
+
+
@@ -265,12 +274,12 @@
- 呼叫
- +
待办
-
- 个人
- 帮助
- 退出
-
移交管理
-
关键事项与协调沟通
-
视频监控
-
现场考勤
-
意见收集
- +
+
+
+
+
+
@@ -441,7 +450,7 @@ Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="700px" Height="500px"> - +